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>

diff --cc monitoring/ceph-mixin/dashboards/utils.libsonnet
Simple merge

diff --cc monitoring/ceph-mixin/dashboards_out/ceph-cluster-advanced.json
Simple merge

diff --cc monitoring/ceph-mixin/dashboards_out/host-details.json
index 1d82ecb66242d7b753c3a5f50a406543fa134a71,98f4fa1c6f96cf99b85769688dae72ff505ff849..46ee60442834b6abb036ac49b9cdf77a86b2b4c2
--- 1/monitoring/ceph-mixin/dashboards_out/host-details.json
--- 2/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/multi-cluster-overview.json
Simple merge

diff --cc monitoring/ceph-mixin/dashboards_out/osds-overview.json
index d94eacd9bc6e97a4d9ca06079c98c811e7dd458e,1f1fcba0c0e84f4b9f4a44ba124648e1cd66be45..1bb7953f7dc98a4c8a89025e28099d19dd9dafca
--- 1/monitoring/ceph-mixin/dashboards_out/osds-overview.json
--- 2/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 0ae1bc85e575f2f7ee81452966ab3d883ee443ec,f65497792af9da431e4809a5a378e12e085a781a..c441a2252516f9ac819d662a90f88d0544d1c629
--- 1/monitoring/ceph-mixin/dashboards_out/pool-overview.json
--- 2/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 4651e828fbed83311d49c957d64295ad4f5f05f6,8ae650b54138a5b2283924264987b90693bcff11..ba6ea9808ef7e2881c80c4bedb897e0320d5c4b6
--- 1/monitoring/ceph-mixin/dashboards_out/rbd-overview.json
--- 2/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,

diff --cc monitoring/ceph-mixin/dashboards_out/rgw-s3-analytics.json
Simple merge