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

Alerting: Fix duration calculation when testing a rule (#56616)

Browse Source 
When testing a rule within the legacy alerting the `timeMs` field could
sometimes show negative (and/or wrongly calculated) durations. This happens if the alert evaluation crosses a second boundary. This change uses the full timestamp to compute the eval duration.
This commit is contained in:
Jorge Luis Betancourt 2022-10-11 14:40:18 +02:00 committed by GitHub
parent 0a183d1ba2
commit 95b9fa3346
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/alerting/eval_context.go
View File

@ -107,7 +107,7 @@ func (c *EvalContext) shouldUpdateAlertState() bool {
// GetDurationMs returns the duration of the alert evaluation.
func (c *EvalContext) GetDurationMs() float64 {
return float64(c.EndTime.Nanosecond()-c.StartTime.Nanosecond()) / float64(1000000)
return float64(c.EndTime.Sub(c.StartTime).Nanoseconds()) / float64(time.Millisecond)
}
// GetNotificationTitle returns the title of the alert rule including alert state.

15
pkg/services/alerting/eval_context_test.go
View File

@ -404,3 +404,18 @@ func TestEvaluateNotificationTemplateFields(t *testing.T) {
})
}
}
func TestGetDurationFromEvalContext(t *testing.T) {
startTime, err := time.Parse("2006-01-02 15:04:05.999999999 -0700 MST", "2022-10-03 11:33:14.438803 +0200 CEST")
require.NoError(t, err)
endTime, err := time.Parse("2006-01-02 15:04:05.999999999 -0700 MST", "2022-10-03 11:33:15.291075 +0200 CEST")
require.NoError(t, err)
evalContext := EvalContext{
StartTime: startTime,
EndTime: endTime,
}
assert.Equal(t, float64(852.272), evalContext.GetDurationMs())
}