Merge branch 'main' into elastic#8947

alexwizp · May 8, 2024 · 0634586 · 0634586
2 parents 8bba24b + 4759173
commit 0634586
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/...ity_solution/observability_onboarding/public/application/experimental_onboarding_flow.tsx b/...ity_solution/observability_onboarding/public/application/experimental_onboarding_flow.tsx
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import React from 'react';
+import React, { useEffect } from 'react';
 import { Route, Routes } from '@kbn/shared-ux-router';
 import { useNavigate, useLocation } from 'react-router-dom-v5-compat';
 import { EuiButtonEmpty, EuiPageTemplate, EuiSpacer } from '@elastic/eui';
@@ -22,6 +22,12 @@ import { CustomLogsPanel } from './quickstart_flows/custom_logs';
 const queryClient = new QueryClient();
 
 export function ExperimentalOnboardingFlow() {
+  const { pathname } = useLocation();
+
+  useEffect(() => {
+    window.scrollTo(0, 0);
+  }, [pathname]);
+
   return (
     <QueryClientProvider client={queryClient}>
       <EuiPageTemplate.Section

diff --git a/...tegration/spaces_only/tests/alerting/group2/transform_rule_types/transform_health/rule.ts b/...tegration/spaces_only/tests/alerting/group2/transform_rule_types/transform_health/rule.ts
@@ -23,14 +23,15 @@ import { TRANSFORM_HEALTH_RESULTS } from '@kbn/transform-plugin/common/constants
 import { FtrProviderContext } from '../../../../../../common/ftr_provider_context';
 import { getUrlPrefix, ObjectRemover } from '../../../../../../common/lib';
 import { Spaces } from '../../../../../scenarios';
+import { runSoon } from '../../../group3/test_helpers';
 
 const CONNECTOR_TYPE_ID = '.index';
 const RULE_TYPE_ID = 'transform_health';
 const ES_TEST_INDEX_SOURCE = 'transform-alert:transform-health';
 const ES_TEST_INDEX_REFERENCE = '-na-';
 const ES_TEST_OUTPUT_INDEX_NAME = `${ES_TEST_INDEX_NAME}-ts-output`;
 
-const RULE_INTERVAL_SECONDS = 3;
+const RULE_INTERVAL_SECONDS = 10000;
 
 interface CreateRuleParams {
   name: string;
@@ -80,8 +81,7 @@ export default function ruleTests({ getService }: FtrProviderContext) {
     `.internal.alerts-transform.health.alerts-default-000001`
   );
 
-  // Failing: See https://github.com/elastic/kibana/issues/177215
-  describe.skip('rule', async () => {
+  describe('rule', async () => {
     const objectRemover = new ObjectRemover(supertest);
     let connectorId: string;
     const transformId = 'test_transform_01';
@@ -121,6 +121,8 @@ export default function ruleTests({ getService }: FtrProviderContext) {
 
       await stopTransform(transformId);
 
+      await runSoon({ id: ruleId, supertest, retry });
+
       log.debug('Checking created alerts...');
 
       const docs = await waitForDocs(1);