Merge branch '7.8' into backport/7.8/pr-65783

Author: elasticmachine

x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.tsx

@@ -265,8 +265,8 @@ export const ExpressionChart: React.FC<Props> = ({
           <EuiText size="xs" color="subdued">
             <FormattedMessage
               id="xpack.infra.metrics.alerts.dataTimeRangeLabel"
-              defaultMessage="Last 20 {timeLabel}"
-              values={{ timeLabel }}
+              defaultMessage="Last {lookback} {timeLabel}"
+              values={{ timeLabel, lookback: timeSize * 20 }}
             />
           </EuiText>
         )}

x-pack/plugins/infra/public/alerting/metric_threshold/components/validation.tsx

@@ -5,6 +5,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { isNumber } from 'lodash';
 import {
   MetricExpressionParams,
   Comparator,
@@ -63,6 +64,21 @@ export function validateMetricThreshold({
       );
     }
 
+    // The Threshold component returns an empty array with a length ([empty]) because it's using delete newThreshold[i].
+    // We need to use [...c.threshold] to convert it to an array with an undefined value ([undefined]) so we can test each element.
+    if (c.threshold && c.threshold.length && ![...c.threshold].every(isNumber)) {
+      [...c.threshold].forEach((v, i) => {
+        if (!isNumber(v)) {
+          const key = i === 0 ? 'threshold0' : 'threshold1';
+          errors[id][key].push(
+            i18n.translate('xpack.infra.metrics.alertFlyout.error.thresholdTypeRequired', {
+              defaultMessage: 'Thresholds must contain a valid number.',
+            })
+          );
+        }
+      });
+    }
+
     if (c.comparator === Comparator.BETWEEN && (!c.threshold || c.threshold.length < 2)) {
       errors[id].threshold1.push(
         i18n.translate('xpack.infra.metrics.alertFlyout.error.thresholdRequired', {

x-pack/plugins/infra/public/components/alerting/inventory/validation.tsx

@@ -6,6 +6,8 @@
 
 import { i18n } from '@kbn/i18n';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { isNumber } from 'lodash';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { MetricExpressionParams } from '../../../../server/lib/alerting/metric_threshold/types';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ValidationResult } from '../../../../../triggers_actions_ui/public/types';
@@ -51,6 +53,21 @@ export function validateMetricThreshold({
       );
     }
 
+    // The Threshold component returns an empty array with a length ([empty]) because it's using delete newThreshold[i].
+    // We need to use [...c.threshold] to convert it to an array with an undefined value ([undefined]) so we can test each element.
+    if (c.threshold && c.threshold.length && ![...c.threshold].every(isNumber)) {
+      [...c.threshold].forEach((v, i) => {
+        if (!isNumber(v)) {
+          const key = i === 0 ? 'threshold0' : 'threshold1';
+          errors[id][key].push(
+            i18n.translate('xpack.infra.metrics.alertFlyout.error.thresholdTypeRequired', {
+              defaultMessage: 'Thresholds must contain a valid number.',
+            })
+          );
+        }
+      });
+    }
+
     if (c.comparator === 'between' && (!c.threshold || c.threshold.length < 2)) {
       errors[id].threshold1.push(
         i18n.translate('xpack.infra.metrics.alertFlyout.error.thresholdRequired', {