From 16491149fca9f1c7e3547987e64aea2131591be0 Mon Sep 17 00:00:00 2001
From: Sanne Raymaekers <sanne.raymaekers@gmail.com>
Date: Tue, 17 May 2022 11:45:22 +0200
Subject: [PATCH] templates/dashboards: Reduce the interval

The interval dictates the granularity of the graphs. As the interval
decreases, spikes and dips become more pronounced. 28 days as an
interval doesn't actually show much, reduce this to 6h by default which
is a happy medium.
---
 ...age-builder-composer-general.configmap.yml | 20 +++++--------------
 ...image-builder-worker-general.configmap.yml | 18 ++++-------------
 2 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/templates/dashboards/grafana-dashboard-image-builder-composer-general.configmap.yml b/templates/dashboards/grafana-dashboard-image-builder-composer-general.configmap.yml
index e2a3a3081..b080cbed9 100644
--- a/templates/dashboards/grafana-dashboard-image-builder-composer-general.configmap.yml
+++ b/templates/dashboards/grafana-dashboard-image-builder-composer-general.configmap.yml
@@ -35,7 +35,7 @@ data:
       "fiscalYearStartMonth": 0,
       "graphTooltip": 0,
       "id": 32,
-      "iteration": 1652788675671,
+      "iteration": 1652788675673,
       "links": [],
       "liveNow": false,
       "panels": [
@@ -1222,8 +1222,8 @@ data:
             "auto_min": "10s",
             "current": {
               "selected": false,
-              "text": "14d",
-              "value": "14d"
+              "text": "6h",
+              "value": "6h"
             },
             "hide": 0,
             "name": "interval",
@@ -1244,7 +1244,7 @@ data:
                 "value": "1h"
               },
               {
-                "selected": false,
+                "selected": true,
                 "text": "6h",
                 "value": "6h"
               },
@@ -1267,19 +1267,9 @@ data:
                 "selected": false,
                 "text": "7d",
                 "value": "7d"
-              },
-              {
-                "selected": true,
-                "text": "14d",
-                "value": "14d"
-              },
-              {
-                "selected": false,
-                "text": "28d",
-                "value": "28d"
               }
             ],
-            "query": "5m,30m,1h,6h,12h,1d,3d,7d,14d,28d",
+            "query": "5m,30m,1h,6h,12h,1d,3d,7d",
             "queryValue": "",
             "refresh": 2,
             "skipUrlSync": false,
diff --git a/templates/dashboards/grafana-dashboard-image-builder-worker-general.configmap.yml b/templates/dashboards/grafana-dashboard-image-builder-worker-general.configmap.yml
index 76067f950..757f8b5d0 100644
--- a/templates/dashboards/grafana-dashboard-image-builder-worker-general.configmap.yml
+++ b/templates/dashboards/grafana-dashboard-image-builder-worker-general.configmap.yml
@@ -2648,8 +2648,8 @@ data:
             "auto_min": "10s",
             "current": {
               "selected": false,
-              "text": "28d",
-              "value": "28d"
+              "text": "6h",
+              "value": "6h"
             },
             "hide": 0,
             "name": "interval",
@@ -2670,7 +2670,7 @@ data:
                 "value": "1h"
               },
               {
-                "selected": false,
+                "selected": true,
                 "text": "6h",
                 "value": "6h"
               },
@@ -2693,19 +2693,9 @@ data:
                 "selected": false,
                 "text": "7d",
                 "value": "7d"
-              },
-              {
-                "selected": false,
-                "text": "14d",
-                "value": "14d"
-              },
-              {
-                "selected": true,
-                "text": "28d",
-                "value": "28d"
               }
             ],
-            "query": "5m,30m,1h,6h,12h,1d,3d,7d,14d,28d",
+            "query": "5m,30m,1h,6h,12h,1d,3d,7d",
             "queryValue": "",
             "refresh": 2,
             "skipUrlSync": false,