From: Adam King <47704447+adk3798@users.noreply.github.com>
Date: Wed, 7 Aug 2024 13:13:46 +0000 (-0400)
Subject: Merge pull request #56930 from adk3798/wip-65513-quincy
X-Git-Tag: v17.2.8~233
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=44737603d668db383429741d057b2314dc13cbb7;p=ceph.git

Merge pull request #56930 from adk3798/wip-65513-quincy

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

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
---

44737603d668db383429741d057b2314dc13cbb7
diff --cc src/pybind/mgr/cephadm/templates/services/prometheus/prometheus.yml.j2
index 20745c3e8e29,a42df93d42c6..3dcfb0d8aa97
--- a/src/pybind/mgr/cephadm/templates/services/prometheus/prometheus.yml.j2
+++ b/src/pybind/mgr/cephadm/templates/services/prometheus/prometheus.yml.j2
@@@ -14,11 -14,14 +14,15 @@@ alerting
  scrape_configs:
    - job_name: 'ceph'
      honor_labels: true
+     relabel_configs:
+     - source_labels: [instance]
+       target_label: instance
+       replacement: 'ceph_cluster'
      static_configs:
 -    - targets:
  {% for mgr in mgr_scrape_list %}
 -      - '{{ mgr }}'
 +    - targets: ['{{ mgr }}']
 +      labels:
 +        instance: 'ceph_cluster'
  {% endfor %}
  
  {% if nodes %}
diff --cc src/pybind/mgr/cephadm/tests/test_services.py
index 98574f53eba5,385a88345616..7fb38e453553
--- a/src/pybind/mgr/cephadm/tests/test_services.py
+++ b/src/pybind/mgr/cephadm/tests/test_services.py
@@@ -475,10 -475,13 +475,14 @@@ class TestMonitoring
                  scrape_configs:
                    - job_name: 'ceph'
                      honor_labels: true
+                     relabel_configs:
+                     - source_labels: [instance]
+                       target_label: instance
+                       replacement: 'ceph_cluster'
                      static_configs:
 -                    - targets:
 -                      - '[::1]:9283'
 +                    - targets: ['[::1]:9283']
 +                      labels:
 +                        instance: 'ceph_cluster'
  
                    - job_name: 'node'
                      static_configs: