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>

diff --git a/monitoring/ceph-mixin/dashboards/rgw.libsonnet b/monitoring/ceph-mixin/dashboards/rgw.libsonnet
index ff862390ac3b092998375f6b4eb16491125031e0..ea7dac088075fe780e8e35336240ee31eb204ebf 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 418c6bf3786d2dff926f833cb0daa5529e3428ae..dbcf393f680e52dd2047b318d906b291f02f0ebb 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,