From: Aashish Sharma <66050535+aaSharma14@users.noreply.github.com>
Date: Tue, 20 Jan 2026 07:28:37 +0000 (+0530)
Subject: Merge pull request #66661 from rhcs-dashboard/prometheus-cluster-label-fix
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=af3099ecc1b75092b6c148423eefba457a36d381;p=ceph.git

Merge pull request #66661 from rhcs-dashboard/prometheus-cluster-label-fix

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

Reviewed-by: Ankush Behl <ankush.behl@ibm.com>
---

af3099ecc1b75092b6c148423eefba457a36d381
diff --cc monitoring/ceph-mixin/dashboards_out/host-details.json
index 1d82ecb6624,98f4fa1c6f9..46ee6044283
--- 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 d94eacd9bc6,1f1fcba0c0e..1bb7953f7dc
--- 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 0ae1bc85e57,f65497792af..c441a225251
--- 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 4651e828fbe,8ae650b5413..ba6ea9808ef
--- 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,