From: SuperQ <superq@gmail.com>
Date: Mon, 21 Apr 2025 09:47:41 +0000 (+0200)
Subject: ceph-mixin: Update monitoring mixin
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9c4cd107a41292aba547fdd4a3721cbc554a6b6a;p=ceph.git

ceph-mixin: Update monitoring mixin

Update `rate()` queries to be more accurate. The use of `irate()` leads
to misleading graphs because it only looks at the last 2 samples over
the selected time range step interval. Also use `$__rate_interval`
consistently in order to scale over short and long time ranges.
* Replace `irate()` with `rate()` to avoid sample bias.
* Use `$__rate_interval` consistently.
* Update auto_count/min to provide higher detail graphs.

Fixes: https://tracker.ceph.com/issues/72343

Signed-off-by: SuperQ <superq@gmail.com>
Signed-off-by: Ankush Behl <cloudbehl@gmail.com>
---

diff --git a/monitoring/ceph-mixin/dashboards/ceph-cluster.libsonnet b/monitoring/ceph-mixin/dashboards/ceph-cluster.libsonnet
index 1a7dd8fe6dbd..6727b8c43227 100644
--- a/monitoring/ceph-mixin/dashboards/ceph-cluster.libsonnet
+++ b/monitoring/ceph-mixin/dashboards/ceph-cluster.libsonnet
@@ -39,7 +39,7 @@ local g = import 'grafonnet/grafana.libsonnet';
       current='$__auto_interval_interval',
       refresh=2,
       label='Interval',
-      auto_count=10,
+      auto_count=300,
       auto_min='1m',
       options=[
         { selected: true, text: 'auto', value: '$__auto_interval_interval' },
@@ -175,7 +175,7 @@ local g = import 'grafonnet/grafana.libsonnet';
         { color: 'green' },
       ])
       .addTarget($.addTargetSchema(
-        expr='sum(irate(ceph_osd_op_w_in_bytes{%(matchers)s}[5m]))' % $.matchers(),
+        expr='sum(rate(ceph_osd_op_w_in_bytes{%(matchers)s}[$__rate_interval]))' % $.matchers(),
         instant=true,
         interval='$interval',
         datasource='$datasource',
@@ -198,7 +198,7 @@ local g = import 'grafonnet/grafana.libsonnet';
         { color: '#9ac48a', value: 0 },
       ])
       .addTarget($.addTargetSchema(
-        expr='sum(irate(ceph_osd_op_r_out_bytes{%(matchers)s}[5m]))' % $.matchers(),
+        expr='sum(rate(ceph_osd_op_r_out_bytes{%(matchers)s}[$__rate_interval]))' % $.matchers(),
         instant=true,
         interval='$interval',
         datasource='$datasource',
@@ -495,7 +495,7 @@ local g = import 'grafonnet/grafana.libsonnet';
       ])
       .addTargets([
         $.addTargetSchema(
-          expr='sum(irate(ceph_osd_op_w{%(matchers)s}[1m]))' % $.matchers(),
+          expr='sum(rate(ceph_osd_op_w{%(matchers)s}[$__rate_interval]))' % $.matchers(),
           legendFormat='',
           datasource='$datasource',
           instant=true,
@@ -526,7 +526,7 @@ local g = import 'grafonnet/grafana.libsonnet';
       ])
       .addTargets([
         $.addTargetSchema(
-          expr='sum(irate(ceph_osd_op_r{%(matchers)s}[1m]))' % $.matchers(),
+          expr='sum(rate(ceph_osd_op_r{%(matchers)s}[$__rate_interval]))' % $.matchers(),
           legendFormat='',
           datasource='$datasource',
           instant=true,
@@ -729,7 +729,7 @@ local g = import 'grafonnet/grafana.libsonnet';
       .addTargets(
         [
           $.addTargetSchema(
-            expr='sum(irate(ceph_osd_op_w_in_bytes{%(matchers)s}[5m]))' % $.matchers(),
+            expr='sum(rate(ceph_osd_op_w_in_bytes{%(matchers)s}[$__rate_interval]))' % $.matchers(),
             datasource='$datasource',
             interval='$interval',
             legendFormat='Write',
@@ -737,7 +737,7 @@ local g = import 'grafonnet/grafana.libsonnet';
             range=true,
           ),
           $.addTargetSchema(
-            expr='sum(irate(ceph_osd_op_r_out_bytes{%(matchers)s}[5m]))' % $.matchers(),
+            expr='sum(rate(ceph_osd_op_r_out_bytes{%(matchers)s}[$__rate_interval]))' % $.matchers(),
             datasource='$datasource',
             interval='$interval',
             legendFormat='Read',
@@ -772,7 +772,7 @@ local g = import 'grafonnet/grafana.libsonnet';
       .addTargets(
         [
           $.addTargetSchema(
-            expr='sum(irate(ceph_osd_op_w{%(matchers)s}[1m]))' % $.matchers(),
+            expr='sum(rate(ceph_osd_op_w{%(matchers)s}[$__rate_interval]))' % $.matchers(),
             datasource='$datasource',
             interval='$interval',
             legendFormat='Write',
@@ -780,7 +780,7 @@ local g = import 'grafonnet/grafana.libsonnet';
             range=true,
           ),
           $.addTargetSchema(
-            expr='sum(irate(ceph_osd_op_r{%(matchers)s}[1m]))' % $.matchers(),
+            expr='sum(rate(ceph_osd_op_r{%(matchers)s}[$__rate_interval]))' % $.matchers(),
             datasource='$datasource',
             interval='$interval',
             legendFormat='Read',
@@ -1298,7 +1298,7 @@ local g = import 'grafonnet/grafana.libsonnet';
       ])
       .addTargets([
         $.addTargetSchema(
-          expr='sum(irate(ceph_osd_recovery_ops{%(matchers)s}[$interval]))' % $.matchers(),
+          expr='sum(rate(ceph_osd_recovery_ops{%(matchers)s}[$__rate_interval]))' % $.matchers(),
           datasource='$datasource',
           interval='$interval',
           legendFormat='OPS',
@@ -1443,7 +1443,7 @@ local g = import 'grafonnet/grafana.libsonnet';
           yBucketSize=null,
           pluginVersion='9.4.7',
         ).addTarget($.addTargetSchema(
-          expr='rate(ceph_osd_op_r_latency_sum{%(matchers)s}[5m]) / rate(ceph_osd_op_r_latency_count{%(matchers)s}[5m]) >= 0' % $.matchers(),
+          expr='rate(ceph_osd_op_r_latency_sum{%(matchers)s}[$__rate_interval]) / rate(ceph_osd_op_r_latency_count{%(matchers)s}[$__rate_interval]) >= 0' % $.matchers(),
           datasource='$datasource',
           interval='$interval',
           instant=false,
@@ -1494,7 +1494,7 @@ local g = import 'grafonnet/grafana.libsonnet';
           yBucketSize=null,
           pluginVersion='9.4.7',
         ).addTarget($.addTargetSchema(
-          expr='rate(ceph_osd_op_w_latency_sum{%(matchers)s}[5m]) / rate(ceph_osd_op_w_latency_count{%(matchers)s}[5m]) >= 0' % $.matchers(),
+          expr='rate(ceph_osd_op_w_latency_sum{%(matchers)s}[$__rate_interval]) / rate(ceph_osd_op_w_latency_count{%(matchers)s}[$__rate_interval]) >= 0' % $.matchers(),
           datasource='$datasource',
           interval='$interval',
           legendFormat='',
@@ -1525,12 +1525,12 @@ local g = import 'grafonnet/grafana.libsonnet';
         ])
         .addTargets([
           $.addTargetSchema(
-            expr='avg(rate(ceph_osd_op_r_latency_sum{%(matchers)s}[5m]) / rate(ceph_osd_op_r_latency_count{%(matchers)s}[5m]) >= 0)' % $.matchers(),
+            expr='avg(rate(ceph_osd_op_r_latency_sum{%(matchers)s}[$__rate_interval]) / rate(ceph_osd_op_r_latency_count{%(matchers)s}[$__rate_interval]) >= 0)' % $.matchers(),
             datasource='$datasource',
             legendFormat='Read',
           ),
           $.addTargetSchema(
-            expr='avg(rate(ceph_osd_op_w_latency_sum{%(matchers)s}[5m]) / rate(ceph_osd_op_w_latency_count{%(matchers)s}[5m]) >= 0)' % $.matchers(),
+            expr='avg(rate(ceph_osd_op_w_latency_sum{%(matchers)s}[$__rate_interval]) / rate(ceph_osd_op_w_latency_count{%(matchers)s}[$__rate_interval]) >= 0)' % $.matchers(),
             datasource='$datasource',
             legendFormat='Write',
           ),
diff --git a/monitoring/ceph-mixin/dashboards/ceph-nvmeof-performance.libsonnet b/monitoring/ceph-mixin/dashboards/ceph-nvmeof-performance.libsonnet
index a79456db7fbf..32402d107c2c 100644
--- a/monitoring/ceph-mixin/dashboards/ceph-nvmeof-performance.libsonnet
+++ b/monitoring/ceph-mixin/dashboards/ceph-nvmeof-performance.libsonnet
@@ -119,7 +119,7 @@ local g = import 'grafonnet/grafana.libsonnet';
     ])
     .addTarget(
       $.addTargetSchema(
-        expr="avg by(instance) (rate(ceph_nvmeof_reactor_seconds_total{mode='busy',instance=~'$gateway'}[1m]))",
+        expr="avg by(instance) (rate(ceph_nvmeof_reactor_seconds_total{mode='busy',instance=~'$gateway'}[$__rate_interval]))",
         format='',
         instant=false,
         legendFormat='{{name}}',
@@ -155,7 +155,7 @@ local g = import 'grafonnet/grafana.libsonnet';
     ])
     .addTarget(
       $.addTargetSchema(
-        expr="avg by (instance) (rate(ceph_nvmeof_reactor_seconds_total{mode='busy', instance=~'$gateway.*'}[1m]))\n",
+        expr="avg by (instance) (rate(ceph_nvmeof_reactor_seconds_total{mode='busy', instance=~'$gateway.*'}[$__rate_interval]))",
         format='',
         instant=false,
         legendFormat='{{name}}',
@@ -191,7 +191,7 @@ local g = import 'grafonnet/grafana.libsonnet';
     ])
     .addTarget(
       $.addTargetSchema(
-        expr="avg((rate(ceph_nvmeof_bdev_read_seconds_total{instance=~'$gateway'}[30s]) / rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[30s])) > 0)\n",
+        expr="avg((rate(ceph_nvmeof_bdev_read_seconds_total{instance=~'$gateway'}[$__rate_interval]) / rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[$__rate_interval])) > 0)",
         format='time_series',
         instant=false,
         legendFormat='Reads',
@@ -201,7 +201,7 @@ local g = import 'grafonnet/grafana.libsonnet';
     )
     .addTarget(
       $.addTargetSchema(
-        expr="avg((rate(ceph_nvmeof_bdev_write_seconds_total{instance=~'$gateway'}[30s]) / rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[30s])) > 0)",
+        expr="avg((rate(ceph_nvmeof_bdev_write_seconds_total{instance=~'$gateway'}[$__rate_interval]) / rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[$__rate_interval])) > 0)",
         format='time_series',
         instant=false,
         legendFormat='Writes',
@@ -237,7 +237,7 @@ local g = import 'grafonnet/grafana.libsonnet';
     ])
     .addTarget(
       $.addTargetSchema(
-        expr="sum by(instance) (rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[1m]) + rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[1m]))",
+        expr="sum by(instance) (rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[$__rate_interval]) + rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[$__rate_interval]))",
         format='time_series',
         instant=false,
         legendFormat='__auto',
@@ -272,7 +272,7 @@ local g = import 'grafonnet/grafana.libsonnet';
     ])
     .addTarget(
       $.addTargetSchema(
-        expr="\nsum by(nqn) ((rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[1m]) + rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[1m])) * on(instance,bdev_name) group_right ceph_nvmeof_subsystem_namespace_metadata{instance=~'$gateway'})",
+        expr="sum by(nqn) ((rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[$__rate_interval]) + rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[$__rate_interval])) * on(instance,bdev_name) group_right ceph_nvmeof_subsystem_namespace_metadata{instance=~'$gateway'})",
         format='time_series',
         instant=false,
         legendFormat='__auto',
@@ -308,7 +308,7 @@ local g = import 'grafonnet/grafana.libsonnet';
     ])
     .addTarget(
       $.addTargetSchema(
-        expr="topk(5, (sum by(pool_name, rbd_name) (((rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[1m]) + rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[1m])) * on(instance,bdev_name) group_right ceph_nvmeof_bdev_metadata{instance=~'$gateway'}) * on(instance, bdev_name) group_left(nqn) ceph_nvmeof_subsystem_namespace_metadata{nqn=~'$subsystem',instance=~'$gateway'})))",
+        expr="topk(5, (sum by(pool_name, rbd_name) (((rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[$__rate_interval]) + rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[$__rate_interval])) * on(instance,bdev_name) group_right ceph_nvmeof_bdev_metadata{instance=~'$gateway'}) * on(instance, bdev_name) group_left(nqn) ceph_nvmeof_subsystem_namespace_metadata{nqn=~'$subsystem',instance=~'$gateway'})))",
         format='time_series',
         instant=false,
         legendFormat='{{pool_name}}/{{rbd_name}}',
@@ -344,7 +344,7 @@ local g = import 'grafonnet/grafana.libsonnet';
     ])
     .addTarget(
       $.addTargetSchema(
-        expr="sum by(instance) (rate(ceph_nvmeof_bdev_read_bytes_total{instance=~'$gateway'}[1m]) + rate(ceph_nvmeof_bdev_written_bytes_total{instance=~'$gateway'}[1m]))",
+        expr="sum by(instance) (rate(ceph_nvmeof_bdev_read_bytes_total{instance=~'$gateway'}[$__rate_interval]) + rate(ceph_nvmeof_bdev_written_bytes_total{instance=~'$gateway'}[$__rate_interval]))",
         format='time_series',
         instant=false,
         legendFormat='{{name}}',
@@ -379,7 +379,7 @@ local g = import 'grafonnet/grafana.libsonnet';
     ])
     .addTarget(
       $.addTargetSchema(
-        expr="\nsum by(nqn) ((rate(ceph_nvmeof_bdev_read_bytes_total{instance=~'$gateway'}[1m]) + rate(ceph_nvmeof_bdev_written_bytes_total{instance=~'$gateway'}[1m])) * on(instance,bdev_name) group_right ceph_nvmeof_subsystem_namespace_metadata{instance=~'$gateway'})",
+        expr="sum by(nqn) ((rate(ceph_nvmeof_bdev_read_bytes_total{instance=~'$gateway'}[$__rate_interval]) + rate(ceph_nvmeof_bdev_written_bytes_total{instance=~'$gateway'}[$__rate_interval])) * on(instance,bdev_name) group_right ceph_nvmeof_subsystem_namespace_metadata{instance=~'$gateway'})",
         format='time_series',
         instant=false,
         legendFormat='__auto',
@@ -415,7 +415,7 @@ local g = import 'grafonnet/grafana.libsonnet';
     ])
     .addTarget(
       $.addTargetSchema(
-        expr="topk(5, (sum by(pool_name, rbd_name) (((rate(ceph_nvmeof_bdev_read_bytes_total{instance=~'$gateway'}[1m]) + rate(ceph_nvmeof_bdev_written_bytes_total{instance=~'$gateway'}[1m])) * on(instance,bdev_name) group_right ceph_nvmeof_bdev_metadata{instance=~'$gateway'}) * on(instance, bdev_name) group_left(nqn) ceph_nvmeof_subsystem_namespace_metadata{nqn=~'$subsystem',instance=~'$gateway'})))",
+        expr="topk(5, (sum by(pool_name, rbd_name) (((rate(ceph_nvmeof_bdev_read_bytes_total{instance=~'$gateway'}[$__rate_interval]) + rate(ceph_nvmeof_bdev_written_bytes_total{instance=~'$gateway'}[$__rate_interval])) * on(instance,bdev_name) group_right ceph_nvmeof_bdev_metadata{instance=~'$gateway'}) * on(instance, bdev_name) group_left(nqn) ceph_nvmeof_subsystem_namespace_metadata{nqn=~'$subsystem',instance=~'$gateway'})))",
         format='time_series',
         instant=false,
         legendFormat='{{name}}',
diff --git a/monitoring/ceph-mixin/dashboards/ceph-nvmeof.libsonnet b/monitoring/ceph-mixin/dashboards/ceph-nvmeof.libsonnet
index 334eb864445b..4002142ceccb 100644
--- a/monitoring/ceph-mixin/dashboards/ceph-nvmeof.libsonnet
+++ b/monitoring/ceph-mixin/dashboards/ceph-nvmeof.libsonnet
@@ -696,7 +696,7 @@ local g = import 'grafonnet/grafana.libsonnet';
     ])
     .addTarget(
       $.addTargetSchema(
-        expr="sum(irate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[$__rate_interval]))",
+        expr="sum(rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[$__rate_interval]))",
         format='time_series',
         instant=null,
         legendFormat='Read',
@@ -706,7 +706,7 @@ local g = import 'grafonnet/grafana.libsonnet';
     )
     .addTarget(
       $.addTargetSchema(
-        expr="sum(irate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[$__rate_interval]))",
+        expr="sum(rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[$__rate_interval]))",
         format='time_series',
         instant=false,
         legendFormat='Write',
@@ -735,7 +735,7 @@ local g = import 'grafonnet/grafana.libsonnet';
     ])
     .addTarget(
       $.addTargetSchema(
-        expr="sum (irate(ceph_nvmeof_bdev_read_bytes_total{instance=~'$gateway'}[$__rate_interval]))",
+        expr="sum (rate(ceph_nvmeof_bdev_read_bytes_total{instance=~'$gateway'}[$__rate_interval]))",
         format='time_series',
         instant=false,
         legendFormat='Read',
@@ -745,7 +745,7 @@ local g = import 'grafonnet/grafana.libsonnet';
     )
     .addTarget(
       $.addTargetSchema(
-        expr="sum (irate(ceph_nvmeof_bdev_written_bytes_total{instance=~'$gateway'}[$__rate_interval]))",
+        expr="sum (rate(ceph_nvmeof_bdev_written_bytes_total{instance=~'$gateway'}[$__rate_interval]))",
         format='time_series',
         instant=false,
         legendFormat='Write',
diff --git a/monitoring/ceph-mixin/dashboards/multi-cluster.libsonnet b/monitoring/ceph-mixin/dashboards/multi-cluster.libsonnet
index 6b0703192025..de2f2770b08b 100644
--- a/monitoring/ceph-mixin/dashboards/multi-cluster.libsonnet
+++ b/monitoring/ceph-mixin/dashboards/multi-cluster.libsonnet
@@ -440,7 +440,7 @@ local g = import 'grafonnet/grafana.libsonnet';
       ])
       .addTargets([
         $.addTargetSchema(
-          expr='sum(irate(ceph_pool_wr{cluster=~"$cluster"}[$__interval]))',
+          expr='sum(rate(ceph_pool_wr{cluster=~"$cluster"}[$__rate_interval]))',
           datasource={ type: 'prometheus', uid: '$datasource' },
           hide=false,
           exemplar=false,
@@ -449,7 +449,7 @@ local g = import 'grafonnet/grafana.libsonnet';
           range=true,
         ),
         $.addTargetSchema(
-          expr='sum(irate(ceph_pool_rd{cluster=~"$cluster"}[$__interval]))',
+          expr='sum(rate(ceph_pool_rd{cluster=~"$cluster"}[$__rate_interval]))',
           datasource={ type: 'prometheus', uid: '$datasource' },
           hide=false,
           exemplar=false,
@@ -617,7 +617,7 @@ local g = import 'grafonnet/grafana.libsonnet';
       ])
       .addTargets([
         $.addTargetSchema(
-          expr='sum(irate(ceph_pool_rd_bytes{cluster=~"$cluster"}[$__interval]))',
+          expr='sum(rate(ceph_pool_rd_bytes{cluster=~"$cluster"}[$__rate_interval]))',
           datasource={ type: 'prometheus', uid: '$datasource' },
           hide=false,
           exemplar=false,
@@ -626,7 +626,7 @@ local g = import 'grafonnet/grafana.libsonnet';
           range=true,
         ),
         $.addTargetSchema(
-          expr='sum(irate(ceph_pool_wr_bytes{cluster=~"$cluster"}[$__interval]))',
+          expr='sum(rate(ceph_pool_wr_bytes{cluster=~"$cluster"}[$__rate_interval]))',
           datasource={ type: 'prometheus', uid: '$datasource' },
           hide=false,
           exemplar=false,
@@ -651,7 +651,7 @@ local g = import 'grafonnet/grafana.libsonnet';
       ])
       .addTargets([
         $.addTargetSchema(
-          expr='sum(irate(ceph_osd_recovery_ops{cluster=~"$cluster"}[$__interval]))',
+          expr='sum(rate(ceph_osd_recovery_ops{cluster=~"$cluster"}[$__rate_interval]))',
           datasource={ type: 'prometheus', uid: '$datasource' },
           hide=false,
           exemplar=false,
@@ -891,7 +891,7 @@ local g = import 'grafonnet/grafana.libsonnet';
         .addTargets(
           [
             $.addTargetSchema(
-              expr='topk(10, sum by (cluster) (irate(ceph_osd_op_w[$__interval]))  \n+ sum by (cluster) (irate(ceph_osd_op_r[$__interval])) )',
+              expr='topk(10, sum by (cluster) (rate(ceph_osd_op_w[$__rate_interval]))  \n+ sum by (cluster) (rate(ceph_osd_op_r[$__rate_interval])) )',
               datasource='$datasource',
               instant=false,
               legendFormat='{{cluster}}',
diff --git a/monitoring/ceph-mixin/dashboards/utils.libsonnet b/monitoring/ceph-mixin/dashboards/utils.libsonnet
index fcfe88e927f6..104e0d4c5f4a 100644
--- a/monitoring/ceph-mixin/dashboards/utils.libsonnet
+++ b/monitoring/ceph-mixin/dashboards/utils.libsonnet
@@ -485,8 +485,8 @@ local timeSeries = import 'timeseries_panel.libsonnet';
                     valuelabels={},
                     refresh=0,
                     label='Interval',
-                    auto_count=10,
-                    auto_min='2m',
+                    auto_count=300,
+                    auto_min='1m',
                     options=[],
                     auto=null)::
     g.template.interval(name=name,
diff --git a/monitoring/ceph-mixin/dashboards_out/ceph-cluster-advanced.json b/monitoring/ceph-mixin/dashboards_out/ceph-cluster-advanced.json
index a31cd5ec3f5b..a3c5a967764c 100644
--- a/monitoring/ceph-mixin/dashboards_out/ceph-cluster-advanced.json
+++ b/monitoring/ceph-mixin/dashboards_out/ceph-cluster-advanced.json
@@ -391,7 +391,7 @@
          "targets": [
             {
                "datasource": "$datasource",
-               "expr": "sum(irate(ceph_osd_op_w_in_bytes{cluster=~\"$cluster\", }[5m]))",
+               "expr": "sum(rate(ceph_osd_op_w_in_bytes{cluster=~\"$cluster\", }[$__rate_interval]))",
                "format": "time_series",
                "instant": true,
                "interval": "$interval",
@@ -469,7 +469,7 @@
          "targets": [
             {
                "datasource": "$datasource",
-               "expr": "sum(irate(ceph_osd_op_r_out_bytes{cluster=~\"$cluster\", }[5m]))",
+               "expr": "sum(rate(ceph_osd_op_r_out_bytes{cluster=~\"$cluster\", }[$__rate_interval]))",
                "format": "time_series",
                "instant": true,
                "interval": "$interval",
@@ -1014,7 +1014,7 @@
          "targets": [
             {
                "datasource": "$datasource",
-               "expr": "sum(irate(ceph_osd_op_w{cluster=~\"$cluster\", }[1m]))",
+               "expr": "sum(rate(ceph_osd_op_w{cluster=~\"$cluster\", }[$__rate_interval]))",
                "format": "time_series",
                "instant": true,
                "intervalFactor": 1,
@@ -1093,7 +1093,7 @@
          "targets": [
             {
                "datasource": "$datasource",
-               "expr": "sum(irate(ceph_osd_op_r{cluster=~\"$cluster\", }[1m]))",
+               "expr": "sum(rate(ceph_osd_op_r{cluster=~\"$cluster\", }[$__rate_interval]))",
                "format": "time_series",
                "instant": true,
                "intervalFactor": 1,
@@ -1285,6 +1285,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -1404,6 +1405,7 @@
             }
          },
          "pluginVersion": "9.1.3",
+         "seriesOverrides": [ ],
          "targets": [
             {
                "datasource": "$datasource",
@@ -1435,6 +1437,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -1513,10 +1516,11 @@
             }
          },
          "pluginVersion": "9.1.3",
+         "seriesOverrides": [ ],
          "targets": [
             {
                "datasource": "$datasource",
-               "expr": "sum(irate(ceph_osd_op_w_in_bytes{cluster=~\"$cluster\", }[5m]))",
+               "expr": "sum(rate(ceph_osd_op_w_in_bytes{cluster=~\"$cluster\", }[$__rate_interval]))",
                "format": "time_series",
                "interval": "$interval",
                "intervalFactor": 1,
@@ -1527,7 +1531,7 @@
             },
             {
                "datasource": "$datasource",
-               "expr": "sum(irate(ceph_osd_op_r_out_bytes{cluster=~\"$cluster\", }[5m]))",
+               "expr": "sum(rate(ceph_osd_op_r_out_bytes{cluster=~\"$cluster\", }[$__rate_interval]))",
                "format": "time_series",
                "interval": "$interval",
                "intervalFactor": 1,
@@ -1542,6 +1546,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -1620,10 +1625,11 @@
             }
          },
          "pluginVersion": "9.1.3",
+         "seriesOverrides": [ ],
          "targets": [
             {
                "datasource": "$datasource",
-               "expr": "sum(irate(ceph_osd_op_w{cluster=~\"$cluster\", }[1m]))",
+               "expr": "sum(rate(ceph_osd_op_w{cluster=~\"$cluster\", }[$__rate_interval]))",
                "format": "time_series",
                "interval": "$interval",
                "intervalFactor": 1,
@@ -1634,7 +1640,7 @@
             },
             {
                "datasource": "$datasource",
-               "expr": "sum(irate(ceph_osd_op_r{cluster=~\"$cluster\", }[1m]))",
+               "expr": "sum(rate(ceph_osd_op_r{cluster=~\"$cluster\", }[$__rate_interval]))",
                "format": "time_series",
                "interval": "$interval",
                "intervalFactor": 1,
@@ -1649,6 +1655,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -1722,6 +1729,7 @@
             }
          },
          "pluginVersion": "9.1.3",
+         "seriesOverrides": [ ],
          "targets": [
             {
                "datasource": "$datasource",
@@ -1739,6 +1747,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -1824,6 +1833,7 @@
             }
          },
          "pluginVersion": "9.1.3",
+         "seriesOverrides": [ ],
          "targets": [
             {
                "datasource": "$datasource",
@@ -1843,6 +1853,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -1916,6 +1927,7 @@
             }
          },
          "pluginVersion": "9.1.3",
+         "seriesOverrides": [ ],
          "targets": [
             {
                "datasource": "$datasource",
@@ -1933,6 +1945,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -2006,6 +2019,7 @@
             }
          },
          "pluginVersion": "9.1.3",
+         "seriesOverrides": [ ],
          "targets": [
             {
                "datasource": "$datasource",
@@ -2023,6 +2037,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -2096,6 +2111,7 @@
             }
          },
          "pluginVersion": "9.1.3",
+         "seriesOverrides": [ ],
          "targets": [
             {
                "datasource": "$datasource",
@@ -2131,6 +2147,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -2219,6 +2236,7 @@
             }
          },
          "pluginVersion": "9.1.3",
+         "seriesOverrides": [ ],
          "targets": [
             {
                "datasource": "$datasource",
@@ -2237,6 +2255,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -2327,6 +2346,7 @@
             }
          },
          "pluginVersion": "9.1.3",
+         "seriesOverrides": [ ],
          "targets": [
             {
                "datasource": "$datasource",
@@ -2548,6 +2568,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -2639,6 +2660,7 @@
             }
          },
          "pluginVersion": "9.1.3",
+         "seriesOverrides": [ ],
          "targets": [
             {
                "datasource": "$datasource",
@@ -2679,6 +2701,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -2751,10 +2774,11 @@
             }
          },
          "pluginVersion": "9.1.3",
+         "seriesOverrides": [ ],
          "targets": [
             {
                "datasource": "$datasource",
-               "expr": "sum(irate(ceph_osd_recovery_ops{cluster=~\"$cluster\", }[$interval]))",
+               "expr": "sum(rate(ceph_osd_recovery_ops{cluster=~\"$cluster\", }[$__rate_interval]))",
                "format": "time_series",
                "interval": "$interval",
                "intervalFactor": 1,
@@ -3118,7 +3142,7 @@
                "targets": [
                   {
                      "datasource": "$datasource",
-                     "expr": "rate(ceph_osd_op_r_latency_sum{cluster=~\"$cluster\", }[5m]) / rate(ceph_osd_op_r_latency_count{cluster=~\"$cluster\", }[5m]) >= 0",
+                     "expr": "rate(ceph_osd_op_r_latency_sum{cluster=~\"$cluster\", }[$__rate_interval]) / rate(ceph_osd_op_r_latency_count{cluster=~\"$cluster\", }[$__rate_interval]) >= 0",
                      "format": "time_series",
                      "instant": false,
                      "interval": "$interval",
@@ -3243,7 +3267,7 @@
                "targets": [
                   {
                      "datasource": "$datasource",
-                     "expr": "rate(ceph_osd_op_w_latency_sum{cluster=~\"$cluster\", }[5m]) / rate(ceph_osd_op_w_latency_count{cluster=~\"$cluster\", }[5m]) >= 0",
+                     "expr": "rate(ceph_osd_op_w_latency_sum{cluster=~\"$cluster\", }[$__rate_interval]) / rate(ceph_osd_op_w_latency_count{cluster=~\"$cluster\", }[$__rate_interval]) >= 0",
                      "format": "time_series",
                      "instant": false,
                      "interval": "$interval",
@@ -3278,6 +3302,7 @@
             },
             {
                "datasource": "$datasource",
+               "description": "",
                "fieldConfig": {
                   "defaults": {
                      "color": {
@@ -3350,10 +3375,11 @@
                   }
                },
                "pluginVersion": "9.1.3",
+               "seriesOverrides": [ ],
                "targets": [
                   {
                      "datasource": "$datasource",
-                     "expr": "avg(rate(ceph_osd_op_r_latency_sum{cluster=~\"$cluster\", }[5m]) / rate(ceph_osd_op_r_latency_count{cluster=~\"$cluster\", }[5m]) >= 0)",
+                     "expr": "avg(rate(ceph_osd_op_r_latency_sum{cluster=~\"$cluster\", }[$__rate_interval]) / rate(ceph_osd_op_r_latency_count{cluster=~\"$cluster\", }[$__rate_interval]) >= 0)",
                      "format": "time_series",
                      "intervalFactor": 1,
                      "legendFormat": "Read",
@@ -3361,7 +3387,7 @@
                   },
                   {
                      "datasource": "$datasource",
-                     "expr": "avg(rate(ceph_osd_op_w_latency_sum{cluster=~\"$cluster\", }[5m]) / rate(ceph_osd_op_w_latency_count{cluster=~\"$cluster\", }[5m]) >= 0)",
+                     "expr": "avg(rate(ceph_osd_op_w_latency_sum{cluster=~\"$cluster\", }[$__rate_interval]) / rate(ceph_osd_op_w_latency_count{cluster=~\"$cluster\", }[$__rate_interval]) >= 0)",
                      "format": "time_series",
                      "intervalFactor": 1,
                      "legendFormat": "Write",
@@ -3373,6 +3399,7 @@
             },
             {
                "datasource": "$datasource",
+               "description": "",
                "fieldConfig": {
                   "defaults": {
                      "color": {
@@ -3448,6 +3475,7 @@
                   }
                },
                "pluginVersion": "9.1.3",
+               "seriesOverrides": [ ],
                "targets": [
                   {
                      "datasource": "$datasource",
@@ -3702,7 +3730,7 @@
          },
          {
             "auto": true,
-            "auto_count": 10,
+            "auto_count": 300,
             "auto_min": "1m",
             "current": {
                "text": "$__auto_interval_interval",
diff --git a/monitoring/ceph-mixin/dashboards_out/ceph-cluster.json b/monitoring/ceph-mixin/dashboards_out/ceph-cluster.json
index 0b5abd73d90b..a217c1a40cb4 100644
--- a/monitoring/ceph-mixin/dashboards_out/ceph-cluster.json
+++ b/monitoring/ceph-mixin/dashboards_out/ceph-cluster.json
@@ -942,14 +942,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(ceph_osd_op_w_in_bytes{cluster=~'$cluster'}[1m]))",
+          "expr": "sum(rate(ceph_osd_op_w_in_bytes{cluster=~'$cluster'}[$__rate_interval]))",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "Writes",
           "refId": "A"
         },
         {
-          "expr": "sum(irate(ceph_osd_op_r_out_bytes{cluster=~'$cluster'}[1m]))",
+          "expr": "sum(rate(ceph_osd_op_r_out_bytes{cluster=~'$cluster'}[$__rate_interval]))",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "Reads",
@@ -1038,7 +1038,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(deriv(ceph_pool_stored{cluster=~'$cluster'}[1m]))",
+          "expr": "sum(deriv(ceph_pool_stored{cluster=~'$cluster'}[$__rate_interval]))",
           "format": "time_series",
           "intervalFactor": 1,
           "refId": "A"
@@ -1249,7 +1249,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(ceph_osd_recovery_ops{cluster=~'$cluster'}[1m]))",
+          "expr": "sum(rate(ceph_osd_recovery_ops{cluster=~'$cluster'}[$__rate_interval]))",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "Op/s",
@@ -1336,7 +1336,7 @@
       },
       {
         "auto": true,
-        "auto_count": 10,
+        "auto_count": 300,
         "auto_min": "1m",
         "current": {
           "text": "auto",
@@ -1443,5 +1443,5 @@
   "timezone": "",
   "title": "Ceph - Cluster",
   "uid": "edtb0oxdq",
-  "version": 0
+  "version": 1
 }
diff --git a/monitoring/ceph-mixin/dashboards_out/ceph-nvmeof-performance.json b/monitoring/ceph-mixin/dashboards_out/ceph-nvmeof-performance.json
index 9ea9f21ac986..1640c61ed2a5 100644
--- a/monitoring/ceph-mixin/dashboards_out/ceph-nvmeof-performance.json
+++ b/monitoring/ceph-mixin/dashboards_out/ceph-nvmeof-performance.json
@@ -136,7 +136,7 @@
          "targets": [
             {
                "datasource": "$datasource",
-               "expr": "avg by(instance) (rate(ceph_nvmeof_reactor_seconds_total{mode='busy',instance=~'$gateway'}[1m]))",
+               "expr": "avg by(instance) (rate(ceph_nvmeof_reactor_seconds_total{mode='busy',instance=~'$gateway'}[$__rate_interval]))",
                "format": "",
                "instant": false,
                "intervalFactor": 1,
@@ -228,7 +228,7 @@
          "targets": [
             {
                "datasource": "$datasource",
-               "expr": "avg by (instance) (rate(ceph_nvmeof_reactor_seconds_total{mode='busy', instance=~'$gateway.*'}[1m]))\n",
+               "expr": "avg by (instance) (rate(ceph_nvmeof_reactor_seconds_total{mode='busy', instance=~'$gateway.*'}[$__rate_interval]))",
                "format": "",
                "instant": false,
                "intervalFactor": 1,
@@ -320,7 +320,7 @@
          "targets": [
             {
                "datasource": "$datasource",
-               "expr": "avg((rate(ceph_nvmeof_bdev_read_seconds_total{instance=~'$gateway'}[30s]) / rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[30s])) > 0)\n",
+               "expr": "avg((rate(ceph_nvmeof_bdev_read_seconds_total{instance=~'$gateway'}[$__rate_interval]) / rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[$__rate_interval])) > 0)",
                "format": "time_series",
                "instant": false,
                "intervalFactor": 1,
@@ -330,7 +330,7 @@
             },
             {
                "datasource": "$datasource",
-               "expr": "avg((rate(ceph_nvmeof_bdev_write_seconds_total{instance=~'$gateway'}[30s]) / rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[30s])) > 0)",
+               "expr": "avg((rate(ceph_nvmeof_bdev_write_seconds_total{instance=~'$gateway'}[$__rate_interval]) / rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[$__rate_interval])) > 0)",
                "format": "time_series",
                "instant": false,
                "intervalFactor": 1,
@@ -422,7 +422,7 @@
          "targets": [
             {
                "datasource": "$datasource",
-               "expr": "sum by(instance) (rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[1m]) + rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[1m]))",
+               "expr": "sum by(instance) (rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[$__rate_interval]) + rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[$__rate_interval]))",
                "format": "time_series",
                "instant": false,
                "intervalFactor": 1,
@@ -510,7 +510,7 @@
          "targets": [
             {
                "datasource": "$datasource",
-               "expr": "\nsum by(nqn) ((rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[1m]) + rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[1m])) * on(instance,bdev_name) group_right ceph_nvmeof_subsystem_namespace_metadata{instance=~'$gateway'})",
+               "expr": "sum by(nqn) ((rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[$__rate_interval]) + rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[$__rate_interval])) * on(instance,bdev_name) group_right ceph_nvmeof_subsystem_namespace_metadata{instance=~'$gateway'})",
                "format": "time_series",
                "instant": false,
                "intervalFactor": 1,
@@ -602,7 +602,7 @@
          "targets": [
             {
                "datasource": "$datasource",
-               "expr": "topk(5, (sum by(pool_name, rbd_name) (((rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[1m]) + rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[1m])) * on(instance,bdev_name) group_right ceph_nvmeof_bdev_metadata{instance=~'$gateway'}) * on(instance, bdev_name) group_left(nqn) ceph_nvmeof_subsystem_namespace_metadata{nqn=~'$subsystem',instance=~'$gateway'})))",
+               "expr": "topk(5, (sum by(pool_name, rbd_name) (((rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[$__rate_interval]) + rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[$__rate_interval])) * on(instance,bdev_name) group_right ceph_nvmeof_bdev_metadata{instance=~'$gateway'}) * on(instance, bdev_name) group_left(nqn) ceph_nvmeof_subsystem_namespace_metadata{nqn=~'$subsystem',instance=~'$gateway'})))",
                "format": "time_series",
                "instant": false,
                "intervalFactor": 1,
@@ -694,7 +694,7 @@
          "targets": [
             {
                "datasource": "$datasource",
-               "expr": "sum by(instance) (rate(ceph_nvmeof_bdev_read_bytes_total{instance=~'$gateway'}[1m]) + rate(ceph_nvmeof_bdev_written_bytes_total{instance=~'$gateway'}[1m]))",
+               "expr": "sum by(instance) (rate(ceph_nvmeof_bdev_read_bytes_total{instance=~'$gateway'}[$__rate_interval]) + rate(ceph_nvmeof_bdev_written_bytes_total{instance=~'$gateway'}[$__rate_interval]))",
                "format": "time_series",
                "instant": false,
                "intervalFactor": 1,
@@ -782,7 +782,7 @@
          "targets": [
             {
                "datasource": "$datasource",
-               "expr": "\nsum by(nqn) ((rate(ceph_nvmeof_bdev_read_bytes_total{instance=~'$gateway'}[1m]) + rate(ceph_nvmeof_bdev_written_bytes_total{instance=~'$gateway'}[1m])) * on(instance,bdev_name) group_right ceph_nvmeof_subsystem_namespace_metadata{instance=~'$gateway'})",
+               "expr": "sum by(nqn) ((rate(ceph_nvmeof_bdev_read_bytes_total{instance=~'$gateway'}[$__rate_interval]) + rate(ceph_nvmeof_bdev_written_bytes_total{instance=~'$gateway'}[$__rate_interval])) * on(instance,bdev_name) group_right ceph_nvmeof_subsystem_namespace_metadata{instance=~'$gateway'})",
                "format": "time_series",
                "instant": false,
                "intervalFactor": 1,
@@ -874,7 +874,7 @@
          "targets": [
             {
                "datasource": "$datasource",
-               "expr": "topk(5, (sum by(pool_name, rbd_name) (((rate(ceph_nvmeof_bdev_read_bytes_total{instance=~'$gateway'}[1m]) + rate(ceph_nvmeof_bdev_written_bytes_total{instance=~'$gateway'}[1m])) * on(instance,bdev_name) group_right ceph_nvmeof_bdev_metadata{instance=~'$gateway'}) * on(instance, bdev_name) group_left(nqn) ceph_nvmeof_subsystem_namespace_metadata{nqn=~'$subsystem',instance=~'$gateway'})))",
+               "expr": "topk(5, (sum by(pool_name, rbd_name) (((rate(ceph_nvmeof_bdev_read_bytes_total{instance=~'$gateway'}[$__rate_interval]) + rate(ceph_nvmeof_bdev_written_bytes_total{instance=~'$gateway'}[$__rate_interval])) * on(instance,bdev_name) group_right ceph_nvmeof_bdev_metadata{instance=~'$gateway'}) * on(instance, bdev_name) group_left(nqn) ceph_nvmeof_subsystem_namespace_metadata{nqn=~'$subsystem',instance=~'$gateway'})))",
                "format": "time_series",
                "instant": false,
                "intervalFactor": 1,
diff --git a/monitoring/ceph-mixin/dashboards_out/ceph-nvmeof.json b/monitoring/ceph-mixin/dashboards_out/ceph-nvmeof.json
index d2ea59da4f84..2112d7a75404 100644
--- a/monitoring/ceph-mixin/dashboards_out/ceph-nvmeof.json
+++ b/monitoring/ceph-mixin/dashboards_out/ceph-nvmeof.json
@@ -1231,7 +1231,7 @@
          "targets": [
             {
                "datasource": "$datasource",
-               "expr": "sum(irate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[$__rate_interval]))",
+               "expr": "sum(rate(ceph_nvmeof_bdev_reads_completed_total{instance=~'$gateway'}[$__rate_interval]))",
                "format": "time_series",
                "intervalFactor": 1,
                "legendFormat": "Read",
@@ -1240,7 +1240,7 @@
             },
             {
                "datasource": "$datasource",
-               "expr": "sum(irate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[$__rate_interval]))",
+               "expr": "sum(rate(ceph_nvmeof_bdev_writes_completed_total{instance=~'$gateway'}[$__rate_interval]))",
                "format": "time_series",
                "instant": false,
                "intervalFactor": 1,
@@ -1301,7 +1301,7 @@
          "targets": [
             {
                "datasource": "$datasource",
-               "expr": "sum (irate(ceph_nvmeof_bdev_read_bytes_total{instance=~'$gateway'}[$__rate_interval]))",
+               "expr": "sum (rate(ceph_nvmeof_bdev_read_bytes_total{instance=~'$gateway'}[$__rate_interval]))",
                "format": "time_series",
                "instant": false,
                "intervalFactor": 1,
@@ -1311,7 +1311,7 @@
             },
             {
                "datasource": "$datasource",
-               "expr": "sum (irate(ceph_nvmeof_bdev_written_bytes_total{instance=~'$gateway'}[$__rate_interval]))",
+               "expr": "sum (rate(ceph_nvmeof_bdev_written_bytes_total{instance=~'$gateway'}[$__rate_interval]))",
                "format": "time_series",
                "instant": false,
                "intervalFactor": 1,
diff --git a/monitoring/ceph-mixin/dashboards_out/cephfs-overview.json b/monitoring/ceph-mixin/dashboards_out/cephfs-overview.json
index 368ba6c2b4a2..a73bf64d5c04 100644
--- a/monitoring/ceph-mixin/dashboards_out/cephfs-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/cephfs-overview.json
@@ -71,6 +71,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -162,6 +163,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
diff --git a/monitoring/ceph-mixin/dashboards_out/cephfsdashboard.json b/monitoring/ceph-mixin/dashboards_out/cephfsdashboard.json
index e7c4cf56da5d..46636529133e 100644
--- a/monitoring/ceph-mixin/dashboards_out/cephfsdashboard.json
+++ b/monitoring/ceph-mixin/dashboards_out/cephfsdashboard.json
@@ -3011,7 +3011,7 @@
                            "viz": false
                         },
                         "lineInterpolation": "linear",
-                        "lineWidth": 0,
+                        "lineWidth": 1,
                         "pointSize": 5,
                         "scaleDistribution": {
                            "type": "linear"
@@ -3648,7 +3648,7 @@
                            "viz": false
                         },
                         "lineInterpolation": "linear",
-                        "lineWidth": 0,
+                        "lineWidth": 1,
                         "pointSize": 5,
                         "scaleDistribution": {
                            "type": "linear"
diff --git a/monitoring/ceph-mixin/dashboards_out/host-details.json b/monitoring/ceph-mixin/dashboards_out/host-details.json
index 99316e2fd032..f0e022c7a369 100644
--- a/monitoring/ceph-mixin/dashboards_out/host-details.json
+++ b/monitoring/ceph-mixin/dashboards_out/host-details.json
@@ -158,6 +158,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -236,6 +237,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -343,6 +345,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -433,6 +436,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -605,6 +609,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -714,6 +719,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -804,6 +810,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -894,6 +901,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -972,6 +980,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
diff --git a/monitoring/ceph-mixin/dashboards_out/hosts-overview.json b/monitoring/ceph-mixin/dashboards_out/hosts-overview.json
index a15d8b0879b1..a391a097d34b 100644
--- a/monitoring/ceph-mixin/dashboards_out/hosts-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/hosts-overview.json
@@ -555,6 +555,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -634,6 +635,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
diff --git a/monitoring/ceph-mixin/dashboards_out/multi-cluster-overview.json b/monitoring/ceph-mixin/dashboards_out/multi-cluster-overview.json
index b9ccc453ac8b..52844c9344eb 100644
--- a/monitoring/ceph-mixin/dashboards_out/multi-cluster-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/multi-cluster-overview.json
@@ -22,13 +22,13 @@
    "graphTooltip": 0,
    "hideControls": false,
    "id": null,
-   "links": [ 
+   "links": [
       {
          "asDropdown": true,
          "icon": "external link",
          "includeVars": true,
          "keepTime": true,
-         "tags": [],
+         "tags": [ ],
          "targetBlank": false,
          "title": "Browse Dashboards",
          "tooltip": "",
@@ -886,7 +886,7 @@
                   "uid": "$datasource"
                },
                "exemplar": false,
-               "expr": "sum(irate(ceph_pool_wr{cluster=~\"$cluster\"}[$__interval]))",
+               "expr": "sum(rate(ceph_pool_wr{cluster=~\"$cluster\"}[$__rate_interval]))",
                "format": "time_series",
                "hide": false,
                "instant": false,
@@ -901,7 +901,7 @@
                   "uid": "$datasource"
                },
                "exemplar": false,
-               "expr": "sum(irate(ceph_pool_rd{cluster=~\"$cluster\"}[$__interval]))",
+               "expr": "sum(rate(ceph_pool_rd{cluster=~\"$cluster\"}[$__rate_interval]))",
                "format": "time_series",
                "hide": false,
                "intervalFactor": 1,
@@ -1310,7 +1310,7 @@
                   "uid": "$datasource"
                },
                "exemplar": false,
-               "expr": "sum(irate(ceph_pool_rd_bytes{cluster=~\"$cluster\"}[$__interval]))",
+               "expr": "sum(rate(ceph_pool_rd_bytes{cluster=~\"$cluster\"}[$__rate_interval]))",
                "format": "time_series",
                "hide": false,
                "instant": false,
@@ -1325,7 +1325,7 @@
                   "uid": "$datasource"
                },
                "exemplar": false,
-               "expr": "sum(irate(ceph_pool_wr_bytes{cluster=~\"$cluster\"}[$__interval]))",
+               "expr": "sum(rate(ceph_pool_wr_bytes{cluster=~\"$cluster\"}[$__rate_interval]))",
                "format": "time_series",
                "hide": false,
                "intervalFactor": 1,
@@ -1389,7 +1389,7 @@
                   "uid": "$datasource"
                },
                "exemplar": false,
-               "expr": "sum(irate(ceph_osd_recovery_ops{cluster=~\"$cluster\"}[$__interval]))",
+               "expr": "sum(rate(ceph_osd_recovery_ops{cluster=~\"$cluster\"}[$__rate_interval]))",
                "format": "time_series",
                "hide": false,
                "instant": false,
@@ -1714,6 +1714,7 @@
          "panels": [
             {
                "datasource": "$datasource",
+               "description": "",
                "fieldConfig": {
                   "defaults": {
                      "color": {
@@ -1786,6 +1787,7 @@
                   }
                },
                "pluginVersion": "9.1.3",
+               "seriesOverrides": [ ],
                "targets": [
                   {
                      "datasource": "$datasource",
@@ -1804,6 +1806,7 @@
             },
             {
                "datasource": "$datasource",
+               "description": "",
                "fieldConfig": {
                   "defaults": {
                      "color": {
@@ -1876,10 +1879,11 @@
                   }
                },
                "pluginVersion": "9.1.3",
+               "seriesOverrides": [ ],
                "targets": [
                   {
                      "datasource": "$datasource",
-                     "expr": "topk(10, sum by (cluster) (irate(ceph_osd_op_w[$__interval]))  \n+ sum by (cluster) (irate(ceph_osd_op_r[$__interval])) )",
+                     "expr": "topk(10, sum by (cluster) (rate(ceph_osd_op_w[$__rate_interval]))  \n+ sum by (cluster) (rate(ceph_osd_op_r[$__rate_interval])) )",
                      "format": "time_series",
                      "instant": false,
                      "intervalFactor": 1,
@@ -1894,6 +1898,7 @@
             },
             {
                "datasource": "$datasource",
+               "description": "",
                "fieldConfig": {
                   "defaults": {
                      "color": {
@@ -1966,6 +1971,7 @@
                   }
                },
                "pluginVersion": "9.1.3",
+               "seriesOverrides": [ ],
                "targets": [
                   {
                      "datasource": "$datasource",
diff --git a/monitoring/ceph-mixin/dashboards_out/osd-device-details.json b/monitoring/ceph-mixin/dashboards_out/osd-device-details.json
index 4d46dce3310a..4bcdd0785aab 100644
--- a/monitoring/ceph-mixin/dashboards_out/osd-device-details.json
+++ b/monitoring/ceph-mixin/dashboards_out/osd-device-details.json
@@ -71,6 +71,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -161,6 +162,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -251,6 +253,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -360,6 +363,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -450,6 +454,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -540,6 +545,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -630,6 +636,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
diff --git a/monitoring/ceph-mixin/dashboards_out/osds-overview.json b/monitoring/ceph-mixin/dashboards_out/osds-overview.json
index 598a3165474c..594e03a9135f 100644
--- a/monitoring/ceph-mixin/dashboards_out/osds-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/osds-overview.json
@@ -64,6 +64,7 @@
    "panels": [
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -292,6 +293,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -991,6 +993,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
diff --git a/monitoring/ceph-mixin/dashboards_out/pool-detail.json b/monitoring/ceph-mixin/dashboards_out/pool-detail.json
index 34fb8432e225..24110b85cb2c 100644
--- a/monitoring/ceph-mixin/dashboards_out/pool-detail.json
+++ b/monitoring/ceph-mixin/dashboards_out/pool-detail.json
@@ -221,6 +221,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -299,6 +300,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -389,6 +391,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -479,6 +482,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
diff --git a/monitoring/ceph-mixin/dashboards_out/pool-overview.json b/monitoring/ceph-mixin/dashboards_out/pool-overview.json
index c3b9b0c5ae38..3458dd144a25 100644
--- a/monitoring/ceph-mixin/dashboards_out/pool-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/pool-overview.json
@@ -1311,6 +1311,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -1396,6 +1397,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -1474,6 +1476,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
diff --git a/monitoring/ceph-mixin/dashboards_out/radosgw-sync-overview.json b/monitoring/ceph-mixin/dashboards_out/radosgw-sync-overview.json
index cb6e87ecbeff..9afbb32c52a2 100644
--- a/monitoring/ceph-mixin/dashboards_out/radosgw-sync-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/radosgw-sync-overview.json
@@ -432,6 +432,7 @@
       },
       {
          "datasource": "$datasource",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -509,6 +510,7 @@
             }
          },
          "pluginVersion": "9.1.3",
+         "seriesOverrides": [ ],
          "targets": [
             {
                "datasource": "$datasource",
diff --git a/monitoring/ceph-mixin/dashboards_out/rgw-s3-analytics.json b/monitoring/ceph-mixin/dashboards_out/rgw-s3-analytics.json
index 92820558309c..1c5ec3b770cb 100644
--- a/monitoring/ceph-mixin/dashboards_out/rgw-s3-analytics.json
+++ b/monitoring/ceph-mixin/dashboards_out/rgw-s3-analytics.json
@@ -1916,6 +1916,7 @@
             },
             {
                "datasource": "${datasource}",
+               "description": "",
                "fieldConfig": {
                   "defaults": {
                      "color": {
@@ -2006,6 +2007,7 @@
                   }
                },
                "pluginVersion": "9.1.3",
+               "seriesOverrides": [ ],
                "targets": [
                   {
                      "datasource": "${datasource}",
@@ -2024,6 +2026,7 @@
             },
             {
                "datasource": "${datasource}",
+               "description": "",
                "fieldConfig": {
                   "defaults": {
                      "color": {
@@ -2114,6 +2117,7 @@
                   }
                },
                "pluginVersion": "9.1.3",
+               "seriesOverrides": [ ],
                "targets": [
                   {
                      "datasource": "${datasource}",
@@ -2132,6 +2136,7 @@
             },
             {
                "datasource": "${datasource}",
+               "description": "",
                "fieldConfig": {
                   "defaults": {
                      "color": {
@@ -2222,6 +2227,7 @@
                   }
                },
                "pluginVersion": "9.1.3",
+               "seriesOverrides": [ ],
                "targets": [
                   {
                      "datasource": "${datasource}",
@@ -2240,6 +2246,7 @@
             },
             {
                "datasource": "${datasource}",
+               "description": "",
                "fieldConfig": {
                   "defaults": {
                      "color": {
@@ -2330,6 +2337,7 @@
                   }
                },
                "pluginVersion": "9.1.3",
+               "seriesOverrides": [ ],
                "targets": [
                   {
                      "datasource": "${datasource}",
@@ -2348,6 +2356,7 @@
             },
             {
                "datasource": "${datasource}",
+               "description": "",
                "fieldConfig": {
                   "defaults": {
                      "color": {
@@ -2438,6 +2447,7 @@
                   }
                },
                "pluginVersion": "9.1.3",
+               "seriesOverrides": [ ],
                "targets": [
                   {
                      "datasource": "${datasource}",
@@ -2456,6 +2466,7 @@
             },
             {
                "datasource": "${datasource}",
+               "description": "",
                "fieldConfig": {
                   "defaults": {
                      "color": {
@@ -2546,6 +2557,7 @@
                   }
                },
                "pluginVersion": "9.1.3",
+               "seriesOverrides": [ ],
                "targets": [
                   {
                      "datasource": "${datasource}",
@@ -2564,6 +2576,7 @@
             },
             {
                "datasource": "${datasource}",
+               "description": "",
                "fieldConfig": {
                   "defaults": {
                      "color": {
@@ -2654,6 +2667,7 @@
                   }
                },
                "pluginVersion": "9.1.3",
+               "seriesOverrides": [ ],
                "targets": [
                   {
                      "datasource": "${datasource}",
@@ -2672,6 +2686,7 @@
             },
             {
                "datasource": "${datasource}",
+               "description": "",
                "fieldConfig": {
                   "defaults": {
                      "color": {
@@ -2762,6 +2777,7 @@
                   }
                },
                "pluginVersion": "9.1.3",
+               "seriesOverrides": [ ],
                "targets": [
                   {
                      "datasource": "${datasource}",
@@ -2780,6 +2796,7 @@
             },
             {
                "datasource": "${datasource}",
+               "description": "",
                "fieldConfig": {
                   "defaults": {
                      "color": {
@@ -2870,6 +2887,7 @@
                   }
                },
                "pluginVersion": "9.1.3",
+               "seriesOverrides": [ ],
                "targets": [
                   {
                      "datasource": "${datasource}",
@@ -3411,6 +3429,7 @@
             },
             {
                "datasource": "${datasource}",
+               "description": "",
                "fieldConfig": {
                   "defaults": {
                      "color": {
@@ -3501,6 +3520,7 @@
                   }
                },
                "pluginVersion": "9.1.3",
+               "seriesOverrides": [ ],
                "targets": [
                   {
                      "datasource": "${datasource}",
@@ -3519,6 +3539,7 @@
             },
             {
                "datasource": "${datasource}",
+               "description": "",
                "fieldConfig": {
                   "defaults": {
                      "color": {
@@ -3609,6 +3630,7 @@
                   }
                },
                "pluginVersion": "9.1.3",
+               "seriesOverrides": [ ],
                "targets": [
                   {
                      "datasource": "${datasource}",
@@ -3627,6 +3649,7 @@
             },
             {
                "datasource": "${datasource}",
+               "description": "",
                "fieldConfig": {
                   "defaults": {
                      "color": {
@@ -3717,6 +3740,7 @@
                   }
                },
                "pluginVersion": "9.1.3",
+               "seriesOverrides": [ ],
                "targets": [
                   {
                      "datasource": "${datasource}",
@@ -3735,6 +3759,7 @@
             },
             {
                "datasource": "${datasource}",
+               "description": "",
                "fieldConfig": {
                   "defaults": {
                      "color": {
@@ -3825,6 +3850,7 @@
                   }
                },
                "pluginVersion": "9.1.3",
+               "seriesOverrides": [ ],
                "targets": [
                   {
                      "datasource": "${datasource}",
@@ -3843,6 +3869,7 @@
             },
             {
                "datasource": "${datasource}",
+               "description": "",
                "fieldConfig": {
                   "defaults": {
                      "color": {
@@ -3933,6 +3960,7 @@
                   }
                },
                "pluginVersion": "9.1.3",
+               "seriesOverrides": [ ],
                "targets": [
                   {
                      "datasource": "${datasource}",
@@ -3951,6 +3979,7 @@
             },
             {
                "datasource": "${datasource}",
+               "description": "",
                "fieldConfig": {
                   "defaults": {
                      "color": {
@@ -4041,6 +4070,7 @@
                   }
                },
                "pluginVersion": "9.1.3",
+               "seriesOverrides": [ ],
                "targets": [
                   {
                      "datasource": "${datasource}",
@@ -4059,6 +4089,7 @@
             },
             {
                "datasource": "${datasource}",
+               "description": "",
                "fieldConfig": {
                   "defaults": {
                      "color": {
@@ -4149,6 +4180,7 @@
                   }
                },
                "pluginVersion": "9.1.3",
+               "seriesOverrides": [ ],
                "targets": [
                   {
                      "datasource": "${datasource}",
@@ -4167,6 +4199,7 @@
             },
             {
                "datasource": "${datasource}",
+               "description": "",
                "fieldConfig": {
                   "defaults": {
                      "color": {
@@ -4257,6 +4290,7 @@
                   }
                },
                "pluginVersion": "9.1.3",
+               "seriesOverrides": [ ],
                "targets": [
                   {
                      "datasource": "${datasource}",
@@ -4275,6 +4309,7 @@
             },
             {
                "datasource": "${datasource}",
+               "description": "",
                "fieldConfig": {
                   "defaults": {
                      "color": {
@@ -4365,6 +4400,7 @@
                   }
                },
                "pluginVersion": "9.1.3",
+               "seriesOverrides": [ ],
                "targets": [
                   {
                      "datasource": "${datasource}",
diff --git a/monitoring/ceph-mixin/dashboards_out/smb-overview.json b/monitoring/ceph-mixin/dashboards_out/smb-overview.json
index 178dec6c8c53..51ccad2ea6e4 100644
--- a/monitoring/ceph-mixin/dashboards_out/smb-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/smb-overview.json
@@ -667,9 +667,8 @@
          "type": "stat"
       },
       {
-         "datasource": {
-            "uid": "${datasource}"
-         },
+         "datasource": "${datasource}",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -742,7 +741,8 @@
                "sort": "none"
             }
          },
-         "pluginVersion": "11.6.0",
+         "pluginVersion": "9.1.3",
+         "seriesOverrides": [ ],
          "targets": [
             {
                "datasource": {
@@ -776,9 +776,8 @@
          "type": "timeseries"
       },
       {
-         "datasource": {
-            "uid": "${datasource}"
-         },
+         "datasource": "${datasource}",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -851,7 +850,8 @@
                "sort": "none"
             }
          },
-         "pluginVersion": "11.6.0",
+         "pluginVersion": "9.1.3",
+         "seriesOverrides": [ ],
          "targets": [
             {
                "datasource": {
@@ -871,9 +871,8 @@
          "type": "timeseries"
       },
       {
-         "datasource": {
-            "uid": "${datasource}"
-         },
+         "datasource": "${datasource}",
+         "description": "",
          "fieldConfig": {
             "defaults": {
                "color": {
@@ -946,7 +945,8 @@
                "sort": "none"
             }
          },
-         "pluginVersion": "11.6.0",
+         "pluginVersion": "9.1.3",
+         "seriesOverrides": [ ],
          "targets": [
             {
                "datasource": {