From: Aashish Sharma <Aashish.Sharma1@ibm.com>
Date: Tue, 25 Mar 2025 11:35:05 +0000 (+0530)
Subject: mgr/dashboard: fix image filter's query on rbd-details grafana panel
X-Git-Tag: v19.2.3~194^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c89aa90c3e5b63d92ba90fcf4cf8cf8cea171ead;p=ceph.git

mgr/dashboard: fix image filter's query on rbd-details grafana panel

The image filter on the RBD Details grafana panel is using a query with a type "label_values(ceph_rbd_read_ops{cluster=~\"$cluster\", , pool=\"$pool\"}, image)". The extra comma needs to be removed.

Fixes: https://tracker.ceph.com/issues/70653

Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit 8d9fe8fd709fe2792dec5fdbf364e77e3446f7fb)
---

diff --git a/monitoring/ceph-mixin/dashboards/rbd.libsonnet b/monitoring/ceph-mixin/dashboards/rbd.libsonnet
index bcb8a28cfe591..08febab930ffe 100644
--- a/monitoring/ceph-mixin/dashboards/rbd.libsonnet
+++ b/monitoring/ceph-mixin/dashboards/rbd.libsonnet
@@ -80,7 +80,7 @@ local info_rbd_stats = std.join(
     .addTemplate(
       $.addTemplateSchema('image',
                           '$datasource',
-                          'label_values(ceph_rbd_read_ops{%(matchers)s, pool="$pool"}, image)' % $.matchers(),
+                          'label_values(ceph_rbd_read_ops{%(matchers)s pool="$pool"}, image)' % $.matchers(),
                           1,
                           false,
                           0,
diff --git a/monitoring/ceph-mixin/dashboards_out/rbd-details.json b/monitoring/ceph-mixin/dashboards_out/rbd-details.json
index 500c51f4ba9b1..09b9bdfb5e062 100644
--- a/monitoring/ceph-mixin/dashboards_out/rbd-details.json
+++ b/monitoring/ceph-mixin/dashboards_out/rbd-details.json
@@ -417,7 +417,7 @@
             "multi": false,
             "name": "image",
             "options": [ ],
-            "query": "label_values(ceph_rbd_read_ops{cluster=~\"$cluster\", , pool=\"$pool\"}, image)",
+            "query": "label_values(ceph_rbd_read_ops{cluster=~\"$cluster\",  pool=\"$pool\"}, image)",
             "refresh": 1,
             "regex": "",
             "sort": 0,