From 347d9f06dc443439b4668fd5cf0aa0665e3c0828 Mon Sep 17 00:00:00 2001
From: Matt Pryor <matt@stackhpc.com>
Date: Fri, 21 Oct 2022 13:31:36 +0100
Subject: [PATCH] Stop loki-stack chart from creating a datasource

---
 .../templates/monitoring/loki-stack.yaml             | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/charts/cluster-addons/templates/monitoring/loki-stack.yaml b/charts/cluster-addons/templates/monitoring/loki-stack.yaml
index e49bf06..c1c4948 100644
--- a/charts/cluster-addons/templates/monitoring/loki-stack.yaml
+++ b/charts/cluster-addons/templates/monitoring/loki-stack.yaml
@@ -8,7 +8,12 @@ metadata:
     {{- include "cluster-addons.componentLabels" (list . "loki-stack") | nindent 4 }}
     addons.stackhpc.com/watch: ""
 stringData:
-  values: |
+  defaults: |
+    grafana:
+      sidecar:
+        datasources:
+          enabled: false
+  overrides: |
     {{- toYaml .Values.monitoring.lokiStack.release.values | nindent 4 }}
 ---
 apiVersion: addons.stackhpc.com/v1alpha1
@@ -25,7 +30,10 @@ spec:
   valuesSources:
     - secret:
         name: {{ include "cluster-addons.componentName" (list . "loki-stack") }}-config
-        key: values
+        key: defaults
+    - secret:
+        name: {{ include "cluster-addons.componentName" (list . "loki-stack") }}-config
+        key: overrides
 ---
 apiVersion: addons.stackhpc.com/v1alpha1
 kind: Manifests