Increase 'group_wait' to let time to inhibition alerts to be executed (…

…#1382) * Increase 'group_wait' to let time to inhibition alerts to be executed * Fix notification-template * Fix notification-template * Add hasPrefix function to rendering template * Add hasPrefix function to rendering template * Add hasPrefix function to rendering template --------- Co-authored-by: Quentin Bisson <[email protected]>
giantswarm · Sep 25, 2023 · 6d13c66 · 6d13c66
1 parent e288361
commit 6d13c66
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Increase `group_wait` from AlertManager config to let more time to inhibition alerts to be executed.
+
 ## [4.50.0] - 2023-09-25
 
 ### Changed

diff --git a/files/templates/alertmanager/alertmanager.yaml b/files/templates/alertmanager/alertmanager.yaml
@@ -12,7 +12,7 @@ templates:
 route:
   group_by: [alertname, cluster_id, installation, status]
   group_interval: 15m
-  group_wait: 30s
+  group_wait: 1m
   repeat_interval: 4h
   receiver: root
 

diff --git a/...ler/resource/alerting/alertmanagerconfig/test/alertmanager-config/case-1-awsconfig.golden b/...ler/resource/alerting/alertmanagerconfig/test/alertmanager-config/case-1-awsconfig.golden
@@ -8,7 +8,7 @@ templates:
 route:
   group_by: [alertname, cluster_id, installation, status]
   group_interval: 15m
-  group_wait: 30s
+  group_wait: 1m
   repeat_interval: 4h
   receiver: root
 

diff --git a/...r/resource/alerting/alertmanagerconfig/test/alertmanager-config/case-2-azureconfig.golden b/...r/resource/alerting/alertmanagerconfig/test/alertmanager-config/case-2-azureconfig.golden
@@ -8,7 +8,7 @@ templates:
 route:
   group_by: [alertname, cluster_id, installation, status]
   group_interval: 15m
-  group_wait: 30s
+  group_wait: 1m
   repeat_interval: 4h
   receiver: root
 

diff --git a/...ler/resource/alerting/alertmanagerconfig/test/alertmanager-config/case-3-kvmconfig.golden b/...ler/resource/alerting/alertmanagerconfig/test/alertmanager-config/case-3-kvmconfig.golden
@@ -8,7 +8,7 @@ templates:
 route:
   group_by: [alertname, cluster_id, installation, status]
   group_interval: 15m
-  group_wait: 30s
+  group_wait: 1m
   repeat_interval: 4h
   receiver: root
 

diff --git a/...resource/alerting/alertmanagerconfig/test/alertmanager-config/case-4-control-plane.golden b/...resource/alerting/alertmanagerconfig/test/alertmanager-config/case-4-control-plane.golden
@@ -8,7 +8,7 @@ templates:
 route:
   group_by: [alertname, cluster_id, installation, status]
   group_interval: 15m
-  group_wait: 30s
+  group_wait: 1m
   repeat_interval: 4h
   receiver: root
 

diff --git a/...e/alerting/alertmanagerconfig/test/alertmanager-config/case-5-cluster-api-v1alpha3.golden b/...e/alerting/alertmanagerconfig/test/alertmanager-config/case-5-cluster-api-v1alpha3.golden
@@ -8,7 +8,7 @@ templates:
 route:
   group_by: [alertname, cluster_id, installation, status]
   group_interval: 15m
-  group_wait: 30s
+  group_wait: 1m
   repeat_interval: 4h
   receiver: root
 

diff --git a/...source/alerting/alertmanagerconfig/test/alertmanager-config/case-6-cluster-api-eks.golden b/...source/alerting/alertmanagerconfig/test/alertmanager-config/case-6-cluster-api-eks.golden
@@ -8,7 +8,7 @@ templates:
 route:
   group_by: [alertname, cluster_id, installation, status]
   group_interval: 15m
-  group_wait: 30s
+  group_wait: 1m
   repeat_interval: 4h
   receiver: root