From e18aa5301c035f5048ceda7fa6e0bcad757d7407 Mon Sep 17 00:00:00 2001 From: Yury Kovalev Date: Wed, 19 Nov 2025 16:37:01 +0100 Subject: [PATCH] Revert "drop label replacements due to prometheus bug (#325)" This reverts commit afe5454338740a2d02bbb66fb446aa909d218a78. --- .../prometheus/pod_monitors/rhacs-cloudwatch-exporter.yaml | 2 ++ .../prometheus/pod_monitors/rhacs-emailsender-metrics.yaml | 2 ++ .../prometheus/pod_monitors/rhacs-fleetshard-sync-metrics.yaml | 2 ++ resources/prometheus/pod_monitors/rhacs-tenant-metrics.yaml | 2 ++ 4 files changed, 8 insertions(+) diff --git a/resources/prometheus/pod_monitors/rhacs-cloudwatch-exporter.yaml b/resources/prometheus/pod_monitors/rhacs-cloudwatch-exporter.yaml index 6e27ffc..6ee9a17 100644 --- a/resources/prometheus/pod_monitors/rhacs-cloudwatch-exporter.yaml +++ b/resources/prometheus/pod_monitors/rhacs-cloudwatch-exporter.yaml @@ -24,9 +24,11 @@ spec: - action: labelmap regex: __meta_kubernetes_pod_annotation_rhacs_redhat_com_(.+) + replacement: rhacs_${1} - action: labelmap regex: __meta_kubernetes_pod_label_rhacs_redhat_com_(.+) + replacement: rhacs_${1} - sourceLabels: [rhacs_tenant] targetLabel: rhacs_instance_id diff --git a/resources/prometheus/pod_monitors/rhacs-emailsender-metrics.yaml b/resources/prometheus/pod_monitors/rhacs-emailsender-metrics.yaml index c915362..d1fefa9 100644 --- a/resources/prometheus/pod_monitors/rhacs-emailsender-metrics.yaml +++ b/resources/prometheus/pod_monitors/rhacs-emailsender-metrics.yaml @@ -24,6 +24,8 @@ spec: - action: labelmap regex: __meta_kubernetes_pod_annotation_rhacs_redhat_com_(.+) + replacement: rhacs_${1} - action: labelmap regex: __meta_kubernetes_pod_label_rhacs_redhat_com_(.+) + replacement: rhacs_${1} diff --git a/resources/prometheus/pod_monitors/rhacs-fleetshard-sync-metrics.yaml b/resources/prometheus/pod_monitors/rhacs-fleetshard-sync-metrics.yaml index fa72876..5b6d552 100644 --- a/resources/prometheus/pod_monitors/rhacs-fleetshard-sync-metrics.yaml +++ b/resources/prometheus/pod_monitors/rhacs-fleetshard-sync-metrics.yaml @@ -24,9 +24,11 @@ spec: - action: labelmap regex: __meta_kubernetes_pod_annotation_rhacs_redhat_com_(.+) + replacement: rhacs_${1} - action: labelmap regex: __meta_kubernetes_pod_label_rhacs_redhat_com_(.+) + replacement: rhacs_${1} - sourceLabels: [rhacs_tenant] targetLabel: rhacs_instance_id diff --git a/resources/prometheus/pod_monitors/rhacs-tenant-metrics.yaml b/resources/prometheus/pod_monitors/rhacs-tenant-metrics.yaml index 4b4464f..1712355 100644 --- a/resources/prometheus/pod_monitors/rhacs-tenant-metrics.yaml +++ b/resources/prometheus/pod_monitors/rhacs-tenant-metrics.yaml @@ -22,9 +22,11 @@ spec: - action: labelmap regex: __meta_kubernetes_pod_annotation_rhacs_redhat_com_(.+) + replacement: rhacs_${1} - action: labelmap regex: __meta_kubernetes_pod_label_rhacs_redhat_com_(.+) + replacement: rhacs_${1} - sourceLabels: [rhacs_tenant] targetLabel: rhacs_instance_id