From: Aashish Sharma <66050535+aaSharma14@users.noreply.github.com>
Date: Thu, 22 Jan 2026 05:52:19 +0000 (+0530)
Subject: Merge pull request #66984 from aaSharma14/wip-74452-tentacle
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8b385cc9fbab29a6e549288f8b4184d005ce7b2c;p=ceph.git

Merge pull request #66984 from aaSharma14/wip-74452-tentacle

tentacle: monitoring: make cluster matcher backward compatible for pre-reef metrics

Reviewed-by: Afreen Misbah <afreen@ibm.com>
---

8b385cc9fbab29a6e549288f8b4184d005ce7b2c
diff --cc monitoring/ceph-mixin/dashboards_out/host-details.json
index eefb773f805,ac896d0d8fb..d7acf5e34d9
--- a/monitoring/ceph-mixin/dashboards_out/host-details.json
+++ b/monitoring/ceph-mixin/dashboards_out/host-details.json
@@@ -1157,10 -1157,10 +1157,10 @@@
              "showHeader": true
           },
           "pluginVersion": "10.4.0",
 -         "styles": "",
 +         "styles": [ ],
           "targets": [
              {
-                "expr": "topk(10,\n  (sum by (instance)(ceph_daemon_health_metrics{type=\"SLOW_OPS\", ceph_daemon=~\"osd.*\", cluster=~\"$cluster\", }))\n)\n",
+                "expr": "topk(10,\n  (sum by (instance)(ceph_daemon_health_metrics{type=\"SLOW_OPS\", ceph_daemon=~\"osd.*\", cluster=~\"$cluster|\", }))\n)\n",
                 "format": "table",
                 "instant": true,
                 "intervalFactor": 1,
diff --cc monitoring/ceph-mixin/dashboards_out/osds-overview.json
index 9aae21008d2,e9390d698ce..0b2715ecd3d
--- a/monitoring/ceph-mixin/dashboards_out/osds-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/osds-overview.json
@@@ -255,10 -255,10 +255,10 @@@
              "showHeader": true
           },
           "pluginVersion": "10.4.0",
 -         "styles": "",
 +         "styles": [ ],
           "targets": [
              {
-                "expr": "topk(10,\n  (sort(\n    (\n      rate(ceph_osd_op_r_latency_sum{cluster=~\"$cluster\", }[$__rate_interval]) /\n        on (ceph_daemon) rate(ceph_osd_op_r_latency_count{cluster=~\"$cluster\", }[$__rate_interval]) *\n        1000\n    )\n  ))\n)\n",
+                "expr": "topk(10,\n  (sort(\n    (\n      rate(ceph_osd_op_r_latency_sum{cluster=~\"$cluster|\", }[$__rate_interval]) /\n        on (ceph_daemon) rate(ceph_osd_op_r_latency_count{cluster=~\"$cluster|\", }[$__rate_interval]) *\n        1000\n    )\n  ))\n)\n",
                 "format": "table",
                 "instant": true,
                 "intervalFactor": 1,
@@@ -519,10 -519,10 +519,10 @@@
              "showHeader": true
           },
           "pluginVersion": "10.4.0",
 -         "styles": "",
 +         "styles": [ ],
           "targets": [
              {
-                "expr": "topk(10,\n  (sort(\n    (rate(ceph_osd_op_w_latency_sum{cluster=~\"$cluster\", }[$__rate_interval]) /\n      on (ceph_daemon) rate(ceph_osd_op_w_latency_count{cluster=~\"$cluster\", }[$__rate_interval]) *\n      1000)\n  ))\n)\n",
+                "expr": "topk(10,\n  (sort(\n    (rate(ceph_osd_op_w_latency_sum{cluster=~\"$cluster|\", }[$__rate_interval]) /\n      on (ceph_daemon) rate(ceph_osd_op_w_latency_count{cluster=~\"$cluster|\", }[$__rate_interval]) *\n      1000)\n  ))\n)\n",
                 "format": "table",
                 "instant": true,
                 "intervalFactor": 1,
diff --cc monitoring/ceph-mixin/dashboards_out/pool-overview.json
index fcc1bd7a4b2,3157204a268..57d6e226e8f
--- a/monitoring/ceph-mixin/dashboards_out/pool-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/pool-overview.json
@@@ -1171,10 -1171,10 +1171,10 @@@
              "showHeader": true
           },
           "pluginVersion": "10.4.0",
 -         "styles": "",
 +         "styles": [ ],
           "targets": [
              {
-                "expr": "(\n  ceph_pool_compress_under_bytes{cluster=~\"$cluster\", } /\n    ceph_pool_compress_bytes_used{cluster=~\"$cluster\", } > 0\n) and on(pool_id) (\n  (\n    (ceph_pool_compress_under_bytes{cluster=~\"$cluster\", } > 0) /\n      ceph_pool_stored_raw{cluster=~\"$cluster\", }\n  ) * 100 > 0.5\n)\n",
+                "expr": "(\n  ceph_pool_compress_under_bytes{cluster=~\"$cluster|\", } /\n    ceph_pool_compress_bytes_used{cluster=~\"$cluster|\", } > 0\n) and on(pool_id) (\n  (\n    (ceph_pool_compress_under_bytes{cluster=~\"$cluster|\", } > 0) /\n      ceph_pool_stored_raw{cluster=~\"$cluster|\", }\n  ) * 100 > 0.5\n)\n",
                 "format": "table",
                 "instant": true,
                 "intervalFactor": 1,
diff --cc monitoring/ceph-mixin/dashboards_out/rbd-overview.json
index 2e9b450afcc,bf349477c72..44c725bd31e
--- a/monitoring/ceph-mixin/dashboards_out/rbd-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/rbd-overview.json
@@@ -493,10 -493,10 +493,10 @@@
              "showHeader": true
           },
           "pluginVersion": "10.4.0",
 -         "styles": "",
 +         "styles": [ ],
           "targets": [
              {
-                "expr": "topk(10,\n  (\n    sort((\n      rate(ceph_rbd_write_ops{cluster=~\"$cluster\", }[$__rate_interval]) +\n        on (image, pool, namespace) rate(ceph_rbd_read_ops{cluster=~\"$cluster\", }[$__rate_interval])\n    ))\n  )\n)\n",
+                "expr": "topk(10,\n  (\n    sort((\n      rate(ceph_rbd_write_ops{cluster=~\"$cluster|\", }[$__rate_interval]) +\n        on (image, pool, namespace) rate(ceph_rbd_read_ops{cluster=~\"$cluster|\", }[$__rate_interval])\n    ))\n  )\n)\n",
                 "format": "table",
                 "instant": true,
                 "intervalFactor": 1,
@@@ -642,10 -642,10 +642,10 @@@
              "showHeader": true
           },
           "pluginVersion": "10.4.0",
 -         "styles": "",
 +         "styles": [ ],
           "targets": [
              {
-                "expr": "topk(10,\n  sort(\n    sum(\n      rate(ceph_rbd_read_bytes{cluster=~\"$cluster\", }[$__rate_interval]) +\n        rate(ceph_rbd_write_bytes{cluster=~\"$cluster\", }[$__rate_interval])\n    ) by (pool, image, namespace)\n  )\n)\n",
+                "expr": "topk(10,\n  sort(\n    sum(\n      rate(ceph_rbd_read_bytes{cluster=~\"$cluster|\", }[$__rate_interval]) +\n        rate(ceph_rbd_write_bytes{cluster=~\"$cluster|\", }[$__rate_interval])\n    ) by (pool, image, namespace)\n  )\n)\n",
                 "format": "table",
                 "instant": true,
                 "intervalFactor": 1,
@@@ -791,10 -791,10 +791,10 @@@
              "showHeader": true
           },
           "pluginVersion": "10.4.0",
 -         "styles": "",
 +         "styles": [ ],
           "targets": [
              {
-                "expr": "topk(10,\n  sum(\n    rate(ceph_rbd_write_latency_sum{cluster=~\"$cluster\", }[$__rate_interval]) /\n      clamp_min(rate(ceph_rbd_write_latency_count{cluster=~\"$cluster\", }[$__rate_interval]), 1) +\n      rate(ceph_rbd_read_latency_sum{cluster=~\"$cluster\", }[$__rate_interval]) /\n      clamp_min(rate(ceph_rbd_read_latency_count{cluster=~\"$cluster\", }[$__rate_interval]), 1)\n  ) by (pool, image, namespace)\n)\n",
+                "expr": "topk(10,\n  sum(\n    rate(ceph_rbd_write_latency_sum{cluster=~\"$cluster|\", }[$__rate_interval]) /\n      clamp_min(rate(ceph_rbd_write_latency_count{cluster=~\"$cluster|\", }[$__rate_interval]), 1) +\n      rate(ceph_rbd_read_latency_sum{cluster=~\"$cluster|\", }[$__rate_interval]) /\n      clamp_min(rate(ceph_rbd_read_latency_count{cluster=~\"$cluster|\", }[$__rate_interval]), 1)\n  ) by (pool, image, namespace)\n)\n",
                 "format": "table",
                 "instant": true,
                 "intervalFactor": 1,