From 4646a02aecf91466fc32306827e21a4089dd0917 Mon Sep 17 00:00:00 2001
From: "Constantin (Cleo) Winkler" <41841989+Lucostus@users.noreply.github.com>
Date: Fri, 3 Jan 2025 12:14:26 +0100
Subject: [PATCH] Multena: Grafana Alerting (#459)

Enables Alerting for Grafana in Multena
---
 infra/gp-multena/Chart.yaml                | 4 ++--
 infra/gp-multena/templates/configmaps.yaml | 8 ++++++++
 infra/gp-multena/values.yaml               | 6 ++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/infra/gp-multena/Chart.yaml b/infra/gp-multena/Chart.yaml
index de7582ba..9b9ede41 100644
--- a/infra/gp-multena/Chart.yaml
+++ b/infra/gp-multena/Chart.yaml
@@ -15,9 +15,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.5.4
+version: 1.7.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 0.6.3
\ No newline at end of file
+appVersion: 0.7.0
\ No newline at end of file
diff --git a/infra/gp-multena/templates/configmaps.yaml b/infra/gp-multena/templates/configmaps.yaml
index c5e476a5..4f3f7158 100644
--- a/infra/gp-multena/templates/configmaps.yaml
+++ b/infra/gp-multena/templates/configmaps.yaml
@@ -25,6 +25,12 @@ data:
       bypass: {{ .Values.proxy.admin.bypass }}
       group: {{ .Values.proxy.admin.group }}
 
+    alert:
+      enabled: {{ .Values.proxy.alert.enabled }}
+      token_header: {{ .Values.proxy.alert.tokenHeader }}
+      alert_cert_url: {{ .Values.proxy.alert.certUrl }}
+      alert_cert: {{ .Values.proxy.alert.cert | quote }}
+
     {{- if .Values.proxy.db.enabled }}
     db:
       enabled: true
@@ -43,6 +49,7 @@ data:
       use_mutual_tls: {{ .Values.tls.thanos.enabled }}
       cert: "/etc/secrets/ca/thanos/{{ .Values.tls.thanos.cert }}"
       key: "/etc/secrets/ca/thanos/{{ .Values.tls.thanos.key }}"
+      actor_header: {{ .Values.proxy.thanos.actorHeader }}
       headers:
         {{- range $key, $value := .Values.proxy.thanos.headers }}
         {{ $key }}: {{ $value }}
@@ -54,6 +61,7 @@ data:
       use_mutual_tls: {{ .Values.tls.loki.enabled }}
       cert: "/etc/secrets/ca/loki/{{ .Values.tls.loki.cert }}"
       key: "/etc/secrets/ca/loki/{{ .Values.tls.loki.key }}"
+      actor_header: {{ .Values.proxy.loki.actorHeader }}
       headers:
         {{- range $key, $value := .Values.proxy.loki.headers }}
         {{ $key }}: {{ $value }}
diff --git a/infra/gp-multena/values.yaml b/infra/gp-multena/values.yaml
index 3fae505b..f5a20897 100644
--- a/infra/gp-multena/values.yaml
+++ b/infra/gp-multena/values.yaml
@@ -12,8 +12,14 @@ proxy:
   loki:
     url: https://loki-query-frontend-http.openshift-logging.svc.cluster.local:3100
     tenantLabel: kubernetes_namespace_name
+    actorHeader: X-Loki-Actor-Path
     headers:
       X-Scope-OrgID: application
+  alert:
+    enabled: false # enable alerting
+    tokenHeader: X-Multena-alert # header to use for the token
+    certUrl: https://sso.play.run.gepardec.com/realms/internal/protocol/openid-connect/certs
+    cert: '' # local jwks cert
   db:
     enabled: false # enable mysql label provider
     user: multitenant