From 7041bc37575ceeceddd94ec568283ff36fe6b0b1 Mon Sep 17 00:00:00 2001
From: Jack Jackson <scubbojj@gmail.com>
Date: Mon, 26 Jun 2023 22:30:40 -0700
Subject: [PATCH] Move Grafana values to block-file format

---
 app-of-apps/templates/apps.yaml | 56 ++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/app-of-apps/templates/apps.yaml b/app-of-apps/templates/apps.yaml
index 39accda..f8972d3 100644
--- a/app-of-apps/templates/apps.yaml
+++ b/app-of-apps/templates/apps.yaml
@@ -126,35 +126,33 @@ spec:
     targetRevision: "6.49.0"
 
     helm:
-      parameters:
-        - name: image.tag
-          value: "9.3.2"
-        - name: ingress.enabled
-          value: "true"
-        - name: ingress.hosts[0]
-          value: grafana.avril
-        - name: persistence.enabled
-          value: "true"
-        - name: persistence.storageClassName
-          value: longhorn
-        - name: sidecar.dashboards.enabled
-          value: "true"
-        - name: sidecar.dashboards.defaultFolderName
-          value: "General"
-        - name: sidecar.dashboards.label
-          value: grafana_dashboard
-        - name: sidecar.dashboards.labelValue
-          value: "1"
-        - name: sidecar.dashboards.folderAnnotation
-          value: grafana_folder
-        - name: sidecar.dashboards.searchNamespace
-          value: ALL
-        - name: sidecar.dashboards.provider.foldersFromFilesStructure
-          value: "true"
-        - name: Prometheus
-          value: http://prometheus.avril
-          access: proxy
-          isDefault: true
+      values: |
+        image:
+          tag: "9.3.2"
+        ingress:
+          enabled: true
+          hosts:
+          - grafana.avril
+        persistence:
+          enabled: true
+          storageClassName: longhorn
+        sidecar:
+          dashboards:
+            enabled: true
+            defaultFolderName: General
+            label: grafana_dashboard
+            labelValue: "1"
+            folderAnnotation: grafana_folder
+            searchNamespace: ALL
+            provider:
+              foldersFromFilesStructure: "true"
+        datasources:
+          datasources.yaml:
+            apiVersion: 1
+            datasources:
+              - name: Prometheus
+                type: prometheus
+                url: http://prometheus.avril
 
   destination:
     server: "https://kubernetes.default.svc"