From: Avan Thakkar <athakkar@redhat.com>
Date: Mon, 18 Mar 2024 17:41:12 +0000 (+0530)
Subject: quincy: mgr/dashboard: fix duplicate grafana panels when on mgr failover
X-Git-Tag: v17.2.8~355^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e4566737d6f8606935a31cd73aa98b2806cda5e7;p=ceph.git

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

Fixes: https://tracker.ceph.com/issues/64970
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
---

diff --git a/src/pybind/mgr/cephadm/templates/services/prometheus/prometheus.yml.j2 b/src/pybind/mgr/cephadm/templates/services/prometheus/prometheus.yml.j2
index bb0a8fcae51..20745c3e8e2 100644
--- a/src/pybind/mgr/cephadm/templates/services/prometheus/prometheus.yml.j2
+++ b/src/pybind/mgr/cephadm/templates/services/prometheus/prometheus.yml.j2
@@ -15,9 +15,10 @@ scrape_configs:
   - job_name: 'ceph'
     honor_labels: true
     static_configs:
-    - targets:
 {% for mgr in mgr_scrape_list %}
-      - '{{ mgr }}'
+    - targets: ['{{ mgr }}']
+      labels:
+        instance: 'ceph_cluster'
 {% endfor %}
 
 {% if nodes %}
diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py
index 9de22e3bf20..98574f53eba 100644
--- a/src/pybind/mgr/cephadm/tests/test_services.py
+++ b/src/pybind/mgr/cephadm/tests/test_services.py
@@ -476,8 +476,9 @@ class TestMonitoring:
                   - job_name: 'ceph'
                     honor_labels: true
                     static_configs:
-                    - targets:
-                      - '[::1]:9283'
+                    - targets: ['[::1]:9283']
+                      labels:
+                        instance: 'ceph_cluster'
 
                   - job_name: 'node'
                     static_configs: