Update linkerd-stable-mixin to monitoring-mixins-v1.6.0 (#620)

Signed-off-by: Nicolas Lamirault <nlamirault@users.noreply.github.com> Co-authored-by: Nicolas Lamirault <nlamirault@users.noreply.github.com>
portefaix · Nov 19, 2023 · d5fd9b8 · d5fd9b8
1 parent 5e52069
commit d5fd9b8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 50 deletions.
diff --git a/charts/linkerd-stable-mixin/Chart.yaml b/charts/linkerd-stable-mixin/Chart.yaml
@@ -33,12 +33,12 @@ keywords:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.1.2
+version: 1.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: stable-2.10.2
+appVersion: master
 
 maintainers:
   - name: nlamirault
@@ -59,5 +59,5 @@ annotations:
     fingerprint: C39918B3EBDE35C23B8D0B8E5F99269A6FCA437C
     url: https://keybase.io/nlamirault/pgp_keys.asc
   artifacthub.io/changes: |
-    - kind: fix
-      description: Normalise dashboards ConfigMaps using ConfigMapList
+    - kind: changed
+      description: linkerd-stable-mixin vmaster
diff --git a/charts/linkerd-stable-mixin/templates/alerts.yaml b/charts/linkerd-stable-mixin/templates/alerts.yaml
@@ -1,19 +1,3 @@
-# Copyright (C) Nicolas Lamirault <nicolas.lamirault@gmail.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
@@ -29,17 +13,14 @@ metadata:
     {{- end }}
 spec:
   groups:
-  - name: linkerd
-    rules:
-    - alert: LinkerdRequestsHighErrorRate
-      annotations:
-        message: Linkerd error rate for {{`{{`}} $labels.deployment | $labels.statefulset
-          | $labels.daemonset {{`}}`}}.
-        runbook_url: https://github.com/nlamiraut/monitoring-mixins/tree/master/mixins/linkerd-stable-mixin/runbook.md#alert-name-linkerdrequestshigherrorrate
-        summary: Linkerd have high error rate for more than 10 minutes.
-      expr: sum(rate(request_errors_total[1m])) by (deployment, statefulset, daemonset)
-        / sum(rate(request_total[1m])) by (deployment, statefulset, daemonset) * 100
-        > 10
-      for: 10m
-      labels:
-        severity: warning
+      - name: linkerd
+        rules:
+          - alert: LinkerdRequestsHighErrorRate
+            annotations:
+              message: Linkerd error rate for {{`{{`}} $labels.deployment | $labels.statefulset | $labels.daemonset {{`}}`}}.
+              runbook_url: https://github.com/nlamiraut/monitoring-mixins/tree/master/mixins/linkerd-stable-mixin/runbook.md#alert-name-linkerdrequestshigherrorrate
+              summary: Linkerd have high error rate for more than 10 minutes.
+            expr: sum(rate(request_errors_total[1m])) by (deployment, statefulset, daemonset) / sum(rate(request_total[1m])) by (deployment, statefulset, daemonset) * 100 > 10
+            for: 10m
+            labels:
+              severity: warning
diff --git a/charts/linkerd-stable-mixin/templates/configmap-dashboards.yaml b/charts/linkerd-stable-mixin/templates/configmap-dashboards.yaml
@@ -1,19 +1,3 @@
-# Copyright (C) Nicolas Lamirault <nicolas.lamirault@gmail.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-
 ---
 {{- $files := .Files.Glob "dashboards/*.json" }}
 {{- if $files }}