From 20dca99d67f82a6c166eafd2a74271928f2baf9b Mon Sep 17 00:00:00 2001
From: Kjeld Schouten <kjeld@schouten-lebbing.nl>
Date: Sun, 7 Jan 2024 14:23:30 +0100
Subject: [PATCH] fix(grafana): correct some fetcher settings

Signed-off-by: Kjeld Schouten <kjeld@schouten-lebbing.nl>
---
 charts/enterprise/grafana/values.yaml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/charts/enterprise/grafana/values.yaml b/charts/enterprise/grafana/values.yaml
index 53a9c199edb..1dc86404a6c 100644
--- a/charts/enterprise/grafana/values.yaml
+++ b/charts/enterprise/grafana/values.yaml
@@ -49,6 +49,7 @@ workload:
             LOG_LEVEL: info
             FOLDER: /tmp/dashboards
             RESOURCE: both
+            NAMESPACE: 'ALL'
             UNIQUE_FILENAMES: false
             # NAMESPACE: null
             # FOLDER_ANNOTATION: null
@@ -57,7 +58,7 @@ workload:
             # WATCH_CLIENT_TIMEOUT: 3600
             SKIP_TLS_VERIFY: false
             REQ_USERNAME: "{{ .Values.workload.main.podSpec.containers.main.env.GF_SECURITY_ADMIN_USER }}"
-            REQ_PASSWORD: "{{ .Values.workload.main.podSpec.containers.main.env.GF_SECURITY_ADMIN_USER }}"
+            REQ_PASSWORD: "{{ .Values.workload.main.podSpec.containers.main.env.GF_SECURITY_ADMIN_PASSWORD }}"
             REQ_URL: "http://localhost:3000/api/admin/provisioning/dashboards/reload"
             REQ_METHOD: POST
           probes:
@@ -78,6 +79,7 @@ workload:
             LOG_LEVEL: info
             FOLDER: /app/provisioning/datasources
             RESOURCE: both
+            NAMESPACE: 'ALL'
             UNIQUE_FILENAMES: false
             # NAMESPACE: null
             # FOLDER_ANNOTATION: null
@@ -86,7 +88,7 @@ workload:
             # WATCH_CLIENT_TIMEOUT: 3600
             SKIP_TLS_VERIFY: false
             REQ_USERNAME: "{{ .Values.workload.main.podSpec.containers.main.env.GF_SECURITY_ADMIN_USER }}"
-            REQ_PASSWORD: "{{ .Values.workload.main.podSpec.containers.main.env.GF_SECURITY_ADMIN_USER }}"
+            REQ_PASSWORD: "{{ .Values.workload.main.podSpec.containers.main.env.GF_SECURITY_ADMIN_PASSWORD }}"
             REQ_URL: "http://localhost:3000/api/admin/provisioning/datasources/reload"
             REQ_METHOD: POST
           probes:
@@ -107,6 +109,7 @@ workload:
             LOG_LEVEL: info
             FOLDER: /app/provisioning/alerts
             RESOURCE: both
+            NAMESPACE: 'ALL'
             UNIQUE_FILENAMES: false
             # NAMESPACE: null
             # FOLDER_ANNOTATION: null
@@ -115,7 +118,7 @@ workload:
             # WATCH_CLIENT_TIMEOUT: 3600
             SKIP_TLS_VERIFY: false
             REQ_USERNAME: "{{ .Values.workload.main.podSpec.containers.main.env.GF_SECURITY_ADMIN_USER }}"
-            REQ_PASSWORD: "{{ .Values.workload.main.podSpec.containers.main.env.GF_SECURITY_ADMIN_USER }}"
+            REQ_PASSWORD: "{{ .Values.workload.main.podSpec.containers.main.env.GF_SECURITY_ADMIN_PASSWORD }}"
             REQ_URL: "http://localhost:3000/api/admin/provisioning/alerts/reload"
             REQ_METHOD: POST
           probes:
@@ -136,6 +139,7 @@ workload:
             LOG_LEVEL: info
             FOLDER: /app/provisioning/plugins
             RESOURCE: both
+            NAMESPACE: 'ALL'
             UNIQUE_FILENAMES: false
             # NAMESPACE: null
             # FOLDER_ANNOTATION: null
@@ -144,7 +148,7 @@ workload:
             # WATCH_CLIENT_TIMEOUT: 3600
             SKIP_TLS_VERIFY: false
             REQ_USERNAME: "{{ .Values.workload.main.podSpec.containers.main.env.GF_SECURITY_ADMIN_USER }}"
-            REQ_PASSWORD: "{{ .Values.workload.main.podSpec.containers.main.env.GF_SECURITY_ADMIN_USER }}"
+            REQ_PASSWORD: "{{ .Values.workload.main.podSpec.containers.main.env.GF_SECURITY_ADMIN_PASSWORD }}"
             REQ_URL: "http://localhost:3000/api/admin/provisioning/plugins/reload"
             REQ_METHOD: POST
           probes:
@@ -165,6 +169,7 @@ workload:
             LOG_LEVEL: info
             FOLDER: /app/provisioning/notifiers
             RESOURCE: both
+            NAMESPACE: 'ALL'
             UNIQUE_FILENAMES: false
             # NAMESPACE: null
             # FOLDER_ANNOTATION: null
@@ -173,7 +178,7 @@ workload:
             # WATCH_CLIENT_TIMEOUT: 3600
             SKIP_TLS_VERIFY: false
             REQ_USERNAME: "{{ .Values.workload.main.podSpec.containers.main.env.GF_SECURITY_ADMIN_USER }}"
-            REQ_PASSWORD: "{{ .Values.workload.main.podSpec.containers.main.env.GF_SECURITY_ADMIN_USER }}"
+            REQ_PASSWORD: "{{ .Values.workload.main.podSpec.containers.main.env.GF_SECURITY_ADMIN_PASSWORD }}"
             REQ_URL: "http://localhost:3000/api/admin/provisioning/notifiers/reload"
             REQ_METHOD: POST
           probes: