From c62c1da74e85dcd6c7073dbb5fcd09612fd1bd5f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 19 Nov 2023 14:39:52 +0100
Subject: [PATCH] Update kube-state-metrics-mixin to monitoring-mixins-v1.6.0
 (#614)

Signed-off-by: Nicolas Lamirault <nlamirault@users.noreply.github.com>
Co-authored-by: Nicolas Lamirault <nlamirault@users.noreply.github.com>
---
 charts/kube-state-metrics-mixin/Chart.yaml         |  6 +++---
 .../kube-state-metrics-mixin/templates/alerts.yaml | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/charts/kube-state-metrics-mixin/Chart.yaml b/charts/kube-state-metrics-mixin/Chart.yaml
index a7f335c5..e1242003 100644
--- a/charts/kube-state-metrics-mixin/Chart.yaml
+++ b/charts/kube-state-metrics-mixin/Chart.yaml
@@ -31,12 +31,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.0
+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: 2.2.4
+appVersion: 2.10.1
 
 maintainers:
   - name: nlamirault
@@ -60,4 +60,4 @@ annotations:
     url: https://keybase.io/nlamirault/pgp_keys.asc
   artifacthub.io/changes: |
     - kind: changed
-      description: kube-state-metrics-mixin v2.8.2
+      description: kube-state-metrics-mixin v2.10.1
diff --git a/charts/kube-state-metrics-mixin/templates/alerts.yaml b/charts/kube-state-metrics-mixin/templates/alerts.yaml
index 712e3684..91a4b4e8 100644
--- a/charts/kube-state-metrics-mixin/templates/alerts.yaml
+++ b/charts/kube-state-metrics-mixin/templates/alerts.yaml
@@ -20,9 +20,9 @@ spec:
               description: kube-state-metrics is experiencing errors at an elevated rate in list operations. This is likely causing it to not be able to expose metrics about Kubernetes objects correctly or at all.
               summary: kube-state-metrics is experiencing errors in list operations.
             expr: |
-              (sum(rate(kube_state_metrics_list_total{job="kube-state-metrics",result="error"}[5m]))
+              (sum(rate(kube_state_metrics_list_total{job="kube-state-metrics",result="error"}[5m])) by (cluster)
                 /
-              sum(rate(kube_state_metrics_list_total{job="kube-state-metrics"}[5m])))
+              sum(rate(kube_state_metrics_list_total{job="kube-state-metrics"}[5m])) by (cluster))
               > 0.01
             for: 15m
             labels:
@@ -32,9 +32,9 @@ spec:
               description: kube-state-metrics is experiencing errors at an elevated rate in watch operations. This is likely causing it to not be able to expose metrics about Kubernetes objects correctly or at all.
               summary: kube-state-metrics is experiencing errors in watch operations.
             expr: |
-              (sum(rate(kube_state_metrics_watch_total{job="kube-state-metrics",result="error"}[5m]))
+              (sum(rate(kube_state_metrics_watch_total{job="kube-state-metrics",result="error"}[5m])) by (cluster)
                 /
-              sum(rate(kube_state_metrics_watch_total{job="kube-state-metrics"}[5m])))
+              sum(rate(kube_state_metrics_watch_total{job="kube-state-metrics"}[5m])) by (cluster))
               > 0.01
             for: 15m
             labels:
@@ -44,7 +44,7 @@ spec:
               description: kube-state-metrics pods are running with different --total-shards configuration, some Kubernetes objects may be exposed multiple times or not exposed at all.
               summary: kube-state-metrics sharding is misconfigured.
             expr: |
-              stdvar (kube_state_metrics_total_shards{job="kube-state-metrics"}) != 0
+              stdvar (kube_state_metrics_total_shards{job="kube-state-metrics"}) by (cluster) != 0
             for: 15m
             labels:
               severity: critical
@@ -53,9 +53,9 @@ spec:
               description: kube-state-metrics shards are missing, some Kubernetes objects are not being exposed.
               summary: kube-state-metrics shards are missing.
             expr: |
-              2^max(kube_state_metrics_total_shards{job="kube-state-metrics"}) - 1
+              2^max(kube_state_metrics_total_shards{job="kube-state-metrics"}) by (cluster) - 1
                 -
-              sum( 2 ^ max by (shard_ordinal) (kube_state_metrics_shard_ordinal{job="kube-state-metrics"}) )
+              sum( 2 ^ max by (cluster, shard_ordinal) (kube_state_metrics_shard_ordinal{job="kube-state-metrics"}) ) by (cluster)
               != 0
             for: 15m
             labels: