IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Torkel Ödegaard
2019-03-25 16:27:58 +01:00
committed by GitHub
parent 8a396acdb4
commit 7c81f4dfd8
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/services/alerting/rule.go
View File

@@ -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) {

1
pkg/services/alerting/rule_test.go
View File

@@ -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},