From 66006928b89ea2256062f990326eedba005ce0d2 Mon Sep 17 00:00:00 2001 From: Alexander Akhmetov Date: Mon, 7 Apr 2025 21:55:32 +0200 Subject: [PATCH] Alerting: Set ExecErrState to Normal for imported Prometheus rules (#103556) --- pkg/services/ngalert/prom/convert.go | 2 +- pkg/services/ngalert/prom/convert_test.go | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/services/ngalert/prom/convert.go b/pkg/services/ngalert/prom/convert.go index 2027dcd1f99..28bf9715858 100644 --- a/pkg/services/ngalert/prom/convert.go +++ b/pkg/services/ngalert/prom/convert.go @@ -72,7 +72,7 @@ var ( defaultConfig = Config{ FromTimeRange: &defaultTimeRange, EvaluationOffset: &defaultEvaluationOffset, - ExecErrState: models.ErrorErrState, + ExecErrState: models.OkErrState, NoDataState: models.OK, KeepOriginalRuleDefinition: util.Pointer(true), } diff --git a/pkg/services/ngalert/prom/convert_test.go b/pkg/services/ngalert/prom/convert_test.go index ffa655ef650..87a2ea9ff16 100644 --- a/pkg/services/ngalert/prom/convert_test.go +++ b/pkg/services/ngalert/prom/convert_test.go @@ -354,6 +354,9 @@ func TestPrometheusRulesToGrafana(t *testing.T) { require.Equal(t, models.Duration(10*time.Minute+evalOffset), grafanaRule.Data[0].RelativeTimeRange.From) require.Equal(t, util.Pointer(1), grafanaRule.MissingSeriesEvalsToResolve) + require.Equal(t, models.OkErrState, grafanaRule.ExecErrState) + require.Equal(t, models.OK, grafanaRule.NoDataState) + originalRuleDefinition, err := yaml.Marshal(promRule) require.NoError(t, err) require.Equal(t, string(originalRuleDefinition), grafanaRule.Metadata.PrometheusStyleRule.OriginalRuleDefinition)