[8.x] [Metric threshold] Fix the condition not showing up in the metr…

…ic threshold flyout (#192736) (#192825) # Backport This will backport the following commits from `main` to `8.x`: - [[Metric threshold] Fix the condition not showing up in the metric threshold flyout (#192736)](#192736)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Maryam Saeidi <[email protected]>
elastic · Sep 13, 2024 · 21b86ae · 21b86ae
1 parent 77b7a0e
commit 21b86ae
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 2 deletions.
diff --git a/...servability_solution/infra/public/alerting/metric_threshold/components/expression_row.tsx b/...servability_solution/infra/public/alerting/metric_threshold/components/expression_row.tsx
@@ -200,7 +200,7 @@ export const ExpressionRow = ({
 
   return (
     <>
-      <EuiFlexGroup gutterSize="xs">
+      <EuiFlexGroup gutterSize="xs" data-test-subj="metricThresholdExpressionRow">
         <EuiFlexItem grow={false}>
           <EuiButtonIcon
             iconType={isExpanded ? 'arrowDown' : 'arrowRight'}

diff --git a/x-pack/plugins/observability_solution/infra/public/containers/metrics_source/source.tsx b/x-pack/plugins/observability_solution/infra/public/containers/metrics_source/source.tsx
@@ -45,7 +45,7 @@ export const useSourceFetcher = ({ sourceId }: { sourceId: string }) => {
             method: 'GET',
           }
         );
-        telemetry.reportPerformanceMetricEvent(
+        telemetry?.reportPerformanceMetricEvent(
           'infra_source_load',
           performance.now() - start,
           {},

diff --git a/x-pack/test/functional/services/observability/alerts/rules_page.ts b/x-pack/test/functional/services/observability/alerts/rules_page.ts
@@ -6,6 +6,8 @@
  */
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
+const METRIC_THRESHOLD_RULE_TYPE_SELECTOR = 'metrics.alert.threshold-SelectOption';
+
 export function ObservabilityAlertsRulesProvider({ getService }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const find = getService('find');
@@ -30,12 +32,25 @@ export function ObservabilityAlertsRulesProvider({ getService }: FtrProviderCont
     await find.clickByButtonText('metric-threshold');
   };
 
+  const clickOnInfrastructureCategory = async () => {
+    const categories = await testSubjects.find('ruleTypeModal');
+    const category = await categories.findByCssSelector(`.euiFacetButton[title="Infrastructure"]`);
+    await category.click();
+  };
+
+  const clickOnMetricThresholdRule = async () => {
+    await testSubjects.existOrFail(METRIC_THRESHOLD_RULE_TYPE_SELECTOR);
+    await testSubjects.click(METRIC_THRESHOLD_RULE_TYPE_SELECTOR);
+  };
+
   return {
     getManageRulesPageHref,
     clickCreateRuleButton,
     clickRuleStatusDropDownMenu,
     clickDisableFromDropDownMenu,
     clickLogsTab,
     clickOnRuleInEventLogs,
+    clickOnInfrastructureCategory,
+    clickOnMetricThresholdRule,
   };
 }
diff --git a/x-pack/test/observability_functional/apps/observability/index.ts b/x-pack/test/observability_functional/apps/observability/index.ts
@@ -24,5 +24,6 @@ export default function ({ loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./pages/rules_page'));
     loadTestFile(require.resolve('./pages/rule_details_page'));
     loadTestFile(require.resolve('./pages/alert_details_page'));
+    loadTestFile(require.resolve('./pages/alerts/metric_threshold'));
   });
 }
diff --git a/x-pack/test/observability_functional/apps/observability/pages/alerts/metric_threshold.ts b/x-pack/test/observability_functional/apps/observability/pages/alerts/metric_threshold.ts
@@ -0,0 +1,38 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../../../ftr_provider_context';
+
+export default ({ getService }: FtrProviderContext) => {
+  const esArchiver = getService('esArchiver');
+  const testSubjects = getService('testSubjects');
+
+  describe('Metric threshold rule', function () {
+    this.tags('includeFirefox');
+
+    const observability = getService('observability');
+
+    before(async () => {
+      await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+      await observability.alerts.common.navigateToRulesPage();
+    });
+
+    after(async () => {
+      await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+    });
+
+    it('shows the metric threshold rule in the observability section', async () => {
+      await observability.alerts.rulesPage.clickCreateRuleButton();
+      await observability.alerts.rulesPage.clickOnInfrastructureCategory();
+      await observability.alerts.rulesPage.clickOnMetricThresholdRule();
+    });
+
+    it('shows an expression row in the condition section', async () => {
+      await testSubjects.existOrFail('metricThresholdExpressionRow');
+    });
+  });
+};