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>

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 eefb773f8055c1c6fbdf72ae7c0f82d6c9bb3f7b,ac896d0d8fb1d50ac44e92b784c5cea0f74bb53c..d7acf5e34d999cc3f7a94ffbb5d091a277d982fc
--- 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 9aae21008d278e55d2cdfbd72e17a152f801cf1f,e9390d698ce78d4476366180bc356f70ebb8ab8f..0b2715ecd3d4bd36c775b842b68d21519709426f
--- 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 fcc1bd7a4b24fb809da34c1041b0b1d1b3f5d8c2,3157204a26838fadc5c1ca08933f283af7f7f4ff..57d6e226e8f3f1a35564bbe8ebd43bea12e7bf95
--- 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/radosgw-sync-overview.json
Simple merge

diff --cc monitoring/ceph-mixin/dashboards_out/rbd-overview.json
index 2e9b450afcc573aeb402324422e78cdcf802fe97,bf349477c723b6132bd0d4b52d8999669b4bc269..44c725bd31ed2973a611c7eade5ec2cef6c01e88
--- 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