gian/ceph-mirror
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2026-08-02 07:03:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

monitoring: upgrade grafana version to 12.3.1

Browse Source 
Fixes: https://tracker.ceph.com/issues/74436

Signed-off-by: Aashish Sharma <aasharma@redhat.com>
This commit is contained in:
Aashish Sharma 2026-01-14 10:57:36 +05:30
parent 3818189f55
commit c1329c9945
10 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monitoring/ceph-mixin/dashboards/utils.libsonnet
View File

@ -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,

2
monitoring/ceph-mixin/dashboards_out/ceph-cluster-advanced.json
View File

@ -3650,7 +3650,7 @@
"showHeader": true
},
"pluginVersion": "9.4.7",
"styles": "",
"styles": [ ],
"targets": [
{
"datasource": "$datasource",

2
monitoring/ceph-mixin/dashboards_out/ceph-nvmeof.json
View File

@ -1426,7 +1426,7 @@
"sortBy": [ ]
},
"pluginVersion": "9.1.3",
"styles": "",
"styles": [ ],
"targets": [
{
"datasource": "$datasource",

2
monitoring/ceph-mixin/dashboards_out/host-details.json
View File

@ -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",

4
monitoring/ceph-mixin/dashboards_out/multi-cluster-overview.json
View File

@ -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": {

6
monitoring/ceph-mixin/dashboards_out/osds-overview.json
View File

@ -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",

2
monitoring/ceph-mixin/dashboards_out/pool-overview.json
View File

@ -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",

6
monitoring/ceph-mixin/dashboards_out/rbd-overview.json
View File

@ -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",

12
monitoring/ceph-mixin/dashboards_out/rgw-s3-analytics.json
View File

@ -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": {

2
src/python-common/ceph/cephadm/images.py
View File

@ -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')