From d6d5771aff7d720db791053c1b6dd6c6908c2633 Mon Sep 17 00:00:00 2001
From: Pepe Cano <825430+ppcano@users.noreply.github.com>
Date: Mon, 28 Apr 2025 10:42:37 +0200
Subject: [PATCH] alerting: update UI text to clarify recovery threshold for
 pending state (#102788)

* alerting: update UI text to clarify recovery threshold for pending state

* Update recent translation
---
 .../unified/GrafanaRuleQueryViewer.tsx        |  4 ++-
 .../expressions/components/Threshold.tsx      | 35 +++++++++++++------
 public/locales/en-US/grafana.json             | 18 +++++-----
 3 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/public/app/features/alerting/unified/GrafanaRuleQueryViewer.tsx b/public/app/features/alerting/unified/GrafanaRuleQueryViewer.tsx
index 781726d1413..71dd85a6799 100644
--- a/public/app/features/alerting/unified/GrafanaRuleQueryViewer.tsx
+++ b/public/app/features/alerting/unified/GrafanaRuleQueryViewer.tsx
@@ -503,7 +503,9 @@ function ThresholdExpressionViewer({ model }: { model: ExpressionQuery }) {
         {unloadEvaluator && (
           <>
             <div className={styles.label}>
-              <Trans i18nKey="alerting.threshold-expression-viewer.stop-alerting-when">Stop alerting when </Trans>
+              <Trans i18nKey="alerting.threshold-expression-viewer.stop-alerting-when">
+                Stop alerting (or pending state) when{' '}
+              </Trans>
             </div>
             <div className={styles.value}>{expression}</div>
 
diff --git a/public/app/features/expressions/components/Threshold.tsx b/public/app/features/expressions/components/Threshold.tsx
index e3fa883d918..ebb9ae393aa 100644
--- a/public/app/features/expressions/components/Threshold.tsx
+++ b/public/app/features/expressions/components/Threshold.tsx
@@ -219,7 +219,7 @@ function RecoveryThresholdRow({ isRange, condition, onError, dispatch, allowOnbl
               <InlineField
                 label={t(
                   'alerting.rule-form.threshold.recovery.stop-alerting-outside-range',
-                  'Stop alerting when outside range'
+                  'Stop alerting (or pending state) when outside range'
                 )}
                 labelWidth={'auto'}
               >
@@ -256,7 +256,7 @@ function RecoveryThresholdRow({ isRange, condition, onError, dispatch, allowOnbl
             <InlineField
               label={t(
                 'alerting.rule-form.threshold.recovery.stop-alerting-inside-range',
-                'Stop alerting when inside range'
+                'Stop alerting (or pending state) when inside range'
               )}
               labelWidth={'auto'}
             >
@@ -293,7 +293,7 @@ function RecoveryThresholdRow({ isRange, condition, onError, dispatch, allowOnbl
             <InlineField
               label={t(
                 'alerting.rule-form.threshold.recovery.stop-alerting-inside-range',
-                'Stop alerting when inside range'
+                'Stop alerting (or pending state) when inside range'
               )}
               labelWidth={'auto'}
             >
@@ -329,7 +329,7 @@ function RecoveryThresholdRow({ isRange, condition, onError, dispatch, allowOnbl
             <InlineField
               label={t(
                 'alerting.rule-form.threshold.recovery.stop-alerting-outside-range',
-                'Stop alerting when outside range'
+                'Stop alerting (or pending state) when outside range'
               )}
               labelWidth={'auto'}
             >
@@ -370,7 +370,10 @@ function RecoveryThresholdRow({ isRange, condition, onError, dispatch, allowOnbl
         return (
           <InlineFieldRow className={styles.hysteresis}>
             <InlineField
-              label={t('alerting.rule-form.threshold.recovery.stop-alerting-bellow', 'Stop alerting when below')}
+              label={t(
+                'alerting.rule-form.threshold.recovery.stop-alerting-bellow',
+                'Stop alerting (or pending state) when below'
+              )}
               labelWidth={'auto'}
               invalid={Boolean(invalidErrorMsg)}
               error={invalidErrorMsg}
@@ -390,7 +393,10 @@ function RecoveryThresholdRow({ isRange, condition, onError, dispatch, allowOnbl
         return (
           <InlineFieldRow className={styles.hysteresis}>
             <InlineField
-              label={t('alerting.rule-form.threshold.recovery.stop-alerting-above', 'Stop alerting when above')}
+              label={t(
+                'alerting.rule-form.threshold.recovery.stop-alerting-above',
+                'Stop alerting (or pending state) when above'
+              )}
               labelWidth={'auto'}
               invalid={Boolean(invalidErrorMsg)}
               error={invalidErrorMsg}
@@ -410,7 +416,10 @@ function RecoveryThresholdRow({ isRange, condition, onError, dispatch, allowOnbl
         return (
           <InlineFieldRow className={styles.hysteresis}>
             <InlineField
-              label={t('alerting.rule-form.threshold.recovery.stop-alerting-equal', 'Stop alerting when equal to')}
+              label={t(
+                'alerting.rule-form.threshold.recovery.stop-alerting-equal',
+                'Stop alerting (or pending state) when equal to'
+              )}
               labelWidth={'auto'}
               invalid={Boolean(invalidErrorMsg)}
               error={invalidErrorMsg}
@@ -432,7 +441,7 @@ function RecoveryThresholdRow({ isRange, condition, onError, dispatch, allowOnbl
             <InlineField
               label={t(
                 'alerting.rule-form.threshold.recovery.stop-alerting-not-equal',
-                'Stop alerting when not equal to'
+                'Stop alerting (or pending state) when not equal to'
               )}
               labelWidth={'auto'}
               invalid={Boolean(invalidErrorMsg)}
@@ -453,7 +462,10 @@ function RecoveryThresholdRow({ isRange, condition, onError, dispatch, allowOnbl
         return (
           <InlineFieldRow className={styles.hysteresis}>
             <InlineField
-              label={t('alerting.rule-form.threshold.recovery.stop-alerting-less', 'Stop alerting when less than')}
+              label={t(
+                'alerting.rule-form.threshold.recovery.stop-alerting-less',
+                'Stop alerting (or pending state) when less than'
+              )}
               labelWidth={'auto'}
               invalid={Boolean(invalidErrorMsg)}
               error={invalidErrorMsg}
@@ -473,7 +485,10 @@ function RecoveryThresholdRow({ isRange, condition, onError, dispatch, allowOnbl
         return (
           <InlineFieldRow className={styles.hysteresis}>
             <InlineField
-              label={t('alerting.rule-form.threshold.recovery.stop-alerting-more', 'Stop alerting when more than')}
+              label={t(
+                'alerting.rule-form.threshold.recovery.stop-alerting-more',
+                'Stop alerting (or pending state) when more than'
+              )}
               labelWidth={'auto'}
               invalid={Boolean(invalidErrorMsg)}
               error={invalidErrorMsg}
diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json
index 5f5704eb8a8..fa21b59fe76 100644
--- a/public/locales/en-US/grafana.json
+++ b/public/locales/en-US/grafana.json
@@ -1931,14 +1931,14 @@
       },
       "threshold": {
         "recovery": {
-          "stop-alerting-above": "Stop alerting when above",
-          "stop-alerting-bellow": "Stop alerting when below",
-          "stop-alerting-equal": "Stop alerting when equal to",
-          "stop-alerting-inside-range": "Stop alerting when inside range",
-          "stop-alerting-less": "Stop alerting when less than",
-          "stop-alerting-more": "Stop alerting when more than",
-          "stop-alerting-not-equal": "Stop alerting when not equal to",
-          "stop-alerting-outside-range": "Stop alerting when outside range",
+          "stop-alerting-above": "Stop alerting (or pending state) when above",
+          "stop-alerting-bellow": "Stop alerting (or pending state) when below",
+          "stop-alerting-equal": "Stop alerting (or pending state) when equal to",
+          "stop-alerting-inside-range": "Stop alerting (or pending state) when inside range",
+          "stop-alerting-less": "Stop alerting (or pending state) when less than",
+          "stop-alerting-more": "Stop alerting (or pending state) when more than",
+          "stop-alerting-not-equal": "Stop alerting (or pending state) when not equal to",
+          "stop-alerting-outside-range": "Stop alerting (or pending state) when outside range",
           "title": "Custom recovery threshold"
         }
       }
@@ -2330,7 +2330,7 @@
     },
     "threshold-expression-viewer": {
       "input": "Input",
-      "stop-alerting-when": "Stop alerting when "
+      "stop-alerting-when": "Stop alerting (or pending state) when "
     },
     "timeseries-row": {
       "time-series-data": "Time series data",