From 8666f8ba3a5b2b50e27ca00977423dcc6b1f1b9f Mon Sep 17 00:00:00 2001
From: friedrich goerz <friedrich.goerz@netgo.de>
Date: Thu, 2 Feb 2023 17:17:37 +0100
Subject: [PATCH] DEV-863: helm cahrt pimped to add more than one msteams-hook
 as receiver

---
 Chart.yaml                                |  2 +-
 secrets.yaml                              |  9 +++++++--
 templates/secret_alertmanager-config.yaml | 12 ++++++++----
 values.yaml                               |  2 +-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Chart.yaml b/Chart.yaml
index fb7c7a8..9fadbcf 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -25,5 +25,5 @@ appVersion: "0.1.1"
 
 dependencies:
   - name: bootstrap
-    version: 0.1.48
+    version: 0.1.49
     repository: oci://prodnso-harbor-01.smardigo.digital/infrastructure
diff --git a/secrets.yaml b/secrets.yaml
index 8902c56..422f52c 100644
--- a/secrets.yaml
+++ b/secrets.yaml
@@ -50,14 +50,19 @@ imagePullCreds:
         username: ENC[AES256_GCM,data:yWu8DRKINkiU7HwThA==,iv:OvNE/LxtUJ+U8HsLoY2DtuGeTvHidkas3ChcflD0wDM=,tag:Tumb0Dx6j7+Zp60uEGcZ4Q==,type:str]
         password: ENC[AES256_GCM,data:B4dgDbUJP1Ada7+4oCC1ZrlcxrPMnY2tFaOlHlp8uTXlq0KCKrmHoQ==,iv:yqpoLaPnFkbvliyVxVoKDlozr6BcdFug9ZwF1gpcysA=,tag:mvj2LmU23XE3EHrMOobLdg==,type:str]
         email: ENC[AES256_GCM,data:1ZZF3yyuFux0STpWRgZVcLPq4velSSQdT2Y=,iv:D9EHf8n1mYC7nGNfUrqrr6MlB0X+R+LGasdRpoN2u70=,tag:cXCbpo3IX67LDC9zqIUTiw==,type:str]
+bootstrap:
+    prometheus_msteams:
+        connectors:
+            - alert_nso_teamDevops: ENC[AES256_GCM,data:zK8wowm5r6vi8VDqk01IZjv5sM/AwWGRobZ5BDJw7iuA680zCQjDfZutMA59jV1+n98IPNWCN6mNK6qJRCQlPI4Os6meFlCzZealIlK2NjXrhu2Fr+6lWUOCGkFfX+KfgDdyIXz2a/bl2NNRgCdihVbCE79G2xt5diAgl55wKCBepm7qf9IZp10X5IAuvQ7Ym4rVxWUXd9D88hQLoUn0WJobBLr3lX+zKUiBB65vzSqQpmycaMmA7dELmLo/OZ9NoG8moRjzY41ELQ==,iv:zLwbM/MjRDLqMJx9RzTkOIJzT65fYZLIlKfgZl/DbwI=,tag:7QSszFAEiPWJsjqbsextGA==,type:str]
+            - alert_nso_teamErechnung_mobene: ENC[AES256_GCM,data:l3gX06GUsh18hChnLNTrDmJJLK+WoOMRZewq5V+Bqg9xFlIKQ1EjEeUqdJEXAGjjT4XlAXaDbs+U8TSFpTS93EbQ+/qDF7JyJKu3wmKfVTlUTIGvc3BXgIos2Rerc4D+WZPIsClQQSUgoArC65sX6WxwHq9pwHblA9vVmlFWTAre7cYrCDCpWC3pNC/jXUj9ohW590fRr63/0MBDpfR1IRac1LnUEy76e9wmMek9oDlnd8RRIlsKmC6PvrB3qbjvu2pfrHl0NH/RGQ==,iv:8RLTns5RYJhPCjZTpRtfjfaPLgUwpQW3kB++hKzk5Q8=,tag:8hvxnXHHIQggsXTLMgk8WQ==,type:str]
 sops:
     kms: []
     gcp_kms: []
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2023-01-26T13:48:41Z"
-    mac: ENC[AES256_GCM,data:1eYnUDiekTMCDpcZuW5iIZeBhcyPkAAapnkgRf8i7MC/NKSXzs2J2Vz83jNj+0XWCHrCELTV4AdXchSEmREuDw6hHWZxRY6OukbvVocZZMRA4wc4ckeJ0CqpY03g2yryBaDr09fD6Rj9QqB8jY63mZga2rNvNezHRULa9le1Jz8=,iv:b+BK4FQ+Lnr4MwZ2I1kaUX0J1mFIIQcKsy5K/w/L5pU=,tag:dYFJXfGY40Ym81NgGCj8EA==,type:str]
+    lastmodified: "2023-02-02T16:13:52Z"
+    mac: ENC[AES256_GCM,data:uPANKNN0Fw+EFg9bdXKEc8W8wYKl/WT/oEl99MELxpY84T/hTliQ9yH50ChmlN8LppcglNaWkjxTUB51xkqEfViGeaOiv5jMXmGTQJqfSw0LcoBaC+s7kdhnK0t5g3k1neRdfPBwmDKgCVDAymAC/c4FOaABzWKhbE78IdPOecI=,iv:m4e+LdZ196z1m7P2y37pu2fDCX0zEfI0vhao2m+5Uw8=,tag:I3izbLbYf+Ojx/LlUcCmnA==,type:str]
     pgp:
         - created_at: "2023-01-24T11:33:24Z"
           enc: |
diff --git a/templates/secret_alertmanager-config.yaml b/templates/secret_alertmanager-config.yaml
index 4cfcc2e..52921cd 100644
--- a/templates/secret_alertmanager-config.yaml
+++ b/templates/secret_alertmanager-config.yaml
@@ -17,11 +17,11 @@ stringData:
         match:
           severity: info
         continue: true
-      - receiver: prometheus-msteams
+      - receiver: alerting-nso-devops
         match:
           severity: warning
         continue: true
-      - receiver: prometheus-msteams
+      - receiver: alerting-nso-devops
         match:
           severity: critical
         continue: true
@@ -38,9 +38,13 @@ stringData:
         equal: [prometheus]
     receivers:
     - name: devnull
-    - name: prometheus-msteams
+    - name: alerting-nso-devops
       webhook_configs:
-      - url: "http://prometheus-msteams:2000/alert"
+      - url: "http://prometheus-msteams:2000/alert_nso_teamDevops"
+        send_resolved: true
+    - name: alerting-nso-mobene
+      webhook_configs:
+      - url: "http://prometheus-msteams:2000/alert_nso_teamErechnung_mobene"
         send_resolved: true
 
 kind: Secret
diff --git a/values.yaml b/values.yaml
index 19223b8..e5c5aa6 100644
--- a/values.yaml
+++ b/values.yaml
@@ -62,7 +62,7 @@ bootstrap:
     enable: false
 
   cloud_provider: hetzner
-  teams_webhook: https://netgo.webhook.office.com/webhookb2/783c0128-5ab8-45a5-a81f-f9f78a98c342@a80318cd-cd6f-4d2e-83bb-ce3d4140f8b7/IncomingWebhook/d66e86e336004dfd980f208274141ee3/521ac200-eb68-43b8-ae5b-a4f210b0f983
+
   alertmanager_config_secret_name: myalertmanager
 
   oidc: