Skip to content

N
nexpie-grafana-theme
Commit 7c81f4df by Torkel Ödegaard Committed by GitHub
Options

fix(Alerting): Fixed alert rules with eval in day units, fixes #16174 (#16182)

parent 8a396acd
Showing with 2 additions and 0 deletions
pkg/services/alerting/rule.go
...@@ -73,6 +73,7 @@ var unitMultiplier = map[string]int{ ...@@ -73,6 +73,7 @@ var unitMultiplier = map[string]int{
"s": 1, "s": 1,
"m": 60, "m": 60,
"h": 3600, "h": 3600,
"d": 86400,
} }
func getTimeDurationStringToSeconds(str string) (int64, error) { func getTimeDurationStringToSeconds(str string) (int64, error) {
......
pkg/services/alerting/rule_test.go
...@@ -24,6 +24,7 @@ func TestAlertRuleFrequencyParsing(t *testing.T) { ...@@ -24,6 +24,7 @@ func TestAlertRuleFrequencyParsing(t *testing.T) {
{input: "10s", result: 10}, {input: "10s", result: 10},
{input: "10m", result: 600}, {input: "10m", result: 600},
{input: "1h", result: 3600}, {input: "1h", result: 3600},
{input: "1d", result: 86400},
{input: "1o", result: 1}, {input: "1o", result: 1},
{input: "0s", err: ErrFrequencyCannotBeZeroOrLess}, {input: "0s", err: ErrFrequencyCannotBeZeroOrLess},
{input: "0m", err: ErrFrequencyCannotBeZeroOrLess}, {input: "0m", err: ErrFrequencyCannotBeZeroOrLess},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment