Merge PR #66964 into squid

* refs/pull/66964/head:
	monitoring: upgrade grafana version to 12.3.1

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 5e34c96f4eeba5404c537d1c04e150ce2f01d16e,589008179b0f2ad55b310bc152476dad6325cba6..5752e8c89f6695fcd5ffd8c54f8614a12b6da5f2
--- 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
@@@ -1135,10 -1135,10 +1135,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 a6b48b70e4feb2d92da0350dffac484133495383,41beb72a6e6d06aa430a28b71d51c76225cf7db5..4c44da91695675f818afcd736325fcd91705af1e
--- 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
@@@ -241,10 -241,10 +241,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,
@@@ -504,10 -504,10 +504,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 974646c550d019ba85a08ca5e2da5c479e446720,66300a5b8d6190231623705169c912c7b0d880d6..edcc7151a6607f167f3952e83f5f89d9cf5d1998
--- 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
@@@ -1158,10 -1158,10 +1158,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 10c5aba95bc220462a113c6859d015a4b81f7f48,76d1455715ae84d583eacaa201421ccb3a34955b..fe73e1b619755a6205d681ae78e60e54e2eb85fc
--- 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
@@@ -480,10 -480,10 +480,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,
@@@ -629,10 -629,10 +629,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,
@@@ -778,10 -778,10 +778,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