ceph-mixin: reset auto_count to 10

Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit ebca859c5d22740678baff0353b39c5642f1eb0b)

diff --git a/monitoring/ceph-mixin/dashboards/ceph-cluster.libsonnet b/monitoring/ceph-mixin/dashboards/ceph-cluster.libsonnet
index 3a6fc5aec5165c16ce07f7a622e3607fca11ee38..297b4e75cd501a7364cb8d21cd8e07fd6a8fa57e 100644 (file)
--- 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=300,
+      auto_count=10,
       auto_min='1m',
       options=[
         { selected: true, text: 'auto', value: '$__auto_interval_interval' },

diff --git a/monitoring/ceph-mixin/dashboards/utils.libsonnet b/monitoring/ceph-mixin/dashboards/utils.libsonnet
index 104e0d4c5f4ab8fc9142ac69237e2f11a53e3e6d..da9b4abf95ac30d63b743b69388565359bb07958 100644 (file)
--- a/monitoring/ceph-mixin/dashboards/utils.libsonnet
+++ b/monitoring/ceph-mixin/dashboards/utils.libsonnet
@@ -485,7 +485,7 @@ local timeSeries = import 'timeseries_panel.libsonnet';
                     valuelabels={},
                     refresh=0,
                     label='Interval',
-                    auto_count=300,
+                    auto_count=10,
                     auto_min='1m',
                     options=[],
                     auto=null)::

diff --git a/monitoring/ceph-mixin/dashboards_out/ceph-cluster-advanced.json b/monitoring/ceph-mixin/dashboards_out/ceph-cluster-advanced.json
index 248c216b85ec3fe120d25dd91dc53207fc1d2a31..7ded8530f8d0ee0e19bb5a608c19e11053cca9b7 100644 (file)
--- a/monitoring/ceph-mixin/dashboards_out/ceph-cluster-advanced.json
+++ b/monitoring/ceph-mixin/dashboards_out/ceph-cluster-advanced.json
@@ -3790,7 +3790,7 @@
          },
          {
             "auto": true,
-            "auto_count": 300,
+            "auto_count": 10,
             "auto_min": "1m",
             "current": {
                "text": "$__auto_interval_interval",

diff --git a/monitoring/ceph-mixin/dashboards_out/smb-overview.json b/monitoring/ceph-mixin/dashboards_out/smb-overview.json
index 51ccad2ea6e42d3db908d1a1926c8e80226dfdf6..0642ccdbaa3fbb62429628712aa714e3051b3228 100644 (file)
--- a/monitoring/ceph-mixin/dashboards_out/smb-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/smb-overview.json
@@ -667,7 +667,9 @@
          "type": "stat"
       },
       {
-         "datasource": "${datasource}",
+         "datasource": {
+            "uid": "${datasource}"
+         },
          "description": "",
          "fieldConfig": {
             "defaults": {
@@ -741,7 +743,7 @@
                "sort": "none"
             }
          },
-         "pluginVersion": "9.1.3",
+         "pluginVersion": "11.6.0",
          "seriesOverrides": [ ],
          "targets": [
             {
@@ -776,7 +778,9 @@
          "type": "timeseries"
       },
       {
-         "datasource": "${datasource}",
+         "datasource": {
+            "uid": "${datasource}"
+         },
          "description": "",
          "fieldConfig": {
             "defaults": {
@@ -850,7 +854,7 @@
                "sort": "none"
             }
          },
-         "pluginVersion": "9.1.3",
+         "pluginVersion": "11.6.0",
          "seriesOverrides": [ ],
          "targets": [
             {
@@ -871,7 +875,9 @@
          "type": "timeseries"
       },
       {
-         "datasource": "${datasource}",
+         "datasource": {
+            "uid": "${datasource}"
+         },
          "description": "",
          "fieldConfig": {
             "defaults": {
@@ -945,7 +951,7 @@
                "sort": "none"
             }
          },
-         "pluginVersion": "9.1.3",
+         "pluginVersion": "11.6.0",
          "seriesOverrides": [ ],
          "targets": [
             {