From 1622ad8f760472600fdc97f1701a493f52e7ab5c Mon Sep 17 00:00:00 2001
From: Aashish Sharma
 <aasharma@li-e74156cc-2f67-11b2-a85c-e98659a63c5c.ibm.com>
Date: Thu, 2 May 2024 17:12:26 +0530
Subject: [PATCH] mgr/dashboard: fix cluster filter typo in
 multi-cluster-overview grafana dashboard

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

Signed-off-by: Aashish Sharma <aasharma@redhat.com>
---
 monitoring/ceph-mixin/dashboards/multi-cluster.libsonnet      | 4 ++--
 .../ceph-mixin/dashboards_out/multi-cluster-overview.json     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/monitoring/ceph-mixin/dashboards/multi-cluster.libsonnet b/monitoring/ceph-mixin/dashboards/multi-cluster.libsonnet
index 2559206fbe2..94d32b49771 100644
--- a/monitoring/ceph-mixin/dashboards/multi-cluster.libsonnet
+++ b/monitoring/ceph-mixin/dashboards/multi-cluster.libsonnet
@@ -806,7 +806,7 @@ local g = import 'grafonnet/grafana.libsonnet';
           },
         ]).addTargets([
           $.addTargetSchema(
-            expr='ALERTS{alertstate="firing", %(matchers)s}}' % $.matchers(),
+            expr='ALERTS{alertstate="firing", %(matchers)s}' % $.matchers(),
             datasource={ type: 'prometheus', uid: '$datasource' },
             format='table',
             hide=false,
@@ -955,7 +955,7 @@ local g = import 'grafonnet/grafana.libsonnet';
         .addTargets(
           [
             $.addTargetSchema(
-              expr='topk(10, ceph_pool_bytes_used{%(matchers)s}}/ceph_pool_max_avail{%(matchers)s}} * on(pool_id, cluster) group_left(instance, name) ceph_pool_metadata{%(matchers)s}})' % $.matchers(),
+              expr='topk(10, ceph_pool_bytes_used{%(matchers)s}/ceph_pool_max_avail{%(matchers)s} * on(pool_id, cluster) group_left(instance, name) ceph_pool_metadata{%(matchers)s})' % $.matchers(),
               datasource='$datasource',
               instant=false,
               legendFormat='{{cluster}} - {{name}}',
diff --git a/monitoring/ceph-mixin/dashboards_out/multi-cluster-overview.json b/monitoring/ceph-mixin/dashboards_out/multi-cluster-overview.json
index 70fbcf92bf1..7442aa45e8a 100644
--- a/monitoring/ceph-mixin/dashboards_out/multi-cluster-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/multi-cluster-overview.json
@@ -1645,7 +1645,7 @@
                         "uid": "$datasource"
                      },
                      "exemplar": false,
-                     "expr": "ALERTS{alertstate=\"firing\", cluster=~\"$cluster\", }}",
+                     "expr": "ALERTS{alertstate=\"firing\", cluster=~\"$cluster\", }",
                      "format": "table",
                      "hide": false,
                      "instant": true,
@@ -2016,7 +2016,7 @@
                "targets": [
                   {
                      "datasource": "$datasource",
-                     "expr": "topk(10, ceph_pool_bytes_used{cluster=~\"$cluster\", }}/ceph_pool_max_avail{cluster=~\"$cluster\", }} * on(pool_id, cluster) group_left(instance, name) ceph_pool_metadata{cluster=~\"$cluster\", }})",
+                     "expr": "topk(10, ceph_pool_bytes_used{cluster=~\"$cluster\", }/ceph_pool_max_avail{cluster=~\"$cluster\", } * on(pool_id, cluster) group_left(instance, name) ceph_pool_metadata{cluster=~\"$cluster\", })",
                      "format": "time_series",
                      "instant": false,
                      "intervalFactor": 1,
-- 
2.39.5