Remove role label usage (#923)

giantswarm · Oct 4, 2023 · 845dfad · 845dfad
1 parent e9a71bb
commit 845dfad
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Removed
+
+- Remove role label usage instead of relying on `kube_node_role`` metric.
+
 ## [2.136.0] - 2023-10-04
 
 ### Changed

diff --git a/helm/prometheus-rules/templates/alerting-rules/etcd.management-cluster.rules.yml b/helm/prometheus-rules/templates/alerting-rules/etcd.management-cluster.rules.yml
@@ -49,7 +49,7 @@ spec:
       annotations:
         description: '{{`Etcd has no leader.`}}'
         opsrecipe: etcd-has-no-leader/
-      expr: etcd_server_has_leader{role=~"master|control-plane", cluster_type="management_cluster", provider!~"eks"} == 0
+      expr: etcd_server_has_leader{cluster_type="management_cluster", provider!~"eks"} == 0
       for: 5m
       labels:
         area: kaas

diff --git a/helm/prometheus-rules/templates/alerting-rules/management-cluster.rules.yml b/helm/prometheus-rules/templates/alerting-rules/management-cluster.rules.yml
@@ -16,7 +16,7 @@ spec:
       annotations:
         description: '{{`Management cluster {{ $labels.cluster_id }} has less than 3 nodes.`}}'
         opsrecipe: management-cluster-less-than-three-workers/
-      expr: sum(kubelet_node_name{cluster_type="management_cluster", role="worker"}) < 3
+      expr: sum(kubelet_node_name{cluster_type="management_cluster"} * on (node) kube_node_role{role="worker"}) < 3
       for: 1h
       labels:
         area: kaas