From e11d1aa84f7b8042c6e23ee7c904e842c8b4753e Mon Sep 17 00:00:00 2001
From: Alex Lebens <alexanderlebens@gmail.com>
Date: Wed, 14 May 2025 23:02:32 -0500
Subject: [PATCH] add valkey for unified alerting

---
 .../cl01tl/monitoring/grafana-operator/Chart.yaml    |  4 ++++
 .../grafana-operator/templates/grafana.yaml          |  8 ++------
 .../cl01tl/monitoring/grafana-operator/values.yaml   | 12 ++++++++++++
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/clusters/cl01tl/monitoring/grafana-operator/Chart.yaml b/clusters/cl01tl/monitoring/grafana-operator/Chart.yaml
index 85f200466..a75900f9d 100644
--- a/clusters/cl01tl/monitoring/grafana-operator/Chart.yaml
+++ b/clusters/cl01tl/monitoring/grafana-operator/Chart.yaml
@@ -19,6 +19,10 @@ dependencies:
   - name: grafana-operator
     version: v5.18.0
     repository: https://grafana.github.io/helm-charts
+  - name: valkey
+    alias: valkey-unified-alerting
+    version: 3.0.4
+    repository: oci://harbor.alexlebens.net/proxy-registry-1.docker.io/bitnamicharts
   - name: postgres-cluster
     alias: postgres-17-cluster
     version: 5.0.7
diff --git a/clusters/cl01tl/monitoring/grafana-operator/templates/grafana.yaml b/clusters/cl01tl/monitoring/grafana-operator/templates/grafana.yaml
index 83f6f2b40..1ce1e1687 100644
--- a/clusters/cl01tl/monitoring/grafana-operator/templates/grafana.yaml
+++ b/clusters/cl01tl/monitoring/grafana-operator/templates/grafana.yaml
@@ -29,7 +29,7 @@ spec:
       auto_assign_org_id: "1"
     auth:
       disable_login_form: "true"
-      oauth_auto_login: "true"
+      auto_login: "true"
       signout_redirect_url: https://authentik.alexlebens.net/application/o/grafana/end-session/
     auth.generic_oauth:
       enabled: "true"
@@ -50,11 +50,7 @@ spec:
       password: ${DB_PASSWORD}
     unified_alerting:
       enabled: "false"
-      ha_listen_address: "${POD_IP}:9094"
-      ha_peers: "grafana-alerting:9094"
-      ha_advertise_address: "${POD_IP}:9094"
-      ha_peer_timeout: 15s
-      ha_reconnect_timeout: 2m
+      ha_redis_address: redis://grafana-operator-valkey-headless.grafana-operator:6379
   deployment:
     spec:
       template:
diff --git a/clusters/cl01tl/monitoring/grafana-operator/values.yaml b/clusters/cl01tl/monitoring/grafana-operator/values.yaml
index d1dbb6028..23e3827ac 100644
--- a/clusters/cl01tl/monitoring/grafana-operator/values.yaml
+++ b/clusters/cl01tl/monitoring/grafana-operator/values.yaml
@@ -12,6 +12,18 @@ grafana-operator:
     enabled: true
   dashboard:
     enabled: false
+valkey-unified-alerting:
+  architecture: standalone
+  auth:
+    enabled: false
+    usePasswordFiles: false
+  primary:
+    persistence:
+      enabled: true
+      size: 1Gi
+  replica:
+    persistence:
+      enabled: false
 postgres-17-cluster:
   mode: standalone
   cluster: