Merge pull request #140 from AET-DevOps25/feature/finalize-grafana-settigns

Add discord webhook as secret

Author: edkaya

.env.template

@@ -5,9 +5,12 @@ GITLAB_CLIENT_SECRET="" # see https://rancher.ase.cit.tum.de/dashboard/c/c-m-nhc
 API_OPENAI="" # see https://rancher.ase.cit.tum.de/dashboard/c/c-m-nhcfjg9h/explorer/secret/team-continuous-disappointment/genai-secret#data
 API_OPENWEBUI="" # see https://rancher.ase.cit.tum.de/dashboard/c/c-m-nhcfjg9h/explorer/secret/team-continuous-disappointment/genai-secret#data
 
+# If you also want to use/test grafana alerts, you need to set the following variable:
+DISCORD_WEBHOOK_URL=""
+
 # If you want to use cloud LLM models, you need to include your respective api keys (our openai key is already in rancher)
 
 API_OPENAI="" # see https://rancher.ase.cit.tum.de/dashboard/c/c-m-nhcfjg9h/explorer/secret/team-continuous-disappointment/genai-secret#data
 API_ANTHROPIC="" # your anthropic key
 API_MISTRAL="" # your mistral key
-API_HUGGINGFACEHUB="" # your huggingface api token
+API_HUGGINGFACEHUB="" # your huggingface api token

.github/workflows/ci-cd.yml

@@ -280,4 +280,5 @@ jobs:
             --set secrets.gitlabClientSecretDev="${{ secrets.DEV_CLIENT_SECRET }}" \
             --set secrets.mongodbAdminPassword="${{ secrets.MONGODB_ADMIN_PASSWORD }}" \
             --set secrets.apiOpenAi="${{ secrets.API_OPENAI }}" \
-            --set secrets.apiOpenWebUi="${{ secrets.API_OPENWEBUI }}"
+            --set secrets.apiOpenWebUi="${{ secrets.API_OPENWEBUI }}" \
+            --set secrets.discordWebhookUrl="${{ secrets.DISCORD_WEBHOOK_URL }}"

.github/workflows/helm-manual.yml

@@ -26,4 +26,5 @@ jobs:
             --set secrets.gitlabClientSecretDev="${{ secrets.DEV_CLIENT_SECRET }}" \
             --set secrets.mongodbAdminPassword="${{ secrets.MONGODB_ADMIN_PASSWORD }}" \
             --set secrets.apiOpenAi="${{ secrets.API_OPENAI }}" \
-            --set secrets.apiOpenWebUi="${{ secrets.API_OPENWEBUI }}"
+            --set secrets.apiOpenWebUi="${{ secrets.API_OPENWEBUI }}" \
+            --set secrets.discordWebhookUrl="${{ secrets.DISCORD_WEBHOOK_URL }}"

docker-compose.yml

@@ -125,6 +125,7 @@ services:
       - GF_USERS_ALLOW_SIGN_UP=false
       - GF_FEATURE_TOGGLES_ENABLE=logsInExplore
       - GF_LOG_CONSOLECOLORS=true
+      - DISCORD_WEBHOOK_URL=${DISCORD_WEBHOOK_URL}
     depends_on:
       - prometheus
       - loki

monitoring/grafana/provisioning/alerting/contact-points.yaml

@@ -6,6 +6,6 @@ contactPoints:
         - uid: aep95aewu00e8d
           type: discord
           settings:
-            url: https://discord.com/api/webhooks/1384597112955867277/YXLiCFAP8G3sXSv0EMNcspAVSeIElReokz2r2LoK-gtB-SxEbiTlplqXsrL09d8pwj4x
+            url: ${DISCORD_WEBHOOK_URL}
             use_discord_username: false
           disableResolveMessage: false

recipai-chart/templates/grafana/grafana-alerting.yml

@@ -14,7 +14,7 @@ data:
           - uid: fepdr2f5po5q8c
             type: discord
             settings:
-              url: "https://discord.com/api/webhooks/1384597112955867277/YXLiCFAP8G3sXSv0EMNcspAVSeIElReokz2r2LoK-gtB-SxEbiTlplqXsrL09d8pwj4x"
+              url: {{ .Values.secrets.discordWebhookUrl | quote }}
               use_discord_username: false
             disableResolveMessage: false
 

recipai-chart/values.yaml

@@ -63,6 +63,7 @@ secrets:
   mongodbAdminPassword: "set in CI pipeline"
   apiOpenAi: "set in CI pipeline"
   apiOpenWebUi: "set in CI pipeline"
+  discordWebhookUrl: "set in CI pipeline"
 
 genai:
   baseUrl: "https://gpu.aet.cit.tum.de"