From 1aeb5f77550437dce08df23d684a19c7f8e8b259 Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Mar 25 2024 12:47:25 +0000
Subject: Merge branch 'crameleon/mail-alerts' into 'production'


Extend wait time for Postfix mail alerts

See merge request infra/salt!1602
---

diff --git a/salt/files/prometheus/alerts/mail.yml b/salt/files/prometheus/alerts/mail.yml
index c058e3a..16ea52f 100644
--- a/salt/files/prometheus/alerts/mail.yml
+++ b/salt/files/prometheus/alerts/mail.yml
@@ -9,55 +9,55 @@ groups:
       - alert: Postfix queue
         expr: >-
           postfix_queue_length{queue!~"deferred|flush"} > 0
-        for: 30s
+        for: 310s
         labels:
           severity: warning
         annotations:
           title: >-
             Large mail queue on {{ $labels.instance }}
           description: |
-            The Postfix "{{ $labels.queue }}" queue on {{ $labels.instance }} exceeds 0 messages for over thirty seconds.
+            The Postfix "{{ $labels.queue }}" queue on {{ $labels.instance }} exceeds 0 messages for over five minutes.
             VALUE = {{ $value }}
             LABELS = {{ $labels }}
 
       - alert: Postfix flush queue
         expr: >-
           postfix_queue_length{queue="flush"} > 1
-        for: 30s
+        for: 310s
         labels:
           severity: warning
         annotations:
           title: >-
             Large flush mail queue on {{ $labels.instance }}
           description: |
-            The Postfix "flush" queue on {{ $labels.instance }} exceeds 1 message for over thirty seconds.
+            The Postfix "flush" queue on {{ $labels.instance }} exceeds 1 message for over five minutes.
             VALUE = {{ $value }}
             LABELS = {{ $labels }}
 
       - alert: Postfix deferred queue
         expr: >-
           postfix_queue_length{instance!~"mx[1-4].infra.opensuse.org", queue="deferred"} > 1
-        for: 30s
+        for: 310s
         labels:
           severity: warning
         annotations:
           title: >-
             Large deferred mail queue on {{ $labels.instance }}
           description: |
-            The Postfix "deferred" queue on {{ $labels.instance }} exceeds 1 held message for over thirty seconds.
+            The Postfix "deferred" queue on {{ $labels.instance }} exceeds 1 held message for over five minutes.
             VALUE = {{ $value }}
             LABELS = {{ $labels }}
 
       - alert: Large Postfix deferred queue
         expr: >-
           postfix_queue_length{instance=~"mx[1-4].infra.opensuse.org", queue="deferred"} > 400
-        for: 30s
+        for: 310s
         labels:
           severity: critical
         annotations:
           title: >-
             Large deferred mail queue on {{ $labels.instance }}
           description: |
-            The Postfix "deferred" queue on {{ $labels.instance }} exceeds 400 held messages for over thirty seconds.
+            The Postfix "deferred" queue on {{ $labels.instance }} exceeds 400 held messages for over five minutes.
             VALUE = {{ $value }}
             LABELS = {{ $labels }}