Merge pull request ceph#56626 from rhcs-dashboard/fix-prometheus-conf-mgr-failover

mgr/dashboard: fix duplicate grafana panels when on mgr failover

Reviewed-by: Adam King <[email protected]>
Reviewed-by: Nizamudeen A <[email protected]>

Author: adk3798

src/pybind/mgr/cephadm/templates/services/prometheus/prometheus.yml.j2

@@ -41,6 +41,10 @@ scrape_configs:
     tls_config:
       ca_file: mgr_prometheus_cert.pem
     honor_labels: true
+    relabel_configs:
+    - source_labels: [instance]
+      target_label: instance
+      replacement: 'ceph_cluster'
     http_sd_configs:
     - url: {{ mgr_prometheus_sd_url }}
       basic_auth:
@@ -54,6 +58,9 @@ scrape_configs:
     - source_labels: [__address__]
       target_label: cluster
       replacement: {{ cluster_fsid }}
+    - source_labels: [instance]
+      target_label: instance
+      replacement: 'ceph_cluster'
     http_sd_configs:
     - url: {{ mgr_prometheus_sd_url }}
 {% endif %}

src/pybind/mgr/cephadm/tests/test_services.py

@@ -744,6 +744,9 @@ def test_prometheus_config_security_disabled(self, _run_cephadm, cephadm_module:
                     - source_labels: [__address__]
                       target_label: cluster
                       replacement: fsid
+                    - source_labels: [instance]
+                      target_label: instance
+                      replacement: 'ceph_cluster'
                     http_sd_configs:
                     - url: http://[::1]:8765/sd/prometheus/sd-config?service=mgr-prometheus
 
@@ -904,6 +907,10 @@ def gen_cert(host, addr):
                     tls_config:
                       ca_file: mgr_prometheus_cert.pem
                     honor_labels: true
+                    relabel_configs:
+                    - source_labels: [instance]
+                      target_label: instance
+                      replacement: 'ceph_cluster'
                     http_sd_configs:
                     - url: https://[::1]:8765/sd/prometheus/sd-config?service=mgr-prometheus
                       basic_auth: