From: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
Date: Wed, 18 May 2022 08:12:25 +0000 (+0200)
Subject: ceph-mixin: remove timepicker override in every dashboards
X-Git-Tag: v18.0.0~780^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=37add644d1e65b4d6375a63dcbef742420a5a4c3;p=ceph.git

ceph-mixin: remove timepicker override in every dashboards

Signed-off-by: Arthur Outhenin-Chalandre <arthur.outhenin-chalandre@cern.ch>
---

diff --git a/monitoring/ceph-mixin/dashboards/cephfs.libsonnet b/monitoring/ceph-mixin/dashboards/cephfs.libsonnet
index aa267dda78c44..d12d9f4ddc10b 100644
--- a/monitoring/ceph-mixin/dashboards/cephfs.libsonnet
+++ b/monitoring/ceph-mixin/dashboards/cephfs.libsonnet
@@ -7,14 +7,10 @@ local g = import 'grafonnet/grafana.libsonnet';
       '',
       'tbO9LAiZz',
       'now-1h',
-      '15s',
+      '30s',
       16,
       $._config.dashboardTags,
-      '',
-      {
-        refresh_intervals: ['5s', '10s', '15s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d'],
-        time_options: ['5m', '15m', '1h', '6h', '12h', '24h', '2d', '7d', '30d'],
-      }
+      ''
     )
     .addAnnotation(
       $.addAnnotationSchema(
diff --git a/monitoring/ceph-mixin/dashboards/host.libsonnet b/monitoring/ceph-mixin/dashboards/host.libsonnet
index aea072852a6a8..3e0b31f2c4595 100644
--- a/monitoring/ceph-mixin/dashboards/host.libsonnet
+++ b/monitoring/ceph-mixin/dashboards/host.libsonnet
@@ -7,14 +7,10 @@ local g = import 'grafonnet/grafana.libsonnet';
       '',
       'y0KGL0iZz',
       'now-1h',
-      '10s',
+      '30s',
       16,
       $._config.dashboardTags,
       '',
-      {
-        refresh_intervals: ['5s', '10s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d'],
-        time_options: ['5m', '15m', '1h', '6h', '12h', '24h', '2d', '7d', '30d'],
-      }
     )
     .addRequired(
       type='grafana', id='grafana', name='Grafana', version='5.3.2'
@@ -291,14 +287,10 @@ local g = import 'grafonnet/grafana.libsonnet';
       '',
       'rtOg0AiWz',
       'now-1h',
-      '10s',
+      '30s',
       16,
       $._config.dashboardTags + ['overview'],
-      '',
-      {
-        refresh_intervals: ['5s', '10s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d'],
-        time_options: ['5m', '15m', '1h', '6h', '12h', '24h', '2d', '7d', '30d'],
-      }
+      ''
     )
     .addRequired(
       type='grafana', id='grafana', name='Grafana', version='5.3.2'
diff --git a/monitoring/ceph-mixin/dashboards/osd.libsonnet b/monitoring/ceph-mixin/dashboards/osd.libsonnet
index a4830ee42e520..5b2920c2d71da 100644
--- a/monitoring/ceph-mixin/dashboards/osd.libsonnet
+++ b/monitoring/ceph-mixin/dashboards/osd.libsonnet
@@ -7,14 +7,10 @@ local g = import 'grafonnet/grafana.libsonnet';
       '',
       'lo02I1Aiz',
       'now-1h',
-      '10s',
+      '30s',
       16,
       $._config.dashboardTags,
-      '',
-      {
-        refresh_intervals: ['5s', '10s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d'],
-        time_options: ['5m', '15m', '1h', '6h', '12h', '24h', '2d', '7d', '30d'],
-      }
+      ''
     )
     .addAnnotation(
       $.addAnnotationSchema(
@@ -343,14 +339,10 @@ local g = import 'grafonnet/grafana.libsonnet';
       '',
       'CrAHE0iZz',
       'now-3h',
-      '',
+      '30s',
       16,
       $._config.dashboardTags,
-      '',
-      {
-        refresh_intervals: ['5s', '10s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d'],
-        time_options: ['5m', '15m', '1h', '6h', '12h', '24h', '2d', '7d', '30d'],
-      }
+      ''
     )
     .addAnnotation(
       $.addAnnotationSchema(
diff --git a/monitoring/ceph-mixin/dashboards/pool.libsonnet b/monitoring/ceph-mixin/dashboards/pool.libsonnet
index 0f23920cb38cc..6444335d9cf55 100644
--- a/monitoring/ceph-mixin/dashboards/pool.libsonnet
+++ b/monitoring/ceph-mixin/dashboards/pool.libsonnet
@@ -7,14 +7,10 @@ local g = import 'grafonnet/grafana.libsonnet';
       '',
       'z99hzWtmk',
       'now-1h',
-      '15s',
+      '30s',
       22,
       $._config.dashboardTags,
-      '',
-      {
-        refresh_intervals: ['5s', '10s', '15s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d'],
-        time_options: ['5m', '15m', '1h', '6h', '12h', '24h', '2d', '7d', '30d'],
-      }
+      ''
     )
     .addAnnotation(
       $.addAnnotationSchema(
@@ -366,14 +362,10 @@ local g = import 'grafonnet/grafana.libsonnet';
       '',
       '-xyV8KCiz',
       'now-1h',
-      '15s',
+      '30s',
       22,
       $._config.dashboardTags,
-      '',
-      {
-        refresh_intervals: ['5s', '10s', '15s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d'],
-        time_options: ['5m', '15m', '1h', '6h', '12h', '24h', '2d', '7d', '30d'],
-      }
+      ''
     )
     .addRequired(
       type='grafana', id='grafana', name='Grafana', version='5.3.2'
diff --git a/monitoring/ceph-mixin/dashboards/rbd.libsonnet b/monitoring/ceph-mixin/dashboards/rbd.libsonnet
index b16a86dd55dd6..0eca5a877737b 100644
--- a/monitoring/ceph-mixin/dashboards/rbd.libsonnet
+++ b/monitoring/ceph-mixin/dashboards/rbd.libsonnet
@@ -29,14 +29,10 @@ local u = import 'utils.libsonnet';
       'Detailed Performance of RBD Images (IOPS/Throughput/Latency)',
       'YhCYGcuZz',
       'now-1h',
-      false,
+      '30s',
       16,
       $._config.dashboardTags,
-      '',
-      {
-        refresh_intervals: ['5s', '10s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d'],
-        time_options: ['5m', '15m', '1h', '6h', '12h', '24h', '2d', '7d', '30d'],
-      }
+      ''
     )
     .addAnnotation(
       $.addAnnotationSchema(
@@ -163,11 +159,7 @@ local u = import 'utils.libsonnet';
       '30s',
       16,
       $._config.dashboardTags + ['overview'],
-      '',
-      {
-        refresh_intervals: ['5s', '10s', '15s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d'],
-        time_options: ['5m', '15m', '1h', '6h', '12h', '24h', '2d', '7d', '30d'],
-      }
+      ''
     )
     .addAnnotation(
       $.addAnnotationSchema(
diff --git a/monitoring/ceph-mixin/dashboards/rgw.libsonnet b/monitoring/ceph-mixin/dashboards/rgw.libsonnet
index ef7095c04f4a0..437eb783f1875 100644
--- a/monitoring/ceph-mixin/dashboards/rgw.libsonnet
+++ b/monitoring/ceph-mixin/dashboards/rgw.libsonnet
@@ -31,14 +31,10 @@ local u = import 'utils.libsonnet';
       '',
       'rgw-sync-overview',
       'now-1h',
-      '15s',
+      '30s',
       16,
       $._config.dashboardTags + ['overview'],
-      '',
-      {
-        refresh_intervals: ['5s', '10s', '15s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d'],
-        time_options: ['5m', '15m', '1h', '6h', '12h', '24h', '2d', '7d', '30d'],
-      }
+      ''
     )
     .addAnnotation(
       $.addAnnotationSchema(
@@ -169,14 +165,10 @@ local u = import 'utils.libsonnet';
       '',
       'WAkugZpiz',
       'now-1h',
-      '15s',
+      '30s',
       16,
       $._config.dashboardTags + ['overview'],
-      '',
-      {
-        refresh_intervals: ['5s', '10s', '15s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d'],
-        time_options: ['5m', '15m', '1h', '6h', '12h', '24h', '2d', '7d', '30d'],
-      }
+      ''
     )
     .addAnnotation(
       $.addAnnotationSchema(
@@ -678,14 +670,10 @@ local u = import 'utils.libsonnet';
       '',
       'x5ARzZtmk',
       'now-1h',
-      '15s',
+      '30s',
       16,
       $._config.dashboardTags + ['overview'],
-      '',
-      {
-        refresh_intervals: ['5s', '10s', '15s', '30s', '1m', '5m', '15m', '30m', '1h', '2h', '1d'],
-        time_options: ['5m', '15m', '1h', '6h', '12h', '24h', '2d', '7d', '30d'],
-      }
+      ''
     )
     .addAnnotation(
       $.addAnnotationSchema(
diff --git a/monitoring/ceph-mixin/dashboards/utils.libsonnet b/monitoring/ceph-mixin/dashboards/utils.libsonnet
index be9d4ce2b2122..a7774c7ceed82 100644
--- a/monitoring/ceph-mixin/dashboards/utils.libsonnet
+++ b/monitoring/ceph-mixin/dashboards/utils.libsonnet
@@ -10,8 +10,7 @@ local g = import 'grafonnet/grafana.libsonnet';
                   refresh,
                   schemaVersion,
                   tags,
-                  timezone,
-                  timepicker)::
+                  timezone)::
     g.dashboard.new(title=title,
                     description=description,
                     uid=uid,
@@ -19,8 +18,7 @@ local g = import 'grafonnet/grafana.libsonnet';
                     refresh=refresh,
                     schemaVersion=schemaVersion,
                     tags=tags,
-                    timezone=timezone,
-                    timepicker=timepicker),
+                    timezone=timezone),
 
   graphPanelSchema(aliasColors,
                    title,
diff --git a/monitoring/ceph-mixin/dashboards_out/cephfs-overview.json b/monitoring/ceph-mixin/dashboards_out/cephfs-overview.json
index d76f92ae32a55..3e7aeef45785d 100644
--- a/monitoring/ceph-mixin/dashboards_out/cephfs-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/cephfs-overview.json
@@ -241,7 +241,7 @@
          ]
       }
    ],
-   "refresh": "15s",
+   "refresh": "30s",
    "rows": [ ],
    "schemaVersion": 16,
    "style": "dark",
@@ -334,7 +334,6 @@
       "refresh_intervals": [
          "5s",
          "10s",
-         "15s",
          "30s",
          "1m",
          "5m",
diff --git a/monitoring/ceph-mixin/dashboards_out/host-details.json b/monitoring/ceph-mixin/dashboards_out/host-details.json
index cff3ffcd65035..93c51f0094107 100644
--- a/monitoring/ceph-mixin/dashboards_out/host-details.json
+++ b/monitoring/ceph-mixin/dashboards_out/host-details.json
@@ -1121,7 +1121,7 @@
          ]
       }
    ],
-   "refresh": "10s",
+   "refresh": "30s",
    "rows": [ ],
    "schemaVersion": 16,
    "style": "dark",
diff --git a/monitoring/ceph-mixin/dashboards_out/hosts-overview.json b/monitoring/ceph-mixin/dashboards_out/hosts-overview.json
index 61996aac77730..f1cd4c49935b2 100644
--- a/monitoring/ceph-mixin/dashboards_out/hosts-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/hosts-overview.json
@@ -713,7 +713,7 @@
          ]
       }
    ],
-   "refresh": "10s",
+   "refresh": "30s",
    "rows": [ ],
    "schemaVersion": 16,
    "style": "dark",
diff --git a/monitoring/ceph-mixin/dashboards_out/osd-device-details.json b/monitoring/ceph-mixin/dashboards_out/osd-device-details.json
index 822733fbba546..384516fb01956 100644
--- a/monitoring/ceph-mixin/dashboards_out/osd-device-details.json
+++ b/monitoring/ceph-mixin/dashboards_out/osd-device-details.json
@@ -750,7 +750,7 @@
          ]
       }
    ],
-   "refresh": "",
+   "refresh": "30s",
    "rows": [ ],
    "schemaVersion": 16,
    "style": "dark",
diff --git a/monitoring/ceph-mixin/dashboards_out/osds-overview.json b/monitoring/ceph-mixin/dashboards_out/osds-overview.json
index 8ec8c36cce88f..18f0bed45ff55 100644
--- a/monitoring/ceph-mixin/dashboards_out/osds-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/osds-overview.json
@@ -862,7 +862,7 @@
          ]
       }
    ],
-   "refresh": "10s",
+   "refresh": "30s",
    "rows": [ ],
    "schemaVersion": 16,
    "style": "dark",
diff --git a/monitoring/ceph-mixin/dashboards_out/pool-detail.json b/monitoring/ceph-mixin/dashboards_out/pool-detail.json
index 4810e4c35d6c1..dc8b4152a494c 100644
--- a/monitoring/ceph-mixin/dashboards_out/pool-detail.json
+++ b/monitoring/ceph-mixin/dashboards_out/pool-detail.json
@@ -587,7 +587,7 @@
          ]
       }
    ],
-   "refresh": "15s",
+   "refresh": "30s",
    "rows": [ ],
    "schemaVersion": 22,
    "style": "dark",
@@ -680,7 +680,6 @@
       "refresh_intervals": [
          "5s",
          "10s",
-         "15s",
          "30s",
          "1m",
          "5m",
diff --git a/monitoring/ceph-mixin/dashboards_out/pool-overview.json b/monitoring/ceph-mixin/dashboards_out/pool-overview.json
index b4a116456323c..7f042aa5b0d8c 100644
--- a/monitoring/ceph-mixin/dashboards_out/pool-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/pool-overview.json
@@ -1420,7 +1420,7 @@
          ]
       }
    ],
-   "refresh": "15s",
+   "refresh": "30s",
    "rows": [ ],
    "schemaVersion": 22,
    "style": "dark",
@@ -1514,7 +1514,6 @@
       "refresh_intervals": [
          "5s",
          "10s",
-         "15s",
          "30s",
          "1m",
          "5m",
diff --git a/monitoring/ceph-mixin/dashboards_out/radosgw-detail.json b/monitoring/ceph-mixin/dashboards_out/radosgw-detail.json
index c2b090f9045e4..a0f8f3537c481 100644
--- a/monitoring/ceph-mixin/dashboards_out/radosgw-detail.json
+++ b/monitoring/ceph-mixin/dashboards_out/radosgw-detail.json
@@ -420,7 +420,7 @@
          "valueName": "current"
       }
    ],
-   "refresh": "15s",
+   "refresh": "30s",
    "rows": [ ],
    "schemaVersion": 16,
    "style": "dark",
@@ -514,7 +514,6 @@
       "refresh_intervals": [
          "5s",
          "10s",
-         "15s",
          "30s",
          "1m",
          "5m",
diff --git a/monitoring/ceph-mixin/dashboards_out/radosgw-overview.json b/monitoring/ceph-mixin/dashboards_out/radosgw-overview.json
index aa24a5161ee5f..4332aac5ee502 100644
--- a/monitoring/ceph-mixin/dashboards_out/radosgw-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/radosgw-overview.json
@@ -1084,7 +1084,7 @@
          ]
       }
    ],
-   "refresh": "15s",
+   "refresh": "30s",
    "rows": [ ],
    "schemaVersion": 16,
    "style": "dark",
@@ -1238,7 +1238,6 @@
       "refresh_intervals": [
          "5s",
          "10s",
-         "15s",
          "30s",
          "1m",
          "5m",
diff --git a/monitoring/ceph-mixin/dashboards_out/radosgw-sync-overview.json b/monitoring/ceph-mixin/dashboards_out/radosgw-sync-overview.json
index b6dd774cf81b3..e0c3037d50a31 100644
--- a/monitoring/ceph-mixin/dashboards_out/radosgw-sync-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/radosgw-sync-overview.json
@@ -382,7 +382,7 @@
          ]
       }
    ],
-   "refresh": "15s",
+   "refresh": "30s",
    "rows": [ ],
    "schemaVersion": 16,
    "style": "dark",
@@ -476,7 +476,6 @@
       "refresh_intervals": [
          "5s",
          "10s",
-         "15s",
          "30s",
          "1m",
          "5m",
diff --git a/monitoring/ceph-mixin/dashboards_out/rbd-details.json b/monitoring/ceph-mixin/dashboards_out/rbd-details.json
index 2477e30501283..f64de312af528 100644
--- a/monitoring/ceph-mixin/dashboards_out/rbd-details.json
+++ b/monitoring/ceph-mixin/dashboards_out/rbd-details.json
@@ -317,7 +317,7 @@
          ]
       }
    ],
-   "refresh": false,
+   "refresh": "30s",
    "rows": [ ],
    "schemaVersion": 16,
    "style": "dark",
diff --git a/monitoring/ceph-mixin/dashboards_out/rbd-overview.json b/monitoring/ceph-mixin/dashboards_out/rbd-overview.json
index 5b0b726ff52e1..e017280e02bfa 100644
--- a/monitoring/ceph-mixin/dashboards_out/rbd-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/rbd-overview.json
@@ -709,7 +709,6 @@
       "refresh_intervals": [
          "5s",
          "10s",
-         "15s",
          "30s",
          "1m",
          "5m",