prometheus-kubernetes-rules: make service label configurable (#6598)

* prometheus-kubernetes-rules: make service label configurable * without value
sapcc · May 29, 2024 · 4d82217 · 4d82217
1 parent d068754
commit 4d82217
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/prometheus-rules/prometheus-kubernetes-rules/Chart.yaml b/prometheus-rules/prometheus-kubernetes-rules/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "1.0"
 description: A collection of Prometheus alerting and aggregation rules for Kubernetes.
 name: prometheus-kubernetes-rules
-version: 1.9.0
+version: 1.9.1
diff --git a/prometheus-rules/prometheus-kubernetes-rules/alerts/apiserver.alerts.tpl b/prometheus-rules/prometheus-kubernetes-rules/alerts/apiserver.alerts.tpl
@@ -8,7 +8,7 @@ groups:
     labels:
       tier: {{ required ".Values.tier missing" .Values.tier }}
       support_group: {{ required ".Values.supportGroup missing" .Values.supportGroup }}
-      service: k8s
+      service: {{ required ".Values.service missing" .Values.service }}
       severity: warning
       context: apiserver
       meta: "{{`{{ $labels.instance }}`}}"
@@ -24,7 +24,7 @@ groups:
     labels:
       tier: {{ required ".Values.tier missing" .Values.tier }}
       support_group: {{ required ".Values.supportGroup missing" .Values.supportGroup }}
-      service: k8s
+      service: {{ required ".Values.service missing" .Values.service }}
       severity: warning
       context: apiserver
       meta: "{{`{{ $labels.instance }}`}}"
@@ -40,7 +40,7 @@ groups:
     labels:
       tier: {{ required ".Values.tier missing" .Values.tier }}
       support_group: {{ required ".Values.supportGroup missing" .Values.supportGroup }}
-      service: k8s
+      service: {{ required ".Values.service missing" .Values.service }}
       severity: info
       context: apiserver
       dashboard: kubernetes-health
@@ -54,7 +54,7 @@ groups:
     labels:
       tier: {{ required ".Values.tier missing" .Values.tier }}
       support_group: {{ required ".Values.supportGroup missing" .Values.supportGroup }}
-      service: k8s
+      service: {{ required ".Values.service missing" .Values.service }}
       support_group: containers
       severity: info
       context: apiserver
@@ -71,7 +71,7 @@ groups:
     labels:
       tier: {{ required ".Values.tier missing" .Values.tier }}
       support_group: {{ required ".Values.supportGroup missing" .Values.supportGroup }}
-      service: k8s
+      service: {{ required ".Values.service missing" .Values.service }}
       severity: warning
       context: apiserver
     annotations:

diff --git a/prometheus-rules/prometheus-kubernetes-rules/alerts/health.alerts.tpl b/prometheus-rules/prometheus-kubernetes-rules/alerts/health.alerts.tpl
@@ -8,7 +8,7 @@ groups:
     labels:
       tier: {{ required ".Values.tier missing" .Values.tier }}
       support_group: {{ required ".Values.supportGroup missing" .Values.supportGroup }}
-      service: k8s
+      service: {{ required ".Values.service missing" .Values.service }}
       severity: critical
       context: node
       meta: "{{`{{ $value }}`}} nodes NotReady"
@@ -24,7 +24,7 @@ groups:
     labels:
       tier: {{ required ".Values.tier missing" .Values.tier }}
       support_group: {{ required ".Values.supportGroup missing" .Values.supportGroup }}
-      service: k8s
+      service: {{ required ".Values.service missing" .Values.service }}
       severity: warning
       context: node
       meta: "{{`{{ $labels.node }}`}} is NotReady"
@@ -41,7 +41,7 @@ groups:
     labels:
       tier: {{ required ".Values.tier missing" .Values.tier }}
       support_group: {{ required ".Values.supportGroup missing" .Values.supportGroup }}
-      service: k8s
+      service: {{ required ".Values.service missing" .Values.service }}
       severity: warning
       context: node
       meta: "{{`{{ $labels.node }}`}}"
@@ -56,7 +56,7 @@ groups:
     labels:
       tier: {{ required ".Values.tier missing" .Values.tier }}
       support_group: {{ required ".Values.supportGroup missing" .Values.supportGroup }}
-      service: k8s
+      service: {{ required ".Values.service missing" .Values.service }}
       severity: warning
       context: node
       dashboard: kubernetes-health
@@ -99,7 +99,7 @@ groups:
     labels:
       tier: {{ required ".Values.tier missing" .Values.tier }}
       support_group: {{ required ".Values.supportGroup missing" .Values.supportGroup }}
-      service: k8s
+      service: {{ required ".Values.service missing" .Values.service }}
       severity: warning
       context: system
       meta: "{{`{{ $labels.node }}`}}"

diff --git a/prometheus-rules/prometheus-kubernetes-rules/alerts/kubelet.alerts.tpl b/prometheus-rules/prometheus-kubernetes-rules/alerts/kubelet.alerts.tpl
@@ -70,7 +70,7 @@ groups:
     labels:
       tier: {{ required ".Values.tier missing" .Values.tier }}
       support_group: {{ required ".Values.supportGroup missing" .Values.supportGroup }}
-      service: k8s
+      service: {{ required ".Values.service missing" .Values.service }}
       severity: warning
       context: kubelet
       meta: "{{`{{ $labels.node }}`}}"
@@ -84,7 +84,7 @@ groups:
     labels:
       tier: {{ required ".Values.tier missing" .Values.tier }}
       support_group: {{ required ".Values.supportGroup missing" .Values.supportGroup }}
-      service: k8s
+      service: {{ required ".Values.service missing" .Values.service }}
       severity: warning
       context: kubelet
       meta: "{{`{{ $labels.node }}`}}"
@@ -102,7 +102,7 @@ groups:
     labels:
       tier: {{ required ".Values.tier missing" .Values.tier }}
       support_group: {{ required ".Values.supportGroup missing" .Values.supportGroup }}
-      service: k8s
+      service: {{ required ".Values.service missing" .Values.service }}
       severity: warning
       context: kubelet
       meta: "Many 5xx responses for Kubelet on {{`{{ $labels.node }}`}} "