diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d5d6f2f9..4bf46f817 100644 --- 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 index ffd375580..cb945bf40 100644 --- 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/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/case-1-awsconfig.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/case-1-awsconfig.golden index 8878f1886..aca706058 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/case-1-awsconfig.golden +++ b/service/controller/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/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/case-2-azureconfig.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/case-2-azureconfig.golden index 8878f1886..aca706058 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/case-2-azureconfig.golden +++ b/service/controller/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/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/case-3-kvmconfig.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/case-3-kvmconfig.golden index 8878f1886..aca706058 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/case-3-kvmconfig.golden +++ b/service/controller/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/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/case-4-control-plane.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/case-4-control-plane.golden index 8878f1886..aca706058 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/case-4-control-plane.golden +++ b/service/controller/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/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/case-5-cluster-api-v1alpha3.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/case-5-cluster-api-v1alpha3.golden index 8878f1886..aca706058 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/case-5-cluster-api-v1alpha3.golden +++ b/service/controller/resource/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/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/case-6-cluster-api-eks.golden b/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/case-6-cluster-api-eks.golden index 8878f1886..aca706058 100644 --- a/service/controller/resource/alerting/alertmanagerconfig/test/alertmanager-config/case-6-cluster-api-eks.golden +++ b/service/controller/resource/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