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 aa267dda78c44fad5e8ecffd71564738546757b3..d12d9f4ddc10b3e9447df807bd8ad921057819d0 100644 (file)
--- 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 aea072852a6a8ce3b812f1c31e9691a08ee23a98..3e0b31f2c4595fe110ffdc2b0f8bb390f8aee4e4 100644 (file)
--- 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 a4830ee42e520f23eb97652bc2fc4e69ac16cd6d..5b2920c2d71da1d79cf0fe6271d529f30a9172ca 100644 (file)
--- 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 0f23920cb38cc8979047760eba7e933f41984c18..6444335d9cf554ae479cd07b3798a8b827b33e05 100644 (file)
--- 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 b16a86dd55dd6823e9281924cfd8e0018ff4ff82..0eca5a877737be9ab9dead1994fb5874d14be0da 100644 (file)
--- 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 ef7095c04f4a095825d987936e6c76122ce7f9a5..437eb783f1875ed10fa420b87d0fe0db93b7def5 100644 (file)
--- 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 be9d4ce2b21221edd1a6c3293cfc2fdeac4a7b9f..a7774c7ceed82c51aa80960bcdde5900d2f948eb 100644 (file)
--- 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 d76f92ae32a55c0a986fca9c42a9cb0b411f8bf9..3e7aeef45785d42b4c8af9d34e5a635eaec12d6e 100644 (file)
--- 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 cff3ffcd650359b3d2c00f38ecded3f06e3a4ad7..93c51f00941072123cc56e7e7a7651b8f4432f22 100644 (file)
--- 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 61996aac7773026b532c14f70776b2324dd288ca..f1cd4c49935b28de7a1c1ec596281c14bc9e80bc 100644 (file)
--- 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 822733fbba546563fd20fed924104bd00f40ff01..384516fb019561eed73667baa59d85b384694517 100644 (file)
--- 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 8ec8c36cce88f64c6323a523a2fb7bccf0039320..18f0bed45ff55e4597abbb378dc008af3e9e3447 100644 (file)
--- 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 4810e4c35d6c1e1c9290c0b7c5ad93dee2dba1a1..dc8b4152a494c5ba140202ca076d24bb488cb547 100644 (file)
--- 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 b4a116456323cfecb944f0e963c06587628e5192..7f042aa5b0d8c422cebfe57ad0d88d0e99bfba2a 100644 (file)
--- 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 c2b090f9045e4b42d7a544da7607797c29cdb4ec..a0f8f3537c4819ae26e8a3ff2a424c962a830d33 100644 (file)
--- 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 aa24a5161ee5f1bbdd220ad9abf57567ddfad5c6..4332aac5ee502942652c645f945f999be5713039 100644 (file)
--- 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 b6dd774cf81b326306544dae708c0e01e9c265c0..e0c3037d50a31c6f1e4c6aa312e6f10e64aab501 100644 (file)
--- 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 2477e3050128374d178a9c3641b6354520b3e3b2..f64de312af52872229ac49cde74fee84a0737a84 100644 (file)
--- 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 5b0b726ff52e1e8476773efe8d36b2902a36eae8..e017280e02bfa998e37cf64e8b8f29a9e600c4ad 100644 (file)
--- 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",