From b047f33e275d2e908f7e8a220944573f2e367bf7 Mon Sep 17 00:00:00 2001
From: Jon <jonathon.lockwood@networkedweb.com>
Date: Sat, 30 Sep 2023 12:14:47 +0930
Subject: [PATCH] feat(Grafana): Configure grafana from values.yaml

!4
---
 templates/Grafana-Grafana.yaml |  8 +-------
 values.yaml                    | 23 +++++++++++++++++++++--
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/templates/Grafana-Grafana.yaml b/templates/Grafana-Grafana.yaml
index 6b2c03d..2a59f6c 100644
--- a/templates/Grafana-Grafana.yaml
+++ b/templates/Grafana-Grafana.yaml
@@ -11,13 +11,7 @@ metadata:
   namespace: "{{ .Values.nfc_monitoring.grafana.namespace }}"
 spec:
   config:
-    log:
-      mode: "console"
-    auth:
-      disable_login_form: "false"
-    security:
-      admin_user: "{{ .Values.nfc_monitoring.grafana.admin_user }}"
-      admin_password: "{{ .Values.nfc_monitoring.grafana.admin_password }}"
+    {{ toYaml $.Values.nfc_monitoring.grafana.config | nindent 4 }}
   deployment:
     metadata:
       labels:
diff --git a/values.yaml b/values.yaml
index ef98045..5b4c1db 100644
--- a/values.yaml
+++ b/values.yaml
@@ -26,8 +26,26 @@ nfc_monitoring:
 
   grafana:
 
-    admin_user: admin
-    admin_password: admin
+    # Grafana Configuration
+    # Type: Dict
+    # See: https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana
+    config:
+      analytics:
+        enabled: 'false'
+      # database:
+      #   type: mysql
+      #   host: mariadb-galera.mariadb.svc:3306
+      #   name: grafana
+      #   user: root
+      #   password: admin
+
+      log:
+        mode: "console"
+      auth:
+        disable_login_form: "false"
+      security:
+        admin_user: admin
+        admin_password: admin
 
     image: 
       name: grafana/grafana
@@ -362,6 +380,7 @@ nfc_monitoring:
     enabled: true
 
     # Network Policies to apply. These policies are automagically build using the values below.
+    # What you would find under path root.spec belongs here.
     # 
     # Do:
     #   - Define 'Ingress'