DEV-824: added mobene-msteams-link; refactoring alertmanager.yaml

secrets.yaml

@@ -54,15 +54,15 @@ 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]
+            - alert_nso_teamErechnung_mobene: ENC[AES256_GCM,data:J1QCU/idTNtO2pkcWgE/kqQ5ZQGzTIKeWSH6wZHtb3OByZl9fY+By9LTXue/EA2wmQ76TJu+NL3nHlLQyhwQMg82eEf0JNUpWHRioVgb60U0y2naAIe3DnYrN0t2eCdiQTXo4KXde65MwEq+733P4TtOqrTL6taS112WXNhdb2mAgRNAuwgeUYNQ8Yu7wNxd6crEzMx/ih47hWeFsG9Mn4EamMyKc+RzzwVcHEF6zHIzNYSQJ4sMB81+fbz74Qld,iv:qg/kyhuuCzZCM5FqpXdv/clk1Yk9NxgyXO3EBYyTg2s=,tag:l9RA94gwgRp3ivQX/+1T1w==,type:str]
 sops:
     kms: []
     gcp_kms: []
     azure_kv: []
     hc_vault: []
     age: []
-    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]
+    lastmodified: "2023-02-03T15:44:04Z"
+    mac: ENC[AES256_GCM,data:MWNCy67JmU1yhaDdT5o04iAVR6SKQ2mLH2gsjPH+dmqrraWWrhPPdackroL6do4SIryr49Flh3RPiQV5p2wACREX3CfUZMpMRd5On1vnhjmhjsvrBRH3F/xocPt2FXOhGQCpD+NlsG0A3NX9qYgcDAunUJf9pipBJGgq/pFXDgE=,iv:Iqqu3C8P5x2YOo5gD8EMhqponoEfvDsmeUigpYRFb9c=,tag:8og+ux5KWAiXWuo5WUXUQA==,type:str]
     pgp:
         - created_at: "2023-01-24T11:33:24Z"
           enc: |

templates/secret_alertmanager-config.yaml

@@ -10,21 +10,19 @@ stringData:
       repeat_interval: 3h
       receiver: devnull
       routes:
-      - receiver: devnull
-        match:
-          severity: none
-      - receiver: devnull
-        match:
-          severity: info
+      - match:
+          team: alerting-nso-mobene
+          severity: warning|critical
+        receiver: alerting-nso-mobene
         continue: true
-      - receiver: alerting-nso-devops
-        match:
-          severity: warning
+      - receiver: devnull
+        match_re:
+          severity: none|info
         continue: true
       - receiver: alerting-nso-devops
         match:
-          severity: critical
-        continue: true
+          severity: warning|critical
+        continue: false
     inhibit_rules:
       - source_match:
           alertname: "Watchdog"
@@ -40,11 +38,11 @@ stringData:
     - name: devnull
     - name: alerting-nso-devops
       webhook_configs:
-      - url: "http://prometheus-msteams:2000/alert_nso_teamDevops"
+      - url: "http://prometheus-msteams:2000/alert-nso-team-devops"
         send_resolved: true
     - name: alerting-nso-mobene
       webhook_configs:
-      - url: "http://prometheus-msteams:2000/alert_nso_teamErechnung_mobene"
+      - url: "http://prometheus-msteams:2000/alert-nso-team-erechnung-mobene"
         send_resolved: true
 
 kind: Secret