From 06ea4793bc893ec76c2bc1d71d760c368f2ef8c3 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Fri, 22 Apr 2022 08:50:28 -0400
Subject: [PATCH] Alerting: fix alert creation interval layout bug (#48112)
 (#48113)

(cherry picked from commit 2713de2bd1714ec2bda457b95b7b534630d07bc3)

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
---
 .../components/rule-editor/GrafanaConditionsStep.tsx | 12 +++++-------
 1 file changed, 5 insertions(+), 7 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
index 2d6b637eddf..782b18d8887 100644
--- a/public/app/features/alerting/unified/components/rule-editor/GrafanaConditionsStep.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/GrafanaConditionsStep.tsx
@@ -57,7 +57,10 @@ export const GrafanaConditionsStep: FC = () => {
   return (
     <RuleEditorSection stepNo={3} title="Define alert conditions">
       <ConditionField />
-      <Field label="Evaluate">
+      <Field
+        label="Evaluate"
+        description="Evaluation interval applies to every rule within a group. It can overwrite the interval of an existing alert rule."
+      >
         <div className={styles.flexRow}>
           <InlineLabel
             htmlFor={evaluateEveryId}
@@ -66,12 +69,7 @@ export const GrafanaConditionsStep: FC = () => {
           >
             Evaluate every
           </InlineLabel>
-          <Field
-            label="Evaluate"
-            description="Evaluation internal applies to every rule within a group. It can overwrite the interval of an existing alert rule."
-          >
-            <Input id={evaluateEveryId} width={8} {...register('evaluateEvery', evaluateEveryValidationOptions)} />
-          </Field>
+          <Input id={evaluateEveryId} width={8} {...register('evaluateEvery', evaluateEveryValidationOptions)} />
           <InlineLabel
             htmlFor={evaluateForId}
             width={7}