From 7c81f4dfd81d7b4df515fecc233e80f857c7d56c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 25 Mar 2019 16:27:58 +0100 Subject: [PATCH] fix(Alerting): Fixed alert rules with eval in day units, fixes #16174 (#16182) --- pkg/services/alerting/rule.go | 1 + pkg/services/alerting/rule_test.go | 1 + 2 files changed, 2 insertions(+) diff --git a/pkg/services/alerting/rule.go b/pkg/services/alerting/rule.go index 902c1660976..f55488dc795 100644 --- a/pkg/services/alerting/rule.go +++ b/pkg/services/alerting/rule.go @@ -73,6 +73,7 @@ var unitMultiplier = map[string]int{ "s": 1, "m": 60, "h": 3600, + "d": 86400, } func getTimeDurationStringToSeconds(str string) (int64, error) { diff --git a/pkg/services/alerting/rule_test.go b/pkg/services/alerting/rule_test.go index f4172a57e74..ca533c36210 100644 --- a/pkg/services/alerting/rule_test.go +++ b/pkg/services/alerting/rule_test.go @@ -24,6 +24,7 @@ func TestAlertRuleFrequencyParsing(t *testing.T) { {input: "10s", result: 10}, {input: "10m", result: 600}, {input: "1h", result: 3600}, + {input: "1d", result: 86400}, {input: "1o", result: 1}, {input: "0s", err: ErrFrequencyCannotBeZeroOrLess}, {input: "0m", err: ErrFrequencyCannotBeZeroOrLess},