[kube-prometheus-stack] Resolve Issue 3340 (#3351)

* update add_custom_labels to apply labels to all PrometheusRules Signed-off-by: Scott Grimes <scott.grimes@waldzell.net> * update rules templates compiled from sync_prometheus_rules.p6 Signed-off-by: Scott Grimes <scott.grimes@waldzell.net> * bump chart version Signed-off-by: Scott Grimes <scott.grimes@waldzell.net> * fix node-exporter listen address with kubeRBACProxy enabled (#3336) Signed-off-by: rob <rob@unx.pl> Co-authored-by: MH <zanhsieh@gmail.com> Signed-off-by: Scott Grimes <scott.grimes@waldzell.net> * [prometheus] Bump Prometheus release (#3335) * Bump Prometheus to v2.43.1 Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com> Co-authored-by: MH <zanhsieh@gmail.com> Signed-off-by: Scott Grimes <scott.grimes@waldzell.net> * Fix RoleBinding subject namespace reference (#3342) Signed-off-by: Tom Walker <walker.thomas.p@gmail.com> Signed-off-by: MH <zanhsieh@gmail.com> Co-authored-by: MH <zanhsieh@gmail.com> Signed-off-by: Scott Grimes <scott.grimes@waldzell.net> * Update extraManifests example to be multiline string instead of YAML (#3343) Signed-off-by: Tom Walker <walker.thomas.p@gmail.com> Signed-off-by: Scott Grimes <scott.grimes@waldzell.net> * [prometheus-stackdriver-exporter] Add prometheusRule support (#3115) * [prometheus-stackdriver-exporter] Add prometheusRule support Signed-off-by: Baptiste Roux <arte.but.posix@gmail.com> * [prometheus-stackdriver-exporter] Bump version to 4.3.0 Signed-off-by: Baptiste Roux <arte.but.posix@gmail.com> --------- Signed-off-by: Baptiste Roux <arte.but.posix@gmail.com> Co-authored-by: MH <zanhsieh@gmail.com> Co-authored-by: Rico Pahlisch <pahli88@googlemail.com> Signed-off-by: Scott Grimes <scott.grimes@waldzell.net> * [kube-prometheus-stack] add prometheus config reloader liveness and readiness prob… (#3337) * dongjiang, add prometheus config reloader liveness and readiness probe setting Signed-off-by: dongjiang1989 <dongjiang1989@126.com> * update appVersion to v0.65.1 Signed-off-by: dongjiang1989 <dongjiang1989@126.com> * Update the Chart version to 45.26.0 Signed-off-by: dongjiang <dongjiang1989@126.com> Signed-off-by: dongjiang1989 <dongjiang1989@126.com> * dongjiang, fix trailing spaces Signed-off-by: dongjiang1989 <dongjiang1989@126.com> --------- Signed-off-by: dongjiang1989 <dongjiang1989@126.com> Signed-off-by: dongjiang <dongjiang1989@126.com> * [prometheus] env vars for configmap-reload (#3344) * Add support for env vars for configmap-reload to better support basic authentication at Prometheus * Bump configmap-reload release to 0.65.1 * Update values schema with the latest values Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com> Co-authored-by: MH <zanhsieh@gmail.com> Signed-off-by: Scott Grimes <scott.grimes@waldzell.net> * [prometheus] Fix volume name evaluation (#3348) Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com> Signed-off-by: Scott Grimes <scott.grimes@waldzell.net> * formatting Signed-off-by: Scott Grimes <scott-grimes@users.noreply.github.com> * Update Chart.yaml Signed-off-by: Scott Grimes <scott-grimes@users.noreply.github.com> * Update sync_prometheus_rules.py Signed-off-by: Scott Grimes <scott-grimes@users.noreply.github.com> --------- Signed-off-by: Scott Grimes <scott.grimes@waldzell.net> Signed-off-by: rob <rob@unx.pl> Signed-off-by: zeritti <47476160+zeritti@users.noreply.github.com> Signed-off-by: Tom Walker <walker.thomas.p@gmail.com> Signed-off-by: MH <zanhsieh@gmail.com> Signed-off-by: Baptiste Roux <arte.but.posix@gmail.com> Signed-off-by: dongjiang1989 <dongjiang1989@126.com> Signed-off-by: dongjiang <dongjiang1989@126.com> Signed-off-by: Scott Grimes <scott-grimes@users.noreply.github.com> Co-authored-by: Robert Jerzak <r0bj@users.noreply.github.com> Co-authored-by: MH <zanhsieh@gmail.com> Co-authored-by: zeritti <47476160+zeritti@users.noreply.github.com> Co-authored-by: Tom Walker <walker.thomas.p@gmail.com> Co-authored-by: Baptiste Roux <32563450+BapRx@users.noreply.github.com> Co-authored-by: Rico Pahlisch <pahli88@googlemail.com> Co-authored-by: dongjiang <dongjiang1989@126.com>
prometheus-community · May 17, 2023 · fda9442 · fda9442
1 parent 8f91606
commit fda9442
Show file tree

Hide file tree

Showing 12 changed files with 343 additions and 19 deletions.
diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml
@@ -21,7 +21,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 45.28.0
+version: 45.28.1
 appVersion: v0.65.1
 kubeVersion: ">=1.16.0-0"
 home: https://github.com/prometheus-operator/kube-prometheus

diff --git a/charts/kube-prometheus-stack/hack/sync_prometheus_rules.py b/charts/kube-prometheus-stack/hack/sync_prometheus_rules.py
@@ -264,26 +264,49 @@ def add_rules_per_rule_conditions(rules, group, indent=4):
     return rules
 
 
-def add_custom_labels(rules, indent=4):
+def add_custom_labels(rules_str, indent=4):
     """Add if wrapper for additional rules labels"""
     rule_condition = '{{- if .Values.defaultRules.additionalRuleLabels }}\n{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}\n{{- end }}'
-    rule_condition_len = len(rule_condition) + 1
-
-    separator = " " * indent + "- alert:.*"
-    alerts_positions = re.finditer(separator,rules)
-    alert=-1
-    for alert_position in alerts_positions:
-        # add rule_condition at the end of the alert block
-        if alert >= 0 :
-            index = alert_position.start() + rule_condition_len * alert - 1
-            rules = rules[:index] + "\n" + rule_condition + rules[index:]
-        alert += 1
-
-    # add rule_condition at the end of the last alert
-    if alert >= 0:
-        index = len(rules) - 1
-        rules = rules[:index] + "\n" + rule_condition + rules[index:]
-    return rules
+    rule_seperator = "\n" + " " * indent + "-.*"
+    label_seperator = "\n" + " " * indent + "  labels:"
+    section_seperator = "\n" + " " * indent + "  \S"
+    section_seperator_len = len(section_seperator)-1
+    rules_positions = re.finditer(rule_seperator,rules_str)
+
+    # fetch breakpoint between each set of rules
+    ruleStartingLine = [(rule_position.start(),rule_position.end()) for rule_position in rules_positions]
+    head = rules_str[:ruleStartingLine[0][0]]
+
+    # construct array of rules so they can be handled individually 
+    rules = []
+    # pylint: disable=E1136
+    # See https://github.com/pylint-dev/pylint/issues/1498 for None Values
+    previousRule = None
+    for r in ruleStartingLine:
+         if previousRule != None:
+             rules.append(rules_str[previousRule[0]:r[0]])
+         previousRule = r
+    rules.append(rules_str[previousRule[0]:len(rules_str)-1])
+
+    for i, rule in enumerate(rules):
+        current_label = re.search(label_seperator,rule)
+        if current_label:
+            # `labels:` block exists
+            # determine if there are any existing entries
+            entries = re.search(section_seperator,rule[current_label.end():])
+            if entries:
+                entries_start = current_label.end()
+                entries_end = entries.end()+current_label.end()-section_seperator_len
+                rules[i] = rule[:entries_end] + "\n" + rule_condition  + rule[entries_end:]
+            else:
+                # `labels:` does not contain any entries
+                # append template to label section
+                rules[i]+= "\n" + rule_condition
+        else:
+            # `labels:` block does not exist
+            # create it and append template
+            rules[i]+= label_seperator + "\n" + rule_condition
+    return head + "".join(rules) + "\n"
 
 
 def add_custom_annotations(rules, indent=4):

diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/k8s.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/k8s.rules.yaml
@@ -31,36 +31,60 @@ spec:
           1, max by(cluster, namespace, pod, node) (kube_pod_info{node!=""})
         )
       record: node_namespace_pod_container:container_cpu_usage_seconds_total:sum_irate
+      labels:
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
     - expr: |-
         container_memory_working_set_bytes{job="kubelet", metrics_path="/metrics/cadvisor", image!=""}
         * on (cluster, namespace, pod) group_left(node) topk by(cluster, namespace, pod) (1,
           max by(cluster, namespace, pod, node) (kube_pod_info{node!=""})
         )
       record: node_namespace_pod_container:container_memory_working_set_bytes
+      labels:
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
     - expr: |-
         container_memory_rss{job="kubelet", metrics_path="/metrics/cadvisor", image!=""}
         * on (cluster, namespace, pod) group_left(node) topk by(cluster, namespace, pod) (1,
           max by(cluster, namespace, pod, node) (kube_pod_info{node!=""})
         )
       record: node_namespace_pod_container:container_memory_rss
+      labels:
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
     - expr: |-
         container_memory_cache{job="kubelet", metrics_path="/metrics/cadvisor", image!=""}
         * on (cluster, namespace, pod) group_left(node) topk by(cluster, namespace, pod) (1,
           max by(cluster, namespace, pod, node) (kube_pod_info{node!=""})
         )
       record: node_namespace_pod_container:container_memory_cache
+      labels:
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
     - expr: |-
         container_memory_swap{job="kubelet", metrics_path="/metrics/cadvisor", image!=""}
         * on (cluster, namespace, pod) group_left(node) topk by(cluster, namespace, pod) (1,
           max by(cluster, namespace, pod, node) (kube_pod_info{node!=""})
         )
       record: node_namespace_pod_container:container_memory_swap
+      labels:
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
     - expr: |-
         kube_pod_container_resource_requests{resource="memory",job="kube-state-metrics"}  * on (namespace, pod, cluster)
         group_left() max by (namespace, pod, cluster) (
           (kube_pod_status_phase{phase=~"Pending|Running"} == 1)
         )
       record: cluster:namespace:pod_memory:active:kube_pod_container_resource_requests
+      labels:
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
     - expr: |-
         sum by (namespace, cluster) (
             sum by (namespace, pod, cluster) (
@@ -72,12 +96,20 @@ spec:
             )
         )
       record: namespace_memory:kube_pod_container_resource_requests:sum
+      labels:
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
     - expr: |-
         kube_pod_container_resource_requests{resource="cpu",job="kube-state-metrics"}  * on (namespace, pod, cluster)
         group_left() max by (namespace, pod, cluster) (
           (kube_pod_status_phase{phase=~"Pending|Running"} == 1)
         )
       record: cluster:namespace:pod_cpu:active:kube_pod_container_resource_requests
+      labels:
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
     - expr: |-
         sum by (namespace, cluster) (
             sum by (namespace, pod, cluster) (
@@ -89,12 +121,20 @@ spec:
             )
         )
       record: namespace_cpu:kube_pod_container_resource_requests:sum
+      labels:
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
     - expr: |-
         kube_pod_container_resource_limits{resource="memory",job="kube-state-metrics"}  * on (namespace, pod, cluster)
         group_left() max by (namespace, pod, cluster) (
           (kube_pod_status_phase{phase=~"Pending|Running"} == 1)
         )
       record: cluster:namespace:pod_memory:active:kube_pod_container_resource_limits
+      labels:
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
     - expr: |-
         sum by (namespace, cluster) (
             sum by (namespace, pod, cluster) (
@@ -106,12 +146,20 @@ spec:
             )
         )
       record: namespace_memory:kube_pod_container_resource_limits:sum
+      labels:
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
     - expr: |-
         kube_pod_container_resource_limits{resource="cpu",job="kube-state-metrics"}  * on (namespace, pod, cluster)
         group_left() max by (namespace, pod, cluster) (
          (kube_pod_status_phase{phase=~"Pending|Running"} == 1)
          )
       record: cluster:namespace:pod_cpu:active:kube_pod_container_resource_limits
+      labels:
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
     - expr: |-
         sum by (namespace, cluster) (
             sum by (namespace, pod, cluster) (
@@ -123,6 +171,10 @@ spec:
             )
         )
       record: namespace_cpu:kube_pod_container_resource_limits:sum
+      labels:
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
     - expr: |-
         max by (cluster, namespace, workload, pod) (
           label_replace(
@@ -139,6 +191,9 @@ spec:
         )
       labels:
         workload_type: deployment
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
       record: namespace_workload_pod:kube_pod_owner:relabel
     - expr: |-
         max by (cluster, namespace, workload, pod) (
@@ -149,6 +204,9 @@ spec:
         )
       labels:
         workload_type: daemonset
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
       record: namespace_workload_pod:kube_pod_owner:relabel
     - expr: |-
         max by (cluster, namespace, workload, pod) (
@@ -159,6 +217,9 @@ spec:
         )
       labels:
         workload_type: statefulset
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
       record: namespace_workload_pod:kube_pod_owner:relabel
     - expr: |-
         max by (cluster, namespace, workload, pod) (
@@ -169,5 +230,8 @@ spec:
         )
       labels:
         workload_type: job
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
       record: namespace_workload_pod:kube_pod_owner:relabel
 {{- end }}
diff --git a/...e-prometheus-stack/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml b/...e-prometheus-stack/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml
@@ -27,22 +27,48 @@ spec:
     rules:
     - expr: avg_over_time(code_verb:apiserver_request_total:increase1h[30d]) * 24 * 30
       record: code_verb:apiserver_request_total:increase30d
+      labels:
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
     - expr: sum by (cluster, code) (code_verb:apiserver_request_total:increase30d{verb=~"LIST|GET"})
       labels:
         verb: read
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
       record: code:apiserver_request_total:increase30d
     - expr: sum by (cluster, code) (code_verb:apiserver_request_total:increase30d{verb=~"POST|PUT|PATCH|DELETE"})
       labels:
         verb: write
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
       record: code:apiserver_request_total:increase30d
     - expr: sum by (cluster, verb, scope) (increase(apiserver_request_slo_duration_seconds_count[1h]))
       record: cluster_verb_scope:apiserver_request_slo_duration_seconds_count:increase1h
+      labels:
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
     - expr: sum by (cluster, verb, scope) (avg_over_time(cluster_verb_scope:apiserver_request_slo_duration_seconds_count:increase1h[30d]) * 24 * 30)
       record: cluster_verb_scope:apiserver_request_slo_duration_seconds_count:increase30d
+      labels:
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
     - expr: sum by (cluster, verb, scope, le) (increase(apiserver_request_slo_duration_seconds_bucket[1h]))
       record: cluster_verb_scope_le:apiserver_request_slo_duration_seconds_bucket:increase1h
+      labels:
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
     - expr: sum by (cluster, verb, scope, le) (avg_over_time(cluster_verb_scope_le:apiserver_request_slo_duration_seconds_bucket:increase1h[30d]) * 24 * 30)
       record: cluster_verb_scope_le:apiserver_request_slo_duration_seconds_bucket:increase30d
+      labels:
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
     - expr: |-
         1 - (
           (
@@ -74,6 +100,9 @@ spec:
         sum by (cluster) (code:apiserver_request_total:increase30d)
       labels:
         verb: all
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
       record: apiserver_request:availability30d
     - expr: |-
         1 - (
@@ -99,6 +128,9 @@ spec:
         sum by (cluster) (code:apiserver_request_total:increase30d{verb="read"})
       labels:
         verb: read
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
       record: apiserver_request:availability30d
     - expr: |-
         1 - (
@@ -116,21 +148,46 @@ spec:
         sum by (cluster) (code:apiserver_request_total:increase30d{verb="write"})
       labels:
         verb: write
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
       record: apiserver_request:availability30d
     - expr: sum by (cluster,code,resource) (rate(apiserver_request_total{job="apiserver",verb=~"LIST|GET"}[5m]))
       labels:
         verb: read
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
       record: code_resource:apiserver_request_total:rate5m
     - expr: sum by (cluster,code,resource) (rate(apiserver_request_total{job="apiserver",verb=~"POST|PUT|PATCH|DELETE"}[5m]))
       labels:
         verb: write
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
       record: code_resource:apiserver_request_total:rate5m
     - expr: sum by (cluster, code, verb) (increase(apiserver_request_total{job="apiserver",verb=~"LIST|GET|POST|PUT|PATCH|DELETE",code=~"2.."}[1h]))
       record: code_verb:apiserver_request_total:increase1h
+      labels:
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
     - expr: sum by (cluster, code, verb) (increase(apiserver_request_total{job="apiserver",verb=~"LIST|GET|POST|PUT|PATCH|DELETE",code=~"3.."}[1h]))
       record: code_verb:apiserver_request_total:increase1h
+      labels:
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
     - expr: sum by (cluster, code, verb) (increase(apiserver_request_total{job="apiserver",verb=~"LIST|GET|POST|PUT|PATCH|DELETE",code=~"4.."}[1h]))
       record: code_verb:apiserver_request_total:increase1h
+      labels:
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
     - expr: sum by (cluster, code, verb) (increase(apiserver_request_total{job="apiserver",verb=~"LIST|GET|POST|PUT|PATCH|DELETE",code=~"5.."}[1h]))
       record: code_verb:apiserver_request_total:increase1h
+      labels:
+{{- if .Values.defaultRules.additionalRuleLabels }}
+{{ toYaml .Values.defaultRules.additionalRuleLabels | indent 8 }}
+{{- end }}
 {{- end }}