From 77e642cd8225a6aab7d9953523dac40e59d75cdb Mon Sep 17 00:00:00 2001
From: stubbsta <tanya.steyn22@gmail.com>
Date: Fri, 24 May 2024 12:25:56 +0200
Subject: [PATCH] grafan.ini to use default which can be overridden by env
 variables

---
 docker-compose.yml                   | 3 ++-
 monitoring/configuration/grafana.ini | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 8e5374e..c89da5b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -122,7 +122,8 @@ services:
     env_file:
       - ./monitoring/configuration/grafana-plugins.env
     environment:
-      - ADMIN_PASSW=${GF_SECURITY_ADMIN_PASSWORD}
+      - GF_SECURITY_ADMIN_USER=${GF_SECURITY_ADMIN_USER}
+      - GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD}
     volumes:
       - ./monitoring/configuration/grafana.ini:/etc/grafana/grafana.ini:z
       - ./monitoring/configuration/dashboards.yaml:/etc/grafana/provisioning/dashboards/dashboards.yaml:z
diff --git a/monitoring/configuration/grafana.ini b/monitoring/configuration/grafana.ini
index 2e51258..e8530a8 100644
--- a/monitoring/configuration/grafana.ini
+++ b/monitoring/configuration/grafana.ini
@@ -25,8 +25,8 @@ enabled = true
 org_role = Viewer
 
 [security]
-admin_user = wakusim-user
-admin_password = ${ADMIN_PASSW}
+admin_user = admin
+admin_password = admin
 
 ;[users]
 # disable user signup / registration