monitoring: upgrade grafana version to 12.3.1

Fixes: https://tracker.ceph.com/issues/74436
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit c1329c994596e7ded8232f1a542aabd4e1694b2d)

Conflicts:
	monitoring/ceph-mixin/dashboards_out/ceph-nvmeof.json (file not
in squid)
	monitoring/ceph-mixin/dashboards_out/multi-cluster-overview.json
(file not in squid)
	src/python-common/ceph/cephadm/images.py (file not in squid,
need to change the image name in constants.py instead)

diff --git a/monitoring/ceph-mixin/dashboards/utils.libsonnet b/monitoring/ceph-mixin/dashboards/utils.libsonnet
index 76d351e277ce1e93a429c01327a6dfe5f7ecce2c..ea2df30740eeae66a92991e15b83f76b97699081 100644 (file)
--- a/monitoring/ceph-mixin/dashboards/utils.libsonnet
+++ b/monitoring/ceph-mixin/dashboards/utils.libsonnet
@@ -516,7 +516,6 @@ local timeSeries = import 'timeseries_panel.libsonnet';
     datasource=null,
     description=null,
     sort=null,
-    styles='',
     transform=null,
     pluginVersion='9.1.3',
     options=null,
@@ -531,7 +530,6 @@ local timeSeries = import 'timeseries_panel.libsonnet';
     g.tablePanel.new(datasource=datasource,
                      description=description,
                      sort=sort,
-                     styles=styles,
                      title=title,
                      transform=transform) + {
       pluginVersion: pluginVersion,

diff --git a/monitoring/ceph-mixin/dashboards_out/ceph-cluster-advanced.json b/monitoring/ceph-mixin/dashboards_out/ceph-cluster-advanced.json
index c295b2472b8f7d57d929b8640070d4b25b533fdb..3315133e45327cfb87bb2cfcbff9b10019d41ecd 100644 (file)
--- a/monitoring/ceph-mixin/dashboards_out/ceph-cluster-advanced.json
+++ b/monitoring/ceph-mixin/dashboards_out/ceph-cluster-advanced.json
@@ -3609,7 +3609,7 @@
             "showHeader": true
          },
          "pluginVersion": "9.4.7",
-         "styles": "",
+         "styles": [ ],
          "targets": [
             {
                "datasource": "$datasource",

diff --git a/monitoring/ceph-mixin/dashboards_out/host-details.json b/monitoring/ceph-mixin/dashboards_out/host-details.json
index 4803dab40165ad741540e9fae9d158f6c8c6775d..589008179b0f2ad55b310bc152476dad6325cba6 100644 (file)
--- a/monitoring/ceph-mixin/dashboards_out/host-details.json
+++ b/monitoring/ceph-mixin/dashboards_out/host-details.json
@@ -1135,7 +1135,7 @@
             "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",

diff --git a/monitoring/ceph-mixin/dashboards_out/osds-overview.json b/monitoring/ceph-mixin/dashboards_out/osds-overview.json
index 5460610de18384554daca321ff5605cd346319f8..41beb72a6e6d06aa430a28b71d51c76225cf7db5 100644 (file)
--- a/monitoring/ceph-mixin/dashboards_out/osds-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/osds-overview.json
@@ -241,7 +241,7 @@
             "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",
@@ -504,7 +504,7 @@
             "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",
@@ -1162,7 +1162,7 @@
             "showHeader": true
          },
          "pluginVersion": "10.4.0",
-         "styles": "",
+         "styles": [ ],
          "targets": [
             {
                "expr": "topk(10,\n  (ceph_daemon_health_metrics{type=\"SLOW_OPS\", ceph_daemon=~\"osd.*\"})\n)\n",

diff --git a/monitoring/ceph-mixin/dashboards_out/pool-overview.json b/monitoring/ceph-mixin/dashboards_out/pool-overview.json
index 3ad2d43227f51eeb600c37b46154acd9be29daf0..66300a5b8d6190231623705169c912c7b0d880d6 100644 (file)
--- a/monitoring/ceph-mixin/dashboards_out/pool-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/pool-overview.json
@@ -1158,7 +1158,7 @@
             "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",

diff --git a/monitoring/ceph-mixin/dashboards_out/rbd-overview.json b/monitoring/ceph-mixin/dashboards_out/rbd-overview.json
index 34666c67b298af8f0ef43b2f127e222e99c64bca..76d1455715ae84d583eacaa201421ccb3a34955b 100644 (file)
--- a/monitoring/ceph-mixin/dashboards_out/rbd-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/rbd-overview.json
@@ -480,7 +480,7 @@
             "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",
@@ -629,7 +629,7 @@
             "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",
@@ -778,7 +778,7 @@
             "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",

diff --git a/monitoring/ceph-mixin/dashboards_out/rgw-s3-analytics.json b/monitoring/ceph-mixin/dashboards_out/rgw-s3-analytics.json
index 397279f545522d868d837a60eb26736511cd4d64..e8d7b5538581d80a55486ab8a2ca2fba9c64cdbd 100644 (file)
--- a/monitoring/ceph-mixin/dashboards_out/rgw-s3-analytics.json
+++ b/monitoring/ceph-mixin/dashboards_out/rgw-s3-analytics.json
@@ -684,7 +684,7 @@
             ]
          },
          "pluginVersion": "9.4.7",
-         "styles": "",
+         "styles": [ ],
          "targets": [
             {
                "datasource": {
@@ -930,7 +930,7 @@
             ]
          },
          "pluginVersion": "9.4.7",
-         "styles": "",
+         "styles": [ ],
          "targets": [
             {
                "datasource": {
@@ -1204,7 +1204,7 @@
             ]
          },
          "pluginVersion": "9.4.7",
-         "styles": "",
+         "styles": [ ],
          "targets": [
             {
                "datasource": {
@@ -1452,7 +1452,7 @@
             ]
          },
          "pluginVersion": "9.4.7",
-         "styles": "",
+         "styles": [ ],
          "targets": [
             {
                "datasource": {
@@ -2938,7 +2938,7 @@
                   ]
                },
                "pluginVersion": "9.4.7",
-               "styles": "",
+               "styles": [ ],
                "targets": [
                   {
                      "datasource": {
@@ -4433,7 +4433,7 @@
                   ]
                },
                "pluginVersion": "9.4.7",
-               "styles": "",
+               "styles": [ ],
                "targets": [
                   {
                      "datasource": {

diff --git a/src/cephadm/cephadmlib/constants.py b/src/cephadm/cephadmlib/constants.py
index 45ed85beb48626fef9fe59a9bd727f3916a1aa0c..ac4665c77637348a698d6b5cda13fe83e03100a5 100644 (file)
--- a/src/cephadm/cephadmlib/constants.py
+++ b/src/cephadm/cephadmlib/constants.py
@@ -9,7 +9,7 @@ DEFAULT_LOKI_IMAGE = 'quay.io/ceph/loki:3.0.0'
 DEFAULT_PROMTAIL_IMAGE = 'quay.io/ceph/promtail:3.0.0'
 DEFAULT_NODE_EXPORTER_IMAGE = 'quay.io/prometheus/node-exporter:v1.5.0'
 DEFAULT_ALERT_MANAGER_IMAGE = 'quay.io/prometheus/alertmanager:v0.25.0'
-DEFAULT_GRAFANA_IMAGE = 'quay.io/ceph/grafana:10.4.0'
+DEFAULT_GRAFANA_IMAGE = 'quay.io/ceph/grafana:12.3.1'
 DEFAULT_HAPROXY_IMAGE = 'quay.io/ceph/haproxy:2.3'
 DEFAULT_KEEPALIVED_IMAGE = 'quay.io/ceph/keepalived:2.2.4'
 DEFAULT_NVMEOF_IMAGE = 'quay.io/ceph/nvmeof:1.2.1'

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 1ddfb0240e713a39ae06ff7bac0e68da6b05ec8d..4059f49894d4dbe4e15248d0b37cf24d819d2c8e 100644 (file)
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -134,7 +134,7 @@ DEFAULT_NVMEOF_IMAGE = 'quay.io/ceph/nvmeof:1.2.5'
 DEFAULT_LOKI_IMAGE = 'quay.io/ceph/loki:3.0.0'
 DEFAULT_PROMTAIL_IMAGE = 'quay.io/ceph/promtail:3.0.0'
 DEFAULT_ALERT_MANAGER_IMAGE = 'quay.io/prometheus/alertmanager:v0.25.0'
-DEFAULT_GRAFANA_IMAGE = 'quay.io/ceph/grafana:10.4.0'
+DEFAULT_GRAFANA_IMAGE = 'quay.io/ceph/grafana:12.3.1'
 DEFAULT_HAPROXY_IMAGE = 'quay.io/ceph/haproxy:2.3'
 DEFAULT_KEEPALIVED_IMAGE = 'quay.io/ceph/keepalived:2.2.4'
 DEFAULT_SNMP_GATEWAY_IMAGE = 'quay.io/ceph/snmp-notifier:v1.2.1'