From 0c89528a7e0525c2a0c71329e1401773ff4da8ae Mon Sep 17 00:00:00 2001
From: admin <gittea@mail.com>
Date: Mon, 16 Mar 2026 22:45:33 +0100
Subject: [PATCH] fix: move grafana admin password to sops secret

---
 clusters/homelab/monitoring/helmrelease.yaml |  4 ++-
 clusters/homelab/monitoring/secret.sops.yaml | 27 ++++++++++----------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/clusters/homelab/monitoring/helmrelease.yaml b/clusters/homelab/monitoring/helmrelease.yaml
index b9ba97f..fa6eba6 100644
--- a/clusters/homelab/monitoring/helmrelease.yaml
+++ b/clusters/homelab/monitoring/helmrelease.yaml
@@ -16,7 +16,9 @@ spec:
   values:
     grafana:
       enabled: true
-      adminPassword: "changeme"
+      admin:
+        existingSecret: alertmanager-telegram
+        passwordKey: grafana_admin_password
       persistence:
         enabled: true
         storageClassName: longhorn
diff --git a/clusters/homelab/monitoring/secret.sops.yaml b/clusters/homelab/monitoring/secret.sops.yaml
index 4bf8937..d8a31a7 100644
--- a/clusters/homelab/monitoring/secret.sops.yaml
+++ b/clusters/homelab/monitoring/secret.sops.yaml
@@ -1,11 +1,12 @@
-apiVersion: ENC[AES256_GCM,data:QlE=,iv:Ik4B44f3cOwSp9oFJ7F47Sg3ntXHWB/9n+MmHAAGQuw=,tag:YSaqT6FGoGq2VM6licJeYQ==,type:str]
-kind: ENC[AES256_GCM,data:u58dkRAt,iv:Qmjnr5GW+r4ah9ouY+tCoUOSgZpqDyNaNXmZcpju9ds=,tag:6XBS4AkjLQjB+edE9bbyTw==,type:str]
+apiVersion: ENC[AES256_GCM,data:/0c=,iv:01X2VXGeZ0Kmbv7JHJo83/MjWsQntn+EvHEW/3/RfCE=,tag:Bbc+X30LmyMpXw7KUEII6A==,type:str]
+kind: ENC[AES256_GCM,data:7palKY8J,iv:oqlHnjOy7VfDdL1OtSof9gKkzPf6v9YLMvp71zJBpHU=,tag:RUmSOgaZolJRaBTM4v/uEQ==,type:str]
 metadata:
-    name: ENC[AES256_GCM,data:ReYceyg4ZOGtP2wTSiwbGrD2F8NP,iv:33/axQuRGND+HmAYviZB45zJOgsMFTIkrha4mT5XUK8=,tag:wye5adlErHrytJaUaBTO+A==,type:str]
-    namespace: ENC[AES256_GCM,data:0zBUyJJ/Elz0HQ==,iv:As7ZH6Tfp4yWhIG+ti4wxVYW4PJIXqcU73vCvdWmSg4=,tag:0ju3gO64NGfbTfUuqJ5tRA==,type:str]
+    name: ENC[AES256_GCM,data:m+Yal3PBNuyK6xbkmSwkMfYJxrOR,iv:FCTcn55vt46DenTxTwA8CaZalkTKXwcJr8ThaD8pEDE=,tag:Ut+SeYJLuxFp/EXHANwbGw==,type:str]
+    namespace: ENC[AES256_GCM,data:Q4Vh+RzDE+5aVA==,iv:bwGlGuyblve1onLfB4bsFREBKy3ediMcwlJJkkgvTq8=,tag:Nx/N2F0Nh9n8KauZz/1UdQ==,type:str]
 stringData:
-    telegram_bot_token: ENC[AES256_GCM,data:k6nLP/La1YXF8ABNnDXBiczFoBcgNVMBkn9b+2NtouAtSQhPPNhqO7A0tg6MGA==,iv:nULLyuRiFZSbrbFeyshZDLImUKPenDCFTerXBJaQlyo=,tag:L9+KfbUHNTUTt/fW7nCTLw==,type:str]
-    telegram_chat_id: ENC[AES256_GCM,data:wy56l1rIrit6jQ==,iv:p7T9mT14n09Roxw07hCegjYh/hOfPdJub5sToUGgjTM=,tag:jvqegX7sFFaE9OpsmpPVxQ==,type:str]
+    telegram_bot_token: ENC[AES256_GCM,data:fiTox1JXFs7AxHNwJKpyeX6Gggo2R7UhJrZ//BgWV+XDDOXtL3/juvbMuvGXRw==,iv:ca2/Fj4sYfCX8j/kUdO1jq+Y/EYwvydMJubqC8HdmYE=,tag:qA/IzhwEuCtnVIef+biFHw==,type:str]
+    telegram_chat_id: ENC[AES256_GCM,data:2+fe8pM/rDftCQ==,iv:riz9RVGq8DFJTjxd0gAZJH3mqmvyAFCrai8+sQQEJtk=,tag:+mHDeQzek2C5r8qaH3tpXw==,type:str]
+    grafana_admin_password: ENC[AES256_GCM,data:pt1cveYtBZk=,iv:flKDtIQaMKbvf43OCjT0FnbRVyvXD4NHgDqIz/YNK80=,tag:iiernbqOoOgW8rePdJO3MA==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -15,14 +16,14 @@ sops:
         - recipient: age1rydfcalt7pu4jnmh298lgjlasxyjldyaz3xyssk7v54lpu30fv0qna96ea
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMUThWS1ZycWpBMXNUMFVD
-            bW80THZJZ2RINHhMM1hkUWVzU09XVlFINzNnCnhUMnE5Z09uR09PdEdlNVJ5TkR2
-            dGZSTFFLUmNNWlVjRkMwYjFWcVI3N1kKLS0tIE54RWN5OXdwYzB1ZExCK0tZSS8r
-            a3BRL3grUUFudWpSVjk1UGxmUzNLdHcKNrkVmCy3lJYDyWeiaX1bfJ9sVZTwoBgR
-            UiL4mqWIeuri56L5+J53X96j6mrGGy0L0MQIqbxpcImrtyMxRJO8XQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2bXFnalZCczBWbDJvYzdR
+            TFJnS0tlSzZTaE0zVGFQVVlFcDI4UVBRRkZrCmFVZnFEOGcrUGdhRGt5Um1OeFkr
+            ZUNXWUJJUG82WlVrKzVudFVVQWh3V0kKLS0tIGFBV1pvbVVNbWVqQ2JQTExyamJ1
+            bkFvZGVsQmVrOGoxRHVJT1VMcldjOVEKvGRg2s7jz3iM4L3YJtb9oBKmkE9lhYnI
+            H9HbnSEJa74X7ugYhvTE04mPpHhhDJHHMVBmGUwzbybQHJzPcTFyQA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2026-03-16T17:32:23Z"
-    mac: ENC[AES256_GCM,data:M7t1HjRKL2sJqZxd00UAoASCufWSutZyKokMu2M4ZbGbwRNmIT9jI7y3BGxxbx8f/MspPWD0DnvWGvE+Dg6kmYhwoFV8CUQ6ZjfdQQV9dbghgQ++Cki7UfikretokpZa3gkNvmX71v0HV/awSPuTtLTlSwmd2ugjhaySj4SAW80=,iv:5daxNHDyc57ppVYdUOdTAmw3kqQi0NBW2wYXY2j8Lck=,tag:eC6/z0i3bpd59DlavpRSSA==,type:str]
+    lastmodified: "2026-03-16T21:45:24Z"
+    mac: ENC[AES256_GCM,data:SDKKSAE+5lej05IVDX2cr0wK1+W/+6uLDKukw9rk3QFEdP7EWmV5cac6M35fMqnPr81Q+1lkdNiVuo3T6UxrryqH7k/Ou/+kkt+glEWWQ1w9bsapEad8XPj2a2udLshIc58UEfLPIvW/1f0ABFPqDDqK5e0kUw2a7bUPRmgqvSE=,iv:SNpsV8u5SdaLAeNRg0A1/H2nwLHYQjhYruz8BcSR7Qg=,tag:qOfofOkRc581EeiJ7FCy3Q==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.4