Merge pull request #81 from statisticsnorway/add-am-config

Use AlertManager config
statisticsnorway · Jan 29, 2025 · a4734f2 · a4734f2
2 parents a2ebb3d + 16d78e4
commit a4734f2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/.github/workflows/alert-deploy.yml b/.github/workflows/alert-deploy.yml
@@ -8,6 +8,7 @@ on:
     paths:
       - '.nais/alerts.yaml'
       - '.github/workflows/alert-deploy.yml'
+  workflow_dispatch:
 permissions:
   id-token: write
 
@@ -24,6 +25,10 @@ jobs:
           CLUSTER: test
           RESOURCE: .nais/alerts.yaml
           DEPLOY_SERVER: deploy.ssb.cloud.nais.io:443
+      - name: Deploy AlertManager config
+        uses: statisticsnorway/dapla-stat-iac/.github/workflows/reusable/alertconfig_deploy.yaml@main
+        with:
+          cluster: test
 
   prod-deploy:
     name: Deploy alerts to prod
@@ -37,3 +42,7 @@ jobs:
           CLUSTER: prod
           RESOURCE: .nais/alerts.yaml
           DEPLOY_SERVER: deploy.ssb.cloud.nais.io:443
+      - name: Deploy AlertManager config
+        uses: statisticsnorway/dapla-stat-iac/.github/workflows/reusable/alertconfig_deploy.yaml@main
+        with:
+          cluster: prod
diff --git a/.nais/alerts.yaml b/.nais/alerts.yaml
@@ -19,6 +19,8 @@ spec:
           labels:
             service: maskinporten-guardian
             namespace: dapla-stat
+            alertmanager_custom_config: dapla-stat
+            alert_type: custom
             severity: critical
 
         - alert: Guardian is unavailable
@@ -30,4 +32,6 @@ spec:
           labels:
             service: maskinporten-guardian
             namespace: dapla-stat
+            alertmanager_custom_config: dapla-stat
+            alert_type: custom
             severity: critical