* added change on provisioning request so response returns saved value

* added tests to verify create+update response value is OK

Author: yasmin-tr

pkg/services/ngalert/provisioning/alert_rules.go

@@ -157,6 +157,7 @@ func (service *AlertRuleService) CreateAlertRule(ctx context.Context, rule model
 			}
 		}
 	}
+	rule.ExecErrState = models.OkErrState // LOGZ.IO GRAFANA CHANGE :: DEV-46410 - Change default ExecErrState to OK and enforce OK value
 	err = service.xact.InTransaction(ctx, func(ctx context.Context) error {
 		ids, err := service.ruleStore.InsertAlertRules(ctx, []models.AlertRule{
 			rule,
@@ -411,6 +412,7 @@ func (service *AlertRuleService) UpdateAlertRule(ctx context.Context, rule model
 	rule.Updated = time.Now()
 	rule.ID = storedRule.ID
 	rule.IntervalSeconds = storedRule.IntervalSeconds
+	rule.ExecErrState = models.OkErrState // LOGZ.IO GRAFANA CHANGE :: DEV-46410 - Change default ExecErrState to OK and enforce OK value
 	err = rule.SetDashboardAndPanelFromAnnotations()
 	if err != nil {
 		return models.AlertRule{}, err

pkg/services/ngalert/provisioning/alert_rules_test.go

@@ -68,6 +68,20 @@ func TestAlertRuleService(t *testing.T) {
 		require.NoError(t, err)
 	})
 
+	// LOGZ.IO GRAFANA CHANGE :: DEV-46410 - Change default ExecErrState to OK and enforce OK value
+	t.Run("update alert rule ExecErrState enforces OK state", func(t *testing.T) {
+		rule := dummyRule("test-update-errstate", orgID)
+		rule, err := ruleService.CreateAlertRule(context.Background(), rule, models.ProvenanceNone, 0)
+		require.NoError(t, err)
+		require.Equal(t, models.OkErrState, rule.ExecErrState)
+
+		rule.ExecErrState = models.ErrorErrState
+		rule, err = ruleService.UpdateAlertRule(context.Background(), rule, models.ProvenanceNone)
+		require.NoError(t, err)
+		require.Equal(t, models.OkErrState, rule.ExecErrState)
+	})
+	// LOGZ.IO GRAFANA CHANGE :: End
+
 	t.Run("group creation should propagate group title correctly", func(t *testing.T) {
 		group := createDummyGroup("group-test-3", orgID)
 		group.Rules[0].RuleGroup = "something different"
@@ -556,6 +570,16 @@ func TestCreateAlertRule(t *testing.T) {
 			require.NoError(t, err)
 		})
 	})
+
+	// LOGZ.IO GRAFANA CHANGE :: DEV-46410 - Change default ExecErrState to OK and enforce OK value
+	t.Run("should create rule with OK state enforced", func(t *testing.T) {
+		rule := dummyRule("test-create-errstate", orgID)
+		rule.ExecErrState = models.AlertingErrState
+		rule, err := ruleService.CreateAlertRule(context.Background(), rule, models.ProvenanceNone, 0)
+		require.NoError(t, err)
+		require.Equal(t, models.OkErrState, rule.ExecErrState)
+	})
+	// LOGZ.IO GRAFANA CHANGE :: End
 }
 
 func createAlertRuleService(t *testing.T) AlertRuleService {