monitoring: fix rgw_servers filtering in rgw sync overview grafana

Fix rgw daemon filtering in RGW Sync Overview --> Replication(Time) Delta per shard graph in grafana

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

diff --git a/monitoring/ceph-mixin/dashboards/rgw.libsonnet b/monitoring/ceph-mixin/dashboards/rgw.libsonnet
index 6a11a633b8ac8941c1a45b31a7d49755a1b17635..73846e214b077d1154a16e513235f89672216793 100644 (file)
--- a/monitoring/ceph-mixin/dashboards/rgw.libsonnet
+++ b/monitoring/ceph-mixin/dashboards/rgw.libsonnet
@@ -157,7 +157,7 @@ local g = import 'grafonnet/grafana.libsonnet';
       .addTargets(
         [
           $.addTargetSchema(
-            expr='rate(ceph_rgw_sync_delta_sync_delta[$__rate_interval])',
+            expr='rate(ceph_rgw_sync_delta_sync_delta{instance_id=~"$rgw_servers", %(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 9afbb32c52a23325c63e7752ce327b10c9c5f47d..2e23e8211366261ee3c19d89b4fd43550e2208f2 100644 (file)
--- a/monitoring/ceph-mixin/dashboards_out/radosgw-sync-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/radosgw-sync-overview.json
@@ -514,7 +514,7 @@
          "targets": [
             {
                "datasource": "$datasource",
-               "expr": "rate(ceph_rgw_sync_delta_sync_delta[$__rate_interval])",
+               "expr": "rate(ceph_rgw_sync_delta_sync_delta{instance_id=~\"$rgw_servers\", cluster=~\"$cluster\", }[$__rate_interval])",
                "format": "time_series",
                "instant": false,
                "intervalFactor": 1,