From 6d36516e88e467a8ee20d9fe69857c3a9305b18e Mon Sep 17 00:00:00 2001
From: Michael Fornaro <20387402+xUnholy@users.noreply.github.com>
Date: Sun, 30 Aug 2020 12:14:06 +1000
Subject: [PATCH] updating chart values for flux and helm-op

Signed-off-by: Michael Fornaro <20387402+xUnholy@users.noreply.github.com>
---
 config/flux/values.yaml                       | 40 +++++++++----------
 config/helm-operator/values.yaml              | 15 +++++++
 .../prometheus-operator.yaml                  |  2 +
 3 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/config/flux/values.yaml b/config/flux/values.yaml
index f00d24b52b..e7b0e2fd5e 100644
--- a/config/flux/values.yaml
+++ b/config/flux/values.yaml
@@ -18,25 +18,25 @@ git:
 registry:
   disableScanning: true
 
-# prometheus:
-#   enabled: true
-#   serviceMonitor:
-#     # Enables ServiceMonitor creation for the Prometheus Operator
-#     create: true
-#     interval: 30s
-#     scrapeTimeout: 10s
-#     namespace: flux
-#     additionalLabels: {}
+prometheus:
+  enabled: true
+  serviceMonitor:
+    # Enables ServiceMonitor creation for the Prometheus Operator
+    create: true
+    interval: 30s
+    scrapeTimeout: 10s
+    namespace: flux
+    additionalLabels: {}
 
-# syncGarbageCollection:
-#   enabled: true
-#   dry: false
+syncGarbageCollection:
+  enabled: true
+  dry: false
 
-# dashboards:
-#   # If enabled, flux will create a configmap with a dashboard in json that's going to be picked up by grafana
-#   # See https://github.com/helm/charts/tree/master/stable/grafana#configuration - `sidecar.dashboards.enabled`
-#   enabled: true
-#   # The namespace where the dashboard is deployed, defaults to the installation namespace
-#   namespace:
-#   # The prefix of the generated configmaps
-#   nameprefix: dashboard
+dashboards:
+  # If enabled, flux will create a configmap with a dashboard in json that's going to be picked up by grafana
+  # See https://github.com/helm/charts/tree/master/stable/grafana#configuration - `sidecar.dashboards.enabled`
+  enabled: true
+  # # The namespace where the dashboard is deployed, defaults to the installation namespace
+  # namespace:
+  # # The prefix of the generated configmaps
+  # nameprefix: dashboard
diff --git a/config/helm-operator/values.yaml b/config/helm-operator/values.yaml
index db1b644a07..e607d98d49 100644
--- a/config/helm-operator/values.yaml
+++ b/config/helm-operator/values.yaml
@@ -25,3 +25,18 @@ resources:
   requests:
     cpu: 50m
     memory: 64Mi
+
+prometheus:
+  enabled: true
+  serviceMonitor:
+    # Enables ServiceMonitor creation for the Prometheus Operator
+    create: true
+    interval:
+    scrapeTimeout:
+    namespace:
+    additionalLabels: {}
+
+dashboards:
+  # If enabled, helm-operator will create a configmap with a dashboard in json that's going to be picked up by grafana
+  # See https://github.com/helm/charts/tree/master/stable/grafana#configuration - `sidecar.dashboards.enabled`
+  enabled: true
diff --git a/namespaces/observability/prometheus-operator/prometheus-operator.yaml b/namespaces/observability/prometheus-operator/prometheus-operator.yaml
index 50f2f13545..28675095eb 100644
--- a/namespaces/observability/prometheus-operator/prometheus-operator.yaml
+++ b/namespaces/observability/prometheus-operator/prometheus-operator.yaml
@@ -81,6 +81,8 @@ spec:
           repository: raspbernetes/k8s-sidecar
           tag: 0.1.144
         imagePullPolicy: Always
+        dashboards:
+          enabled: true
       plugins:
         - natel-discrete-panel
         - pr0ps-trackmap-panel