Merge branch 'main' into eui/85.1.0

elastic · Aug 1, 2023 · d20bf4e · d20bf4e
2 parents 94240ae + 7b58f7f
commit d20bf4e
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 21 deletions.
diff --git a/x-pack/plugins/cases/public/components/user_actions/index.test.tsx b/x-pack/plugins/cases/public/components/user_actions/index.test.tsx
@@ -82,7 +82,8 @@ const useFindCaseUserActionsMock = useFindCaseUserActions as jest.Mock;
 const useUpdateCommentMock = useUpdateComment as jest.Mock;
 const patchComment = jest.fn();
 
-describe(`UserActions`, () => {
+// FLAKY: https://github.com/elastic/kibana/issues/156741
+describe.skip(`UserActions`, () => {
   const sampleData = {
     content: 'what a great comment update',
   };
@@ -325,7 +326,8 @@ describe(`UserActions`, () => {
     });
   });
 
-  describe('Host isolation action', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/156742
+  describe.skip('Host isolation action', () => {
     it('renders in the cases details view', async () => {
       const isolateAction = [getHostIsolationUserAction()];
       const props = {
@@ -372,7 +374,15 @@ describe(`UserActions`, () => {
     });
   });
 
-  describe('pagination', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/156750
+  // FLAKY: https://github.com/elastic/kibana/issues/156749
+  // FLAKY: https://github.com/elastic/kibana/issues/156748
+  // FLAKY: https://github.com/elastic/kibana/issues/156747
+  // FLAKY: https://github.com/elastic/kibana/issues/156746
+  // FLAKY: https://github.com/elastic/kibana/issues/156745
+  // FLAKY: https://github.com/elastic/kibana/issues/156744
+  // FLAKY: https://github.com/elastic/kibana/issues/156743
+  describe.skip('pagination', () => {
     beforeEach(() => {
       jest.clearAllMocks();
     });

diff --git a/...gins/observability_onboarding/public/components/app/system_logs/install_elastic_agent.tsx b/...gins/observability_onboarding/public/components/app/system_logs/install_elastic_agent.tsx
@@ -60,15 +60,15 @@ export function InstallElasticAgent() {
   const { data: monitoringRole, status: monitoringRoleStatus } = useFetcher(
     (callApi) => {
       return callApi(
-        'GET /internal/observability_onboarding/custom_logs/privileges'
+        'GET /internal/observability_onboarding/logs/setup/privileges'
       );
     },
     []
   );
 
   const { data: setup } = useFetcher((callApi) => {
     return callApi(
-      'GET /internal/observability_onboarding/custom_logs/install_shipper_setup'
+      'GET /internal/observability_onboarding/logs/setup/environment'
     );
   }, []);
 
@@ -79,20 +79,17 @@ export function InstallElasticAgent() {
   } = useFetcher(
     (callApi) => {
       if (monitoringRole?.hasPrivileges) {
-        return callApi(
-          'POST /internal/observability_onboarding/custom_logs/save',
-          {
-            params: {
-              body: {
-                name: datasetName,
-                state: {
-                  datasetName,
-                  namespace,
-                },
+        return callApi('POST /internal/observability_onboarding/logs/flow', {
+          params: {
+            body: {
+              name: datasetName,
+              state: {
+                datasetName,
+                namespace,
               },
             },
-          }
-        );
+          },
+        });
       }
     },
     [monitoringRole?.hasPrivileges]
@@ -102,7 +99,7 @@ export function InstallElasticAgent() {
     const { onboardingId } = getState();
     if (onboardingId) {
       return callApi(
-        'PUT /internal/observability_onboarding/custom_logs/{onboardingId}/save',
+        'PUT /internal/observability_onboarding/flow/{onboardingId}',
         {
           params: {
             path: { onboardingId },
@@ -152,7 +149,7 @@ export function InstallElasticAgent() {
     (callApi) => {
       if (onboardingId) {
         return callApi(
-          'GET /internal/observability_onboarding/custom_logs/{onboardingId}/progress',
+          'GET /internal/observability_onboarding/flow/{onboardingId}/progress',
           { params: { path: { onboardingId } } }
         );
       }

diff --git a/..._engine_api_integration/security_and_spaces/group10/risk_engine/risk_score_calculation.ts b/..._engine_api_integration/security_and_spaces/group10/risk_engine/risk_score_calculation.ts
@@ -123,7 +123,8 @@ export default ({ getService }: FtrProviderContext): void => {
         ]);
       });
 
-      describe('paging through calculationss', () => {
+      // FLAKY: https://github.com/elastic/kibana/issues/162736
+      describe.skip('paging through calculationss', () => {
         let documentId: string;
         beforeEach(async () => {
           documentId = uuidv4();

diff --git a/...ngine_api_integration/security_and_spaces/group7/exception_operators_data_types/double.ts b/...ngine_api_integration/security_and_spaces/group7/exception_operators_data_types/double.ts
@@ -33,7 +33,8 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
   const es = getService('es');
 
-  describe('Rule exception operators for data type double', () => {
+  // Failing: See https://github.com/elastic/kibana/issues/155122
+  describe.skip('Rule exception operators for data type double', () => {
     before(async () => {
       await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/double');
       await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/double_as_string');