From 9ee7561521067d28b8f977ea9965abf8980bdcbe Mon Sep 17 00:00:00 2001
From: Steve Wilkerson <wilkers.steve@gmail.com>
Date: Mon, 20 Aug 2018 10:59:53 -0500
Subject: [PATCH] Grafana: Update default refresh intervals, enable gate
 ingress

This updates the grafana dashboards to use a default refresh
value of 5m to prevent dashboards with intensive queries (like the
container dashboard) from submitting frequent, expensive requests
to Prometheus

This also removes the override to disable the ingress service for
grafana in the developer deployment script, as it was overlooked
when enabling ingresses after the ingress chart was introduced

Change-Id: I0958a3978cec25a1350172cbe75996f1346858c5
---
 grafana/values.yaml                       | 16 ++++++++--------
 tools/deployment/developer/100-grafana.sh |  1 -
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/grafana/values.yaml b/grafana/values.yaml
index 4260754ab..21b7141e4 100644
--- a/grafana/values.yaml
+++ b/grafana/values.yaml
@@ -4499,7 +4499,7 @@ conf:
           type: interval
       annotations:
         list: []
-      refresh: 1m
+      refresh: 5m
       schemaVersion: 12
       version: 26
       links: []
@@ -5672,7 +5672,7 @@ conf:
           type: query
       annotations:
         list: []
-      refresh: 1m
+      refresh: 5m
       schemaVersion: 12
       version: 22
       links: []
@@ -5718,7 +5718,7 @@ conf:
       hideControls: false
       id:
       links: []
-      refresh: 1m
+      refresh: 5m
       rows:
       - collapse: false
         height:
@@ -9971,7 +9971,7 @@ conf:
           type: query
       annotations:
         list: []
-      refresh: 10s
+      refresh: 5m
       schemaVersion: 12
       version: 13
       links: []
@@ -10009,7 +10009,7 @@ conf:
       hideControls: false
       id:
       links: []
-      refresh: 5s
+      refresh: 5m
       rows:
       - collapse: false
         height: 266
@@ -13181,7 +13181,7 @@ conf:
       hideControls: false
       id:
       links: []
-      refresh: 1m
+      refresh: 5m
       rows:
       - collapse: false
         height: 250px
@@ -14649,7 +14649,7 @@ conf:
       hideControls: false
       id:
       links: []
-      refresh: 10s
+      refresh: 5m
       rows:
       - collapse: false
         height: 250
@@ -15257,7 +15257,7 @@ conf:
       hideControls: false
       id:
       links: []
-      refresh: 1m
+      refresh: 5m
       rows:
       - collapse: false
         height: 250px
diff --git a/tools/deployment/developer/100-grafana.sh b/tools/deployment/developer/100-grafana.sh
index 8a78a2ad5..d2a01c78c 100755
--- a/tools/deployment/developer/100-grafana.sh
+++ b/tools/deployment/developer/100-grafana.sh
@@ -32,7 +32,6 @@ manifests:
   job_db_session_sync: false
   secret_db: false
   secret_db_session: false
-  service_ingress: false
 conf:
   grafana:
     database: