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:
	src/python-common/ceph/cephadm/images.py (conflicts with some
new images from main branch..we just need to change the grafana image's
version)

diff --git a/monitoring/ceph-mixin/dashboards/utils.libsonnet b/monitoring/ceph-mixin/dashboards/utils.libsonnet
index da9b4abf95ac30d63b743b69388565359bb07958..1b4f62df513487c8695e71a723ca630763ab7cfc 100644 (file)
--- 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 7ded8530f8d0ee0e19bb5a608c19e11053cca9b7..58899fe65043a683061cbcd8ec35b14364e776ba 100644 (file)
--- 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 fc5859d212cb3217e4057b04db52b74f2d7fc141..ce204230bb6f35e3b35d6a264298e995f629eeed 100644 (file)
--- 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 f0e022c7a369610482c9baf8e320238133b6867a..eefb773f8055c1c6fbdf72ae7c0f82d6c9bb3f7b 100644 (file)
--- 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 52844c9344ebde8de3622aa1845b02dd08e0b7d1..c82117bfca748404bdf4825cb6f4c7e8f74ed1a8 100644 (file)
--- 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 594e03a9135f58e54e813634167b006b5a6c3ab7..9aae21008d278e55d2cdfbd72e17a152f801cf1f 100644 (file)
--- 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 3458dd144a25a02d4a1e53ccc91e4c188201f084..fcc1bd7a4b24fb809da34c1041b0b1d1b3f5d8c2 100644 (file)
--- 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 1d50716f58a428a47ec7235b5c6dce5d2491b655..2e9b450afcc573aeb402324422e78cdcf802fe97 100644 (file)
--- 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 1c5ec3b770cbd24d573d5bd4f7a25499dc7a887e..dc83467bce37e4ea8473b2547cfc5d295a3d27a2 100644 (file)
--- 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 13934a49f10bf734f73be7b4bd54f6db463799e4..b74a4217d234f8dd4211a63f8d217e2ab5dc5ffa 100644 (file)
--- a/src/python-common/ceph/cephadm/images.py
+++ b/src/python-common/ceph/cephadm/images.py
@@ -29,7 +29,7 @@ class DefaultImages(Enum):
     PROMTAIL = _create_image('docker.io/grafana/promtail:3.0.0', 'promtail')
     NODE_EXPORTER = _create_image('quay.io/prometheus/node-exporter:v1.9.1', 'node_exporter')
     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')