public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

alerting: update UI text to clarify recovery threshold for pending state (#102788)

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

* Update recent translation
This commit is contained in:
Pepe Cano
2025-04-28 10:42:37 +02:00
committed by GitHub
parent cf453b46d4
commit d6d5771aff
3 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/alerting/unified/GrafanaRuleQueryViewer.tsx
+3 -1
View File
@@ -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>
public/app/features/expressions/components/Threshold.tsx
+25 -10
View File
@@ -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}
public/locales/en-US/grafana.json
+9 -9
View File
@@ -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",