From 2a8a6d755f104e19f696d085925402bb74288acc Mon Sep 17 00:00:00 2001
From: Pepe Cano <825430+ppcano@users.noreply.github.com>
Date: Mon, 3 Jun 2024 15:41:34 +0200
Subject: [PATCH] Alerting: update `Set evaluation behavior` text (#88301)

* Alerting: update `Set evaluation behavior` text

* Update `Evaluation group` description for the `Evaluation group` modal view
---
 .../rule-editor/CloudEvaluationBehavior.tsx   |  2 +-
 .../components/rule-editor/FolderAndGroup.tsx | 10 +++++++---
 .../rule-editor/GrafanaEvaluationBehavior.tsx | 20 +++++++++++++++----
 .../components/rules/EditRuleGroupModal.tsx   |  9 ++++++++-
 4 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/public/app/features/alerting/unified/components/rule-editor/CloudEvaluationBehavior.tsx b/public/app/features/alerting/unified/components/rule-editor/CloudEvaluationBehavior.tsx
index f134e1cec8f..53d5cc17033 100644
--- a/public/app/features/alerting/unified/components/rule-editor/CloudEvaluationBehavior.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/CloudEvaluationBehavior.tsx
@@ -28,7 +28,7 @@ export const CloudEvaluationBehavior = () => {
     <RuleEditorSection stepNo={3} title="Set evaluation behavior">
       <Field
         label="Pending period"
-        description="Period in which an alert rule can be in breach of the condition until the alert rule fires."
+        description='Period the threshold condition must be met to trigger the alert. Selecting "None" triggers the alert immediately once the condition is met.'
       >
         <div className={styles.flexRow}>
           <Field invalid={!!errors.forTime?.message} error={errors.forTime?.message} className={styles.inlineField}>
diff --git a/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx b/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx
index d21b697117c..6a505fa06ee 100644
--- a/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/FolderAndGroup.tsx
@@ -208,9 +208,9 @@ export function FolderAndGroup({
       <Stack alignItems="center">
         <div style={{ width: 420 }}>
           <Field
-            label="Evaluation group"
+            label="Evaluation group and interval"
             data-testid="group-picker"
-            description="Rules within the same group are evaluated concurrently over the same time interval."
+            description="Define how often the alert rule is evaluated."
             className={styles.formInput}
             error={errors.group?.message}
             invalid={!!errors.group?.message}
@@ -397,7 +397,11 @@ function EvaluationGroupCreationModal({
       <FormProvider {...formAPI}>
         <form onSubmit={handleSubmit(() => onSubmit())}>
           <Field
-            label={<Label htmlFor={'group'}>Evaluation group name</Label>}
+            label={
+              <Label htmlFor={'group'} description="A group evaluates all its rules over the same evaluation interval.">
+                Evaluation group
+              </Label>
+            }
             error={formState.errors.group?.message}
             invalid={Boolean(formState.errors.group)}
           >
diff --git a/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx b/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx
index 40251eec288..939bd993524 100644
--- a/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx
+++ b/public/app/features/alerting/unified/components/rule-editor/GrafanaEvaluationBehavior.tsx
@@ -181,7 +181,7 @@ function ForInput({ evaluateEvery }: { evaluateEvery: string }) {
         label={
           <Label
             htmlFor="evaluateFor"
-            description="Period in which an alert rule can be in breach of the condition until the alert rule fires."
+            description='Period the threshold condition must be met to trigger the alert. Selecting "None" triggers the alert immediately once the condition is met.'
           >
             Pending period
           </Label>
@@ -232,10 +232,22 @@ function getDescription() {
         Define how the alert rule is evaluated.
       </Text>
       <NeedHelpInfo
-        contentText="Evaluation groups are containers for evaluating alert and recording rules. An evaluation group defines an evaluation interval - how often a rule is checked. Alert rules within the same evaluation group are evaluated sequentially"
+        contentText={
+          <>
+            <p>Evaluation groups are containers for evaluating alert and recording rules.</p>
+            <p>
+              An evaluation group defines an evaluation interval - how often a rule is evaluated. Alert rules within the
+              same evaluation group are evaluated over the same evaluation interval.
+            </p>
+            <p>
+              Pending period specifies how long the threshold condition must be met before the alert starts firing. This
+              option helps prevent alerts from being triggered by temporary issues.
+            </p>
+          </>
+        }
         externalLink={docsLink}
-        linkText={`Read about evaluation`}
-        title="Evaluation"
+        linkText={`Read about evaluation and alert states`}
+        title="Alert rule evaluation"
       />
     </Stack>
   );
diff --git a/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx b/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx
index 34526989588..662c582d1cd 100644
--- a/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx
+++ b/public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx
@@ -293,7 +293,14 @@ export function EditCloudGroupModal(props: ModalProps): React.ReactElement {
               </Stack>
             )}
             <Field
-              label={<Label htmlFor="groupName">Evaluation group name</Label>}
+              label={
+                <Label
+                  htmlFor="groupName"
+                  description="A group evaluates all its rules over the same evaluation interval."
+                >
+                  Evaluation group
+                </Label>
+              }
               invalid={!!errors.groupName}
               error={errors.groupName?.message}
             >