test

d4rkfella · Jan 18, 2025 · 4c5c4c2 · 4c5c4c2
1 parent 38517d0
commit 4c5c4c2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/kubernetes/main/apps/observability/kube-prometheus-stack/app/helmrelease.yaml b/kubernetes/main/apps/observability/kube-prometheus-stack/app/helmrelease.yaml
@@ -153,27 +153,19 @@ spec:
             vault.hashicorp.com/role: "prometheus"
             vault.hashicorp.com/agent-run-as-user: "1000"
             vault.hashicorp.com/agent-run-as-group: "2000"
-        #alertingEndpoints:
-          #- name: "alertmanager-operated"
-            #namespace: "observability"
-            #port: 9093
-            #scheme: https
-            #pathPrefix: "/"
-            #apiVersion: v2
-            #tlsConfig:
-              #serverName: "alertmanager.darkfellanetwork.com"
-            #oauth2:
-              #clientId:
-                #secret:
-                  #name: prometheus-oauth2-credentials
-                  #key: client_id
-              #clientSecret:
-                #name: prometheus-oauth2-credentials
-                #key: client_secret
-              #tokenUrl: https://accounts.darkfellanetwork.com/realms/DarkfellaNET/protocol/openid-connect/token
-              #scopes: ["openid", "profile", "email"]
-              #endpointParams:
-                #grant_type: 'client_credentials'
+        additionalAlertManagerConfigsSecret:
+          name: prometheus-oauth2-credentials
+          key: alertmanager-config.yaml
+          optional: false
+        alertingEndpoints:
+          - name: "alertmanager-operated"
+            namespace: "observability"
+            port: 9093
+            scheme: https
+            pathPrefix: "/"
+            apiVersion: v2
+            tlsConfig:
+              serverName: "alertmanager.darkfellanetwork.com"
         podMonitorSelectorNilUsesHelmValues: false
         probeSelectorNilUsesHelmValues: false
         ruleSelectorNilUsesHelmValues: false

diff --git a/kubernetes/main/apps/observability/kube-prometheus-stack/app/secretproviderclass.yaml b/kubernetes/main/apps/observability/kube-prometheus-stack/app/secretproviderclass.yaml
@@ -11,6 +11,8 @@ spec:
         objectName: client_id
       - key: client_secret
         objectName: client_secret
+      - key: alertmanager-config.yaml
+        objectName: alertmanager-config.yaml
       secretName: prometheus-oauth2-credentials
       type: Opaque
   parameters:
@@ -29,6 +31,9 @@ spec:
       - objectName: "client_secret"
         secretPath: "secrets/data/oauth2/prometheus"
         secretKey: "client_secret"
+      - objectName: "alertmanager-config.yaml"
+        secretPath: "secrets/data/oauth2/prometheus"
+        secretKey: "alertmanager-config.yaml"
 ---
 apiVersion: secrets-store.csi.x-k8s.io/v1alpha1
 kind: SecretProviderClass