From b289b8ac6e84816ebdcd00b6d76b8cd60a7bc8e8 Mon Sep 17 00:00:00 2001 From: Alexander Weaver Date: Fri, 13 Jan 2023 13:58:02 -0600 Subject: [PATCH] Alerting: Set error annotation on EvaluationError regardless of underlying error type (#61506) Set error annotation regardless of underlying error type --- pkg/services/ngalert/state/state.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/services/ngalert/state/state.go b/pkg/services/ngalert/state/state.go index e804bb5aa61..03e33036d2b 100644 --- a/pkg/services/ngalert/state/state.go +++ b/pkg/services/ngalert/state/state.go @@ -229,6 +229,7 @@ func resultError(state *State, rule *models.AlertRule, result eval.Result, logge state.SetError(result.Error, result.EvaluatedAt, nextEndsTime(rule.IntervalSeconds, result.EvaluatedAt)) if result.Error != nil { + state.Annotations["Error"] = result.Error.Error() // If the evaluation failed because a query returned an error then add the Ref ID and // Datasource UID as labels var queryError expr.QueryError @@ -240,7 +241,6 @@ func resultError(state *State, rule *models.AlertRule, result eval.Result, logge break } } - state.Annotations["Error"] = queryError.Error() } } }