From c1329c994596e7ded8232f1a542aabd4e1694b2d Mon Sep 17 00:00:00 2001 From: Aashish Sharma Date: Wed, 14 Jan 2026 10:57:36 +0530 Subject: [PATCH] monitoring: upgrade grafana version to 12.3.1 Fixes: https://tracker.ceph.com/issues/74436 Signed-off-by: Aashish Sharma --- monitoring/ceph-mixin/dashboards/utils.libsonnet | 2 -- .../dashboards_out/ceph-cluster-advanced.json | 2 +- .../ceph-mixin/dashboards_out/ceph-nvmeof.json | 2 +- .../ceph-mixin/dashboards_out/host-details.json | 2 +- .../dashboards_out/multi-cluster-overview.json | 4 ++-- .../ceph-mixin/dashboards_out/osds-overview.json | 6 +++--- .../ceph-mixin/dashboards_out/pool-overview.json | 2 +- .../ceph-mixin/dashboards_out/rbd-overview.json | 6 +++--- .../ceph-mixin/dashboards_out/rgw-s3-analytics.json | 12 ++++++------ src/python-common/ceph/cephadm/images.py | 2 +- 10 files changed, 19 insertions(+), 21 deletions(-) diff --git a/monitoring/ceph-mixin/dashboards/utils.libsonnet b/monitoring/ceph-mixin/dashboards/utils.libsonnet index da9b4abf95ac3..1b4f62df51348 100644 --- a/monitoring/ceph-mixin/dashboards/utils.libsonnet +++ b/monitoring/ceph-mixin/dashboards/utils.libsonnet @@ -545,7 +545,6 @@ local timeSeries = import 'timeseries_panel.libsonnet'; datasource=null, description=null, sort=null, - styles='', transform=null, pluginVersion='9.1.3', options=null, @@ -560,7 +559,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 4f40690e1ae06..59acffba50b33 100644 --- a/monitoring/ceph-mixin/dashboards_out/ceph-cluster-advanced.json +++ b/monitoring/ceph-mixin/dashboards_out/ceph-cluster-advanced.json @@ -3650,7 +3650,7 @@ "showHeader": true }, "pluginVersion": "9.4.7", - "styles": "", + "styles": [ ], "targets": [ { "datasource": "$datasource", diff --git a/monitoring/ceph-mixin/dashboards_out/ceph-nvmeof.json b/monitoring/ceph-mixin/dashboards_out/ceph-nvmeof.json index d8710f40747f5..934ac0f9f78a8 100644 --- a/monitoring/ceph-mixin/dashboards_out/ceph-nvmeof.json +++ b/monitoring/ceph-mixin/dashboards_out/ceph-nvmeof.json @@ -1426,7 +1426,7 @@ "sortBy": [ ] }, "pluginVersion": "9.1.3", - "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 7d67bbdd8c98a..1d82ecb66242d 100644 --- a/monitoring/ceph-mixin/dashboards_out/host-details.json +++ b/monitoring/ceph-mixin/dashboards_out/host-details.json @@ -1157,7 +1157,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/multi-cluster-overview.json b/monitoring/ceph-mixin/dashboards_out/multi-cluster-overview.json index 96d5200ec252f..7b9704e85d170 100644 --- a/monitoring/ceph-mixin/dashboards_out/multi-cluster-overview.json +++ b/monitoring/ceph-mixin/dashboards_out/multi-cluster-overview.json @@ -336,7 +336,7 @@ "showHeader": true }, "pluginVersion": "9.4.7", - "styles": "", + "styles": [ ], "targets": [ { "datasource": { @@ -1590,7 +1590,7 @@ ] }, "pluginVersion": "9.4.7", - "styles": "", + "styles": [ ], "targets": [ { "datasource": { diff --git a/monitoring/ceph-mixin/dashboards_out/osds-overview.json b/monitoring/ceph-mixin/dashboards_out/osds-overview.json index ca22afa4a93e1..d94eacd9bc6e9 100644 --- a/monitoring/ceph-mixin/dashboards_out/osds-overview.json +++ b/monitoring/ceph-mixin/dashboards_out/osds-overview.json @@ -255,7 +255,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", @@ -519,7 +519,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", @@ -1178,7 +1178,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 cf27352d6aaf1..0ae1bc85e575f 100644 --- a/monitoring/ceph-mixin/dashboards_out/pool-overview.json +++ b/monitoring/ceph-mixin/dashboards_out/pool-overview.json @@ -1171,7 +1171,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 61485d7f62e66..4651e828fbed8 100644 --- a/monitoring/ceph-mixin/dashboards_out/rbd-overview.json +++ b/monitoring/ceph-mixin/dashboards_out/rbd-overview.json @@ -493,7 +493,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", @@ -642,7 +642,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", @@ -791,7 +791,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 c24b0980a1153..932ce370fa3dd 100644 --- a/monitoring/ceph-mixin/dashboards_out/rgw-s3-analytics.json +++ b/monitoring/ceph-mixin/dashboards_out/rgw-s3-analytics.json @@ -697,7 +697,7 @@ ] }, "pluginVersion": "9.4.7", - "styles": "", + "styles": [ ], "targets": [ { "datasource": { @@ -943,7 +943,7 @@ ] }, "pluginVersion": "9.4.7", - "styles": "", + "styles": [ ], "targets": [ { "datasource": { @@ -1217,7 +1217,7 @@ ] }, "pluginVersion": "9.4.7", - "styles": "", + "styles": [ ], "targets": [ { "datasource": { @@ -1465,7 +1465,7 @@ ] }, "pluginVersion": "9.4.7", - "styles": "", + "styles": [ ], "targets": [ { "datasource": { @@ -2969,7 +2969,7 @@ ] }, "pluginVersion": "9.4.7", - "styles": "", + "styles": [ ], "targets": [ { "datasource": { @@ -4482,7 +4482,7 @@ ] }, "pluginVersion": "9.4.7", - "styles": "", + "styles": [ ], "targets": [ { "datasource": { diff --git a/src/python-common/ceph/cephadm/images.py b/src/python-common/ceph/cephadm/images.py index 4b66ebc3b3498..b491e989141fc 100644 --- a/src/python-common/ceph/cephadm/images.py +++ b/src/python-common/ceph/cephadm/images.py @@ -36,7 +36,7 @@ class DefaultImages(Enum): ALERTMANAGER = _create_image( 'quay.io/prometheus/alertmanager:v0.28.1', 'alertmanager' ) - GRAFANA = _create_image('quay.io/ceph/grafana:12.2.0', 'grafana') + GRAFANA = _create_image('quay.io/ceph/grafana:12.3.1', 'grafana') HAPROXY = _create_image('quay.io/ceph/haproxy:2.3', 'haproxy') KEEPALIVED = _create_image('quay.io/ceph/keepalived:2.2.4', 'keepalived') NVMEOF = _create_image('quay.io/ceph/nvmeof:1.5', 'nvmeof') -- 2.47.3