Merge pull request #42 from logzio/DEV-42328-grafana-alert-creation-h…

…andle-no-data-error-states-better DEV-42328 Change grafana alert default error state field
logzio · Dec 3, 2023 · f920d18 · f920d18
2 parents a7a1d57 + d13d523
commit f920d18
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/public/app/features/alerting/unified/components/rule-editor/GrafanaConditionsStep.tsx b/public/app/features/alerting/unified/components/rule-editor/GrafanaConditionsStep.tsx
@@ -72,7 +72,12 @@ export const GrafanaConditionsStep: FC = () => {
           >
             Evaluate every
           </InlineLabel>
-          <Input readOnly={true /* // LOGZ.IO Changes*/} id={evaluateEveryId} width={8} {...register('evaluateEvery', evaluateEveryValidationOptions)} />
+          <Input
+            readOnly={true /* // LOGZ.IO Changes*/}
+            id={evaluateEveryId}
+            width={8}
+            {...register('evaluateEvery', evaluateEveryValidationOptions)}
+          />
           <InlineLabel
             htmlFor={evaluateForId}
             width={7}
@@ -119,6 +124,8 @@ export const GrafanaConditionsStep: FC = () => {
               render={({ field: { onChange, ref, ...field } }) => (
                 <GrafanaAlertStatePicker
                   {...field}
+                  // LOGZ.IO GRAFANA CHANGE :: disable edit of error state handling
+                  disabled
                   inputId="exec-err-state-input"
                   width={42}
                   includeNoData={false}

diff --git a/public/app/features/alerting/unified/utils/rule-form.ts b/public/app/features/alerting/unified/utils/rule-form.ts
@@ -54,7 +54,7 @@ export const getDefaultFormValues = (): RuleFormValues => {
     queries: [],
     condition: '',
     noDataState: GrafanaAlertStateDecision.NoData,
-    execErrState: GrafanaAlertStateDecision.Alerting,
+    execErrState: GrafanaAlertStateDecision.OK, // LOGZ.IO GRAFANA CHANGE :: make error query error state OK by default
     evaluateEvery: '1m',
     evaluateFor: '5m',