From 182c46be723a29d5600b19e8ce064999a458134f Mon Sep 17 00:00:00 2001
From: Cato Olsen <olsen.cato@gmail.com>
Date: Thu, 5 Oct 2023 11:49:39 +0200
Subject: [PATCH] =?UTF-8?q?Endret=20format=20p=C3=A5=20Links,=20og=20endre?=
 =?UTF-8?q?t=20config=20p=C3=A5=20receivers=20ihht.=20dok.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .nais/alerting-dolly.yml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.nais/alerting-dolly.yml b/.nais/alerting-dolly.yml
index b8c559a107..2ca981996e 100644
--- a/.nais/alerting-dolly.yml
+++ b/.nais/alerting-dolly.yml
@@ -7,9 +7,10 @@ metadata:
     team: dolly
 spec:
   receivers:
-    slack:
-      channel: "#dolly-alerts"
-      icon_emoji: ':dolly-panic:'
+    - name: 'dolly-alerts'
+      slackConfigs:
+        channel: "#dolly-alerts"
+        icon_emoji: ':dolly-panic:'
   groups:
     - name: dolly-alerts
       rules:
@@ -20,7 +21,7 @@ spec:
           annotations:
             summary: 'Applikasjonen *{{ $labels.deployment }}* har hatt 0 replicas i >5min og er ikke tilgjengelig.'
             action: |
-              Alertmanager: '<https://alertmanager.dev-gcp.nav.cloud.nais.io/#/alerts?silenced=false&inhibited=false&active=true&filter=%7Balertname%3D%22dolly-replicas-unavailable%22%2C%20app%3D%22{{ $labels.app }}%22%7D&customGrouping=true|Link>'
+              Alertmanager: <https://alertmanager.dev-gcp.nav.cloud.nais.io/#/alerts?silenced=false&inhibited=false&active=true&filter=%7Balertname%3D%22dolly-replicas-unavailable%22%2C%20app%3D%22{{ $labels.app }}%22%7D&customGrouping=true|Link>
               Events: `kubectl describe pod -l app={{ $labels.deployment }}`
               Logger: `kubectl logs -l app={{ $labels.deployment }}`
           labels:
@@ -36,7 +37,7 @@ spec:
               Alertmanager: '<https://alertmanager.dev-gcp.nav.cloud.nais.io/#/alerts?silenced=false&inhibited=false&active=true&filter=%7Balertname%3D%22dolly-log-errors%22%2C%20app%3D%22{{ $labels.app }}%22%7D&customGrouping=true|Link>'
               Events: `kubectl describe pod -l app={{ $labels.app }}`
               Logger: `kubectl logs -l app={{ $labels.app }}`
-              Kibana: `<https://logs.adeo.no/app/discover#/?_g=(filters:!(),refreshInterval:(pause:!t,value:60000),time:(from:now-30m,to:now))&_a=(columns:!(level,message,envclass,application,pod),filters:!(),grid:(columns:(x_WorkerID:(width:325))),index:'96e648c0-980a-11e9-830a-e17bbd64b4db',interval:auto,query:(language:kuery,query:'namespace:%20%22dolly%22%20AND%20level:%20%22Error%22%20AND%20application:%20%22{{ $labels.app }}%22'),sort:!(!('@timestamp',desc)))|Link>`
+              Kibana: <https://logs.adeo.no/app/discover#/?_g=(filters:!(),refreshInterval:(pause:!t,value:60000),time:(from:now-30m,to:now))&_a=(columns:!(level,message,envclass,application,pod),filters:!(),grid:(columns:(x_WorkerID:(width:325))),index:'96e648c0-980a-11e9-830a-e17bbd64b4db',interval:auto,query:(language:kuery,query:'namespace:%20%22dolly%22%20AND%20level:%20%22Error%22%20AND%20application:%20%22{{ $labels.app }}%22'),sort:!(!('@timestamp',desc)))|Link>
           labels:
             namespace: 'dolly'
             severity: 'warning'
@@ -47,10 +48,10 @@ spec:
           annotations:
             summary: 'Applikasjonen *{{ $labels.app }}* har gitt mer enn 5 HTTP 5xx-responser i løpet av de siste 15 minuttene.'
             action: |
-              Alertmanager: '<https://alertmanager.dev-gcp.nav.cloud.nais.io/#/alerts?silenced=false&inhibited=false&active=true&filter=%7Balertname%3D%22dolly-server-http-5xx%22%2C%20app%3D%22{{ $labels.app }}%22%7D&customGrouping=true|Link>'
+              Alertmanager: <https://alertmanager.dev-gcp.nav.cloud.nais.io/#/alerts?silenced=false&inhibited=false&active=true&filter=%7Balertname%3D%22dolly-server-http-5xx%22%2C%20app%3D%22{{ $labels.app }}%22%7D&customGrouping=true|Link>
               Events: `kubectl describe pod -l app={{ $labels.app }}`
               Logger: `kubectl logs -l app={{ $labels.app }}`
-              Kibana: `<https://logs.adeo.no/app/discover#/?_g=(filters:!(),refreshInterval:(pause:!t,value:60000),time:(from:now-30m,to:now))&_a=(columns:!(level,message,envclass,application,pod),filters:!(),grid:(columns:(x_WorkerID:(width:325))),index:'96e648c0-980a-11e9-830a-e17bbd64b4db',interval:auto,query:(language:kuery,query:'namespace:%20%22dolly%22%20AND%20level:%20%22Error%22%20AND%20application:%20%22{{ $labels.app }}%22'),sort:!(!('@timestamp',desc)))|Link>`
+              Kibana: <https://logs.adeo.no/app/discover#/?_g=(filters:!(),refreshInterval:(pause:!t,value:60000),time:(from:now-30m,to:now))&_a=(columns:!(level,message,envclass,application,pod),filters:!(),grid:(columns:(x_WorkerID:(width:325))),index:'96e648c0-980a-11e9-830a-e17bbd64b4db',interval:auto,query:(language:kuery,query:'namespace:%20%22dolly%22%20AND%20level:%20%22Error%22%20AND%20application:%20%22{{ $labels.app }}%22'),sort:!(!('@timestamp',desc)))|Link>
           labels:
             namespace: 'dolly'
             severity: 'warning'
@@ -61,10 +62,10 @@ spec:
           annotations:
             summary: 'Applikasjonen *{{ $labels.app }}* har fått mer enn 5 HTTP 4xx-responser i løpet av de siste 15 minuttene.'
             action: |
-              Alertmanager: '<https://alertmanager.dev-gcp.nav.cloud.nais.io/#/alerts?silenced=false&inhibited=false&active=true&filter=%7Balertname%3D%22dolly-client-http-4xx%22%2C%20app%3D%22{{ $labels.app }}%22%7D&customGrouping=true|Link>'
+              Alertmanager: <https://alertmanager.dev-gcp.nav.cloud.nais.io/#/alerts?silenced=false&inhibited=false&active=true&filter=%7Balertname%3D%22dolly-client-http-4xx%22%2C%20app%3D%22{{ $labels.app }}%22%7D&customGrouping=true|Link>
               Events: `kubectl describe pod -l app={{ $labels.app }}`
               Logger: `kubectl logs -l app={{ $labels.app }}`
-              Kibana: `<https://logs.adeo.no/app/discover#/?_g=(filters:!(),refreshInterval:(pause:!t,value:60000),time:(from:now-30m,to:now))&_a=(columns:!(level,message,envclass,application,pod),filters:!(),grid:(columns:(x_WorkerID:(width:325))),index:'96e648c0-980a-11e9-830a-e17bbd64b4db',interval:auto,query:(language:kuery,query:'namespace:%20%22dolly%22%20AND%20level:%20%22Error%22%20AND%20application:%20%22{{ $labels.app }}%22'),sort:!(!('@timestamp',desc)))|Link>`
+              Kibana: <https://logs.adeo.no/app/discover#/?_g=(filters:!(),refreshInterval:(pause:!t,value:60000),time:(from:now-30m,to:now))&_a=(columns:!(level,message,envclass,application,pod),filters:!(),grid:(columns:(x_WorkerID:(width:325))),index:'96e648c0-980a-11e9-830a-e17bbd64b4db',interval:auto,query:(language:kuery,query:'namespace:%20%22dolly%22%20AND%20level:%20%22Error%22%20AND%20application:%20%22{{ $labels.app }}%22'),sort:!(!('@timestamp',desc)))|Link>
           labels:
             namespace: 'dolly'
             severity: 'warning'