DEV-45405 - Fix more grafana tests (#54)

fix tests from change of ExecErrState: api_provisioning_test.go api_ruler_export_test.go api_ruler_validation_test.go
logzio · Nov 3, 2024 · 39dc34a · 39dc34a
1 parent 2996e94
commit 39dc34a
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 22 deletions.
diff --git a/pkg/services/ngalert/api/api_provisioning_test.go b/pkg/services/ngalert/api/api_provisioning_test.go
@@ -587,6 +587,7 @@ func TestProvisioningApi(t *testing.T) {
 				insertRule(t, sut, rule1)
 				insertRule(t, sut, createTestAlertRule("rule2", 1))
 
+				// LOGZ.IO GRAFANA CHANGE :: DEV-46410 - Change default ExecErrState to OK and enforce OK value
 				expectedResponse := `resource "grafana_rule_group" "rule_group_0000" {
   org_id           = 1
   name             = "my-cool-group"
@@ -610,7 +611,7 @@ func TestProvisioningApi(t *testing.T) {
     }
 
     no_data_state  = "Alerting"
-    exec_err_state = "Error"
+    exec_err_state = "OK"
     for            = "0s"
     annotations = {
       test = "annotation"

diff --git a/pkg/services/ngalert/api/api_ruler_export_test.go b/pkg/services/ngalert/api/api_ruler_export_test.go
@@ -38,6 +38,7 @@ func TestExportFromPayload(t *testing.T) {
 
 	srv := createService(ruleStore)
 
+	// LOGZ.IO GRAFANA CHANGE :: DEV-46410 - Change default ExecErrState to OK and enforce OK value - changed in test files: post-rulegroup-101.json, post-rulegroup-101-export.yaml, post-rulegroup-101-export.json, post-rulegroup-101-export.hcl
 	requestFile := "post-rulegroup-101.json"
 	rawBody, err := testData.ReadFile(path.Join("test-data", requestFile))
 	require.NoError(t, err)

diff --git a/pkg/services/ngalert/api/api_ruler_validation_test.go b/pkg/services/ngalert/api/api_ruler_validation_test.go
@@ -71,7 +71,7 @@ func validRule() apimodels.PostableExtendedRuleNode {
 			},
 			UID:          util.GenerateShortUID(),
 			NoDataState:  allNoData[rand.Intn(len(allNoData))],
-			ExecErrState: allExecError[rand.Intn(len(allExecError))],
+			ExecErrState: apimodels.OkErrState, // LOGZ.IO GRAFANA CHANGE :: DEV-46410 - Change default ExecErrState to OK and enforce OK value
 		},
 	}
 }
@@ -365,14 +365,14 @@ func TestValidateRuleNode_NoUID(t *testing.T) {
 			},
 		},
 		{
-			name: "defaults to Alerting if ExecErrState is empty",
+			name: "defaults to OK if ExecErrState is empty", // LOGZ.IO GRAFANA CHANGE :: DEV-46410 - Change default ExecErrState to OK and enforce OK value
 			rule: func() *apimodels.PostableExtendedRuleNode {
 				r := validRule()
 				r.GrafanaManagedAlert.ExecErrState = ""
 				return &r
 			},
 			assert: func(t *testing.T, api *apimodels.PostableExtendedRuleNode, alert *models.AlertRule) {
-				require.Equal(t, models.AlertingErrState, alert.ExecErrState)
+				require.Equal(t, models.OkErrState, alert.ExecErrState) // LOGZ.IO GRAFANA CHANGE :: DEV-46410 - Change default ExecErrState to OK and enforce OK value
 			},
 		},
 		{
@@ -459,14 +459,15 @@ func TestValidateRuleNodeFailures_NoUID(t *testing.T) {
 				return &r
 			},
 		},
-		{
-			name: "fail if ExecErrState is not known",
-			rule: func() *apimodels.PostableExtendedRuleNode {
-				r := validRule()
-				r.GrafanaManagedAlert.ExecErrState = apimodels.ExecutionErrorState(util.GenerateShortUID())
-				return &r
-			},
-		},
+		// LOGZ.IO GRAFANA CHANGE :: DEV-46410 - Change default ExecErrState to OK and enforce OK value - will not fail on unknown ExecErrState
+		//{
+		//	name: "fail if ExecErrState is not known",
+		//	rule: func() *apimodels.PostableExtendedRuleNode {
+		//		r := validRule()
+		//		r.GrafanaManagedAlert.ExecErrState = apimodels.ExecutionErrorState(util.GenerateShortUID())
+		//		return &r
+		//	},
+		//},
 		{
 			name: "fail if there are not data (nil)",
 			rule: func() *apimodels.PostableExtendedRuleNode {
@@ -604,14 +605,14 @@ func TestValidateRuleNode_UID(t *testing.T) {
 			},
 		},
 		{
-			name: "use empty Alerting if ExecErrState is empty",
+			name: "use OK state if ExecErrState is empty", // LOGZ.IO GRAFANA CHANGE :: DEV-46410 - Change default ExecErrState to OK and enforce OK value
 			rule: func() *apimodels.PostableExtendedRuleNode {
 				r := validRule()
 				r.GrafanaManagedAlert.ExecErrState = ""
 				return &r
 			},
 			assert: func(t *testing.T, api *apimodels.PostableExtendedRuleNode, alert *models.AlertRule) {
-				require.Equal(t, models.ExecutionErrorState(""), alert.ExecErrState)
+				require.Equal(t, models.OkErrState, alert.ExecErrState) // LOGZ.IO GRAFANA CHANGE :: DEV-46410 - Change default ExecErrState to OK and enforce OK value
 			},
 		},
 		{

diff --git a/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.hcl b/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.hcl
@@ -43,7 +43,7 @@ resource "grafana_rule_group" "rule_group_0000" {
     }
 
     no_data_state  = "NoData"
-    exec_err_state = "Alerting"
+    exec_err_state = "OK"
     for            = "2m"
     is_paused      = false
   }
@@ -75,7 +75,7 @@ resource "grafana_rule_group" "rule_group_0000" {
     }
 
     no_data_state  = "NoData"
-    exec_err_state = "Alerting"
+    exec_err_state = "OK"
     is_paused      = false
 
     notification_settings {

diff --git a/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.json b/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.json
@@ -63,7 +63,7 @@
             }
           ],
           "noDataState": "NoData",
-          "execErrState": "Alerting",
+          "execErrState": "OK",
           "for": "2m",
           "isPaused": false
         },
@@ -107,7 +107,7 @@
             }
           ],
           "noDataState": "NoData",
-          "execErrState": "Alerting",
+          "execErrState": "OK",
           "for": "0s",
           "isPaused": false,
           "notification_settings":{

diff --git a/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.yaml b/pkg/services/ngalert/api/test-data/post-rulegroup-101-export.yaml
@@ -47,7 +47,7 @@ groups:
                 refId: condition
                 type: math
           noDataState: NoData
-          execErrState: Alerting
+          execErrState: OK
           for: 2m
           isPaused: false
         - title: reduced testdata query - 2
@@ -80,7 +80,7 @@ groups:
                 refId: B
                 type: reduce
           noDataState: NoData
-          execErrState: Alerting
+          execErrState: OK
           for: 0s
           isPaused: false
           notification_settings:

diff --git a/pkg/services/ngalert/api/test-data/post-rulegroup-101.json b/pkg/services/ngalert/api/test-data/post-rulegroup-101.json
@@ -63,7 +63,7 @@
           }
         ],
         "no_data_state": "NoData",
-        "exec_err_state": "Alerting"
+        "exec_err_state": "OK"
       }
     },
     {
@@ -109,7 +109,7 @@
           }
         ],
         "no_data_state": "NoData",
-        "exec_err_state": "Alerting",
+        "exec_err_state": "OK",
         "notification_settings":{
           "receiver":"Test-Receiver",
           "group_by":["alertname","grafana_folder","test"],