mr/dashboard: remove rgw_servers filter from radosgw-sync-overview grafana dashboard

Fixes: https://tracker.ceph.com/issues/76239
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit b0601df2a55e3fc56370687b27693779ad356be5)

diff --git a/monitoring/ceph-mixin/dashboards/rgw.libsonnet b/monitoring/ceph-mixin/dashboards/rgw.libsonnet
index b2f2f586c51cd8f60e41ec752cdd22da4d1b5d91..ec78842468b110f1235ff36a3ad24af80cea7fff 100644 (file)
--- a/monitoring/ceph-mixin/dashboards/rgw.libsonnet
+++ b/monitoring/ceph-mixin/dashboards/rgw.libsonnet
@@ -58,19 +58,6 @@ local g = import 'grafonnet/grafana.libsonnet';
     .addTemplate(
       $.addClusterTemplate()
     )
-
-    .addTemplate(
-      $.addTemplateSchema(
-        'rgw_servers',
-        '$datasource',
-        'label_values(ceph_rgw_metadata{%(matchers)s}, ceph_daemon)' % $.matchers(),
-        1,
-        true,
-        1,
-        null,
-        'rgw.(.*)'
-      )
-    )
     .addPanels([
       RgwSyncOverviewPanel(
         'Replication (throughput) from Source Zone',
@@ -143,7 +130,7 @@ local g = import 'grafonnet/grafana.libsonnet';
       .addTargets(
         [
           $.addTargetSchema(
-            expr='rate(ceph_rgw_sync_delta_sync_delta{instance_id=~"$rgw_servers", %(matchers)s}[$__rate_interval])',
+            expr='rate(ceph_rgw_sync_delta_sync_delta{%(matchers)s}[$__rate_interval])',
             datasource='$datasource',
             instant=false,
             legendFormat='{{instance_id}} - {{shard_id}}',

diff --git a/monitoring/ceph-mixin/dashboards_out/radosgw-sync-overview.json b/monitoring/ceph-mixin/dashboards_out/radosgw-sync-overview.json
index 36bab6f9be7a3f05350b6972df3d73422882d2da..74a713503d437f1b008937cbff38d0b7748d4583 100644 (file)
--- a/monitoring/ceph-mixin/dashboards_out/radosgw-sync-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/radosgw-sync-overview.json
@@ -499,7 +499,7 @@
          "targets": [
             {
                "datasource": "$datasource",
-               "expr": "rate(ceph_rgw_sync_delta_sync_delta{instance_id=~\"$rgw_servers\", cluster=~\"$cluster\", }[$__rate_interval])",
+               "expr": "rate(ceph_rgw_sync_delta_sync_delta{cluster=~\"$cluster\", }[$__rate_interval])",
                "format": "time_series",
                "instant": false,
                "intervalFactor": 1,
@@ -555,26 +555,6 @@
             "tagsQuery": "",
             "type": "query",
             "useTags": false
-         },
-         {
-            "allValue": null,
-            "current": { },
-            "datasource": "$datasource",
-            "hide": 0,
-            "includeAll": true,
-            "label": null,
-            "multi": false,
-            "name": "rgw_servers",
-            "options": [ ],
-            "query": "label_values(ceph_rgw_metadata{cluster=~\"$cluster|\", }, ceph_daemon)",
-            "refresh": 1,
-            "regex": "rgw.(.*)",
-            "sort": 1,
-            "tagValuesQuery": "",
-            "tags": [ ],
-            "tagsQuery": "",
-            "type": "query",
-            "useTags": false
          }
       ]
    },