From 15ba3876f2b067dbb9654fb3b238a3ae02f8d933 Mon Sep 17 00:00:00 2001 From: Yijie Qin Date: Wed, 25 Jan 2023 12:08:07 -0500 Subject: [PATCH 1/3] allow time interval for alert manager Signed-off-by: Yijie Qin --- pkg/alertmanager/alertmanager.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkg/alertmanager/alertmanager.go b/pkg/alertmanager/alertmanager.go index 5cb46ca5927..33a34076a48 100644 --- a/pkg/alertmanager/alertmanager.go +++ b/pkg/alertmanager/alertmanager.go @@ -368,9 +368,13 @@ func (am *Alertmanager) ApplyConfig(userID string, conf *config.Config, rawCfg s return nil } - muteTimes := make(map[string][]timeinterval.TimeInterval, len(conf.MuteTimeIntervals)) + timeIntervals := make(map[string][]timeinterval.TimeInterval, len(conf.MuteTimeIntervals)+len(conf.TimeIntervals)) for _, ti := range conf.MuteTimeIntervals { - muteTimes[ti.Name] = ti.TimeIntervals + timeIntervals[ti.Name] = ti.TimeIntervals + } + + for _, ti := range conf.TimeIntervals { + timeIntervals[ti.Name] = ti.TimeIntervals } pipeline := am.pipelineBuilder.New( @@ -378,7 +382,7 @@ func (am *Alertmanager) ApplyConfig(userID string, conf *config.Config, rawCfg s waitFunc, am.inhibitor, silence.NewSilencer(am.silences, am.marker, am.logger), - muteTimes, + timeIntervals, am.nflog, am.state, ) From 8e89198a57817120b8b8f3b7cad9ba955ccc8733 Mon Sep 17 00:00:00 2001 From: Yijie Qin Date: Wed, 25 Jan 2023 12:12:41 -0500 Subject: [PATCH 2/3] change log update Signed-off-by: Yijie Qin --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0a9eb824c5..501e4058f35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ * [BUGFIX] Fixed ingesters with less tokens stuck in LEAVING. #5061 * [BUGFIX] Tracing: Fix missing object storage span instrumentation. #5074 * [BUGFIX] Ingester: Ingesters returning empty response for metadata APIs. #5081 +* [FEATURE] Alertmanager: Add support for time_intervals. #5102 ## 1.14.0 2022-12-02 From 9e4cd061233ee7258925fe6371716a8c58a60315 Mon Sep 17 00:00:00 2001 From: Yijie Qin Date: Thu, 26 Jan 2023 18:59:50 -0500 Subject: [PATCH 3/3] fix lint Signed-off-by: Yijie Qin --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 501e4058f35..912a81d3db8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,7 @@ * [BUGFIX] Fixed ingesters with less tokens stuck in LEAVING. #5061 * [BUGFIX] Tracing: Fix missing object storage span instrumentation. #5074 * [BUGFIX] Ingester: Ingesters returning empty response for metadata APIs. #5081 -* [FEATURE] Alertmanager: Add support for time_intervals. #5102 +* [FEATURE] Alertmanager: Add support for time_intervals. #5102 ## 1.14.0 2022-12-02