From aeded80d8625833a3dee83bb723732631b32c6a9 Mon Sep 17 00:00:00 2001
From: Jatin Kathuria <jatin.kathuria@elastic.co>
Date: Tue, 2 May 2023 15:47:12 +0200
Subject: [PATCH 01/33] [Security Solution] [Fix] Alert Page Controls do not
 take Alert Table "Additional Filters" into account. (#155861)

## Summary

This PR handles : [Security Solution] New alert filters are not taking
into consideration alert table filters #155173 and #156252

Currently, Alert Page Controls do not take Alert Table Checkboxes (
Building block + Threat indicator alerts only ) into account. This PR
enables the effect of Alert Table Checkboxes on Alert Page controls

| Before | After |
|--|--|
| <video
src="https://user-images.githubusercontent.com/7485038/234568673-b05ffc32-09bc-4378-aecb-bb64dbc5cbb6.mov"
/> | <video
src="https://user-images.githubusercontent.com/7485038/234562759-6309d6a0-f7db-48fd-bd9e-62788a1c89fe.mov"/>
|


### Checklist

Delete any items that are not applicable to this PR.

- [x] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios.
---
 .../components/filter_group/mocks/index.tsx   |  18 +-
 .../detection_engine.test.tsx                 | 217 +++++++++++++-----
 .../detection_engine/detection_engine.tsx     |  23 +-
 3 files changed, 183 insertions(+), 75 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/common/components/filter_group/mocks/index.tsx b/x-pack/plugins/security_solution/public/common/components/filter_group/mocks/index.tsx
index 3fa2ff03318cb..d31285ccb3761 100644
--- a/x-pack/plugins/security_solution/public/common/components/filter_group/mocks/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/filter_group/mocks/index.tsx
@@ -8,7 +8,7 @@
 import type { ControlGroupContainer } from '@kbn/controls-plugin/public';
 import type { Filter } from '@kbn/es-query';
 import type { FC } from 'react';
-import React from 'react';
+import React, { useEffect } from 'react';
 import { TEST_IDS } from '../constants';
 import type { FilterGroupProps } from '../types';
 import { getControlGroupMock } from './control_group';
@@ -61,15 +61,17 @@ import { getControlGroupMock } from './control_group';
  *});
  *
  */
-export function getMockedFilterGroupWithCustomFilters(outputFilters: Filter[] | undefined) {
+export function getMockedFilterGroupWithCustomFilters(outputFilters?: Filter[]) {
   const FilterGroup: FC<FilterGroupProps> = ({ onInit, onFilterChange }) => {
-    if (onInit) {
-      onInit(getControlGroupMock() as unknown as ControlGroupContainer);
-    }
+    useEffect(() => {
+      if (onInit) {
+        onInit(getControlGroupMock() as unknown as ControlGroupContainer);
+      }
 
-    if (onFilterChange) {
-      onFilterChange(outputFilters ?? []);
-    }
+      if (onFilterChange) {
+        onFilterChange(outputFilters ?? []);
+      }
+    }, [onInit, onFilterChange]);
 
     return <div data-test-subj={TEST_IDS.MOCKED_CONTROL} />;
   };
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.test.tsx
index 13836e658eee7..c340c08ad7268 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.test.tsx
@@ -29,9 +29,10 @@ import { createFilterManagerMock } from '@kbn/data-plugin/public/query/filter_ma
 import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 import { createStubDataView } from '@kbn/data-views-plugin/common/data_view.stub';
 import { useListsConfig } from '../../containers/detection_engine/lists/use_lists_config';
-import type { FilterGroupProps } from '../../../common/components/filter_group/types';
 import { FilterGroup } from '../../../common/components/filter_group';
 import type { AlertsTableComponentProps } from '../../components/alerts_table/alerts_grouping';
+import { getMockedFilterGroupWithCustomFilters } from '../../../common/components/filter_group/mocks';
+import { TableId } from '@kbn/securitysolution-data-table';
 
 // Test will fail because we will to need to mock some core services to make the test work
 // For now let's forget about SiemSearchBar and QueryBar
@@ -171,7 +172,46 @@ const state: State = {
 };
 
 const { storage } = createSecuritySolutionStorageMock();
-const store = createStore(state, SUB_PLUGINS_REDUCER, kibanaObservable, storage);
+
+const getStoreWithCustomState = (newState: State = state) => {
+  return createStore(newState, SUB_PLUGINS_REDUCER, kibanaObservable, storage);
+};
+
+const store = getStoreWithCustomState();
+
+const stateWithBuildingBlockAlertsEnabled: State = {
+  ...state,
+  dataTable: {
+    ...state.dataTable,
+    tableById: {
+      ...state.dataTable.tableById,
+      [TableId.test]: {
+        ...state.dataTable.tableById[TableId.test],
+        additionalFilters: {
+          showOnlyThreatIndicatorAlerts: false,
+          showBuildingBlockAlerts: true,
+        },
+      },
+    },
+  },
+};
+
+const stateWithThreatIndicatorsAlertEnabled: State = {
+  ...state,
+  dataTable: {
+    ...state.dataTable,
+    tableById: {
+      ...state.dataTable.tableById,
+      [TableId.test]: {
+        ...state.dataTable.tableById[TableId.test],
+        additionalFilters: {
+          showOnlyThreatIndicatorAlerts: true,
+          showBuildingBlockAlerts: false,
+        },
+      },
+    },
+  },
+};
 
 jest.mock('../../components/alerts_table/timeline_actions/use_add_bulk_to_timeline', () => ({
   useAddBulkToTimelineAction: jest.fn(() => {}),
@@ -230,69 +270,136 @@ describe('DetectionEnginePageComponent', () => {
     });
   });
 
-  it('the pageFiltersUpdateHandler updates status when a multi status filter is passed', async () => {
-    (FilterGroup as jest.Mock).mockImplementationOnce(({ onFilterChange }: FilterGroupProps) => {
-      if (onFilterChange) {
-        // once with status
-        onFilterChange([
-          {
-            meta: {
-              index: 'security-solution-default',
-              key: 'kibana.alert.workflow_status',
-              params: ['open', 'acknowledged'],
-            },
-          },
-        ]);
-      }
-      return <span />;
-    });
+  it('should pass building block filter to the alert Page Controls', async () => {
+    const MockedFilterGroup = FilterGroup as jest.Mock;
+    MockedFilterGroup.mockImplementationOnce(getMockedFilterGroupWithCustomFilters());
     await waitFor(() => {
       render(
-        <TestProviders store={store}>
+        <TestProviders store={getStoreWithCustomState(stateWithBuildingBlockAlertsEnabled)}>
           <Router history={mockHistory}>
             <DetectionEnginePage />
           </Router>
         </TestProviders>
       );
     });
-    // when statusFilter updates, we call mockStatusCapture in test mocks
-    expect(mockStatusCapture).toHaveBeenNthCalledWith(1, []);
-    expect(mockStatusCapture).toHaveBeenNthCalledWith(2, ['open', 'acknowledged']);
-  });
 
-  it('the pageFiltersUpdateHandler updates status when a single status filter is passed', async () => {
-    (FilterGroup as jest.Mock).mockImplementationOnce(({ onFilterChange }: FilterGroupProps) => {
-      if (onFilterChange) {
-        // once with status
-        onFilterChange([
+    expect(MockedFilterGroup).toHaveBeenCalledWith(
+      expect.objectContaining({
+        filters: [
           {
             meta: {
-              index: 'security-solution-default',
-              key: 'kibana.alert.workflow_status',
+              alias: null,
+              negate: true,
               disabled: false,
+              type: 'exists',
+              key: 'kibana.alert.building_block_type',
+              value: 'exists',
             },
             query: {
-              match_phrase: {
-                'kibana.alert.workflow_status': 'open',
+              exists: {
+                field: 'kibana.alert.building_block_type',
               },
             },
           },
+        ],
+      }),
+      expect.anything()
+    );
+  });
+
+  it('should pass threat Indicator filter to the alert Page Controls', async () => {
+    const MockedFilterGroup = FilterGroup as jest.Mock;
+    MockedFilterGroup.mockImplementationOnce(getMockedFilterGroupWithCustomFilters());
+
+    await waitFor(() => {
+      render(
+        <TestProviders store={getStoreWithCustomState(stateWithThreatIndicatorsAlertEnabled)}>
+          <Router history={mockHistory}>
+            <DetectionEnginePage />
+          </Router>
+        </TestProviders>
+      );
+    });
+
+    expect(MockedFilterGroup).toHaveBeenCalledWith(
+      expect.objectContaining({
+        filters: [
           {
             meta: {
-              index: 'security-solution-default',
-              key: 'kibana.alert.severity',
+              alias: null,
+              negate: true,
               disabled: false,
+              type: 'exists',
+              key: 'kibana.alert.building_block_type',
+              value: 'exists',
             },
             query: {
-              match_phrase: {
-                'kibana.alert.severity': 'low',
+              exists: {
+                field: 'kibana.alert.building_block_type',
               },
             },
           },
-        ]);
-      }
-      return <span />;
+        ],
+      }),
+      expect.anything()
+    );
+  });
+
+  it('the pageFiltersUpdateHandler updates status when a multi status filter is passed', async () => {
+    (FilterGroup as jest.Mock).mockImplementationOnce(
+      getMockedFilterGroupWithCustomFilters([
+        {
+          meta: {
+            index: 'security-solution-default',
+            key: 'kibana.alert.workflow_status',
+            params: ['open', 'acknowledged'],
+          },
+        },
+      ])
+    );
+    await waitFor(() => {
+      render(
+        <TestProviders store={store}>
+          <Router history={mockHistory}>
+            <DetectionEnginePage />
+          </Router>
+        </TestProviders>
+      );
     });
+    // when statusFilter updates, we call mockStatusCapture in test mocks
+    expect(mockStatusCapture).toHaveBeenNthCalledWith(1, []);
+    expect(mockStatusCapture).toHaveBeenNthCalledWith(2, ['open', 'acknowledged']);
+  });
+
+  it('the pageFiltersUpdateHandler updates status when a single status filter is passed', async () => {
+    (FilterGroup as jest.Mock).mockImplementationOnce(
+      getMockedFilterGroupWithCustomFilters([
+        {
+          meta: {
+            index: 'security-solution-default',
+            key: 'kibana.alert.workflow_status',
+            disabled: false,
+          },
+          query: {
+            match_phrase: {
+              'kibana.alert.workflow_status': 'open',
+            },
+          },
+        },
+        {
+          meta: {
+            index: 'security-solution-default',
+            key: 'kibana.alert.severity',
+            disabled: false,
+          },
+          query: {
+            match_phrase: {
+              'kibana.alert.severity': 'low',
+            },
+          },
+        },
+      ])
+    );
     await waitFor(() => {
       render(
         <TestProviders store={store}>
@@ -308,26 +415,22 @@ describe('DetectionEnginePageComponent', () => {
   });
 
   it('the pageFiltersUpdateHandler clears status when no status filter is passed', async () => {
-    (FilterGroup as jest.Mock).mockImplementationOnce(({ onFilterChange }: FilterGroupProps) => {
-      if (onFilterChange) {
-        // once with status
-        onFilterChange([
-          {
-            meta: {
-              index: 'security-solution-default',
-              key: 'kibana.alert.severity',
-              disabled: false,
-            },
-            query: {
-              match_phrase: {
-                'kibana.alert.severity': 'low',
-              },
+    (FilterGroup as jest.Mock).mockImplementationOnce(
+      getMockedFilterGroupWithCustomFilters([
+        {
+          meta: {
+            index: 'security-solution-default',
+            key: 'kibana.alert.severity',
+            disabled: false,
+          },
+          query: {
+            match_phrase: {
+              'kibana.alert.severity': 'low',
             },
           },
-        ]);
-      }
-      return <span />;
-    });
+        },
+      ])
+    );
     await waitFor(() => {
       render(
         <TestProviders store={store}>
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.tsx
index 1ccfaea4584ee..27c9a27e130b4 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.tsx
@@ -77,13 +77,13 @@ import { useKibana } from '../../../common/lib/kibana';
 import { NoPrivileges } from '../../../common/components/no_privileges';
 import { HeaderPage } from '../../../common/components/header_page';
 import { LandingPageComponent } from '../../../common/components/landing_page';
-import { DetectionPageFilterSet } from '../../components/detection_page_filters';
 import type { FilterGroupHandler } from '../../../common/components/filter_group/types';
 import type { Status } from '../../../../common/detection_engine/schemas/common/schemas';
 import { AlertsTableFilterGroup } from '../../components/alerts_table/alerts_filter_group';
 import { GroupedAlertsTable } from '../../components/alerts_table/alerts_grouping';
 import { AlertsTableComponent } from '../../components/alerts_table';
 import type { AddFilterProps } from '../../components/alerts_kpis/common/types';
+import { DetectionPageFilterSet } from '../../components/detection_page_filters';
 /**
  * Need a 100% height here to account for the graph/analyze tool, which sets no explicit height parameters, but fills the available space.
  */
@@ -172,6 +172,14 @@ const DetectionEnginePageComponent: React.FC<DetectionEngineComponentProps> = ({
 
   const { filterManager } = data.query;
 
+  const topLevelFilters = useMemo(() => {
+    return [
+      ...filters,
+      ...buildShowBuildingBlockFilter(showBuildingBlockAlerts),
+      ...buildThreatMatchFilter(showOnlyThreatIndicatorAlerts),
+    ];
+  }, [showBuildingBlockAlerts, showOnlyThreatIndicatorAlerts, filters]);
+
   const alertPageFilters = useMemo(() => {
     if (arePageFiltersEnabled) {
       return detectionPageFilters;
@@ -230,13 +238,8 @@ const DetectionEnginePageComponent: React.FC<DetectionEngineComponentProps> = ({
   );
 
   const alertsDefaultFilters = useMemo(
-    () => [
-      ...filters,
-      ...buildShowBuildingBlockFilter(showBuildingBlockAlerts),
-      ...buildThreatMatchFilter(showOnlyThreatIndicatorAlerts),
-      ...(alertPageFilters ?? []),
-    ],
-    [filters, showBuildingBlockAlerts, showOnlyThreatIndicatorAlerts, alertPageFilters]
+    () => [...topLevelFilters, ...(alertPageFilters ?? [])],
+    [topLevelFilters, alertPageFilters]
   );
 
   // AlertsTable manages global filters itself, so not including `filters`
@@ -350,7 +353,7 @@ const DetectionEnginePageComponent: React.FC<DetectionEngineComponentProps> = ({
         <DetectionPageFilterSet
           dataViewId={dataViewId}
           onFilterChange={pageFiltersUpdateHandler}
-          filters={filters}
+          filters={topLevelFilters}
           query={query}
           timeRange={{
             from,
@@ -362,10 +365,10 @@ const DetectionEnginePageComponent: React.FC<DetectionEngineComponentProps> = ({
         />
       ),
     [
+      topLevelFilters,
       arePageFiltersEnabled,
       dataViewId,
       statusFilter,
-      filters,
       onFilterGroupChangedCallback,
       pageFiltersUpdateHandler,
       showUpdating,

From 3c9da2cd296f9e23b5052e8bf624ddd062bcbcd0 Mon Sep 17 00:00:00 2001
From: Xavier Mouligneau <xavier.mouligneau@elastic.co>
Date: Tue, 2 May 2023 09:47:29 -0400
Subject: [PATCH 02/33] [RAM] Apply maintenance windows privilege to UI
 (#156191)

## Summary

We will have three scenarios with kibana privileges

### NONE
Kibana privileges form maintenance window:
<img width="680" alt="image"
src="https://user-images.githubusercontent.com/189600/235188523-acaff7de-54d4-4991-a014-05c0f449738c.png">

`The expected result is to not see maintenance window at all`

<img width="1481" alt="image"
src="https://user-images.githubusercontent.com/189600/235188658-6a53b463-4856-42c7-916e-aa8e6d7e326b.png">

### READ
Kibana privileges form maintenance window:
<img width="677" alt="image"
src="https://user-images.githubusercontent.com/189600/235188908-623d32ac-39a7-484e-bd5c-f858e04d16b2.png">

`The expected result is to only see the table with window maintenance
and you can not edit them`

<img width="1487" alt="image"
src="https://user-images.githubusercontent.com/189600/235189169-f71422bf-6394-4574-87fb-14c653ca1e79.png">
<img width="1484" alt="image"
src="https://user-images.githubusercontent.com/189600/235192048-149519ba-0505-46e3-b737-2703560eb3d6.png">


### ALL
Kibana privileges form maintenance window:
<img width="668" alt="image"
src="https://user-images.githubusercontent.com/189600/235189384-e71d9138-221c-4024-91bb-2ae32da1bd3b.png">

`The expected result is to be able to create/edit/etc on any maintenance
windows`

<img width="1484" alt="image"
src="https://user-images.githubusercontent.com/189600/235189974-e36c1e65-0586-4840-ace5-32caf06455c6.png">
<img width="1481" alt="image"
src="https://user-images.githubusercontent.com/189600/235192269-0f8d1922-d48f-494c-9979-2288bf142286.png">



### Checklist

Delete any items that are not applicable to this PR.

- [x] Any text added follows [EUI's writing
guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses
sentence case text and includes [i18n
support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)
- [x] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
---
 .../alerting/public/lib/test_utils.tsx        | 27 +++++-
 .../components/empty_prompt.tsx               |  7 +-
 .../components/license_prompt.tsx             |  1 +
 .../maintenance_windows_list.test.tsx         | 26 +++++-
 .../components/maintenance_windows_list.tsx   | 48 ++++++-----
 .../pages/maintenance_windows/index.test.tsx  | 84 +++++++++++++++++++
 .../pages/maintenance_windows/index.tsx       | 50 +++++++++--
 .../pages/maintenance_windows/translations.ts | 14 ++++
 .../server/maintenance_window_feature.ts      |  6 +-
 x-pack/plugins/alerting/tsconfig.json         |  1 +
 .../maintenance_window_callout.test.tsx       | 73 ++++++++++++++--
 .../maintenance_window_callout.tsx            | 20 ++++-
 .../use_fetch_active_maintenance_windows.ts   |  4 +-
 .../feature_controls/management_security.ts   |  8 +-
 14 files changed, 327 insertions(+), 42 deletions(-)
 create mode 100644 x-pack/plugins/alerting/public/pages/maintenance_windows/index.test.tsx

diff --git a/x-pack/plugins/alerting/public/lib/test_utils.tsx b/x-pack/plugins/alerting/public/lib/test_utils.tsx
index 56485d7c88ad1..6e1642bfe0d36 100644
--- a/x-pack/plugins/alerting/public/lib/test_utils.tsx
+++ b/x-pack/plugins/alerting/public/lib/test_utils.tsx
@@ -11,7 +11,7 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { I18nProvider } from '@kbn/i18n-react';
 import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { render as reactRender, RenderOptions, RenderResult } from '@testing-library/react';
-import { CoreStart } from '@kbn/core/public';
+import { Capabilities, CoreStart } from '@kbn/core/public';
 import { coreMock } from '@kbn/core/public/mocks';
 import { euiDarkVars } from '@kbn/ui-theme';
 import type { ILicense } from '@kbn/licensing-plugin/public';
@@ -22,6 +22,7 @@ import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 type UiRender = (ui: React.ReactElement, options?: RenderOptions) => RenderResult;
 
 interface AppMockRendererArgs {
+  capabilities?: Capabilities;
   license?: ILicense | null;
 }
 
@@ -30,9 +31,15 @@ export interface AppMockRenderer {
   coreStart: CoreStart;
   queryClient: QueryClient;
   AppWrapper: React.FC<{ children: React.ReactElement }>;
+  mocked: {
+    setBadge: jest.Mock;
+  };
 }
 
-export const createAppMockRenderer = ({ license }: AppMockRendererArgs = {}): AppMockRenderer => {
+export const createAppMockRenderer = ({
+  capabilities,
+  license,
+}: AppMockRendererArgs = {}): AppMockRenderer => {
   const theme$ = of({ eui: euiDarkVars, darkMode: true });
 
   const licensingPluginMock = licensingMock.createStart();
@@ -53,13 +60,26 @@ export const createAppMockRenderer = ({ license }: AppMockRendererArgs = {}): Ap
       error: () => {},
     },
   });
+
+  const mockedSetBadge = jest.fn();
   const core = coreMock.createStart();
   const services = {
     ...core,
+    application: {
+      ...core.application,
+      capabilities: {
+        ...core.application.capabilities,
+        ...capabilities,
+      },
+    },
     licensing:
       license != null
         ? { ...licensingPluginMock, license$: new BehaviorSubject(license) }
         : licensingPluginMock,
+    chrome: {
+      ...core.chrome,
+      setBadge: mockedSetBadge,
+    },
   };
   const AppWrapper: React.FC<{ children: React.ReactElement }> = React.memo(({ children }) => (
     <I18nProvider>
@@ -85,5 +105,8 @@ export const createAppMockRenderer = ({ license }: AppMockRendererArgs = {}): Ap
     render,
     queryClient,
     AppWrapper,
+    mocked: {
+      setBadge: mockedSetBadge,
+    },
   };
 };
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/empty_prompt.tsx b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/empty_prompt.tsx
index 63e7a36c74e06..4b733f1a7289b 100644
--- a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/empty_prompt.tsx
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/empty_prompt.tsx
@@ -41,7 +41,12 @@ export const EmptyPrompt = React.memo<EmptyPromptProps>(
     }, [showCreateButton, onClickCreate, docLinks]);
 
     return (
-      <EuiPageTemplate.EmptyPrompt title={emptyTitle} body={emptyBody} actions={renderActions} />
+      <EuiPageTemplate.EmptyPrompt
+        data-test-subj="mw-empty-prompt"
+        title={emptyTitle}
+        body={emptyBody}
+        actions={renderActions}
+      />
     );
   }
 );
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/license_prompt.tsx b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/license_prompt.tsx
index 61de0593e387b..4d1b0588fda4a 100644
--- a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/license_prompt.tsx
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/license_prompt.tsx
@@ -24,6 +24,7 @@ export const LicensePrompt = React.memo(() => {
 
   return (
     <EuiPageTemplate.EmptyPrompt
+      data-test-subj="mw-license-prompt"
       title={title}
       body={
         <EuiFlexGroup direction="column">
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/maintenance_windows_list.test.tsx b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/maintenance_windows_list.test.tsx
index ed3fcb0839441..6cb9708199e0f 100644
--- a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/maintenance_windows_list.test.tsx
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/maintenance_windows_list.test.tsx
@@ -94,7 +94,12 @@ describe('MaintenanceWindowsList', () => {
 
   test('it renders', () => {
     const result = appMockRenderer.render(
-      <MaintenanceWindowsList refreshData={() => {}} loading={false} items={items} />
+      <MaintenanceWindowsList
+        refreshData={() => {}}
+        loading={false}
+        items={items}
+        readOnly={false}
+      />
     );
 
     expect(result.getAllByTestId('list-item')).toHaveLength(items.length);
@@ -115,5 +120,24 @@ describe('MaintenanceWindowsList', () => {
 
     // check the endDate formatting
     expect(result.getAllByText('05/05/23 00:00 AM')).toHaveLength(4);
+
+    // check if action menu is there
+    expect(result.getAllByTestId('table-actions-icon-button')).toHaveLength(items.length);
+  });
+
+  test('it does NOT renders action column in readonly', () => {
+    const result = appMockRenderer.render(
+      <MaintenanceWindowsList
+        refreshData={() => {}}
+        loading={false}
+        items={items}
+        readOnly={true}
+      />
+    );
+
+    expect(result.getAllByTestId('list-item')).toHaveLength(items.length);
+
+    // check if action menu is there
+    expect(result.queryByTestId('table-actions-icon-button')).not.toBeInTheDocument();
   });
 });
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/maintenance_windows_list.tsx b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/maintenance_windows_list.tsx
index 705219b9baa2a..7c817a1d70809 100644
--- a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/maintenance_windows_list.tsx
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/maintenance_windows_list.tsx
@@ -32,10 +32,11 @@ import { useFinishAndArchiveMaintenanceWindow } from '../../../hooks/use_finish_
 interface MaintenanceWindowsListProps {
   loading: boolean;
   items: MaintenanceWindowFindResponse[];
+  readOnly: boolean;
   refreshData: () => void;
 }
 
-const columns: Array<EuiBasicTableColumn<MaintenanceWindowFindResponse>> = [
+const COLUMNS: Array<EuiBasicTableColumn<MaintenanceWindowFindResponse>> = [
   {
     field: 'title',
     name: i18n.NAME,
@@ -99,7 +100,7 @@ const search: { filters: SearchFilterConfig[] } = {
 };
 
 export const MaintenanceWindowsList = React.memo<MaintenanceWindowsListProps>(
-  ({ loading, items, refreshData }) => {
+  ({ loading, items, readOnly, refreshData }) => {
     const { euiTheme } = useEuiTheme();
     const { navigateToEditMaintenanceWindows } = useEditMaintenanceWindowsNavigation();
     const onEdit = useCallback(
@@ -139,32 +140,41 @@ export const MaintenanceWindowsList = React.memo<MaintenanceWindowsListProps>(
       `;
     }, [euiTheme.colors.highlight]);
 
-    const actions: Array<EuiBasicTableColumn<MaintenanceWindowFindResponse>> = [
-      {
-        name: '',
-        render: ({ status, id }: { status: MaintenanceWindowStatus; id: string }) => {
-          return (
-            <TableActionsPopover
-              id={id}
-              status={status}
-              onEdit={onEdit}
-              onCancel={onCancel}
-              onArchive={onArchive}
-              onCancelAndArchive={onCancelAndArchive}
-            />
-          );
+    const actions: Array<EuiBasicTableColumn<MaintenanceWindowFindResponse>> = useMemo(
+      () => [
+        {
+          name: '',
+          render: ({ status, id }: { status: MaintenanceWindowStatus; id: string }) => {
+            return (
+              <TableActionsPopover
+                id={id}
+                status={status}
+                onEdit={onEdit}
+                onCancel={onCancel}
+                onArchive={onArchive}
+                onCancelAndArchive={onCancelAndArchive}
+              />
+            );
+          },
         },
-      },
-    ];
+      ],
+      [onArchive, onCancel, onCancelAndArchive, onEdit]
+    );
+
+    const columns = useMemo(
+      () => (readOnly ? COLUMNS : COLUMNS.concat(actions)),
+      [actions, readOnly]
+    );
 
     return (
       <EuiInMemoryTable
+        data-test-subj="mw-table"
         css={tableCss}
         itemId="id"
         loading={loading || isLoadingFinish || isLoadingArchive || isLoadingFinishAndArchive}
         tableCaption="Maintenance Windows List"
         items={items}
-        columns={columns.concat(actions)}
+        columns={columns}
         pagination={true}
         sorting={sorting}
         rowProps={rowProps}
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/index.test.tsx b/x-pack/plugins/alerting/public/pages/maintenance_windows/index.test.tsx
new file mode 100644
index 0000000000000..31efde4db1378
--- /dev/null
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/index.test.tsx
@@ -0,0 +1,84 @@
+/*
+ * 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 React from 'react';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
+import type { Capabilities } from '@kbn/core-capabilities-common';
+import { AppMockRenderer, createAppMockRenderer } from '../../lib/test_utils';
+import { useFindMaintenanceWindows } from '../../hooks/use_find_maintenance_windows';
+import { MaintenanceWindowsPage } from '.';
+import { MAINTENANCE_WINDOW_FEATURE_ID } from '../../../common';
+
+jest.mock('../../hooks/use_find_maintenance_windows', () => ({
+  useFindMaintenanceWindows: jest.fn(),
+}));
+
+describe('Maintenance windows page', () => {
+  let appMockRenderer: AppMockRenderer;
+  let license = licensingMock.createLicense({
+    license: { type: 'platinum' },
+  });
+  let capabilities: Capabilities = {
+    [MAINTENANCE_WINDOW_FEATURE_ID]: {
+      show: true,
+      save: true,
+    },
+    navLinks: {},
+    management: {},
+    catalogue: {},
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (useFindMaintenanceWindows as jest.Mock).mockReturnValue({
+      isLoading: false,
+      maintenanceWindows: [],
+      refetch: jest.fn(),
+    });
+    license = licensingMock.createLicense({
+      license: { type: 'platinum' },
+    });
+    capabilities = {
+      maintenanceWindow: {
+        show: true,
+        save: true,
+      },
+      navLinks: {},
+      management: {},
+      catalogue: {},
+    };
+    appMockRenderer = createAppMockRenderer({ capabilities, license });
+  });
+
+  test('show license prompt', () => {
+    license = licensingMock.createLicense({
+      license: { type: 'gold' },
+    });
+    appMockRenderer = createAppMockRenderer({ capabilities, license });
+    const result = appMockRenderer.render(<MaintenanceWindowsPage />);
+    expect(result.queryByTestId('mw-license-prompt')).toBeInTheDocument();
+  });
+
+  test('show empty prompt', () => {
+    const result = appMockRenderer.render(<MaintenanceWindowsPage />);
+    expect(result.queryByTestId('mw-empty-prompt')).toBeInTheDocument();
+    expect(appMockRenderer.mocked.setBadge).not.toBeCalled();
+  });
+
+  test('show table in read only', () => {
+    capabilities = {
+      ...capabilities,
+      [MAINTENANCE_WINDOW_FEATURE_ID]: {
+        show: true,
+        save: false,
+      },
+    };
+    appMockRenderer = createAppMockRenderer({ capabilities, license });
+    const result = appMockRenderer.render(<MaintenanceWindowsPage />);
+    expect(result.queryByTestId('mw-table')).toBeInTheDocument();
+    expect(appMockRenderer.mocked.setBadge).toBeCalledTimes(1);
+  });
+});
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/index.tsx b/x-pack/plugins/alerting/public/pages/maintenance_windows/index.tsx
index ac6d0b5534b9a..5eae620c5a3e5 100644
--- a/x-pack/plugins/alerting/public/pages/maintenance_windows/index.tsx
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/index.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useCallback } from 'react';
+import React, { useCallback, useEffect } from 'react';
 import {
   EuiButton,
   EuiFlexGroup,
@@ -28,9 +28,14 @@ import { CenterJustifiedSpinner } from './components/center_justified_spinner';
 import { ExperimentalBadge } from './components/page_header';
 import { useLicense } from '../../hooks/use_license';
 import { LicensePrompt } from './components/license_prompt';
+import { MAINTENANCE_WINDOW_FEATURE_ID } from '../../../common';
 
 export const MaintenanceWindowsPage = React.memo(() => {
-  const { docLinks } = useKibana().services;
+  const {
+    application: { capabilities },
+    chrome,
+    docLinks,
+  } = useKibana().services;
   const { isAtLeastPlatinum } = useLicense();
 
   const { navigateToCreateMaintenanceWindow } = useCreateMaintenanceWindowNavigation();
@@ -44,10 +49,37 @@ export const MaintenanceWindowsPage = React.memo(() => {
   }, [navigateToCreateMaintenanceWindow]);
 
   const refreshData = useCallback(() => refetch(), [refetch]);
-
-  const showEmptyPrompt = !isLoading && maintenanceWindows.length === 0;
+  const showWindowMaintenance = capabilities[MAINTENANCE_WINDOW_FEATURE_ID].show;
+  const writeWindowMaintenance = capabilities[MAINTENANCE_WINDOW_FEATURE_ID].save;
+  const showEmptyPrompt =
+    !isLoading &&
+    maintenanceWindows.length === 0 &&
+    showWindowMaintenance &&
+    writeWindowMaintenance;
   const hasLicense = isAtLeastPlatinum();
 
+  const readOnly = showWindowMaintenance && !writeWindowMaintenance;
+
+  // if the user is read only then display the glasses badge in the global navigation header
+  const setBadge = useCallback(() => {
+    if (readOnly) {
+      chrome.setBadge({
+        text: i18n.READ_ONLY_BADGE_TEXT,
+        tooltip: i18n.READ_ONLY_BADGE_TOOLTIP,
+        iconType: 'glasses',
+      });
+    }
+  }, [chrome, readOnly]);
+
+  useEffect(() => {
+    setBadge();
+
+    // remove the icon after the component unmounts
+    return () => {
+      chrome.setBadge();
+    };
+  }, [setBadge, chrome]);
+
   if (isLoading) {
     return <CenterJustifiedSpinner />;
   }
@@ -71,9 +103,14 @@ export const MaintenanceWindowsPage = React.memo(() => {
             <p>{i18n.MAINTENANCE_WINDOWS_DESCRIPTION}</p>
           </EuiText>
         </EuiPageHeaderSection>
-        {!showEmptyPrompt && hasLicense ? (
+        {!showEmptyPrompt && hasLicense && writeWindowMaintenance ? (
           <EuiPageHeaderSection>
-            <EuiButton onClick={handleClickCreate} iconType="plusInCircle" fill>
+            <EuiButton
+              data-test-subj="mw-create-button"
+              onClick={handleClickCreate}
+              iconType="plusInCircle"
+              fill
+            >
               {i18n.CREATE_NEW_BUTTON}
             </EuiButton>
           </EuiPageHeaderSection>
@@ -87,6 +124,7 @@ export const MaintenanceWindowsPage = React.memo(() => {
         <>
           <EuiSpacer size="xl" />
           <MaintenanceWindowsList
+            readOnly={readOnly}
             refreshData={refreshData}
             loading={isLoading}
             items={maintenanceWindows}
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/translations.ts b/x-pack/plugins/alerting/public/pages/maintenance_windows/translations.ts
index 3685398fba223..1ead43b2a3ba0 100644
--- a/x-pack/plugins/alerting/public/pages/maintenance_windows/translations.ts
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/translations.ts
@@ -20,6 +20,20 @@ export const MAINTENANCE_WINDOWS_DESCRIPTION = i18n.translate(
   }
 );
 
+export const READ_ONLY_BADGE_TEXT = i18n.translate(
+  'xpack.alerting.maintenanceWindows.badge.readOnly.text',
+  {
+    defaultMessage: 'Read only',
+  }
+);
+
+export const READ_ONLY_BADGE_TOOLTIP = i18n.translate(
+  'xpack.alerting.maintenanceWindows.badge.readOnly.tooltip',
+  {
+    defaultMessage: 'Unable to create or edit maintenance Windows',
+  }
+);
+
 export const CREATE_NEW_BUTTON = i18n.translate(
   'xpack.alerting.maintenanceWindows.createNewButton',
   {
diff --git a/x-pack/plugins/alerting/server/maintenance_window_feature.ts b/x-pack/plugins/alerting/server/maintenance_window_feature.ts
index fd9af206c4544..686be1ac04a38 100644
--- a/x-pack/plugins/alerting/server/maintenance_window_feature.ts
+++ b/x-pack/plugins/alerting/server/maintenance_window_feature.ts
@@ -22,7 +22,7 @@ export const maintenanceWindowFeature: KibanaFeatureConfig = {
   category: DEFAULT_APP_CATEGORIES.management,
   app: [],
   management: {
-    insightsAndAlerting: ['triggersActions'],
+    insightsAndAlerting: ['maintenanceWindows'],
   },
   privileges: {
     all: {
@@ -32,7 +32,7 @@ export const maintenanceWindowFeature: KibanaFeatureConfig = {
         MAINTENANCE_WINDOW_API_PRIVILEGES.WRITE_MAINTENANCE_WINDOW,
       ],
       management: {
-        insightsAndAlerting: ['triggersActions'],
+        insightsAndAlerting: ['maintenanceWindows'],
       },
       savedObject: {
         all: [MAINTENANCE_WINDOW_SAVED_OBJECT_TYPE],
@@ -44,7 +44,7 @@ export const maintenanceWindowFeature: KibanaFeatureConfig = {
       app: [],
       api: [MAINTENANCE_WINDOW_API_PRIVILEGES.READ_MAINTENANCE_WINDOW],
       management: {
-        insightsAndAlerting: ['triggersActions'],
+        insightsAndAlerting: ['maintenanceWindows'],
       },
       savedObject: {
         all: [],
diff --git a/x-pack/plugins/alerting/tsconfig.json b/x-pack/plugins/alerting/tsconfig.json
index 200b8e3c2a79e..cdba5b7a4d8e6 100644
--- a/x-pack/plugins/alerting/tsconfig.json
+++ b/x-pack/plugins/alerting/tsconfig.json
@@ -52,6 +52,7 @@
     "@kbn/doc-links",
     "@kbn/core-saved-objects-utils-server",
     "@kbn/core-ui-settings-common",
+    "@kbn/core-capabilities-common",
   ],
   "exclude": [
     "target/**/*",
diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/maintenance_window_callout/maintenance_window_callout.test.tsx b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/maintenance_window_callout/maintenance_window_callout.test.tsx
index 20a8e0d1f2f94..5cd752fcf516d 100644
--- a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/maintenance_window_callout/maintenance_window_callout.test.tsx
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/maintenance_window_callout/maintenance_window_callout.test.tsx
@@ -8,8 +8,12 @@
 import React from 'react';
 import { render, waitFor, cleanup } from '@testing-library/react';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { MaintenanceWindowStatus } from '@kbn/alerting-plugin/common';
+import {
+  MaintenanceWindowStatus,
+  MAINTENANCE_WINDOW_FEATURE_ID,
+} from '@kbn/alerting-plugin/common';
 import type { MaintenanceWindow } from '@kbn/alerting-plugin/common';
+import { useKibana } from '../../../../common/lib/kibana';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import { useAppToastsMock } from '../../../../common/hooks/use_app_toasts.mock';
 import { MaintenanceWindowCallout } from './maintenance_window_callout';
@@ -22,6 +26,8 @@ jest.mock('./api', () => ({
   fetchActiveMaintenanceWindows: jest.fn(() => Promise.resolve([])),
 }));
 
+jest.mock('../../../../common/lib/kibana');
+
 const RUNNING_MAINTENANCE_WINDOW_1: Partial<MaintenanceWindow> = {
   title: 'Maintenance window 1',
   id: '63057284-ac31-42ba-fe22-adfe9732e5ae',
@@ -46,6 +52,9 @@ const UPCOMING_MAINTENANCE_WINDOW: Partial<MaintenanceWindow> = {
   ],
 };
 
+const useKibanaMock = useKibana as jest.Mock;
+const fetchActiveMaintenanceWindowsMock = fetchActiveMaintenanceWindows as jest.Mock;
+
 describe('MaintenanceWindowCallout', () => {
   let appToastsMock: jest.Mocked<ReturnType<typeof useAppToastsMock.create>>;
 
@@ -54,6 +63,18 @@ describe('MaintenanceWindowCallout', () => {
 
     appToastsMock = useAppToastsMock.create();
     (useAppToasts as jest.Mock).mockReturnValue(appToastsMock);
+    useKibanaMock.mockReturnValue({
+      services: {
+        application: {
+          capabilities: {
+            [MAINTENANCE_WINDOW_FEATURE_ID]: {
+              save: true,
+              show: true,
+            },
+          },
+        },
+      },
+    });
   });
 
   afterEach(() => {
@@ -62,7 +83,7 @@ describe('MaintenanceWindowCallout', () => {
   });
 
   it('should be visible if currently there is at least one "running" maintenance window', async () => {
-    (fetchActiveMaintenanceWindows as jest.Mock).mockResolvedValue([RUNNING_MAINTENANCE_WINDOW_1]);
+    fetchActiveMaintenanceWindowsMock.mockResolvedValue([RUNNING_MAINTENANCE_WINDOW_1]);
 
     const { findByText } = render(<MaintenanceWindowCallout />, { wrapper: TestProviders });
 
@@ -70,7 +91,7 @@ describe('MaintenanceWindowCallout', () => {
   });
 
   it('should be visible if currently there are multiple "running" maintenance windows', async () => {
-    (fetchActiveMaintenanceWindows as jest.Mock).mockResolvedValue([
+    fetchActiveMaintenanceWindowsMock.mockResolvedValue([
       RUNNING_MAINTENANCE_WINDOW_1,
       RUNNING_MAINTENANCE_WINDOW_2,
     ]);
@@ -81,7 +102,7 @@ describe('MaintenanceWindowCallout', () => {
   });
 
   it('should NOT be visible if currently there are no active (running or upcoming) maintenance windows', async () => {
-    (fetchActiveMaintenanceWindows as jest.Mock).mockResolvedValue([]);
+    fetchActiveMaintenanceWindowsMock.mockResolvedValue([]);
 
     const { container } = render(<MaintenanceWindowCallout />, { wrapper: TestProviders });
 
@@ -89,7 +110,7 @@ describe('MaintenanceWindowCallout', () => {
   });
 
   it('should NOT be visible if currently there are no "running" maintenance windows', async () => {
-    (fetchActiveMaintenanceWindows as jest.Mock).mockResolvedValue([UPCOMING_MAINTENANCE_WINDOW]);
+    fetchActiveMaintenanceWindowsMock.mockResolvedValue([UPCOMING_MAINTENANCE_WINDOW]);
 
     const { container } = render(<MaintenanceWindowCallout />, { wrapper: TestProviders });
 
@@ -121,7 +142,7 @@ describe('MaintenanceWindowCallout', () => {
     };
 
     const mockError = new Error('Network error');
-    (fetchActiveMaintenanceWindows as jest.Mock).mockRejectedValue(mockError);
+    fetchActiveMaintenanceWindowsMock.mockRejectedValue(mockError);
 
     render(<MaintenanceWindowCallout />, { wrapper: createReactQueryWrapper() });
 
@@ -133,4 +154,44 @@ describe('MaintenanceWindowCallout', () => {
       });
     });
   });
+
+  it('should return null if window maintenance privilege is NONE', async () => {
+    useKibanaMock.mockReturnValue({
+      services: {
+        application: {
+          capabilities: {
+            [MAINTENANCE_WINDOW_FEATURE_ID]: {
+              save: false,
+              show: false,
+            },
+          },
+        },
+      },
+    });
+    fetchActiveMaintenanceWindowsMock.mockResolvedValue([RUNNING_MAINTENANCE_WINDOW_1]);
+
+    const { container } = render(<MaintenanceWindowCallout />, { wrapper: TestProviders });
+
+    expect(container).toBeEmptyDOMElement();
+  });
+
+  it('should work as expected if window maintenance privilege is READ ', async () => {
+    useKibanaMock.mockReturnValue({
+      services: {
+        application: {
+          capabilities: {
+            [MAINTENANCE_WINDOW_FEATURE_ID]: {
+              save: false,
+              show: true,
+            },
+          },
+        },
+      },
+    });
+    fetchActiveMaintenanceWindowsMock.mockResolvedValue([RUNNING_MAINTENANCE_WINDOW_1]);
+
+    const { findByText } = render(<MaintenanceWindowCallout />, { wrapper: TestProviders });
+
+    expect(await findByText('A maintenance window is currently running')).toBeInTheDocument();
+  });
 });
diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/maintenance_window_callout/maintenance_window_callout.tsx b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/maintenance_window_callout/maintenance_window_callout.tsx
index 878347dc37c98..5a1d21b39a65b 100644
--- a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/maintenance_window_callout/maintenance_window_callout.tsx
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/maintenance_window_callout/maintenance_window_callout.tsx
@@ -7,12 +7,28 @@
 
 import React from 'react';
 import { EuiCallOut } from '@elastic/eui';
-import { MaintenanceWindowStatus } from '@kbn/alerting-plugin/common';
+import {
+  MaintenanceWindowStatus,
+  MAINTENANCE_WINDOW_FEATURE_ID,
+} from '@kbn/alerting-plugin/common';
 import { useFetchActiveMaintenanceWindows } from './use_fetch_active_maintenance_windows';
 import * as i18n from './translations';
+import { useKibana } from '../../../../common/lib/kibana';
 
 export function MaintenanceWindowCallout(): JSX.Element | null {
-  const { data } = useFetchActiveMaintenanceWindows();
+  const {
+    application: { capabilities },
+  } = useKibana().services;
+
+  const isMaintenanceWindowDisabled =
+    !capabilities[MAINTENANCE_WINDOW_FEATURE_ID].show &&
+    !capabilities[MAINTENANCE_WINDOW_FEATURE_ID].save;
+  const { data } = useFetchActiveMaintenanceWindows({ enabled: !isMaintenanceWindowDisabled });
+
+  if (isMaintenanceWindowDisabled) {
+    return null;
+  }
+
   const activeMaintenanceWindows = data || [];
 
   if (activeMaintenanceWindows.some(({ status }) => status === MaintenanceWindowStatus.Running)) {
diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/maintenance_window_callout/use_fetch_active_maintenance_windows.ts b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/maintenance_window_callout/use_fetch_active_maintenance_windows.ts
index 3603cafbda935..69aecfa794357 100644
--- a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/maintenance_window_callout/use_fetch_active_maintenance_windows.ts
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/maintenance_window_callout/use_fetch_active_maintenance_windows.ts
@@ -5,19 +5,21 @@
  * 2.0.
  */
 
+import type { UseQueryOptions } from '@tanstack/react-query';
 import { useQuery } from '@tanstack/react-query';
 import { INTERNAL_ALERTING_API_GET_ACTIVE_MAINTENANCE_WINDOWS_PATH } from '@kbn/alerting-plugin/common';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import * as i18n from './translations';
 import { fetchActiveMaintenanceWindows } from './api';
 
-export const useFetchActiveMaintenanceWindows = () => {
+export const useFetchActiveMaintenanceWindows = ({ enabled }: Pick<UseQueryOptions, 'enabled'>) => {
   const { addError } = useAppToasts();
 
   return useQuery(
     ['GET', INTERNAL_ALERTING_API_GET_ACTIVE_MAINTENANCE_WINDOWS_PATH],
     ({ signal }) => fetchActiveMaintenanceWindows(signal),
     {
+      enabled,
       refetchInterval: 60000,
       onError: (error) => {
         addError(error, { title: i18n.FETCH_ERROR, toastMessage: i18n.FETCH_ERROR_DESCRIPTION });
diff --git a/x-pack/test/functional/apps/management/feature_controls/management_security.ts b/x-pack/test/functional/apps/management/feature_controls/management_security.ts
index f6f71ad827d1c..d88e2fd8ebe7a 100644
--- a/x-pack/test/functional/apps/management/feature_controls/management_security.ts
+++ b/x-pack/test/functional/apps/management/feature_controls/management_security.ts
@@ -64,7 +64,13 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         expect(sections).to.have.length(2);
         expect(sections[0]).to.eql({
           sectionId: 'insightsAndAlerting',
-          sectionLinks: ['triggersActions', 'cases', 'triggersActionsConnectors', 'jobsListLink'],
+          sectionLinks: [
+            'triggersActions',
+            'cases',
+            'triggersActionsConnectors',
+            'jobsListLink',
+            'maintenanceWindows',
+          ],
         });
         expect(sections[1]).to.eql({
           sectionId: 'kibana',

From c271cbb739d4c8fef2eaa599e27f37ba05c0a6ee Mon Sep 17 00:00:00 2001
From: Maryam Saeidi <maryam.saeidi@elastic.co>
Date: Tue, 2 May 2023 15:52:46 +0200
Subject: [PATCH 03/33] Fix throughput chart on APM alert details page
 (#156348)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #154802

## Summary

Fix the Y-axis label and tooltip:

<img
src="https://user-images.githubusercontent.com/12370520/235647500-5efb80c4-5c93-47b3-bd69-6518ae330a4b.png"
width="500" />

## 🧪 How to test
- Create an APM Latency threshold alert
- Go to the alert details page and check the throughput chart for the
correct label and tooltip
---
 .../ui_components/alert_details_app_section/index.tsx    | 8 +++-----
 .../latency_chart/latency_chart.tsx                      | 3 ---
 .../alert_details_app_section/throughput_chart.tsx       | 9 ++-------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/index.tsx b/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/index.tsx
index 1e1ebde4b8e49..1ede600fc5d62 100644
--- a/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/index.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { formatAlertEvaluationValue } from '@kbn/observability-plugin/public';
 import {
@@ -17,7 +17,7 @@ import {
   ALERT_RULE_UUID,
 } from '@kbn/rule-data-utils';
 import moment from 'moment';
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useMemo } from 'react';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { SERVICE_ENVIRONMENT } from '../../../../../common/es_fields/apm';
 import { ChartPointerEventContextProvider } from '../../../../context/chart_pointer_event/chart_pointer_event_context';
@@ -92,7 +92,6 @@ export function AlertDetailsAppSection({
   const params = rule.params;
   const environment = alert.fields[SERVICE_ENVIRONMENT];
   const latencyAggregationType = getAggsTypeFromRule(params.aggregationType);
-  const [latencyMaxY, setLatencyMaxY] = useState(0);
 
   // duration is us, convert it to MS
   const alertDurationMS = alert.fields[ALERT_DURATION]! / 1000;
@@ -166,8 +165,8 @@ export function AlertDetailsAppSection({
               latencyAggregationType={latencyAggregationType}
               comparisonEnabled={comparisonEnabled}
               offset={offset}
-              setLatencyMaxY={setLatencyMaxY}
             />
+            <EuiSpacer size="s" />
             <EuiFlexGroup direction="row" gutterSize="s">
               <ThroughputChart
                 transactionType={transactionType}
@@ -177,7 +176,6 @@ export function AlertDetailsAppSection({
                 end={end}
                 comparisonChartTheme={comparisonChartTheme}
                 comparisonEnabled={comparisonEnabled}
-                latencyMaxY={latencyMaxY}
                 offset={offset}
                 timeZone={timeZone}
               />
diff --git a/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/latency_chart/latency_chart.tsx b/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/latency_chart/latency_chart.tsx
index 1add00e97120a..d4688fc2b0bcc 100644
--- a/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/latency_chart/latency_chart.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/latency_chart/latency_chart.tsx
@@ -45,7 +45,6 @@ function LatencyChart({
   comparisonEnabled,
   offset,
   timeZone,
-  setLatencyMaxY,
 }: {
   alert: TopAlert;
   transactionType: string;
@@ -58,7 +57,6 @@ function LatencyChart({
   comparisonEnabled: boolean;
   offset: string;
   timeZone: string;
-  setLatencyMaxY: React.Dispatch<React.SetStateAction<number>>;
 }) {
   const preferred = usePreferredDataSourceAndBucketSize({
     start,
@@ -150,7 +148,6 @@ function LatencyChart({
     comparisonEnabled && isTimeComparison(offset) ? previousPeriod : undefined,
   ].filter(filterNil);
   const latencyMaxY = getMaxY(timeseriesLatency);
-  setLatencyMaxY(latencyMaxY);
   const latencyFormatter = getDurationFormatter(latencyMaxY);
   return (
     <EuiFlexItem>
diff --git a/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/throughput_chart.tsx b/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/throughput_chart.tsx
index f9891eea5f13f..7881a5004f998 100644
--- a/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/throughput_chart.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/throughput_chart.tsx
@@ -17,16 +17,15 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { getDurationFormatter } from '@kbn/observability-plugin/common';
 import {
   ChartType,
   getTimeSeriesColor,
 } from '../../../shared/charts/helper/get_timeseries_color';
 import { useFetcher } from '../../../../hooks/use_fetcher';
 import { TimeseriesChart } from '../../../shared/charts/timeseries_chart';
-import { getResponseTimeTickFormatter } from '../../../shared/charts/transaction_charts/helper';
 import { usePreferredDataSourceAndBucketSize } from '../../../../hooks/use_preferred_data_source_and_bucket_size';
 import { ApmDocumentType } from '../../../../../common/document_type';
+import { asExactTransactionRate } from '../../../../../common/utils/formatters';
 
 const INITIAL_STATE = {
   currentPeriod: [],
@@ -40,7 +39,6 @@ function ThroughputChart({
   end,
   comparisonChartTheme,
   comparisonEnabled,
-  latencyMaxY,
   offset,
   timeZone,
 }: {
@@ -51,7 +49,6 @@ function ThroughputChart({
   end: string;
   comparisonChartTheme: RecursivePartial<Theme>;
   comparisonEnabled: boolean;
-  latencyMaxY: number;
   offset: string;
   timeZone: string;
 }) {
@@ -118,8 +115,6 @@ function ThroughputChart({
       : []),
   ];
 
-  const latencyFormatter = getDurationFormatter(latencyMaxY);
-
   return (
     <EuiFlexItem>
       <EuiPanel hasBorder={true}>
@@ -154,7 +149,7 @@ function ThroughputChart({
           fetchStatus={statusThroughput}
           customTheme={comparisonChartTheme}
           timeseries={timeseriesThroughput}
-          yLabelFormat={getResponseTimeTickFormatter(latencyFormatter)}
+          yLabelFormat={asExactTransactionRate}
           timeZone={timeZone}
         />
       </EuiPanel>

From e9804277b20320e37dde3ceaaa6f9ae1b66e3b23 Mon Sep 17 00:00:00 2001
From: Carlos Crespo <crespocarlos@users.noreply.github.com>
Date: Tue, 2 May 2023 10:56:06 -0300
Subject: [PATCH 04/33] [Infrastructure UI] Fix Lens charts for APM hosts
 (#156372)

## Summary

After the implementation of the new API and host limit, all charts now
load only after the table is loaded. This PR changes the filters the
page currently passes to Lens, to pass only a list of host names, the
same way Alerts and Logs tabs do it.

This also fixes a problem where filters remove documents containing
metrics data.


<img width="772" alt="image"
src="https://user-images.githubusercontent.com/2767137/235683301-35709698-49c2-4871-a724-2d2ca662f3f2.png">

<img width="772" alt="image"
src="https://user-images.githubusercontent.com/2767137/235683956-f7170213-afbd-400d-a190-a02087831af1.png">




### How to test

- Connect your local kibana to an oblt cluster
- Go to Hosts view
- Filter by `service.name: "opbeans-java"`
---
 .../infra/public/hooks/use_lens_attributes.ts | 14 ++++++++++----
 .../hosts/components/chart/lens_wrapper.tsx   |  2 +-
 .../metrics/hosts/components/kpis/tile.tsx    | 19 +++++++------------
 .../components/tabs/metrics/metric_chart.tsx  | 19 +++++++------------
 4 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/x-pack/plugins/infra/public/hooks/use_lens_attributes.ts b/x-pack/plugins/infra/public/hooks/use_lens_attributes.ts
index 6250d20750e29..322ab47b7f459 100644
--- a/x-pack/plugins/infra/public/hooks/use_lens_attributes.ts
+++ b/x-pack/plugins/infra/public/hooks/use_lens_attributes.ts
@@ -74,7 +74,13 @@ export const useLensAttributes = ({
     return visualizationAttributes;
   }, [dataView, formulaAPI, options, type, visualizationType]);
 
-  const injectFilters = (data: { filters: Filter[]; query: Query }): LensAttributes | null => {
+  const injectFilters = ({
+    filters,
+    query = { language: 'kuery', query: '' },
+  }: {
+    filters: Filter[];
+    query?: Query;
+  }): LensAttributes | null => {
     if (!attributes) {
       return null;
     }
@@ -82,8 +88,8 @@ export const useLensAttributes = ({
       ...attributes,
       state: {
         ...attributes.state,
-        query: data.query,
-        filters: [...attributes.state.filters, ...data.filters],
+        query,
+        filters: [...attributes.state.filters, ...filters],
       },
     };
   };
@@ -95,7 +101,7 @@ export const useLensAttributes = ({
   }: {
     timeRange: TimeRange;
     filters: Filter[];
-    query: Query;
+    query?: Query;
   }) => {
     return {
       openInLens: {
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/components/chart/lens_wrapper.tsx b/x-pack/plugins/infra/public/pages/metrics/hosts/components/chart/lens_wrapper.tsx
index 34e536aaf37d2..2355812e277d5 100644
--- a/x-pack/plugins/infra/public/pages/metrics/hosts/components/chart/lens_wrapper.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/components/chart/lens_wrapper.tsx
@@ -19,7 +19,7 @@ export interface LensWrapperProps {
   id: string;
   attributes: LensAttributes | null;
   dateRange: TimeRange;
-  query: Query;
+  query?: Query;
   filters: Filter[];
   extraActions: Action[];
   lastReloadRequestTime?: number;
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/components/kpis/tile.tsx b/x-pack/plugins/infra/public/pages/metrics/hosts/components/kpis/tile.tsx
index 89eebeefd240e..afb1181103d9d 100644
--- a/x-pack/plugins/infra/public/pages/metrics/hosts/components/kpis/tile.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/components/kpis/tile.tsx
@@ -77,22 +77,18 @@ export const Tile = ({
     visualizationType: 'metricChart',
   });
 
-  const hostsFilterQuery = useMemo(() => {
-    return createHostsFilter(
-      hostNodes.map((p) => p.name),
-      dataView
-    );
+  const filters = useMemo(() => {
+    return [
+      createHostsFilter(
+        hostNodes.map((p) => p.name),
+        dataView
+      ),
+    ];
   }, [hostNodes, dataView]);
 
-  const filters = useMemo(
-    () => [...searchCriteria.filters, ...searchCriteria.panelFilters, ...[hostsFilterQuery]],
-    [hostsFilterQuery, searchCriteria.filters, searchCriteria.panelFilters]
-  );
-
   const extraActionOptions = getExtraActions({
     timeRange: searchCriteria.dateRange,
     filters,
-    query: searchCriteria.query,
   });
 
   const handleBrushEnd = ({ range }: BrushTriggerEvent['data']) => {
@@ -156,7 +152,6 @@ export const Tile = ({
             lastReloadRequestTime={afterLoadedState.lastReloadRequestTime}
             dateRange={afterLoadedState.dateRange}
             filters={afterLoadedState.filters}
-            query={afterLoadedState.query}
             onBrushEnd={handleBrushEnd}
             loading={loading}
           />
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/components/tabs/metrics/metric_chart.tsx b/x-pack/plugins/infra/public/pages/metrics/hosts/components/tabs/metrics/metric_chart.tsx
index f81228957107a..1ef66e96f8abc 100644
--- a/x-pack/plugins/infra/public/pages/metrics/hosts/components/tabs/metrics/metric_chart.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/components/tabs/metrics/metric_chart.tsx
@@ -60,22 +60,18 @@ export const MetricChart = ({ title, type, breakdownSize }: MetricChartProps) =>
     visualizationType: 'lineChart',
   });
 
-  const hostsFilterQuery = useMemo(() => {
-    return createHostsFilter(
-      currentPage.map((p) => p.name),
-      dataView
-    );
+  const filters = useMemo(() => {
+    return [
+      createHostsFilter(
+        currentPage.map((p) => p.name),
+        dataView
+      ),
+    ];
   }, [currentPage, dataView]);
 
-  const filters = [
-    ...afterLoadedState.filters,
-    ...afterLoadedState.panelFilters,
-    ...[hostsFilterQuery],
-  ];
   const extraActionOptions = getExtraActions({
     timeRange: afterLoadedState.dateRange,
     filters,
-    query: afterLoadedState.query,
   });
 
   const extraActions: Action[] = [extraActionOptions.openInLens];
@@ -132,7 +128,6 @@ export const MetricChart = ({ title, type, breakdownSize }: MetricChartProps) =>
           lastReloadRequestTime={afterLoadedState.lastReloadRequestTime}
           dateRange={afterLoadedState.dateRange}
           filters={filters}
-          query={afterLoadedState.query}
           onBrushEnd={handleBrushEnd}
           loading={loading}
           hasTitle

From b5914f4342659abbe168ca4d849d94b6ee24cbf4 Mon Sep 17 00:00:00 2001
From: Maryam Saeidi <maryam.saeidi@elastic.co>
Date: Tue, 2 May 2023 16:09:49 +0200
Subject: [PATCH 05/33] [AO] Fix APM latency expected value (#156269)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #154801

## 📝 Summary
This PR fixes the expected value of the APM latency rule both in the
flyout and alert details page.

|Before|After 1|After 2|
|---|---|---|

|![image](https://user-images.githubusercontent.com/12370520/235477575-bc1891b7-0067-4bdf-9576-f0dce41d4b4c.png)|![image](https://user-images.githubusercontent.com/12370520/235477607-ab37d990-3536-409a-980d-370473a8c918.png)|![image](https://user-images.githubusercontent.com/12370520/235477667-438ebd69-3e4d-4e95-88f1-5fc8febf9125.png)|


## 🧪 How to test
- Create an APM Latency alert
- Click on the reason to open the flyout and check the expected value
there
- From the action menu of that alert, go to alert details page and check
the expected value
---
 .../alert_details_app_section/index.tsx              |  6 +++++-
 .../public/components/alerts_flyout_body.tsx         | 12 ++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/index.tsx b/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/index.tsx
index 1ede600fc5d62..b17667921ecde 100644
--- a/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/index.tsx
@@ -19,6 +19,7 @@ import {
 import moment from 'moment';
 import React, { useEffect, useMemo } from 'react';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { toMicroseconds as toMicrosecondsUtil } from '../../../../../common/utils/formatters';
 import { SERVICE_ENVIRONMENT } from '../../../../../common/es_fields/apm';
 import { ChartPointerEventContextProvider } from '../../../../context/chart_pointer_event/chart_pointer_event_context';
 import { TimeRangeMetadataContextProvider } from '../../../../context/time_range_metadata/time_range_metadata_context';
@@ -35,6 +36,9 @@ import {
   TRANSACTION_TYPE,
 } from './types';
 
+const toMicroseconds = (value?: number) =>
+  value ? toMicrosecondsUtil(value, 'milliseconds') : value;
+
 export function AlertDetailsAppSection({
   rule,
   alert,
@@ -64,7 +68,7 @@ export function AlertDetailsAppSection({
         ),
         value: formatAlertEvaluationValue(
           alert?.fields[ALERT_RULE_TYPE_ID],
-          alert?.fields[ALERT_EVALUATION_THRESHOLD]
+          toMicroseconds(alert?.fields[ALERT_EVALUATION_THRESHOLD])
         ),
       },
       {
diff --git a/x-pack/plugins/observability/public/components/alerts_flyout_body.tsx b/x-pack/plugins/observability/public/components/alerts_flyout_body.tsx
index 8f1b290b439d2..7686144affbb8 100644
--- a/x-pack/plugins/observability/public/components/alerts_flyout_body.tsx
+++ b/x-pack/plugins/observability/public/components/alerts_flyout_body.tsx
@@ -30,7 +30,7 @@ import { AlertLifecycleStatusBadge } from '@kbn/alerts-ui-shared';
 import moment from 'moment-timezone';
 import { useUiSetting } from '@kbn/kibana-react-plugin/public';
 import { useKibana } from '../utils/kibana_react';
-import { asDuration } from '../../common/utils/formatters';
+import { asDuration, toMicroseconds } from '../../common/utils/formatters';
 import { paths } from '../config/paths';
 import { translations } from '../config/translations';
 import { formatAlertEvaluationValue } from '../utils/format_alert_evaluation_value';
@@ -42,6 +42,14 @@ interface FlyoutProps {
   id?: string;
 }
 
+// For APM Latency threshold rule, threshold is in ms but the duration formatter works with microseconds
+const normalizeUnit = (ruleTypeId: string, value?: number) => {
+  if (ruleTypeId === 'apm.transaction_duration' && value) {
+    return toMicroseconds(value, 'milliseconds');
+  }
+  return value;
+};
+
 export function AlertsFlyoutBody({ alert, id: pageId }: FlyoutProps) {
   const {
     http: {
@@ -89,7 +97,7 @@ export function AlertsFlyoutBody({ alert, id: pageId }: FlyoutProps) {
       title: translations.alertsFlyout.expectedValueLabel,
       description: formatAlertEvaluationValue(
         alert.fields[ALERT_RULE_TYPE_ID],
-        alert.fields[ALERT_EVALUATION_THRESHOLD]
+        normalizeUnit(alert.fields[ALERT_RULE_TYPE_ID], alert.fields[ALERT_EVALUATION_THRESHOLD])
       ),
     },
     {

From 8da8f89db15556ec405122a511ad40698ab808be Mon Sep 17 00:00:00 2001
From: Lisa Cawley <lcawley@elastic.co>
Date: Tue, 2 May 2023 07:24:38 -0700
Subject: [PATCH 06/33] [RAM] Edit maintenance window feature privilege label
 (#156295)

---
 x-pack/plugins/alerting/server/maintenance_window_feature.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/plugins/alerting/server/maintenance_window_feature.ts b/x-pack/plugins/alerting/server/maintenance_window_feature.ts
index 686be1ac04a38..a0bd117d47721 100644
--- a/x-pack/plugins/alerting/server/maintenance_window_feature.ts
+++ b/x-pack/plugins/alerting/server/maintenance_window_feature.ts
@@ -17,7 +17,7 @@ import {
 export const maintenanceWindowFeature: KibanaFeatureConfig = {
   id: MAINTENANCE_WINDOW_FEATURE_ID,
   name: i18n.translate('xpack.alerting.feature.maintenanceWindowFeatureName', {
-    defaultMessage: 'Maintenance Window',
+    defaultMessage: 'Maintenance Windows',
   }),
   category: DEFAULT_APP_CATEGORIES.management,
   app: [],

From b9613994b11ce23bf511f097d3f4b2a974bfce93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20S=C3=A1nchez?= <david.sanchezsoler@elastic.co>
Date: Tue, 2 May 2023 16:28:11 +0200
Subject: [PATCH 07/33] [Fleet] Removes messageSigningService api definition
 from openApi spec (#156376)

## Summary

- Removes message signing service api definition from openAPI spec.
- Updates warning message when `acknowledge` param is missing or set to
false.
---
 .../plugins/fleet/common/openapi/bundled.json | 40 -------------------
 .../plugins/fleet/common/openapi/bundled.yaml | 27 -------------
 .../fleet/common/openapi/entrypoint.yaml      |  4 --
 ...ssage_signing_service@rotate_key_pair.yaml | 24 -----------
 .../rest_spec/message_signing_service.test.ts | 10 ++---
 .../rest_spec/message_signing_service.ts      |  6 +--
 6 files changed, 6 insertions(+), 105 deletions(-)
 delete mode 100644 x-pack/plugins/fleet/common/openapi/paths/message_signing_service@rotate_key_pair.yaml

diff --git a/x-pack/plugins/fleet/common/openapi/bundled.json b/x-pack/plugins/fleet/common/openapi/bundled.json
index 6e7c9d8606955..90e0459cb2e54 100644
--- a/x-pack/plugins/fleet/common/openapi/bundled.json
+++ b/x-pack/plugins/fleet/common/openapi/bundled.json
@@ -3402,46 +3402,6 @@
       },
       "parameters": []
     },
-    "/message_signing_service/rotate_key_pair": {
-      "post": {
-        "summary": "Rotate key pair",
-        "tags": [
-          "Message Signing Service"
-        ],
-        "operationId": "rotate-key-pair",
-        "parameters": [
-          {
-            "schema": {
-              "type": "boolean"
-            },
-            "in": "query",
-            "name": "acknowledge",
-            "required": true,
-            "description": "When set to true, rotate key pair is done. If set to false or missing, it returns an error."
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {
-                    "message": {
-                      "type": "string"
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "400": {
-            "$ref": "#/components/responses/error"
-          }
-        }
-      }
-    },
     "/data_streams": {
       "get": {
         "summary": "List data streams",
diff --git a/x-pack/plugins/fleet/common/openapi/bundled.yaml b/x-pack/plugins/fleet/common/openapi/bundled.yaml
index a62444586efeb..e50525db886d0 100644
--- a/x-pack/plugins/fleet/common/openapi/bundled.yaml
+++ b/x-pack/plugins/fleet/common/openapi/bundled.yaml
@@ -2113,33 +2113,6 @@ paths:
       parameters:
         - $ref: '#/components/parameters/kbn_xsrf'
     parameters: []
-  /message_signing_service/rotate_key_pair:
-    post:
-      summary: Rotate key pair
-      tags:
-        - Message Signing Service
-      operationId: rotate-key-pair
-      parameters:
-        - schema:
-            type: boolean
-          in: query
-          name: acknowledge
-          required: true
-          description: >-
-            When set to true, rotate key pair is done. If set to false or
-            missing, it returns an error.
-      responses:
-        '200':
-          description: OK
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  message:
-                    type: string
-        '400':
-          $ref: '#/components/responses/error'
   /data_streams:
     get:
       summary: List data streams
diff --git a/x-pack/plugins/fleet/common/openapi/entrypoint.yaml b/x-pack/plugins/fleet/common/openapi/entrypoint.yaml
index ee95d9899a570..ca9d1cd3c8e19 100644
--- a/x-pack/plugins/fleet/common/openapi/entrypoint.yaml
+++ b/x-pack/plugins/fleet/common/openapi/entrypoint.yaml
@@ -105,10 +105,6 @@ paths:
   /agent_policies/delete:
     $ref: paths/agent_policies@delete.yaml
 
-  # Message signing service
-  /message_signing_service/rotate_key_pair:
-   $ref: paths/message_signing_service@rotate_key_pair.yaml
-
   # Data streams endpoints
   /data_streams:
     $ref: paths/data_streams.yaml
diff --git a/x-pack/plugins/fleet/common/openapi/paths/message_signing_service@rotate_key_pair.yaml b/x-pack/plugins/fleet/common/openapi/paths/message_signing_service@rotate_key_pair.yaml
deleted file mode 100644
index 477967d3cb2b1..0000000000000
--- a/x-pack/plugins/fleet/common/openapi/paths/message_signing_service@rotate_key_pair.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-post:
-  summary: Rotate key pair
-  tags:
-    - Message Signing Service
-  operationId: rotate-key-pair
-  parameters:
-    - schema:
-        type: boolean
-      in: query
-      name: acknowledge
-      required: true
-      description: When set to true, rotate key pair is done. If set to false or missing, it returns an error.
-  responses:
-    '200':
-      description: OK
-      content:
-        application/json:
-          schema:
-            type: object
-            properties:
-              message:
-                type: string
-    '400':
-      $ref: ../components/responses/error.yaml
\ No newline at end of file
diff --git a/x-pack/plugins/fleet/server/types/rest_spec/message_signing_service.test.ts b/x-pack/plugins/fleet/server/types/rest_spec/message_signing_service.test.ts
index fa1f34164ea99..cc06bd5acae5e 100644
--- a/x-pack/plugins/fleet/server/types/rest_spec/message_signing_service.test.ts
+++ b/x-pack/plugins/fleet/server/types/rest_spec/message_signing_service.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RotateKeyPairSchema } from './message_signing_service';
+import { errorMessage, RotateKeyPairSchema } from './message_signing_service';
 
 describe('RotateKeyPairSchema', () => {
   it('should throw on `false` values for acknowledge', () => {
@@ -13,15 +13,11 @@ describe('RotateKeyPairSchema', () => {
       RotateKeyPairSchema.query.validate({
         acknowledge: false,
       })
-    ).toThrowError(
-      'You must acknowledge the risks of rotating the key pair with acknowledge=true in the request parameters.'
-    );
+    ).toThrowError(errorMessage);
   });
 
   it('should allow without any query', () => {
-    expect(() => RotateKeyPairSchema.query.validate({})).toThrowError(
-      'You must acknowledge the risks of rotating the key pair with acknowledge=true in the request parameters.'
-    );
+    expect(() => RotateKeyPairSchema.query.validate({})).toThrowError(errorMessage);
   });
 
   it.each([1, 'string'])('should not allow non-boolean `%s` values for acknowledge', (value) => {
diff --git a/x-pack/plugins/fleet/server/types/rest_spec/message_signing_service.ts b/x-pack/plugins/fleet/server/types/rest_spec/message_signing_service.ts
index d6037748e4682..e643fd0505618 100644
--- a/x-pack/plugins/fleet/server/types/rest_spec/message_signing_service.ts
+++ b/x-pack/plugins/fleet/server/types/rest_spec/message_signing_service.ts
@@ -7,6 +7,8 @@
 
 import { schema } from '@kbn/config-schema';
 
+export const errorMessage =
+  'Warning: this API will cause a key pair to rotate and should not be necessary in normal operation.  If you proceed, you may need to reinstall Agents in your network. You must acknowledge the risks of rotating the key pair with acknowledge=true in the request parameters.  For more information, reach out to your administrator.';
 export const RotateKeyPairSchema = {
   query: schema.maybe(
     schema.object(
@@ -19,9 +21,7 @@ export const RotateKeyPairSchema = {
         defaultValue: { acknowledge: false },
         validate: (value: { acknowledge: boolean }) => {
           if (!value || !value.acknowledge) {
-            throw new Error(
-              'You must acknowledge the risks of rotating the key pair with acknowledge=true in the request parameters.'
-            );
+            throw new Error(errorMessage);
           }
         },
       }

From 30eb413215cf87f96ba5f58e562a7f9b2fbf7241 Mon Sep 17 00:00:00 2001
From: Lisa Cawley <lcawley@elastic.co>
Date: Tue, 2 May 2023 07:49:53 -0700
Subject: [PATCH 08/33] [Cases] Edit labels for file attachments (#156026)

---
 .../public/components/all_cases/translations.ts      |  4 ++--
 .../components/all_cases/use_cases_columns.test.tsx  | 12 ++++++------
 .../cases/public/components/files/file_type.test.tsx |  6 +++---
 .../cases/public/components/files/translations.tsx   |  8 ++++----
 .../files/use_files_table_columns.test.tsx           |  6 +++---
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/x-pack/plugins/cases/public/components/all_cases/translations.ts b/x-pack/plugins/cases/public/components/all_cases/translations.ts
index 80554bb44fb39..12c16e1f6501d 100644
--- a/x-pack/plugins/cases/public/components/all_cases/translations.ts
+++ b/x-pack/plugins/cases/public/components/all_cases/translations.ts
@@ -52,7 +52,7 @@ export const BULK_ACTIONS = i18n.translate('xpack.cases.caseTable.bulkActions',
 });
 
 export const EXTERNAL_INCIDENT = i18n.translate('xpack.cases.caseTable.snIncident', {
-  defaultMessage: 'External Incident',
+  defaultMessage: 'External incident',
 });
 
 export const SEVERITY = i18n.translate('xpack.cases.caseTable.severity', {
@@ -60,7 +60,7 @@ export const SEVERITY = i18n.translate('xpack.cases.caseTable.severity', {
 });
 
 export const INCIDENT_MANAGEMENT_SYSTEM = i18n.translate('xpack.cases.caseTable.incidentSystem', {
-  defaultMessage: 'Incident Management System',
+  defaultMessage: 'Incident management system',
 });
 
 export const SEARCH_PLACEHOLDER = i18n.translate('xpack.cases.caseTable.searchPlaceholder', {
diff --git a/x-pack/plugins/cases/public/components/all_cases/use_cases_columns.test.tsx b/x-pack/plugins/cases/public/components/all_cases/use_cases_columns.test.tsx
index 060ac64cafb08..f6cbe9113e5d6 100644
--- a/x-pack/plugins/cases/public/components/all_cases/use_cases_columns.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/use_cases_columns.test.tsx
@@ -99,7 +99,7 @@ describe('useCasesColumns ', () => {
             "sortable": true,
           },
           Object {
-            "name": "External Incident",
+            "name": "External incident",
             "render": [Function],
             "width": undefined,
           },
@@ -232,7 +232,7 @@ describe('useCasesColumns ', () => {
             "sortable": true,
           },
           Object {
-            "name": "External Incident",
+            "name": "External incident",
             "render": [Function],
             "width": undefined,
           },
@@ -316,7 +316,7 @@ describe('useCasesColumns ', () => {
             "sortable": true,
           },
           Object {
-            "name": "External Incident",
+            "name": "External incident",
             "render": [Function],
             "width": undefined,
           },
@@ -395,7 +395,7 @@ describe('useCasesColumns ', () => {
             "sortable": true,
           },
           Object {
-            "name": "External Incident",
+            "name": "External incident",
             "render": [Function],
             "width": undefined,
           },
@@ -479,7 +479,7 @@ describe('useCasesColumns ', () => {
             "sortable": true,
           },
           Object {
-            "name": "External Incident",
+            "name": "External incident",
             "render": [Function],
             "width": undefined,
           },
@@ -638,7 +638,7 @@ describe('useCasesColumns ', () => {
             "sortable": true,
           },
           Object {
-            "name": "External Incident",
+            "name": "External incident",
             "render": [Function],
             "width": undefined,
           },
diff --git a/x-pack/plugins/cases/public/components/files/file_type.test.tsx b/x-pack/plugins/cases/public/components/files/file_type.test.tsx
index 8d2c782ee0aae..0fc01442487f4 100644
--- a/x-pack/plugins/cases/public/components/files/file_type.test.tsx
+++ b/x-pack/plugins/cases/public/components/files/file_type.test.tsx
@@ -78,7 +78,7 @@ describe('getFileType', () => {
       expect(actions[0]).toStrictEqual({
         type: AttachmentActionType.CUSTOM,
         isPrimary: false,
-        label: 'Download File',
+        label: 'Download file',
         render: expect.any(Function),
       });
 
@@ -102,7 +102,7 @@ describe('getFileType', () => {
       expect(actions[1]).toStrictEqual({
         type: AttachmentActionType.CUSTOM,
         isPrimary: false,
-        label: 'Delete File',
+        label: 'Delete file',
         render: expect.any(Function),
       });
 
@@ -126,7 +126,7 @@ describe('getFileType', () => {
       expect(actions[1]).toStrictEqual({
         type: AttachmentActionType.CUSTOM,
         isPrimary: false,
-        label: 'Delete File',
+        label: 'Delete file',
         render: expect.any(Function),
       });
 
diff --git a/x-pack/plugins/cases/public/components/files/translations.tsx b/x-pack/plugins/cases/public/components/files/translations.tsx
index 2fd8ed28c6aa4..b500d140217f0 100644
--- a/x-pack/plugins/cases/public/components/files/translations.tsx
+++ b/x-pack/plugins/cases/public/components/files/translations.tsx
@@ -12,7 +12,7 @@ export const ACTIONS = i18n.translate('xpack.cases.caseView.files.actions', {
 });
 
 export const ADD_FILE = i18n.translate('xpack.cases.caseView.files.addFile', {
-  defaultMessage: 'Add File',
+  defaultMessage: 'Add file',
 });
 
 export const CLOSE_MODAL = i18n.translate('xpack.cases.caseView.files.closeModal', {
@@ -20,15 +20,15 @@ export const CLOSE_MODAL = i18n.translate('xpack.cases.caseView.files.closeModal
 });
 
 export const DATE_ADDED = i18n.translate('xpack.cases.caseView.files.dateAdded', {
-  defaultMessage: 'Date Added',
+  defaultMessage: 'Date added',
 });
 
 export const DELETE_FILE = i18n.translate('xpack.cases.caseView.files.deleteFile', {
-  defaultMessage: 'Delete File',
+  defaultMessage: 'Delete file',
 });
 
 export const DOWNLOAD_FILE = i18n.translate('xpack.cases.caseView.files.downloadFile', {
-  defaultMessage: 'Download File',
+  defaultMessage: 'Download file',
 });
 
 export const FILES_TABLE = i18n.translate('xpack.cases.caseView.files.filesTable', {
diff --git a/x-pack/plugins/cases/public/components/files/use_files_table_columns.test.tsx b/x-pack/plugins/cases/public/components/files/use_files_table_columns.test.tsx
index 77070da0dbc57..0205fac1d4ec4 100644
--- a/x-pack/plugins/cases/public/components/files/use_files_table_columns.test.tsx
+++ b/x-pack/plugins/cases/public/components/files/use_files_table_columns.test.tsx
@@ -47,18 +47,18 @@ describe('useFilesTableColumns', () => {
           "data-test-subj": "cases-files-table-date-added",
           "dataType": "date",
           "field": "created",
-          "name": "Date Added",
+          "name": "Date added",
         },
         Object {
           "actions": Array [
             Object {
-              "description": "Download File",
+              "description": "Download file",
               "isPrimary": true,
               "name": "Download",
               "render": [Function],
             },
             Object {
-              "description": "Delete File",
+              "description": "Delete file",
               "isPrimary": true,
               "name": "Delete",
               "render": [Function],

From d71f6f3d0337a66aab755ab576fa6f4f85652a5c Mon Sep 17 00:00:00 2001
From: Jill Guyonnet <jill.guyonnet@elastic.co>
Date: Tue, 2 May 2023 17:02:51 +0200
Subject: [PATCH 09/33] [Fleet] Fix package install with older version
 (#156257)

## Summary

This PR fixes a bug where an older version of a package cannot be
installed when creating a new agent policy.

Closes https://github.com/elastic/kibana/issues/152095

### Reproducing the bug

1. Run Kibana off the `main` branch.
2. Install a package of your choice for the first time (it should not
already be installed) on a version lower than the latest (cf. screenshot
1). In the configuration page under `Where to add this integration?`,
leave `New hosts` selected to ensure a new agent policy is created (cf.
screenshot 2).
3. After the package is installed, go to the package settings: notice
that the installed version is actually the latest (cf. screenshot 3).
4. Note: if you go to the `Integration policies` tab of the package, you
will notice that the integration policy has the version number you
intended to install (cf. screenshot 4).

### Cause of the bug

The `onSubmit` hook used by the package install form [makes use the of
the `epm/packages/_bulk`
endpoint](https://github.com/elastic/kibana/blob/e62581f8bf6098f2813768af2f31647c592645a2/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/form.tsx#L272)
to bulk install multiple packages if a new agent policy is to be
created. The `epm/packages/_bulk` endpoint accepts an array of packages
which are either specified by a package name (string) or name and
version (object). In the current implementation, this hook only provides
the package names, which resolves to the latest version of the package
being installed.

### How this PR fixes the bug

This PR make the following changes:
* Make the `BulkInstallPackagesFromRegistryRequestSchema` validation
accepts an array of either strings or objects of shape `{ name: string,
version: string }` for packages.
* Modify the `sendBulkInstallPackages` request hook to do the same.
* Make the `onSubmit` hook used by the package install form pass the
package name and version to the `epm/packages/_bulk` endpoint.

### Additional changes

* Add API integration test for bulk package install
* Amend OpenAPI definition: [Swagger
link](https://petstore.swagger.io/?url=https://raw.githubusercontent.com/elastic/kibana/a4a3209905a5cf099fa22779e889a57acb124fb2/x-pack/plugins/fleet/common/openapi/bundled.json#/Elastic%20Package%20Manager%20(EPM)/bulk-install-packages)
(cf. screenshot 7)

### Testing steps

1. (Optional) Test that the `epm/packages/_bulk` endpoint accepts
package name as strings or package name and version as objects, or even
a mix of both (cf. screenshot 6).
2. Same steps as `Reproducing the bug` above on this branch. The correct
version of the package should be installed (cf screenshot 5).

### Screenshots

Screenshot 1: preparing to install an older version of a package:
<img width="1917" alt="Screenshot 2023-05-02 at 11 21 12"
src="https://user-images.githubusercontent.com/23701614/235631501-aa03d2b0-6fe8-4e9a-8e0c-5547f8fccea0.png">


Screenshot 2: creating a new agent policy when installing the package:
<img width="1917" alt="Screenshot 2023-05-02 at 11 21 33"
src="https://user-images.githubusercontent.com/23701614/235631650-3d9bfc19-ace3-4488-a7c7-48078aae3e7c.png">

Screenshot 3: integration settings after installing an older version
onto a new agent policy, showing that the installed version is actually
the latest version:
<img width="1917" alt="Screenshot 2023-05-02 at 11 29 07"
src="https://user-images.githubusercontent.com/23701614/235631920-3ca8f606-d225-464e-8094-46aeee4869df.png">


Screenshot 4: `Integration policies` tab, showing that the integration
policy has the older version:
<img width="1917" alt="Screenshot 2023-05-02 at 11 28 43"
src="https://user-images.githubusercontent.com/23701614/235632212-c82a3ddd-cb33-4179-a4ab-b57e33e7490d.png">


Screenshot 5: integration settings after installing an older version
onto a new agent policy **with the bug fix**, showing that the correct
version was installed:
<img width="1917" alt="Screenshot 2023-05-02 at 11 23 09"
src="https://user-images.githubusercontent.com/23701614/235632590-bb26183d-ce60-439c-9bee-eadb9fdb9654.png">


Screenshot 6: API call showing the two ways of specifying a package
using the `epm/packages/_bulk` endpoint (package name only, or name and
version):
<img width="1917" alt="Screenshot 2023-05-02 at 11 59 11"
src="https://user-images.githubusercontent.com/23701614/235637532-ae32072b-ca84-48bb-9760-120a2149f0e5.png">


Screenshot 7: `epm/packages/_bulk` endpoint reference on Swagger:
<img width="1429" alt="Screenshot 2023-05-02 at 15 13 14"
src="https://user-images.githubusercontent.com/23701614/235677504-e8ba1329-1a70-44f8-92c5-0f32e5da7e46.png">

### Checklist

- [x] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
---
 .../plugins/fleet/common/openapi/bundled.json | 22 +++++-
 .../plugins/fleet/common/openapi/bundled.yaml | 14 +++-
 .../openapi/paths/epm@packages_bulk.yaml      | 14 +++-
 .../single_page_layout/hooks/form.tsx         |  4 +-
 .../fleet/public/hooks/use_request/epm.ts     |  4 +-
 .../fleet/server/types/rest_spec/epm.ts       |  8 ++-
 .../apis/epm/bulk_install.ts                  | 68 +++++++++++++++++++
 7 files changed, 124 insertions(+), 10 deletions(-)
 create mode 100644 x-pack/test/fleet_api_integration/apis/epm/bulk_install.ts

diff --git a/x-pack/plugins/fleet/common/openapi/bundled.json b/x-pack/plugins/fleet/common/openapi/bundled.json
index 90e0459cb2e54..34d2a8606daa2 100644
--- a/x-pack/plugins/fleet/common/openapi/bundled.json
+++ b/x-pack/plugins/fleet/common/openapi/bundled.json
@@ -581,9 +581,27 @@
                   "packages": {
                     "type": "array",
                     "items": {
-                      "type": "string"
+                      "oneOf": [
+                        {
+                          "type": "string",
+                          "description": "package name"
+                        },
+                        {
+                          "type": "object",
+                          "properties": {
+                            "name": {
+                              "type": "string",
+                              "description": "package name"
+                            },
+                            "version": {
+                              "type": "string",
+                              "description": "package version"
+                            }
+                          }
+                        }
+                      ]
                     },
-                    "description": "list of package names to install"
+                    "description": "list of packages to install"
                   },
                   "force": {
                     "type": "boolean",
diff --git a/x-pack/plugins/fleet/common/openapi/bundled.yaml b/x-pack/plugins/fleet/common/openapi/bundled.yaml
index e50525db886d0..dd697cadfa4ed 100644
--- a/x-pack/plugins/fleet/common/openapi/bundled.yaml
+++ b/x-pack/plugins/fleet/common/openapi/bundled.yaml
@@ -378,8 +378,18 @@ paths:
                 packages:
                   type: array
                   items:
-                    type: string
-                  description: list of package names to install
+                    oneOf:
+                      - type: string
+                        description: package name
+                      - type: object
+                        properties:
+                          name:
+                            type: string
+                            description: package name
+                          version:
+                            type: string
+                            description: package version
+                  description: list of packages to install
                 force:
                   type: boolean
                   description: force install to ignore package verification errors
diff --git a/x-pack/plugins/fleet/common/openapi/paths/epm@packages_bulk.yaml b/x-pack/plugins/fleet/common/openapi/paths/epm@packages_bulk.yaml
index a3775e69a7131..7a3b3f293cf87 100644
--- a/x-pack/plugins/fleet/common/openapi/paths/epm@packages_bulk.yaml
+++ b/x-pack/plugins/fleet/common/openapi/paths/epm@packages_bulk.yaml
@@ -29,8 +29,18 @@ post:
             packages:
               type: array
               items:
-                type: string
-              description: list of package names to install
+                oneOf:
+                  - type: string
+                    description: package name
+                  - type: object
+                    properties:
+                      name:
+                        type: string
+                        description: package name
+                      version:
+                        type: string
+                        description: package version
+              description: list of packages to install
             force:
               type: boolean
               description: force install to ignore package verification errors
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/form.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/form.tsx
index 9e77b746214e1..cc01cadccb788 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/form.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/form.tsx
@@ -257,9 +257,9 @@ export function useOnSubmit({
         try {
           setFormState('LOADING');
           if ((withSysMonitoring || newAgentPolicy.monitoring_enabled?.length) ?? 0 > 0) {
-            const packagesToPreinstall: string[] = [];
+            const packagesToPreinstall: Array<string | { name: string; version: string }> = [];
             if (packageInfo) {
-              packagesToPreinstall.push(packageInfo.name);
+              packagesToPreinstall.push({ name: packageInfo.name, version: packageInfo.version });
             }
             if (withSysMonitoring) {
               packagesToPreinstall.push(FLEET_SYSTEM_PACKAGE);
diff --git a/x-pack/plugins/fleet/public/hooks/use_request/epm.ts b/x-pack/plugins/fleet/public/hooks/use_request/epm.ts
index f050820508d98..c1cd11f6a8092 100644
--- a/x-pack/plugins/fleet/public/hooks/use_request/epm.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_request/epm.ts
@@ -204,7 +204,9 @@ export const sendInstallPackage = (pkgName: string, pkgVersion: string, force: b
   });
 };
 
-export const sendBulkInstallPackages = (packages: string[]) => {
+export const sendBulkInstallPackages = (
+  packages: Array<string | { name: string; version: string }>
+) => {
   return sendRequest<InstallPackageResponse, FleetErrorResponse>({
     path: epmRouteService.getBulkInstallPath(),
     method: 'post',
diff --git a/x-pack/plugins/fleet/server/types/rest_spec/epm.ts b/x-pack/plugins/fleet/server/types/rest_spec/epm.ts
index 56187c62025c6..204183a056b1b 100644
--- a/x-pack/plugins/fleet/server/types/rest_spec/epm.ts
+++ b/x-pack/plugins/fleet/server/types/rest_spec/epm.ts
@@ -134,7 +134,13 @@ export const BulkInstallPackagesFromRegistryRequestSchema = {
     prerelease: schema.maybe(schema.boolean()),
   }),
   body: schema.object({
-    packages: schema.arrayOf(schema.string(), { minSize: 1 }),
+    packages: schema.arrayOf(
+      schema.oneOf([
+        schema.string(),
+        schema.object({ name: schema.string(), version: schema.string() }),
+      ]),
+      { minSize: 1 }
+    ),
     force: schema.boolean({ defaultValue: false }),
   }),
 };
diff --git a/x-pack/test/fleet_api_integration/apis/epm/bulk_install.ts b/x-pack/test/fleet_api_integration/apis/epm/bulk_install.ts
new file mode 100644
index 0000000000000..7b483c06e36b5
--- /dev/null
+++ b/x-pack/test/fleet_api_integration/apis/epm/bulk_install.ts
@@ -0,0 +1,68 @@
+/*
+ * 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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
+import { skipIfNoDockerRegistry } from '../../helpers';
+import { setupFleetAndAgents } from '../agents/services';
+
+export default function (providerContext: FtrProviderContext) {
+  const { getService } = providerContext;
+  const supertest = getService('supertest');
+
+  const pkgName = 'multiple_versions';
+  const pkgOlderVersion = '0.1.0';
+  const pkgLatestVersion = '0.3.0';
+
+  const uninstallPackage = async (name: string, version: string) => {
+    await supertest.delete(`/api/fleet/epm/packages/${name}/${version}`).set('kbn-xsrf', 'xxxx');
+  };
+
+  describe('bulk package install api', async () => {
+    skipIfNoDockerRegistry(providerContext);
+    setupFleetAndAgents(providerContext);
+
+    it('should install the latest version by default', async () => {
+      const response = await supertest
+        .post(`/api/fleet/epm/packages/_bulk?prerelease=true`)
+        .set('kbn-xsrf', 'xxxx')
+        .send({ packages: [pkgName] })
+        .expect(200);
+
+      expect(response.body.items.length).equal(1);
+      expect(response.body.items[0].version).equal(pkgLatestVersion);
+
+      await uninstallPackage(pkgName, pkgLatestVersion);
+    });
+
+    it('should install an older version if force is true', async () => {
+      const response = await supertest
+        .post(`/api/fleet/epm/packages/_bulk?prerelease=true`)
+        .set('kbn-xsrf', 'xxxx')
+        .send({ packages: [{ name: pkgName, version: pkgOlderVersion }], force: true })
+        .expect(200);
+
+      expect(response.body.items.length).equal(1);
+      expect(response.body.items[0].version).equal(pkgOlderVersion);
+
+      await uninstallPackage(pkgName, pkgOlderVersion);
+    });
+
+    it('should reject installing an older version if force is false', async () => {
+      const response = await supertest
+        .post(`/api/fleet/epm/packages/_bulk?prerelease=true`)
+        .set('kbn-xsrf', 'xxxx')
+        .send({ packages: [{ name: pkgName, version: pkgOlderVersion }] })
+        .expect(200);
+
+      expect(response.body.response[0].statusCode).equal(400);
+      expect(response.body.response[0].error).equal(
+        'multiple_versions-0.1.0 is out-of-date and cannot be installed or updated'
+      );
+    });
+  });
+}

From 3ccf4993e04b1e528a96d396dfa45138a17eca84 Mon Sep 17 00:00:00 2001
From: Achyut Jhunjhunwala <achyut.jhunjhunwala@elastic.co>
Date: Tue, 2 May 2023 17:19:37 +0200
Subject: [PATCH 10/33] Add dev docs for other bucket generation (#156335)

## Summary

This PR adds dev docs for generating `_other` bucket running APM Server
locally
---
 .../apm/dev_docs/overflow_bucket_setup.md     | 103 ++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 x-pack/plugins/apm/dev_docs/overflow_bucket_setup.md

diff --git a/x-pack/plugins/apm/dev_docs/overflow_bucket_setup.md b/x-pack/plugins/apm/dev_docs/overflow_bucket_setup.md
new file mode 100644
index 0000000000000..46d9f4c6df72a
--- /dev/null
+++ b/x-pack/plugins/apm/dev_docs/overflow_bucket_setup.md
@@ -0,0 +1,103 @@
+## Summary
+
+8.7 introduced Overflow Buckets for Metrics. The below setup would enable generating the overflow buckets for the metrics indices.
+
+### Pre-requisites
+
+- Install golang and set go path properly
+
+- Run Elasticsearch locally
+  ```
+  yarn es snapshot
+  ```
+- Run Kibana locally
+  ```
+  yarn start
+  ```
+- Git Clone APM Server locally
+  ```
+  git clone git@github.com:[USER]/apm-server.git
+  ```
+- Modify `apm-server.yml` accordingly
+  ```
+  ## Add this to the bottom of the file
+  apm-server.aggregation:
+  service_transactions:
+    max_groups: 2
+  transactions:
+    max_groups: 2
+  
+  ## Uncomment the following lines under `output.elasticsearch:`
+  username: "elastic"
+  password: "changeme"
+  protocol: "http" // This is by default set to HTTPS, change it to http
+  ```
+- Run APM Server locally
+  ```
+  ./apm-server -c apm-server.yml -e -d "*"
+  ```
+  
+### Steps to generate data
+
+- Copy paste the below script in a file called `tx_max_group.go`
+  This file is responsible for generating 3 transactions per service.
+  ```
+  package main
+
+  import (
+    "fmt"
+    "time"
+    "go.elastic.co/apm/v2"
+  )
+  
+  func main() {
+    tracer := apm.DefaultTracer()
+    once(tracer, "test1")
+    once(tracer, "test2")
+    once(tracer, "test3")
+    tracer.Flush(nil)
+  }
+  
+  func once(tracer *apm.Tracer, name string) {
+    tx := tracer.StartTransaction(name, "type")
+    defer tx.End()
+  
+    span := tx.StartSpanOptions(name, "type", apm.SpanOptions{})
+    time.Sleep(time.Millisecond * 1)
+  
+    span.Outcome = "success"
+    span.Context.SetDestinationService(apm.DestinationServiceSpanContext{
+      Resource: fmt.Sprintf("dest_resource"),
+    })
+    span.End()
+  }
+  ```
+  
+- Now create a Bash Script file, name it anything - e.g., `service_max_group.sh`
+  This file will generate services and then transactions for each service using the go script above.
+  ```
+  #!/usr/bin/env bash
+
+  echo "Starting script"
+  
+  go build -o tx_max_group tx_max_group.go || exit 1
+  
+  for i in {1..10100}
+  do
+  export ELASTIC_APM_SERVICE_NAME="service-$i"
+  ./tx_max_group
+  done
+  
+  echo "Ending script"
+  ```
+
+- Run `sh service_max_group` to generate the data
+
+This would start generating events to APM Server. Now open Service Inventory Page on Kibana to observe the `_other` bucket.
+
+## Known Issues
+
+- APM Server is unable to use Fleet API to generate APM Indices. Due to this, when starting the APM Server, you will see errors like unable to find Metrics Indices. To fix this, run one of the Synthtrace Scenario files which would create the required indices.
+  ```
+  node scripts/synthtrace mobile.ts --clean
+  ```
\ No newline at end of file

From eba1001c64f1084293f6c18d8aa6e7aaff1c568d Mon Sep 17 00:00:00 2001
From: Jatin Kathuria <jatin.kathuria@elastic.co>
Date: Tue, 2 May 2023 17:22:26 +0200
Subject: [PATCH 11/33] [Security Solution] [Fix] Alert Table re-render +
 column width reset + TopN Not rendering (#155478)

## Summary

This PR handles :
-  Column width is reset when alert table re-renders #154796
- [Response Ops] Triggers Actions Alert table un-mounts / remounts
complete row when clicking on checkbox. #155229
- [Security Solution] TopN does not work on Alert Table in Event
Rendered View #155152


|Before | After |
|---|---|
| <video
src="https://user-images.githubusercontent.com/7485038/233974827-548c7e61-0737-436c-8384-0faa923ab5d7.mov"
/> | <video
src="https://user-images.githubusercontent.com/7485038/234316670-4cd318bd-8fde-45ed-999d-a6a78bbf0432.mov"
/>

 |
---
 ...use_data_grid_column_cell_actions.test.tsx |   28 +
 .../use_data_grid_column_cell_actions.tsx     |   16 +-
 .../common/components/cell_actions/mocks.ts   |   20 +
 .../components/alerts_table/index.tsx         |   38 +-
 .../trigger_actions_alert_table/mock/data.ts  | 1696 +++++++++++++++++
 .../use_cell_actions.test.tsx                 |  148 ++
 .../sections/alerts_table/alerts_table.tsx    |    8 +-
 .../alerts_table/alerts_table_state.tsx       |   16 +-
 .../hooks/use_columns/use_columns.ts          |    6 +-
 9 files changed, 1942 insertions(+), 34 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/public/common/components/cell_actions/mocks.ts
 create mode 100644 x-pack/plugins/security_solution/public/detections/hooks/trigger_actions_alert_table/mock/data.ts
 create mode 100644 x-pack/plugins/security_solution/public/detections/hooks/trigger_actions_alert_table/use_cell_actions.test.tsx

diff --git a/packages/kbn-cell-actions/src/hooks/use_data_grid_column_cell_actions.test.tsx b/packages/kbn-cell-actions/src/hooks/use_data_grid_column_cell_actions.test.tsx
index 7cb321a6a3f67..0ffc68615c0b5 100644
--- a/packages/kbn-cell-actions/src/hooks/use_data_grid_column_cell_actions.test.tsx
+++ b/packages/kbn-cell-actions/src/hooks/use_data_grid_column_cell_actions.test.tsx
@@ -191,4 +191,32 @@ describe('useDataGridColumnsCellActions', () => {
       expect(mockCloseCellPopover).toHaveBeenCalled();
     });
   });
+
+  it('should return empty array of actions when list of fields is empty', async () => {
+    const { result, waitForNextUpdate } = renderHook(useDataGridColumnsCellActions, {
+      initialProps: {
+        ...useDataGridColumnsCellActionsProps,
+        fields: [],
+      },
+    });
+
+    await waitForNextUpdate();
+
+    expect(result.current).toBeInstanceOf(Array);
+    expect(result.current.length).toBe(0);
+  });
+
+  it('should return empty array of actions when list of fields is undefined', async () => {
+    const { result, waitForNextUpdate } = renderHook(useDataGridColumnsCellActions, {
+      initialProps: {
+        ...useDataGridColumnsCellActionsProps,
+        fields: undefined,
+      },
+    });
+
+    await waitForNextUpdate();
+
+    expect(result.current).toBeInstanceOf(Array);
+    expect(result.current.length).toBe(0);
+  });
 });
diff --git a/packages/kbn-cell-actions/src/hooks/use_data_grid_column_cell_actions.tsx b/packages/kbn-cell-actions/src/hooks/use_data_grid_column_cell_actions.tsx
index 344e4a058ad44..2913004218032 100644
--- a/packages/kbn-cell-actions/src/hooks/use_data_grid_column_cell_actions.tsx
+++ b/packages/kbn-cell-actions/src/hooks/use_data_grid_column_cell_actions.tsx
@@ -30,7 +30,7 @@ interface BulkField extends Pick<CellActionField, 'name' | 'type'> {
 
 export interface UseDataGridColumnsCellActionsProps
   extends Pick<CellActionsProps, 'triggerId' | 'metadata' | 'disabledActionTypes'> {
-  fields: BulkField[];
+  fields?: BulkField[];
   dataGridRef: MutableRefObject<EuiDataGridRefProps | null>;
 }
 export type UseDataGridColumnsCellActions<
@@ -46,11 +46,11 @@ export const useDataGridColumnsCellActions: UseDataGridColumnsCellActions = ({
 }) => {
   const bulkContexts: CellActionCompatibilityContext[] = useMemo(
     () =>
-      fields.map(({ values, ...field }) => ({
+      fields?.map(({ values, ...field }) => ({
         field, // we are getting the actions for the whole column field, so the compatibility check will be done without the value
         trigger: { id: triggerId },
         metadata,
-      })),
+      })) ?? [],
     [fields, triggerId, metadata]
   );
 
@@ -60,11 +60,13 @@ export const useDataGridColumnsCellActions: UseDataGridColumnsCellActions = ({
 
   const columnsCellActions = useMemo<EuiDataGridColumnCellAction[][]>(() => {
     if (loading) {
-      return fields.map(() => [
-        () => <EuiLoadingSpinner size="s" data-test-subj="dataGridColumnCellAction-loading" />,
-      ]);
+      return (
+        fields?.map(() => [
+          () => <EuiLoadingSpinner size="s" data-test-subj="dataGridColumnCellAction-loading" />,
+        ]) ?? []
+      );
     }
-    if (!columnsActions) {
+    if (!columnsActions || !fields || fields.length === 0) {
       return [];
     }
     return columnsActions.map((actions, columnIndex) =>
diff --git a/x-pack/plugins/security_solution/public/common/components/cell_actions/mocks.ts b/x-pack/plugins/security_solution/public/common/components/cell_actions/mocks.ts
new file mode 100644
index 0000000000000..bf9bd77e6b261
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/cell_actions/mocks.ts
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+
+export const makeAction = (actionsName: string, icon: string = 'icon', order?: number) => ({
+  id: actionsName,
+  type: actionsName,
+  order,
+  getIconType: () => icon,
+  getDisplayName: () => actionsName,
+  getDisplayNameTooltip: () => actionsName,
+  isCompatible: () => Promise.resolve(true),
+  execute: () => {
+    alert(actionsName);
+    return Promise.resolve();
+  },
+});
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
index eb8435d7578be..aedb45acdf3ef 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
@@ -15,12 +15,11 @@ import type { AlertsTableStateProps } from '@kbn/triggers-actions-ui-plugin/publ
 import type { Alert } from '@kbn/triggers-actions-ui-plugin/public/types';
 import { ALERT_BUILDING_BLOCK_TYPE } from '@kbn/rule-data-utils';
 import styled from 'styled-components';
-import { useDispatch, useSelector } from 'react-redux';
+import { useDispatch } from 'react-redux';
 import { getEsQueryConfig } from '@kbn/data-plugin/public';
 import {
   dataTableActions,
   dataTableSelectors,
-  getColumnHeaders,
   tableDefaults,
   TableId,
 } from '@kbn/securitysolution-data-table';
@@ -42,12 +41,13 @@ import { getDataTablesInStorageByIds } from '../../../timelines/containers/local
 import { useSourcererDataView } from '../../../common/containers/sourcerer';
 import { SourcererScopeName } from '../../../common/store/sourcerer/model';
 import { useKibana } from '../../../common/lib/kibana';
-import { useShallowEqualSelector } from '../../../common/hooks/use_selector';
+import { useDeepEqualSelector, useShallowEqualSelector } from '../../../common/hooks/use_selector';
 import { getColumns } from '../../configurations/security_solution_detections';
 import { buildTimeRangeFilter } from './helpers';
 import { eventsViewerSelector } from '../../../common/components/events_viewer/selectors';
 import type { State } from '../../../common/store';
 import * as i18n from './translations';
+import { eventRenderedViewColumns } from '../../configurations/security_solution_detections/columns';
 
 const { updateIsLoading, updateTotalCount } = dataTableActions;
 
@@ -96,6 +96,7 @@ interface DetectionEngineAlertTableProps {
   isLoading?: boolean;
   onRuleChange?: () => void;
 }
+
 export const AlertsTableComponent: FC<DetectionEngineAlertTableProps> = ({
   configId,
   flyoutSize,
@@ -124,9 +125,13 @@ export const AlertsTableComponent: FC<DetectionEngineAlertTableProps> = ({
   const { browserFields, indexPattern: indexPatterns } = useSourcererDataView(sourcererScope);
   const license = useLicense();
 
-  const getGlobalInputs = inputsSelectors.globalSelector();
-  const globalInputs = useSelector((state: State) => getGlobalInputs(state));
-  const { query: globalQuery, filters: globalFilters } = globalInputs;
+  const getGlobalFiltersQuerySelector = useMemo(
+    () => inputsSelectors.globalFiltersQuerySelector(),
+    []
+  );
+  const getGlobalQuerySelector = useMemo(() => inputsSelectors.globalQuerySelector(), []);
+  const globalQuery = useDeepEqualSelector(getGlobalQuerySelector);
+  const globalFilters = useDeepEqualSelector(getGlobalFiltersQuerySelector);
 
   const getTable = useMemo(() => dataTableSelectors.getTableByIdSelector(), []);
 
@@ -173,11 +178,11 @@ export const AlertsTableComponent: FC<DetectionEngineAlertTableProps> = ({
   });
 
   const finalBoolQuery: AlertsTableStateProps['query'] = useMemo(() => {
-    if (!combinedQuery || combinedQuery.kqlError || !combinedQuery.filterQuery) {
+    if (combinedQuery?.kqlError || !combinedQuery?.filterQuery) {
       return { bool: {} };
     }
-    return { bool: { filter: JSON.parse(combinedQuery.filterQuery) } };
-  }, [combinedQuery]);
+    return { bool: { filter: JSON.parse(combinedQuery?.filterQuery) } };
+  }, [combinedQuery?.filterQuery, combinedQuery?.kqlError]);
 
   const isEventRenderedView = tableView === VIEW_SELECTION.eventRenderedView;
 
@@ -205,21 +210,16 @@ export const AlertsTableComponent: FC<DetectionEngineAlertTableProps> = ({
   const columnsFormStorage = dataTableStorage?.[TableId.alertsOnAlertsPage]?.columns ?? [];
   const alertColumns = columnsFormStorage.length ? columnsFormStorage : getColumns(license);
 
-  const evenRenderedColumns = useMemo(
-    () => getColumnHeaders(alertColumns, browserFields, true),
-    [alertColumns, browserFields]
-  );
-
-  const finalColumns = useMemo(
-    () => (isEventRenderedView ? evenRenderedColumns : alertColumns),
-    [evenRenderedColumns, alertColumns, isEventRenderedView]
-  );
-
   const finalBrowserFields = useMemo(
     () => (isEventRenderedView ? {} : browserFields),
     [isEventRenderedView, browserFields]
   );
 
+  const finalColumns = useMemo(
+    () => (isEventRenderedView ? eventRenderedViewColumns : alertColumns),
+    [alertColumns, isEventRenderedView]
+  );
+
   const onAlertTableUpdate: AlertsTableStateProps['onUpdate'] = useCallback(
     ({ isLoading: isAlertTableLoading, totalCount, refresh }) => {
       dispatch(
diff --git a/x-pack/plugins/security_solution/public/detections/hooks/trigger_actions_alert_table/mock/data.ts b/x-pack/plugins/security_solution/public/detections/hooks/trigger_actions_alert_table/mock/data.ts
new file mode 100644
index 0000000000000..45637d28cd9ae
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/detections/hooks/trigger_actions_alert_table/mock/data.ts
@@ -0,0 +1,1696 @@
+/*
+ * 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.
+ */
+
+export const browserFields = {
+  host: {
+    fields: {
+      'host.name': {
+        category: 'host',
+        description:
+          'Name of the host. It can contain what `hostname` returns on Unix systems, the fully qualified domain name, or a name specified by the user. The sender decides which value to use.',
+        name: 'host.name',
+        type: 'string',
+        searchable: true,
+        aggregatable: true,
+        format: 'string',
+        indexes: [
+          'apm-*-transaction*',
+          'traces-apm*',
+          'auditbeat-*',
+          'endgame-*',
+          'filebeat-*',
+          'logs-*',
+          'packetbeat-*',
+          'winlogbeat-*',
+        ],
+      },
+    },
+  },
+};
+
+export const columns = [
+  {
+    columnHeaderType: 'not-filtered',
+    displayAsText: 'Host Name',
+    id: 'host.name',
+    initialWidth: 30,
+  },
+];
+
+export const data = [
+  [
+    {
+      field: 'kibana.alert.rule.updated_by',
+      value: ['elastic'],
+    },
+    {
+      field: 'host.os.name.text',
+      value: ['Debian GNU/Linux'],
+    },
+    {
+      field: 'host.hostname',
+      value: ['bastion00'],
+    },
+    {
+      field: 'host.mac',
+      value: ['42-01-0A-C8-00-2E'],
+    },
+    {
+      field: 'service.type',
+      value: ['system'],
+    },
+    {
+      field: 'signal.rule.enabled',
+      value: ['true'],
+    },
+    {
+      field: 'host.os.version',
+      value: ['10 (buster)'],
+    },
+    {
+      field: 'signal.rule.max_signals',
+      value: [100],
+    },
+    {
+      field: 'source.geo.region_name',
+      value: ['Iowa'],
+    },
+    {
+      field: 'signal.rule.updated_at',
+      value: ['2023-04-25T09:03:13.384Z'],
+    },
+    {
+      field: 'kibana.alert.risk_score',
+      value: [21],
+    },
+    {
+      field: 'source.geo.city_name',
+      value: ['Council Bluffs'],
+    },
+    {
+      field: 'host.os.type',
+      value: ['linux'],
+    },
+    {
+      field: 'signal.original_event.end',
+      value: ['2022-10-14T14:00:24.296Z'],
+    },
+    {
+      field: 'kibana.alert.original_event.module',
+      value: ['system'],
+    },
+    {
+      field: 'kibana.alert.rule.interval',
+      value: ['5m'],
+    },
+    {
+      field: 'kibana.alert.rule.type',
+      value: ['query'],
+    },
+    {
+      field: 'agent.hostname',
+      value: ['bastion00.siem.estc.dev'],
+    },
+    {
+      field: 'kibana.alert.original_event.end',
+      value: ['2022-10-14T14:00:24.296Z'],
+    },
+    {
+      field: 'kibana.alert.rule.immutable',
+      value: ['false'],
+    },
+    {
+      field: 'source.port',
+      value: [56296],
+    },
+    {
+      field: 'client.port',
+      value: [56296],
+    },
+    {
+      field: 'host.containerized',
+      value: [false],
+    },
+    {
+      field: 'destination.bytes',
+      value: [6564],
+    },
+    {
+      field: 'kibana.alert.rule.version',
+      value: ['1'],
+    },
+    {
+      field: 'source.as.number',
+      value: [396982],
+    },
+    {
+      field: 'event.end',
+      value: ['2022-10-14T14:00:24.296Z'],
+    },
+    {
+      field: 'process.entity_id',
+      value: ['rR78V6MnxUY7Go9O'],
+    },
+    {
+      field: 'host.ip',
+      value: ['10.200.0.46', 'fe80::4001:aff:fec8:2e'],
+    },
+    {
+      field: 'agent.type',
+      value: ['auditbeat'],
+    },
+    {
+      field: 'signal.original_event.category',
+      value: ['network'],
+    },
+    {
+      field: 'process.executable.text',
+      value: ['/usr/local/bin/traefik'],
+    },
+    {
+      field: 'related.ip',
+      value: ['10.200.0.46', '35.226.77.71'],
+    },
+    {
+      field: 'server.port',
+      value: [9200],
+    },
+    {
+      field: 'host.id',
+      value: ['a415f7ec8a9af33894317958f24e185f'],
+    },
+    {
+      field: 'timestamp',
+      value: [1666873459714],
+    },
+    {
+      field: 'signal.rule.building_block_type',
+      value: ['default'],
+    },
+    {
+      field: 'kibana.alert.rule.indices',
+      value: [
+        'apm-*-transaction*',
+        'auditbeat-*',
+        'endgame-*',
+        'filebeat-*',
+        'logs-*',
+        'packetbeat-*',
+        'traces-apm*',
+        'winlogbeat-*',
+        '-*elastic-cloud-logs-*',
+      ],
+    },
+    {
+      field: 'signal.rule.updated_by',
+      value: ['elastic'],
+    },
+    {
+      field: 'cloud.account.id',
+      value: ['elastic-siem'],
+    },
+    {
+      field: 'host.os.platform',
+      value: ['debian'],
+    },
+    {
+      field: 'kibana.alert.rule.severity',
+      value: ['low'],
+    },
+    {
+      field: 'signal.original_event.duration',
+      value: ['647874250'],
+    },
+    {
+      field: 'kibana.version',
+      value: ['8.8.0'],
+    },
+    {
+      field: 'signal.ancestors.type',
+      value: ['event', 'signal'],
+    },
+    {
+      field: 'cloud.instance.name',
+      value: ['bastion00'],
+    },
+    {
+      field: 'user.name.text',
+      value: ['traefik'],
+    },
+    {
+      field: 'kibana.alert.ancestors.id',
+      value: [
+        '4z_L1oMBiIcG4Y9J2nxd',
+        '75e2a3903daac549c05eb3aebe90b3ef6d1921b74c4870ee518643a46f778a31',
+      ],
+    },
+    {
+      field: 'kibana.alert.rule.building_block_type',
+      value: ['default'],
+    },
+    {
+      field: 'process.name.text',
+      value: ['traefik'],
+    },
+    {
+      field: 'kibana.alert.rule.description',
+      value: ['Custom Rule'],
+    },
+    {
+      field: 'kibana.alert.rule.producer',
+      value: ['siem'],
+    },
+    {
+      field: 'kibana.alert.rule.to',
+      value: ['now'],
+    },
+    {
+      field: 'signal.rule.id',
+      value: ['023a0260-e348-11ed-bd43-632e972150d6'],
+    },
+    {
+      field: 'system.audit.socket.uid',
+      value: [1018],
+    },
+    {
+      field: 'signal.rule.risk_score',
+      value: [21],
+    },
+    {
+      field: 'signal.reason',
+      value: [
+        'network event with process traefik, source 35.226.77.71:56296, destination 10.200.0.46:9200, by traefik on bastion00.siem.estc.dev created low alert Custom Rule.',
+      ],
+    },
+    {
+      field: 'process.created',
+      value: ['2022-01-31T13:14:05.210Z'],
+    },
+    {
+      field: 'user.risk.calculated_score_norm',
+      value: [31.238997],
+    },
+    {
+      field: 'host.os.name',
+      value: ['Debian GNU/Linux'],
+    },
+    {
+      field: 'signal.status',
+      value: ['open'],
+    },
+    {
+      field: 'client.as.organization.name.text',
+      value: ['GOOGLE-CLOUD-PLATFORM'],
+    },
+    {
+      field: 'flow.final',
+      value: [true],
+    },
+    {
+      field: 'kibana.alert.rule.uuid',
+      value: ['023a0260-e348-11ed-bd43-632e972150d6'],
+    },
+    {
+      field: 'kibana.alert.original_event.category',
+      value: ['network'],
+    },
+    {
+      field: 'client.ip',
+      value: ['35.226.77.71'],
+    },
+    {
+      field: 'process.name',
+      value: ['traefik'],
+    },
+    {
+      field: 'client.as.number',
+      value: [396982],
+    },
+    {
+      field: 'kibana.alert.ancestors.index',
+      value: ['.ds-auditbeat-8.5.0-2022.10.03-000001', 'auditbeat-bulk'],
+    },
+    {
+      field: 'agent.version',
+      value: ['8.5.0'],
+    },
+    {
+      field: 'host.os.family',
+      value: ['debian'],
+    },
+    {
+      field: 'kibana.alert.rule.from',
+      value: ['now-6000000300s'],
+    },
+    {
+      field: 'kibana.alert.rule.parameters',
+      value: [
+        {
+          description: 'Custom Rule',
+          risk_score: 21,
+          severity: 'low',
+          building_block_type: 'default',
+          license: '',
+          meta: {
+            from: '100000000m',
+            kibana_siem_app_url: 'http://localhost:5601/app/security',
+          },
+          author: [],
+          false_positives: [],
+          from: 'now-6000000300s',
+          rule_id: 'caf0db0c-c7e2-455e-89b8-6b0d73619ae5',
+          max_signals: 100,
+          risk_score_mapping: [],
+          severity_mapping: [],
+          threat: [],
+          to: 'now',
+          references: [],
+          version: 1,
+          exceptions_list: [],
+          immutable: false,
+          related_integrations: [],
+          required_fields: [],
+          setup: '',
+          type: 'query',
+          language: 'kuery',
+          index: [
+            'apm-*-transaction*',
+            'auditbeat-*',
+            'endgame-*',
+            'filebeat-*',
+            'logs-*',
+            'packetbeat-*',
+            'traces-apm*',
+            'winlogbeat-*',
+            '-*elastic-cloud-logs-*',
+          ],
+          query: '*',
+          filters: [],
+        },
+      ],
+    },
+    {
+      field: 'signal.original_event.kind',
+      value: ['signal'],
+    },
+    {
+      field: 'client.packets',
+      value: [10],
+    },
+    {
+      field: 'group.id',
+      value: ['1019'],
+    },
+    {
+      field: 'signal.depth',
+      value: [2],
+    },
+    {
+      field: 'kibana.alert.original_event.start',
+      value: ['2022-10-14T14:00:23.649Z'],
+    },
+    {
+      field: 'signal.rule.immutable',
+      value: ['false'],
+    },
+    {
+      field: 'signal.rule.name',
+      value: ['Custom Rule'],
+    },
+    {
+      field: 'event.module',
+      value: ['system'],
+    },
+    {
+      field: 'host.os.kernel',
+      value: ['4.19.0-17-cloud-amd64'],
+    },
+    {
+      field: 'kibana.alert.rule.license',
+      value: [''],
+    },
+    {
+      field: 'kibana.alert.original_event.kind',
+      value: ['signal'],
+    },
+    {
+      field: 'network.type',
+      value: ['ipv4'],
+    },
+    {
+      field: 'source.as.organization.name.text',
+      value: ['GOOGLE-CLOUD-PLATFORM'],
+    },
+    {
+      field: 'signal.rule.description',
+      value: ['Custom Rule'],
+    },
+    {
+      field: 'source.geo.continent_name',
+      value: ['North America'],
+    },
+    {
+      field: 'source.as.organization.name',
+      value: ['GOOGLE-CLOUD-PLATFORM'],
+    },
+    {
+      field: 'process.args',
+      value: ['/usr/local/bin/traefik', '--configfile=/etc/traefik/traefik.yml'],
+    },
+    {
+      field: 'client.bytes',
+      value: [1495],
+    },
+    {
+      field: 'kibana.space_ids',
+      value: ['default'],
+    },
+    {
+      field: 'flow.complete',
+      value: [true],
+    },
+    {
+      field: 'kibana.alert.severity',
+      value: ['low'],
+    },
+    {
+      field: 'signal.ancestors.depth',
+      value: [0, 1],
+    },
+    {
+      field: 'event.category',
+      value: ['network'],
+    },
+    {
+      field: 'host.risk.calculated_score_norm',
+      value: [17.08461],
+    },
+    {
+      field: 'client.geo.country_iso_code',
+      value: ['US'],
+    },
+    {
+      field: 'kibana.alert.ancestors.depth',
+      value: [0, 1],
+    },
+    {
+      field: 'source.ip',
+      value: ['35.226.77.71'],
+    },
+    {
+      field: 'agent.name',
+      value: ['bastion00.siem.estc.dev'],
+    },
+    {
+      field: 'network.community_id',
+      value: ['1:IjFQUo1K34NyjD8pxAitVL9mqdw='],
+    },
+    {
+      field: 'system.audit.socket.euid',
+      value: [1018],
+    },
+    {
+      field: 'group.name',
+      value: ['traefik'],
+    },
+    {
+      field: 'source.packets',
+      value: [10],
+    },
+    {
+      field: 'user.id',
+      value: ['1018'],
+    },
+    {
+      field: 'system.audit.socket.gid',
+      value: [1019],
+    },
+    {
+      field: 'related.user',
+      value: ['traefik'],
+    },
+    {
+      field: 'host.architecture',
+      value: ['x86_64'],
+    },
+    {
+      field: 'kibana.alert.start',
+      value: ['2023-04-25T09:03:15.535Z'],
+    },
+    {
+      field: 'cloud.provider',
+      value: ['gcp'],
+    },
+    {
+      field: 'cloud.machine.type',
+      value: ['e2-small'],
+    },
+    {
+      field: 'kibana.alert.original_event.type',
+      value: ['info', 'connection'],
+    },
+    {
+      field: 'signal.original_event.module',
+      value: ['system'],
+    },
+    {
+      field: 'agent.id',
+      value: ['bb1e5c8f-10ba-48b0-bee1-da60886ba59c'],
+    },
+    {
+      field: 'signal.rule.from',
+      value: ['now-6000000300s'],
+    },
+    {
+      field: 'kibana.alert.rule.enabled',
+      value: ['true'],
+    },
+    {
+      field: 'signal.original_event.start',
+      value: ['2022-10-14T14:00:23.649Z'],
+    },
+    {
+      field: 'event.start',
+      value: ['2022-10-14T14:00:23.649Z'],
+    },
+    {
+      field: 'kibana.alert.ancestors.type',
+      value: ['event', 'signal'],
+    },
+    {
+      field: 'destination.port',
+      value: [9200],
+    },
+    {
+      field: 'user.name',
+      value: ['traefik'],
+    },
+    {
+      field: 'signal.ancestors.index',
+      value: ['.ds-auditbeat-8.5.0-2022.10.03-000001', 'auditbeat-bulk'],
+    },
+    {
+      field: 'destination.packets',
+      value: [9],
+    },
+    {
+      field: 'kibana.alert.original_event.duration',
+      value: ['647874250'],
+    },
+    {
+      field: 'cloud.instance.id',
+      value: ['2730026390719231438'],
+    },
+    {
+      field: 'client.geo.region_name',
+      value: ['Iowa'],
+    },
+    {
+      field: 'signal.original_event.type',
+      value: ['info', 'connection'],
+    },
+    {
+      field: 'kibana.alert.rule.max_signals',
+      value: [100],
+    },
+    {
+      field: 'kibana.alert.rule.risk_score',
+      value: [21],
+    },
+    {
+      field: 'host.os.codename',
+      value: ['buster'],
+    },
+    {
+      field: 'signal.original_event.dataset',
+      value: ['socket'],
+    },
+    {
+      field: 'kibana.alert.rule.consumer',
+      value: ['siem'],
+    },
+    {
+      field: 'destination.ip',
+      value: ['10.200.0.46'],
+    },
+    {
+      field: 'kibana.alert.rule.category',
+      value: ['Custom Query Rule'],
+    },
+    {
+      field: 'event.duration',
+      value: [647874250],
+    },
+    {
+      field: 'event.action',
+      value: ['exec'],
+    },
+    {
+      field: '@timestamp',
+      value: ['2023-04-25T09:03:15.516Z'],
+    },
+    {
+      field: 'kibana.alert.original_event.action',
+      value: ['exec'],
+    },
+    {
+      field: 'host.risk.calculated_level',
+      value: ['Unknown'],
+    },
+    {
+      field: 'agent.ephemeral_id',
+      value: ['71eae441-3269-4828-9496-99a6fd42cb91'],
+    },
+    {
+      field: 'kibana.alert.rule.execution.uuid',
+      value: ['3e763264-9eab-4c6b-98e8-d51367491275'],
+    },
+    {
+      field: 'kibana.alert.uuid',
+      value: ['7d3194c7158fb9edb10541ccdd81f8c2b9c9d3c50b82c14457c959a2fcbcb22a'],
+    },
+    {
+      field: 'kibana.alert.rule.meta.kibana_siem_app_url',
+      value: ['http://localhost:5601/app/security'],
+    },
+    {
+      field: 'signal.rule.license',
+      value: [''],
+    },
+    {
+      field: 'kibana.alert.rule.rule_id',
+      value: ['caf0db0c-c7e2-455e-89b8-6b0d73619ae5'],
+    },
+    {
+      field: 'kibana.alert.ancestors.rule',
+      value: ['532e0020-4a0c-11ed-9aa3-574e520c127d'],
+    },
+    {
+      field: 'cloud.project.id',
+      value: ['elastic-siem'],
+    },
+    {
+      field: 'signal.rule.type',
+      value: ['query'],
+    },
+    {
+      field: 'server.ip',
+      value: ['10.200.0.46'],
+    },
+    {
+      field: 'user.risk.calculated_level',
+      value: ['Low'],
+    },
+    {
+      field: 'kibana.alert.url',
+      value: [
+        'http://localhost:5601/app/security/alerts/redirect/7d3194c7158fb9edb10541ccdd81f8c2b9c9d3c50b82c14457c959a2fcbcb22a?index=.alerts-security.alerts-default&timestamp=2023-04-25T09:03:15.516Z',
+      ],
+    },
+    {
+      field: 'kibana.alert.building_block_type',
+      value: ['default'],
+    },
+    {
+      field: 'process.pid',
+      value: [31349],
+    },
+    {
+      field: 'system.audit.socket.egid',
+      value: [1019],
+    },
+    {
+      field: 'signal.rule.interval',
+      value: ['5m'],
+    },
+    {
+      field: 'cloud.availability_zone',
+      value: ['us-central1-c'],
+    },
+    {
+      field: 'signal.rule.created_by',
+      value: ['elastic'],
+    },
+    {
+      field: 'kibana.alert.rule.created_by',
+      value: ['elastic'],
+    },
+    {
+      field: 'system.audit.socket.kernel_sock_address',
+      value: ['0xffff97d5d9608900'],
+    },
+    {
+      field: 'kibana.alert.rule.name',
+      value: ['Custom Rule'],
+    },
+    {
+      field: 'client.as.organization.name',
+      value: ['GOOGLE-CLOUD-PLATFORM'],
+    },
+    {
+      field: 'host.name',
+      value: ['bastion00.siem.estc.dev'],
+    },
+    {
+      field: 'client.geo.country_name',
+      value: ['United States'],
+    },
+    {
+      field: 'source.geo.region_iso_code',
+      value: ['US-IA'],
+    },
+    {
+      field: 'event.kind',
+      value: ['signal'],
+    },
+    {
+      field: 'signal.rule.created_at',
+      value: ['2023-04-25T09:03:13.384Z'],
+    },
+    {
+      field: 'kibana.alert.workflow_status',
+      value: ['open'],
+    },
+    {
+      field: 'network.packets',
+      value: [19],
+    },
+    {
+      field: 'kibana.alert.reason',
+      value: [
+        'network event with process traefik, source 35.226.77.71:56296, destination 10.200.0.46:9200, by traefik on bastion00.siem.estc.dev created low alert Custom Rule.',
+      ],
+    },
+    {
+      field: 'signal.ancestors.id',
+      value: [
+        '4z_L1oMBiIcG4Y9J2nxd',
+        '75e2a3903daac549c05eb3aebe90b3ef6d1921b74c4870ee518643a46f778a31',
+      ],
+    },
+    {
+      field: 'signal.original_time',
+      value: ['2022-10-27T12:24:19.714Z'],
+    },
+    {
+      field: 'cloud.service.name',
+      value: ['GCE'],
+    },
+    {
+      field: 'ecs.version',
+      value: ['8.0.0'],
+    },
+    {
+      field: 'signal.rule.severity',
+      value: ['low'],
+    },
+    {
+      field: 'kibana.alert.depth',
+      value: [2],
+    },
+    {
+      field: 'kibana.alert.rule.revision',
+      value: [0],
+    },
+    {
+      field: 'signal.rule.version',
+      value: ['1'],
+    },
+    {
+      field: 'client.geo.continent_name',
+      value: ['North America'],
+    },
+    {
+      field: 'server.bytes',
+      value: [6564],
+    },
+    {
+      field: 'kibana.alert.status',
+      value: ['active'],
+    },
+    {
+      field: 'kibana.alert.last_detected',
+      value: ['2023-04-25T09:03:15.535Z'],
+    },
+    {
+      field: 'kibana.alert.original_event.dataset',
+      value: ['socket'],
+    },
+    {
+      field: 'kibana.alert.rule.rule_type_id',
+      value: ['siem.queryRule'],
+    },
+    {
+      field: 'signal.rule.rule_id',
+      value: ['caf0db0c-c7e2-455e-89b8-6b0d73619ae5'],
+    },
+    {
+      field: 'source.geo.country_iso_code',
+      value: ['US'],
+    },
+    {
+      field: 'network.bytes',
+      value: [8059],
+    },
+    {
+      field: 'network.direction',
+      value: ['ingress'],
+    },
+    {
+      field: 'process.executable',
+      value: ['/usr/local/bin/traefik'],
+    },
+    {
+      field: 'source.bytes',
+      value: [1495],
+    },
+    {
+      field: 'client.geo.city_name',
+      value: ['Council Bluffs'],
+    },
+    {
+      field: 'client.geo.region_iso_code',
+      value: ['US-IA'],
+    },
+    {
+      field: 'kibana.alert.rule.updated_at',
+      value: ['2023-04-25T09:03:13.384Z'],
+    },
+    {
+      field: 'server.packets',
+      value: [9],
+    },
+    {
+      field: 'network.transport',
+      value: ['tcp'],
+    },
+    {
+      field: 'signal.original_event.action',
+      value: ['exec'],
+    },
+    {
+      field: 'kibana.alert.rule.created_at',
+      value: ['2023-04-25T09:03:13.384Z'],
+    },
+    {
+      field: 'signal.rule.to',
+      value: ['now'],
+    },
+    {
+      field: 'event.type',
+      value: ['info', 'connection'],
+    },
+    {
+      field: 'process.entry_leader.entity_id',
+      value: ['some99'],
+    },
+    {
+      field: 'source.geo.country_name',
+      value: ['United States'],
+    },
+    {
+      field: 'kibana.alert.rule.meta.from',
+      value: ['100000000m'],
+    },
+    {
+      field: 'event.dataset',
+      value: ['socket'],
+    },
+    {
+      field: 'kibana.alert.original_time',
+      value: ['2022-10-27T12:24:19.714Z'],
+    },
+    {
+      field: '_id',
+      value: '7d3194c7158fb9edb10541ccdd81f8c2b9c9d3c50b82c14457c959a2fcbcb22a',
+    },
+    {
+      field: '_index',
+      value: '.internal.alerts-security.alerts-default-000001',
+    },
+  ],
+  [
+    {
+      field: 'kibana.alert.severity',
+      value: ['low'],
+    },
+    {
+      field: 'host.os.full.text',
+      value: ['Windows Server 2019 Datacenter 1809 (10.0.17763.3406)'],
+    },
+    {
+      field: 'kibana.alert.rule.updated_by',
+      value: ['elastic'],
+    },
+    {
+      field: 'signal.ancestors.depth',
+      value: [0, 1],
+    },
+    {
+      field: 'event.category',
+      value: ['file'],
+    },
+    {
+      field: 'host.risk.calculated_score_norm',
+      value: [31.092354],
+    },
+    {
+      field: 'host.os.name.text',
+      value: ['Windows'],
+    },
+    {
+      field: 'process.parent.pid',
+      value: [652],
+    },
+    {
+      field: 'host.hostname',
+      value: ['siem-windows-endpoint'],
+    },
+    {
+      field: 'signal.original_event.created',
+      value: ['2022-10-14T14:00:27.258Z'],
+    },
+    {
+      field: 'host.mac',
+      value: ['42:01:0a:c8:00:df'],
+    },
+    {
+      field: 'process.code_signature.exists',
+      value: [true],
+    },
+    {
+      field: 'elastic.agent.id',
+      value: ['2ea4b363-6a3f-449e-9d4e-c73ccf28f693'],
+    },
+    {
+      field: 'kibana.alert.ancestors.depth',
+      value: [0, 1],
+    },
+    {
+      field: 'signal.rule.enabled',
+      value: ['true'],
+    },
+    {
+      field: 'host.os.version',
+      value: ['1809 (10.0.17763.3406)'],
+    },
+    {
+      field: 'signal.rule.max_signals',
+      value: [100],
+    },
+    {
+      field: 'signal.rule.updated_at',
+      value: ['2023-04-25T09:03:13.384Z'],
+    },
+    {
+      field: 'kibana.alert.risk_score',
+      value: [21],
+    },
+    {
+      field: 'event.agent_id_status',
+      value: ['verified'],
+    },
+    {
+      field: 'kibana.alert.original_event.id',
+      value: ['MnfiZLkz1DywMGBf++++9ApC'],
+    },
+    {
+      field: 'file.path.text',
+      value: ['C:\\ProgramData\\winlogbeat\\.winlogbeat.yml.new'],
+    },
+    {
+      field: 'host.os.type',
+      value: ['windows'],
+    },
+    {
+      field: 'user.id',
+      value: ['S-1-5-18'],
+    },
+    {
+      field: 'process.Ext.ancestry',
+      value: [
+        'MmVhNGIzNjMtNmEzZi00NDllLTlkNGUtYzczY2NmMjhmNjkzLTY1Mi0xNjY0ODA2NTI4Ljc4NTg5NTAw',
+        'MmVhNGIzNjMtNmEzZi00NDllLTlkNGUtYzczY2NmMjhmNjkzLTUzNi0xNjY0ODA2NTI3LjEwNDI2NTQwMA==',
+      ],
+    },
+    {
+      field: 'kibana.alert.original_event.module',
+      value: ['endpoint'],
+    },
+    {
+      field: 'kibana.alert.rule.interval',
+      value: ['5m'],
+    },
+    {
+      field: 'kibana.alert.rule.type',
+      value: ['query'],
+    },
+    {
+      field: 'signal.original_event.sequence',
+      value: [940441],
+    },
+    {
+      field: 'host.architecture',
+      value: ['x86_64'],
+    },
+    {
+      field: 'kibana.alert.start',
+      value: ['2023-04-25T09:03:15.535Z'],
+    },
+    {
+      field: 'kibana.alert.rule.immutable',
+      value: ['false'],
+    },
+    {
+      field: 'process.Ext.code_signature.status',
+      value: ['trusted'],
+    },
+    {
+      field: 'kibana.alert.original_event.type',
+      value: ['creation'],
+    },
+    {
+      field: 'signal.original_event.module',
+      value: ['endpoint'],
+    },
+    {
+      field: 'agent.id',
+      value: ['2ea4b363-6a3f-449e-9d4e-c73ccf28f693'],
+    },
+    {
+      field: 'signal.rule.from',
+      value: ['now-6000000300s'],
+    },
+    {
+      field: 'kibana.alert.rule.enabled',
+      value: ['true'],
+    },
+    {
+      field: 'kibana.alert.rule.version',
+      value: ['1'],
+    },
+    {
+      field: 'kibana.alert.ancestors.type',
+      value: ['event', 'signal'],
+    },
+    {
+      field: 'file.Ext.windows.zone_identifier',
+      value: [-1],
+    },
+    {
+      field: 'user.name',
+      value: ['SYSTEM'],
+    },
+    {
+      field: 'signal.ancestors.index',
+      value: ['.ds-logs-endpoint.events.file-default-2022.10.08-000003', 'auditbeat-bulk'],
+    },
+    {
+      field: 'process.entity_id',
+      value: [
+        'MmVhNGIzNjMtNmEzZi00NDllLTlkNGUtYzczY2NmMjhmNjkzLTE3MDQtMTY2NDgwNjcwNi4yODUzODk4MDA=',
+      ],
+    },
+    {
+      field: 'host.ip',
+      value: ['10.200.0.223', 'fe80::eda9:848c:24ae:431d', '127.0.0.1', '::1'],
+    },
+    {
+      field: 'agent.type',
+      value: ['endpoint'],
+    },
+    {
+      field: 'signal.original_event.category',
+      value: ['file'],
+    },
+    {
+      field: 'process.executable.text',
+      value: ['C:\\Program Files\\Winlogbeat\\winlogbeat.exe'],
+    },
+    {
+      field: 'signal.original_event.id',
+      value: ['MnfiZLkz1DywMGBf++++9ApC'],
+    },
+    {
+      field: 'user.domain',
+      value: ['NT AUTHORITY'],
+    },
+    {
+      field: 'host.id',
+      value: ['526e76a2-1c82-4245-a179-4fcde1e608fc'],
+    },
+    {
+      field: 'process.Ext.code_signature.subject_name',
+      value: ['Elasticsearch, Inc.'],
+    },
+    {
+      field: 'timestamp',
+      value: [1666873459714],
+    },
+    {
+      field: 'signal.original_event.type',
+      value: ['creation'],
+    },
+    {
+      field: 'kibana.alert.rule.max_signals',
+      value: [100],
+    },
+    {
+      field: 'kibana.alert.rule.risk_score',
+      value: [21],
+    },
+    {
+      field: 'file.name',
+      value: ['.winlogbeat.yml.new'],
+    },
+    {
+      field: 'signal.rule.building_block_type',
+      value: ['default'],
+    },
+    {
+      field: 'process.code_signature.status',
+      value: ['trusted'],
+    },
+    {
+      field: 'signal.original_event.dataset',
+      value: ['endpoint.events.file'],
+    },
+    {
+      field: 'kibana.alert.rule.consumer',
+      value: ['siem'],
+    },
+    {
+      field: 'kibana.alert.rule.indices',
+      value: [
+        'apm-*-transaction*',
+        'auditbeat-*',
+        'endgame-*',
+        'filebeat-*',
+        'logs-*',
+        'packetbeat-*',
+        'traces-apm*',
+        'winlogbeat-*',
+        '-*elastic-cloud-logs-*',
+      ],
+    },
+    {
+      field: 'kibana.alert.rule.category',
+      value: ['Custom Query Rule'],
+    },
+    {
+      field: 'host.os.Ext.variant',
+      value: ['Windows Server 2019 Datacenter'],
+    },
+    {
+      field: 'event.action',
+      value: ['exec'],
+    },
+    {
+      field: 'event.ingested',
+      value: ['2022-10-14T14:00:50.000Z'],
+    },
+    {
+      field: '@timestamp',
+      value: ['2023-04-25T09:03:15.515Z'],
+    },
+    {
+      field: 'kibana.alert.original_event.action',
+      value: ['exec'],
+    },
+    {
+      field: 'signal.rule.updated_by',
+      value: ['elastic'],
+    },
+    {
+      field: 'host.os.platform',
+      value: ['windows'],
+    },
+    {
+      field: 'kibana.alert.rule.severity',
+      value: ['low'],
+    },
+    {
+      field: 'kibana.alert.original_event.agent_id_status',
+      value: ['verified'],
+    },
+    {
+      field: 'data_stream.dataset',
+      value: ['endpoint.events.file'],
+    },
+    {
+      field: 'host.risk.calculated_level',
+      value: ['Low'],
+    },
+    {
+      field: 'kibana.alert.rule.execution.uuid',
+      value: ['3e763264-9eab-4c6b-98e8-d51367491275'],
+    },
+    {
+      field: 'kibana.alert.uuid',
+      value: ['1066d5c3675d7eef4b9e84af64e795be39d1896ec791049eb87a39eb9675a2aa'],
+    },
+    {
+      field: 'kibana.alert.rule.meta.kibana_siem_app_url',
+      value: ['http://localhost:5601/app/security'],
+    },
+    {
+      field: 'kibana.version',
+      value: ['8.8.0'],
+    },
+    {
+      field: 'event.id',
+      value: ['MnfiZLkz1DywMGBf++++9ApC'],
+    },
+    {
+      field: 'signal.rule.license',
+      value: [''],
+    },
+    {
+      field: 'signal.ancestors.type',
+      value: ['event', 'signal'],
+    },
+    {
+      field: 'kibana.alert.rule.rule_id',
+      value: ['caf0db0c-c7e2-455e-89b8-6b0d73619ae5'],
+    },
+    {
+      field: 'kibana.alert.ancestors.rule',
+      value: ['532e0020-4a0c-11ed-9aa3-574e520c127d'],
+    },
+    {
+      field: 'user.name.text',
+      value: ['SYSTEM'],
+    },
+    {
+      field: 'file.path',
+      value: ['C:\\ProgramData\\winlogbeat\\.winlogbeat.yml.new'],
+    },
+    {
+      field: 'signal.rule.type',
+      value: ['query'],
+    },
+    {
+      field: 'kibana.alert.ancestors.id',
+      value: [
+        'cyjM1oMBw7Pvz6uQMxM4',
+        'd46d9fecad3a03741575f552c994ec9c9e5d1089557d49d125255bcd8d863a99',
+      ],
+    },
+    {
+      field: 'kibana.alert.rule.building_block_type',
+      value: ['default'],
+    },
+    {
+      field: 'process.name.text',
+      value: ['winlogbeat.exe'],
+    },
+    {
+      field: 'host.os.full',
+      value: ['Windows Server 2019 Datacenter 1809 (10.0.17763.3406)'],
+    },
+    {
+      field: 'user.risk.calculated_level',
+      value: ['High'],
+    },
+    {
+      field: 'kibana.alert.url',
+      value: [
+        'http://localhost:5601/app/security/alerts/redirect/1066d5c3675d7eef4b9e84af64e795be39d1896ec791049eb87a39eb9675a2aa?index=.alerts-security.alerts-default&timestamp=2023-04-25T09:03:15.515Z',
+      ],
+    },
+    {
+      field: 'kibana.alert.rule.description',
+      value: ['Custom Rule'],
+    },
+    {
+      field: 'kibana.alert.building_block_type',
+      value: ['default'],
+    },
+    {
+      field: 'process.pid',
+      value: [1704],
+    },
+    {
+      field: 'kibana.alert.rule.producer',
+      value: ['siem'],
+    },
+    {
+      field: 'signal.rule.interval',
+      value: ['5m'],
+    },
+    {
+      field: 'signal.rule.created_by',
+      value: ['elastic'],
+    },
+    {
+      field: 'kibana.alert.rule.to',
+      value: ['now'],
+    },
+    {
+      field: 'kibana.alert.rule.created_by',
+      value: ['elastic'],
+    },
+    {
+      field: 'kibana.alert.original_event.ingested',
+      value: ['2022-10-14T14:00:50.000Z'],
+    },
+    {
+      field: 'signal.rule.id',
+      value: ['023a0260-e348-11ed-bd43-632e972150d6'],
+    },
+    {
+      field: 'process.code_signature.subject_name',
+      value: ['Elasticsearch, Inc.'],
+    },
+    {
+      field: 'signal.rule.risk_score',
+      value: [21],
+    },
+    {
+      field: 'signal.reason',
+      value: [
+        'file event with process winlogbeat.exe, file .winlogbeat.yml.new, by SYSTEM on siem-windows-endpoint created low alert Custom Rule.',
+      ],
+    },
+    {
+      field: 'user.risk.calculated_score_norm',
+      value: [75.22127],
+    },
+    {
+      field: 'host.os.name',
+      value: ['Windows'],
+    },
+    {
+      field: 'kibana.alert.rule.name',
+      value: ['Custom Rule'],
+    },
+    {
+      field: 'host.name',
+      value: ['siem-windows-endpoint'],
+    },
+    {
+      field: 'signal.status',
+      value: ['open'],
+    },
+    {
+      field: 'event.kind',
+      value: ['signal'],
+    },
+    {
+      field: 'process.code_signature.trusted',
+      value: [true],
+    },
+    {
+      field: 'signal.rule.created_at',
+      value: ['2023-04-25T09:03:13.384Z'],
+    },
+    {
+      field: 'kibana.alert.workflow_status',
+      value: ['open'],
+    },
+    {
+      field: 'kibana.alert.original_event.created',
+      value: ['2022-10-14T14:00:27.258Z'],
+    },
+    {
+      field: 'kibana.alert.rule.uuid',
+      value: ['023a0260-e348-11ed-bd43-632e972150d6'],
+    },
+    {
+      field: 'kibana.alert.original_event.category',
+      value: ['file'],
+    },
+    {
+      field: 'kibana.alert.reason',
+      value: [
+        'file event with process winlogbeat.exe, file .winlogbeat.yml.new, by SYSTEM on siem-windows-endpoint created low alert Custom Rule.',
+      ],
+    },
+    {
+      field: 'data_stream.type',
+      value: ['logs'],
+    },
+    {
+      field: 'signal.ancestors.id',
+      value: [
+        'cyjM1oMBw7Pvz6uQMxM4',
+        'd46d9fecad3a03741575f552c994ec9c9e5d1089557d49d125255bcd8d863a99',
+      ],
+    },
+    {
+      field: 'signal.original_time',
+      value: ['2022-10-27T12:24:19.714Z'],
+    },
+    {
+      field: 'process.name',
+      value: ['winlogbeat.exe'],
+    },
+    {
+      field: 'file.Ext.header_bytes',
+      value: ['7570646174655f74696d653a20323032'],
+    },
+    {
+      field: 'ecs.version',
+      value: ['1.11.0'],
+    },
+    {
+      field: 'signal.rule.severity',
+      value: ['low'],
+    },
+    {
+      field: 'kibana.alert.ancestors.index',
+      value: ['.ds-logs-endpoint.events.file-default-2022.10.08-000003', 'auditbeat-bulk'],
+    },
+    {
+      field: 'event.created',
+      value: ['2022-10-14T14:00:27.258Z'],
+    },
+    {
+      field: 'process.Ext.code_signature.trusted',
+      value: [true],
+    },
+    {
+      field: 'file.extension',
+      value: ['new'],
+    },
+    {
+      field: 'agent.version',
+      value: ['8.5.0-SNAPSHOT'],
+    },
+    {
+      field: 'kibana.alert.depth',
+      value: [2],
+    },
+    {
+      field: 'process.thread.id',
+      value: [4100],
+    },
+    {
+      field: 'host.os.family',
+      value: ['windows'],
+    },
+    {
+      field: 'kibana.alert.rule.from',
+      value: ['now-6000000300s'],
+    },
+    {
+      field: 'kibana.alert.rule.revision',
+      value: [0],
+    },
+    {
+      field: 'kibana.alert.rule.parameters',
+      value: [
+        {
+          description: 'Custom Rule',
+          risk_score: 21,
+          severity: 'low',
+          building_block_type: 'default',
+          license: '',
+          meta: {
+            from: '100000000m',
+            kibana_siem_app_url: 'http://localhost:5601/app/security',
+          },
+          author: [],
+          false_positives: [],
+          from: 'now-6000000300s',
+          rule_id: 'caf0db0c-c7e2-455e-89b8-6b0d73619ae5',
+          max_signals: 100,
+          risk_score_mapping: [],
+          severity_mapping: [],
+          threat: [],
+          to: 'now',
+          references: [],
+          version: 1,
+          exceptions_list: [],
+          immutable: false,
+          related_integrations: [],
+          required_fields: [],
+          setup: '',
+          type: 'query',
+          language: 'kuery',
+          index: [
+            'apm-*-transaction*',
+            'auditbeat-*',
+            'endgame-*',
+            'filebeat-*',
+            'logs-*',
+            'packetbeat-*',
+            'traces-apm*',
+            'winlogbeat-*',
+            '-*elastic-cloud-logs-*',
+          ],
+          query: '*',
+          filters: [],
+        },
+      ],
+    },
+    {
+      field: 'signal.rule.version',
+      value: ['1'],
+    },
+    {
+      field: 'signal.original_event.kind',
+      value: ['signal'],
+    },
+    {
+      field: 'file.Ext.monotonic_id',
+      value: [157727],
+    },
+    {
+      field: 'kibana.alert.status',
+      value: ['active'],
+    },
+    {
+      field: 'kibana.alert.last_detected',
+      value: ['2023-04-25T09:03:15.535Z'],
+    },
+    {
+      field: 'kibana.alert.original_event.dataset',
+      value: ['endpoint.events.file'],
+    },
+    {
+      field: 'signal.depth',
+      value: [2],
+    },
+    {
+      field: 'signal.rule.immutable',
+      value: ['false'],
+    },
+    {
+      field: 'event.sequence',
+      value: [940441],
+    },
+    {
+      field: 'kibana.alert.rule.rule_type_id',
+      value: ['siem.queryRule'],
+    },
+    {
+      field: 'signal.rule.name',
+      value: ['Custom Rule'],
+    },
+    {
+      field: 'signal.rule.rule_id',
+      value: ['caf0db0c-c7e2-455e-89b8-6b0d73619ae5'],
+    },
+    {
+      field: 'event.module',
+      value: ['endpoint'],
+    },
+    {
+      field: 'host.os.kernel',
+      value: ['1809 (10.0.17763.3406)'],
+    },
+    {
+      field: 'kibana.alert.rule.license',
+      value: [''],
+    },
+    {
+      field: 'kibana.alert.original_event.kind',
+      value: ['signal'],
+    },
+    {
+      field: 'process.executable',
+      value: ['C:\\Program Files\\Winlogbeat\\winlogbeat.exe'],
+    },
+    {
+      field: 'file.Ext.entropy',
+      value: [5.273971112252894],
+    },
+    {
+      field: 'signal.rule.description',
+      value: ['Custom Rule'],
+    },
+    {
+      field: 'kibana.alert.rule.updated_at',
+      value: ['2023-04-25T09:03:13.384Z'],
+    },
+    {
+      field: 'data_stream.namespace',
+      value: ['default'],
+    },
+    {
+      field: 'file.size',
+      value: [1408],
+    },
+    {
+      field: 'message',
+      value: ['Endpoint file event'],
+    },
+    {
+      field: 'process.Ext.code_signature.exists',
+      value: [true],
+    },
+    {
+      field: 'kibana.alert.original_event.sequence',
+      value: [940441],
+    },
+    {
+      field: 'signal.original_event.action',
+      value: ['exec'],
+    },
+    {
+      field: 'kibana.alert.rule.created_at',
+      value: ['2023-04-25T09:03:13.384Z'],
+    },
+    {
+      field: 'signal.rule.to',
+      value: ['now'],
+    },
+    {
+      field: 'event.type',
+      value: ['creation'],
+    },
+    {
+      field: 'process.entry_leader.entity_id',
+      value: ['some98'],
+    },
+    {
+      field: 'kibana.space_ids',
+      value: ['default'],
+    },
+    {
+      field: 'kibana.alert.rule.meta.from',
+      value: ['100000000m'],
+    },
+    {
+      field: 'event.dataset',
+      value: ['endpoint.events.file'],
+    },
+    {
+      field: 'kibana.alert.original_time',
+      value: ['2022-10-27T12:24:19.714Z'],
+    },
+    {
+      field: '_id',
+      value: '1066d5c3675d7eef4b9e84af64e795be39d1896ec791049eb87a39eb9675a2aa',
+    },
+    {
+      field: '_index',
+      value: '.internal.alerts-security.alerts-default-000001',
+    },
+  ],
+];
diff --git a/x-pack/plugins/security_solution/public/detections/hooks/trigger_actions_alert_table/use_cell_actions.test.tsx b/x-pack/plugins/security_solution/public/detections/hooks/trigger_actions_alert_table/use_cell_actions.test.tsx
new file mode 100644
index 0000000000000..16228ec498358
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/detections/hooks/trigger_actions_alert_table/use_cell_actions.test.tsx
@@ -0,0 +1,148 @@
+/*
+ * 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 {
+  createSecuritySolutionStorageMock,
+  mockGlobalState,
+  SUB_PLUGINS_REDUCER,
+  TestProviders,
+} from '../../../common/mock';
+import { TableId } from '@kbn/securitysolution-data-table';
+import { renderHook } from '@testing-library/react-hooks';
+import { getUseCellActionsHook } from './use_cell_actions';
+import { columns as mockColumns, data as mockData } from './mock/data';
+import type {
+  EuiDataGridColumn,
+  EuiDataGridColumnCellAction,
+  EuiDataGridColumnCellActionProps,
+  EuiDataGridRefProps,
+} from '@elastic/eui';
+import { EuiButtonEmpty } from '@elastic/eui';
+import { render, screen } from '@testing-library/react';
+import type { ComponentProps, JSXElementConstructor, PropsWithChildren } from 'react';
+import React from 'react';
+import { makeAction } from '../../../common/components/cell_actions/mocks';
+import { VIEW_SELECTION } from '../../../../common/constants';
+import { createStore } from '../../../common/store';
+import { createStartServicesMock } from '@kbn/timelines-plugin/public/mock';
+import { BehaviorSubject } from 'rxjs';
+
+const useCellActions = getUseCellActionsHook(TableId.test);
+
+const mockDataGridRef: {
+  current: EuiDataGridRefProps;
+} = {
+  current: {
+    closeCellPopover: jest.fn(),
+    setIsFullScreen: jest.fn(),
+    setFocusedCell: jest.fn(),
+    openCellPopover: jest.fn(),
+  },
+};
+
+const renderCellAction = (
+  columnCellAction: EuiDataGridColumnCellAction,
+  props: Partial<EuiDataGridColumnCellActionProps> = {}
+) => {
+  const CellActions = columnCellAction as JSXElementConstructor<EuiDataGridColumnCellActionProps>;
+  return render(
+    <CellActions
+      Component={EuiButtonEmpty}
+      colIndex={0}
+      rowIndex={0}
+      columnId={''}
+      isExpanded={false}
+      {...props}
+    />
+  );
+};
+
+const compatibleActions = [makeAction('action1')];
+
+const withCustomPropsAndCellActions = (props: ComponentProps<typeof TestProviders>) => {
+  const TestProviderWithCustomProps = (_props: PropsWithChildren<Record<string, unknown>>) => (
+    <TestProviders {...props}> {_props.children}</TestProviders>
+  );
+  TestProviderWithCustomProps.displayName = 'TestProviderWithCustomProps';
+  return TestProviderWithCustomProps;
+};
+
+const TestProviderWithActions = withCustomPropsAndCellActions({ cellActions: compatibleActions });
+
+const mockedStateWithEventRenderedView: typeof mockGlobalState = {
+  ...mockGlobalState,
+  dataTable: {
+    ...mockGlobalState.dataTable,
+    tableById: {
+      ...mockGlobalState.dataTable.tableById,
+      [TableId.test]: {
+        ...mockGlobalState.dataTable.tableById[TableId.test],
+        viewMode: VIEW_SELECTION.eventRenderedView,
+      },
+    },
+  },
+};
+export const kibanaObservable = new BehaviorSubject(createStartServicesMock());
+const { storage } = createSecuritySolutionStorageMock();
+
+const TestProviderWithCustomStateAndActions = withCustomPropsAndCellActions({
+  cellActions: compatibleActions,
+  store: createStore(
+    mockedStateWithEventRenderedView,
+    SUB_PLUGINS_REDUCER,
+    kibanaObservable,
+    storage
+  ),
+});
+
+describe('getUseCellActionsHook', () => {
+  it('should render cell actions correctly for gridView view', async () => {
+    const { result, waitForNextUpdate } = renderHook(
+      () =>
+        useCellActions({
+          columns: mockColumns as unknown as EuiDataGridColumn[],
+          data: mockData,
+          dataGridRef: mockDataGridRef,
+          ecsData: [],
+          pageSize: 10,
+        }),
+      {
+        wrapper: TestProviderWithActions,
+      }
+    );
+
+    await waitForNextUpdate();
+
+    const cellAction = result.current.getCellActions('host.name', 0)[0];
+
+    renderCellAction(cellAction);
+
+    expect(screen.getByTestId('dataGridColumnCellAction-action1')).toBeInTheDocument();
+  });
+
+  it('should not render cell actions correctly for eventRendered view', async () => {
+    const { result, waitForNextUpdate } = renderHook(
+      () =>
+        useCellActions({
+          columns: mockColumns as unknown as EuiDataGridColumn[],
+          data: mockData,
+          dataGridRef: mockDataGridRef,
+          ecsData: [],
+          pageSize: 10,
+        }),
+      {
+        wrapper: TestProviderWithCustomStateAndActions,
+      }
+    );
+
+    const cellAction = result.current.getCellActions('host.name', 0);
+
+    await waitForNextUpdate();
+
+    expect(cellAction).toHaveLength(0);
+  });
+});
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.tsx
index 3612beb93102c..0ccc05bac858a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.tsx
@@ -40,6 +40,12 @@ const DefaultGridStyle: EuiDataGridStyle = {
   fontSize: 's',
 };
 
+const getCellActionsStub = {
+  getCellActions: () => null,
+  visibleCellActions: undefined,
+  disabledCellActions: [],
+};
+
 const basicRenderCellValue = ({
   data,
   columnId,
@@ -379,7 +385,7 @@ const AlertsTable: React.FunctionComponent<AlertsTableProps> = (props: AlertsTab
         dataGridRef,
         pageSize: pagination.pageSize,
       })
-    : { getCellActions: () => null, visibleCellActions: undefined, disabledCellActions: [] };
+    : getCellActionsStub;
 
   const columnsWithCellActions = useMemo(() => {
     if (getCellActions) {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table_state.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table_state.tsx
index e9123776a2144..44c560a732b7a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table_state.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table_state.tsx
@@ -323,13 +323,18 @@ const AlertsTableStateWithQueryProvider = ({
   const CasesContext = casesService?.ui.getCasesContext();
   const isCasesContextAvailable = casesService && CasesContext;
 
+  const memoizedCases = useMemo(
+    () => ({
+      data: cases ?? new Map(),
+      isLoading: isLoadingCases,
+    }),
+    [cases, isLoadingCases]
+  );
+
   const tableProps: AlertsTableProps = useMemo(
     () => ({
       alertsTableConfiguration,
-      cases: {
-        data: cases ?? new Map(),
-        isLoading: isLoadingCases,
-      },
+      cases: memoizedCases,
       columns,
       bulkActions: [],
       deletedEventIds: [],
@@ -362,8 +367,7 @@ const AlertsTableStateWithQueryProvider = ({
     }),
     [
       alertsTableConfiguration,
-      cases,
-      isLoadingCases,
+      memoizedCases,
       columns,
       flyoutSize,
       pagination.pageSize,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_columns/use_columns.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_columns/use_columns.ts
index 9caea0dfd26b0..1699a86b78cb6 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_columns/use_columns.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_columns/use_columns.ts
@@ -233,9 +233,13 @@ export const useColumns = ({
     [columns]
   );
 
+  const visibleColumns = useMemo(() => {
+    return getColumnIds(columns);
+  }, [columns]);
+
   return {
     columns,
-    visibleColumns: getColumnIds(columns),
+    visibleColumns,
     isBrowserFieldDataLoading,
     browserFields,
     onColumnsChange: setColumnsAndSave,

From d41da8245e122176912341a274ebe77bc8b60ebf Mon Sep 17 00:00:00 2001
From: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Date: Tue, 2 May 2023 11:23:55 -0400
Subject: [PATCH 12/33] [Fleet] Use react testing libray instead of TestBed
 (#156301)

---
 .../fleet/public/applications/fleet/app.tsx   |   6 +-
 .../components/datastream_pipelines.test.tsx  |   4 -
 .../experimental_datastream_settings.test.tsx |  13 --
 .../components/action_menu.test.tsx           |   6 -
 .../components/search_and_filter_bar.test.tsx |  60 ++----
 .../components/search_and_filter_bar.tsx      |   6 +-
 .../components/table_row_actions.test.tsx     |   6 -
 .../agent_upgrade_modal/hooks.test.tsx        |   7 -
 .../agent_upgrade_modal/index.test.tsx        |   7 -
 .../fleet/sections/agents/index.test.tsx      |   4 +-
 .../download_source_flyout/index.test.tsx     |   7 -
 .../public/applications/integrations/app.tsx  |   5 +-
 ...=> agent_enrollment_flyout.test.mocks.tsx} |  22 ++-
 .../agent_enrollment_flyout.test.tsx          | 174 +++++++-----------
 .../agent_enrollment_flyout/instructions.tsx  |  17 +-
 .../steps/install_managed_agent_step.tsx      |  23 ++-
 .../installation_mode_selection_step.tsx      |   4 +-
 .../components/link_and_revision.test.tsx     |   7 -
 .../fleet/public/hooks/use_fleet_status.tsx   |  26 ++-
 .../public/mock/create_test_renderer.tsx      |  10 +
 x-pack/plugins/fleet/tsconfig.json            |   1 -
 21 files changed, 163 insertions(+), 252 deletions(-)
 rename x-pack/plugins/fleet/public/components/agent_enrollment_flyout/{agent_enrollment_flyout.test.mocks.ts => agent_enrollment_flyout.test.mocks.tsx} (83%)

diff --git a/x-pack/plugins/fleet/public/applications/fleet/app.tsx b/x-pack/plugins/fleet/public/applications/fleet/app.tsx
index d947115861af9..99cf83aee7816 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/app.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/app.tsx
@@ -30,7 +30,7 @@ import type { FleetConfigType, FleetStartServices } from '../../plugin';
 
 import { PackageInstallProvider } from '../integrations/hooks';
 
-import { useAuthz, useFleetStatus, useFlyoutContext } from './hooks';
+import { type FleetStatusProviderProps, useAuthz, useFleetStatus, useFlyoutContext } from './hooks';
 
 import {
   ConfigContext,
@@ -240,6 +240,7 @@ export const FleetAppContext: React.FC<{
   theme$: AppMountParameters['theme$'];
   /** For testing purposes only */
   routerHistory?: History<any>;
+  fleetStatus?: FleetStatusProviderProps;
 }> = memo(
   ({
     children,
@@ -250,6 +251,7 @@ export const FleetAppContext: React.FC<{
     extensions,
     routerHistory,
     theme$,
+    fleetStatus,
   }) => {
     const isDarkMode = useObservable<boolean>(startServices.uiSettings.get$('theme:darkMode'));
 
@@ -265,7 +267,7 @@ export const FleetAppContext: React.FC<{
                       <QueryClientProvider client={queryClient}>
                         <ReactQueryDevtools initialIsOpen={false} />
                         <UIExtensionsContext.Provider value={extensions}>
-                          <FleetStatusProvider>
+                          <FleetStatusProvider defaultFleetStatus={fleetStatus}>
                             <Router history={history}>
                               <PackageInstallProvider
                                 notifications={startServices.notifications}
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/datastream_pipelines.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/datastream_pipelines.test.tsx
index 9caea777a479d..0209c1ad9f2ed 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/datastream_pipelines.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/datastream_pipelines.test.tsx
@@ -17,10 +17,6 @@ const mockedUseGetPipeline = useGetPipeline as jest.MockedFunction<typeof useGet
 jest.mock('../../../../hooks', () => {
   return {
     ...jest.requireActual('../../../../hooks'),
-    FleetStatusProvider: (props: any) => {
-      return props.children;
-    },
-    useFleetStatus: jest.fn().mockReturnValue({ isReady: true } as any),
     useGetPipeline: jest.fn(),
   };
 });
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/components/experimental_datastream_settings.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/components/experimental_datastream_settings.test.tsx
index 2981e3cbca901..0b5cdc0f6ad91 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/components/experimental_datastream_settings.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/components/experimental_datastream_settings.test.tsx
@@ -14,19 +14,6 @@ import type { RegistryDataStream } from '../../../../../../../../../common/types
 
 import { ExperimentDatastreamSettings } from './experimental_datastream_settings';
 
-jest.mock('../../../../../../../../hooks', () => {
-  return {
-    ...jest.requireActual('../../../../../../../../hooks'),
-    FleetStatusProvider: (props: any) => {
-      return props.children;
-    },
-    useFleetStatus: jest.fn().mockReturnValue({ isReady: true } as any),
-    sendGetStatus: jest
-      .fn()
-      .mockResolvedValue({ data: { isReady: true, missing_requirements: [] } }),
-  };
-});
-
 describe('ExperimentDatastreamSettings', () => {
   describe('Synthetic source', () => {
     it('should be enabled an not checked by default', () => {
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/action_menu.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/action_menu.test.tsx
index c88b2c0aedcad..094e3b820ab9b 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/action_menu.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/action_menu.test.tsx
@@ -15,12 +15,6 @@ import { useAuthz } from '../../../../../../hooks/use_authz';
 
 import { AgentDetailsActionMenu } from './actions_menu';
 
-jest.mock('../../../../../../hooks/use_fleet_status', () => ({
-  FleetStatusProvider: (props: any) => {
-    return props.children;
-  },
-}));
-
 jest.mock('../../../../../../services/experimental_features');
 jest.mock('../../../../../../hooks/use_authz');
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.test.tsx
index 9af04b04761a6..5e1e8f773dedb 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.test.tsx
@@ -7,29 +7,12 @@
 
 import React from 'react';
 
-import { ThemeProvider } from 'styled-components';
-
-import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
-
-import { coreMock } from '@kbn/core/public/mocks';
-import { registerTestBed } from '@kbn/test-jest-helpers';
-
 import type { Agent } from '../../../../types';
-
-import { FleetStatusProvider, ConfigContext, KibanaVersionContext } from '../../../../../../hooks';
-
-import { getMockTheme } from '../../../../../../mocks';
-
+import { createFleetTestRendererMock } from '../../../../../../mock';
 import { ExperimentalFeaturesService } from '../../../../services';
 
 import { SearchAndFilterBar } from './search_and_filter_bar';
 
-const mockTheme = getMockTheme({
-  eui: {
-    euiSize: '10px',
-  },
-});
-
 jest.mock('../../../../components', () => {
   return {
     SearchBar: () => <div />,
@@ -41,31 +24,24 @@ jest.mock('../../../../../../hooks/use_locator', () => {
     useDashboardLocator: jest.fn().mockImplementation(() => {
       return {
         id: 'DASHBOARD_APP_LOCATOR',
-        getRedirectUrl: jest.fn().mockResolvedValue('app/dashboards#/view/elastic_agent-a0002'),
+        getRedirectUrl: jest.fn().mockReturnValue('app/dashboards#/view/elastic_agent-a0002'),
       };
     }),
   };
 });
 
-const TestComponent = (props: any) => (
-  <KibanaContextProvider services={coreMock.createStart()}>
-    <ConfigContext.Provider value={{ agents: { enabled: true, elasticsearch: {} }, enabled: true }}>
-      <KibanaVersionContext.Provider value={'8.2.0'}>
-        <ThemeProvider theme={mockTheme}>
-          <FleetStatusProvider>
-            <SearchAndFilterBar {...props} />
-          </FleetStatusProvider>
-        </ThemeProvider>
-      </KibanaVersionContext.Provider>
-    </ConfigContext.Provider>
-  </KibanaContextProvider>
-);
-
 describe('SearchAndFilterBar', () => {
   beforeAll(() => {
     // @ts-ignore - prevents us needing to mock the entire service
     ExperimentalFeaturesService.init({});
   });
+
+  function render(props: any) {
+    const renderer = createFleetTestRendererMock();
+
+    return renderer.render(<SearchAndFilterBar {...props} />);
+  }
+
   it('should show no Actions button when no agent is selected', async () => {
     const selectedAgents: Agent[] = [];
     const props: any = {
@@ -83,10 +59,8 @@ describe('SearchAndFilterBar', () => {
       selectedAgentPolicies: [],
       showAgentActivityTour: {},
     };
-    const testBed = registerTestBed(TestComponent)(props);
-    const { exists } = testBed;
-
-    expect(exists('agentBulkActionsButton')).toBe(false);
+    const results = render(props);
+    expect(results.queryByTestId('agentBulkActionsButton')).toBeNull();
   });
 
   it('should show an Actions button when at least an agent is selected', async () => {
@@ -117,10 +91,8 @@ describe('SearchAndFilterBar', () => {
       selectedAgentPolicies: [],
       showAgentActivityTour: {},
     };
-    const testBed = registerTestBed(TestComponent)(props);
-    const { exists } = testBed;
-
-    expect(exists('agentBulkActionsButton')).not.toBeNull();
+    const results = render(props);
+    expect(results.queryByTestId('agentBulkActionsButton')).not.toBeNull();
   });
 
   it('should show an Actions button when agents selected in query mode', async () => {
@@ -139,9 +111,7 @@ describe('SearchAndFilterBar', () => {
       selectedAgentPolicies: [],
       showAgentActivityTour: {},
     };
-    const testBed = registerTestBed(TestComponent)(props);
-    const { exists } = testBed;
-
-    expect(exists('agentBulkActionsButton')).not.toBeNull();
+    const results = render(props);
+    expect(results.queryByTestId('agentBulkActionsButton')).not.toBeNull();
   });
 });
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.tsx
index c9c527ba36e0a..e66a579fdab7a 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.tsx
@@ -37,7 +37,7 @@ const ClearAllTagsFilterItem = styled(EuiFilterSelectItem)`
   padding: ${(props) => props.theme.eui.euiSizeS};
 `;
 
-export const SearchAndFilterBar: React.FunctionComponent<{
+export interface SearchAndFilterBarProps {
   agentPolicies: AgentPolicy[];
   draftKuery: string;
   onDraftKueryChange: (kuery: string) => void;
@@ -62,7 +62,9 @@ export const SearchAndFilterBar: React.FunctionComponent<{
   visibleAgents: Agent[];
   onClickAgentActivity: () => void;
   showAgentActivityTour: { isOpen: boolean };
-}> = ({
+}
+
+export const SearchAndFilterBar: React.FunctionComponent<SearchAndFilterBarProps> = ({
   agentPolicies,
   draftKuery,
   onDraftKueryChange,
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/table_row_actions.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/table_row_actions.test.tsx
index 810fe0f9617db..529bd41e4897e 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/table_row_actions.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/table_row_actions.test.tsx
@@ -15,12 +15,6 @@ import { useAuthz } from '../../../../../../hooks/use_authz';
 
 import { TableRowActions } from './table_row_actions';
 
-jest.mock('../../../../../../hooks/use_fleet_status', () => ({
-  FleetStatusProvider: (props: any) => {
-    return props.children;
-  },
-}));
-
 jest.mock('../../../../../../services/experimental_features');
 jest.mock('../../../../../../hooks/use_authz');
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/hooks.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/hooks.test.tsx
index 3f4fcea3ca5f7..8aea16559058a 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/hooks.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/hooks.test.tsx
@@ -12,13 +12,6 @@ import { createFleetTestRendererMock } from '../../../../../../mock';
 
 import { useScheduleDateTime } from './hooks';
 
-jest.mock('../../../../../../hooks/use_fleet_status', () => ({
-  FleetStatusProvider: (props: any) => {
-    return props.children;
-  },
-  useFleetStatus: jest.fn().mockReturnValue({}),
-}));
-
 describe('useScheduleDateTime', () => {
   it('do not allow to set a date before the current time', async () => {
     const renderer = createFleetTestRendererMock();
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.test.tsx
index 393b6519fc6c1..78619b976c49f 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.test.tsx
@@ -14,13 +14,6 @@ import { createFleetTestRendererMock } from '../../../../../../mock';
 import { AgentUpgradeAgentModal } from '.';
 import type { AgentUpgradeAgentModalProps } from '.';
 
-jest.mock('../../../../../../hooks/use_fleet_status', () => ({
-  FleetStatusProvider: (props: any) => {
-    return props.children;
-  },
-  useFleetStatus: jest.fn().mockReturnValue({}),
-}));
-
 jest.mock('@elastic/eui', () => {
   return {
     ...jest.requireActual('@elastic/eui'),
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/index.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/index.test.tsx
index 20db1fc804d11..30ac08e0981a7 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/index.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/index.test.tsx
@@ -14,9 +14,7 @@ import { useAuthz } from '../../../../hooks/use_authz';
 import { AgentsApp } from '.';
 
 jest.mock('../../../../hooks/use_fleet_status', () => ({
-  FleetStatusProvider: (props: any) => {
-    return props.children;
-  },
+  ...jest.requireActual('../../../../hooks/use_fleet_status'),
   useFleetStatus: jest.fn().mockReturnValue({}),
 }));
 jest.mock('../../../../hooks/use_request/settings');
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/download_source_flyout/index.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/download_source_flyout/index.test.tsx
index 464d0601ced2b..1c7b1a28d560f 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/download_source_flyout/index.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/download_source_flyout/index.test.tsx
@@ -12,13 +12,6 @@ import { createFleetTestRendererMock } from '../../../../../../mock';
 
 import { EditDownloadSourceFlyout } from '.';
 
-jest.mock('../../../../../../hooks/use_fleet_status', () => ({
-  FleetStatusProvider: (props: any) => {
-    return props.children;
-  },
-  useFleetStatus: jest.fn().mockReturnValue({}),
-}));
-
 function renderFlyout(downloadSource?: DownloadSource) {
   const renderer = createFleetTestRendererMock();
 
diff --git a/x-pack/plugins/fleet/public/applications/integrations/app.tsx b/x-pack/plugins/fleet/public/applications/integrations/app.tsx
index 68b40589d0b8e..bac899a06a9e6 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/app.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/app.tsx
@@ -26,6 +26,7 @@ import type { FleetConfigType, FleetStartServices } from '../../plugin';
 import {
   ConfigContext,
   FleetStatusProvider,
+  type FleetStatusProviderProps,
   KibanaVersionContext,
   useFleetStatus,
 } from '../../hooks';
@@ -61,6 +62,7 @@ export const IntegrationsAppContext: React.FC<{
   theme$: AppMountParameters['theme$'];
   /** For testing purposes only */
   routerHistory?: History<any>; // TODO remove
+  fleetStatus?: FleetStatusProviderProps;
 }> = memo(
   ({
     children,
@@ -71,6 +73,7 @@ export const IntegrationsAppContext: React.FC<{
     extensions,
     setHeaderActionMenu,
     theme$,
+    fleetStatus,
   }) => {
     const isDarkMode = useObservable<boolean>(startServices.uiSettings.get$('theme:darkMode'));
     const CloudContext = startServices.cloud?.CloudContextProvider || EmptyContext;
@@ -87,7 +90,7 @@ export const IntegrationsAppContext: React.FC<{
                       <QueryClientProvider client={queryClient}>
                         <ReactQueryDevtools initialIsOpen={false} />
                         <UIExtensionsContext.Provider value={extensions}>
-                          <FleetStatusProvider>
+                          <FleetStatusProvider defaultFleetStatus={fleetStatus}>
                             <startServices.customIntegrations.ContextProvider>
                               <CloudContext>
                                 <Router history={history}>
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.mocks.ts b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.mocks.tsx
similarity index 83%
rename from x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.mocks.ts
rename to x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.mocks.tsx
index 661c72fbc5118..8f9b13671ce65 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.mocks.ts
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.mocks.tsx
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import React from 'react';
 // TODO(jbudz): should be removed when upgrading to TS@4.8
 // this is a skip for the errors created when typechecking with isolatedModules
 export {};
@@ -12,7 +13,6 @@ export {};
 jest.mock('../../hooks', () => {
   return {
     ...jest.requireActual('../../hooks'),
-    useFleetStatus: jest.fn(),
     useFleetServerStandalone: jest.fn(),
     useAgentEnrollmentFlyoutData: jest.fn(),
   };
@@ -96,14 +96,28 @@ jest.mock('./steps', () => {
     AgentPolicySelectionStep: jest.fn().mockReturnValue({
       'data-test-subj': 'agent-policy-selection-step',
       title: 'agent-policy-selection-step',
+      children: <>TEST</>,
     }),
     AgentEnrollmentKeySelectionStep: jest.fn().mockReturnValue({
       'data-test-subj': 'agent-enrollment-key-selection-step',
       title: 'agent-enrollment-key-selection-step',
+      children: <>TEST</>,
+    }),
+    ConfigureStandaloneAgentStep: jest.fn().mockReturnValue({
+      'data-test-subj': 'configure-standalone-step',
+      title: 'configure-standalone-step',
+      children: <>TEST</>,
+    }),
+    DownloadStep: jest.fn().mockReturnValue({
+      'data-test-subj': 'download-step',
+      title: 'download-step',
+      children: <>TEST</>,
+    }),
+    IncomingDataConfirmationStep: jest.fn().mockReturnValue({
+      'data-test-subj': 'incoming-data-confirmation-step',
+      title: 'incoming-data-confirmation-step',
+      children: <>TEST</>,
     }),
-    DownloadStep: jest
-      .fn()
-      .mockReturnValue({ 'data-test-subj': 'download-step', title: 'download-step' }),
   };
 });
 
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.tsx
index b2a070ac93c55..5f6d46e5e2573 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.tsx
@@ -8,27 +8,17 @@
 import './agent_enrollment_flyout.test.mocks';
 
 import React from 'react';
-import { registerTestBed } from '@kbn/test-jest-helpers';
-import { act } from '@testing-library/react';
-
-import { coreMock } from '@kbn/core/public/mocks';
-
-import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { act, cleanup, fireEvent, waitFor } from '@testing-library/react';
+import type { RenderResult } from '@testing-library/react';
 
+import { createFleetTestRendererMock } from '../../mock';
 import type { AgentPolicy } from '../../../common';
 import {
   useGetFleetServerHosts,
   sendGetOneAgentPolicy,
   useGetAgents,
 } from '../../hooks/use_request';
-import {
-  FleetStatusProvider,
-  ConfigContext,
-  useAgentEnrollmentFlyoutData,
-  KibanaVersionContext,
-  useFleetStatus,
-  useFleetServerStandalone,
-} from '../../hooks';
+import { useAgentEnrollmentFlyoutData, useFleetServerStandalone } from '../../hooks';
 
 import { useAdvancedForm } from '../../applications/fleet/components/fleet_server_instructions/hooks';
 import { useFleetServerUnhealthy } from '../../applications/fleet/sections/agents/hooks/use_fleet_server_unhealthy';
@@ -36,36 +26,13 @@ import { useFleetServerUnhealthy } from '../../applications/fleet/sections/agent
 import type { FlyOutProps } from './types';
 import { AgentEnrollmentFlyout } from '.';
 
-const TestComponent = (props: FlyOutProps) => (
-  <KibanaContextProvider services={coreMock.createStart()}>
-    <ConfigContext.Provider value={{ agents: { enabled: true, elasticsearch: {} }, enabled: true }}>
-      <KibanaVersionContext.Provider value={'8.1.0'}>
-        <FleetStatusProvider>
-          <AgentEnrollmentFlyout {...props} />
-        </FleetStatusProvider>
-      </KibanaVersionContext.Provider>
-    </ConfigContext.Provider>
-  </KibanaContextProvider>
-);
-
-const setup = (props?: FlyOutProps) => {
-  const testBed = registerTestBed(TestComponent)(props);
-  const { find, component } = testBed;
-
-  return {
-    ...testBed,
-    actions: {
-      goToStandaloneTab: () =>
-        act(() => {
-          find('agentEnrollmentFlyout.standaloneTab').simulate('click');
-          component.update();
-        }),
-    },
-  };
-};
+const render = (props?: Partial<FlyOutProps>) => {
+  cleanup();
+  const renderer = createFleetTestRendererMock();
+  const results = renderer.render(<AgentEnrollmentFlyout onClose={jest.fn()} {...props} />);
 
-type SetupReturn = ReturnType<typeof setup>;
-type TestBed = SetupReturn extends Promise<infer U> ? U : SetupReturn;
+  return results;
+};
 
 const testAgentPolicy: AgentPolicy = {
   id: 'test',
@@ -80,9 +47,9 @@ const testAgentPolicy: AgentPolicy = {
 };
 
 describe('<AgentEnrollmentFlyout />', () => {
-  let testBed: TestBed;
+  let results: RenderResult;
 
-  beforeEach(() => {
+  beforeEach(async () => {
     (useGetFleetServerHosts as jest.Mock).mockReturnValue({
       data: {
         items: [
@@ -95,7 +62,6 @@ describe('<AgentEnrollmentFlyout />', () => {
     });
     jest.mocked(useFleetServerStandalone).mockReturnValue({ isFleetServerStandalone: false });
 
-    (useFleetStatus as jest.Mock).mockReturnValue({ isReady: true });
     (useFleetServerUnhealthy as jest.Mock).mockReturnValue({
       isLoading: false,
       isUnhealthy: false,
@@ -135,10 +101,7 @@ describe('<AgentEnrollmentFlyout />', () => {
     });
 
     act(() => {
-      testBed = setup({
-        onClose: jest.fn(),
-      });
-      testBed.component.update();
+      results = render();
     });
   });
 
@@ -153,98 +116,93 @@ describe('<AgentEnrollmentFlyout />', () => {
       isLoadingInitialAgentPolicies: true,
     });
 
-    act(() => {
-      testBed = setup({
-        onClose: jest.fn(),
-      });
-      testBed.component.update();
-    });
+    results = render();
 
-    const { exists } = testBed;
-    expect(exists('agentEnrollmentFlyout')).toBe(true);
-    expect(exists('loadingSpinner')).toBe(true);
+    expect(results.queryByTestId('agentEnrollmentFlyout')).not.toBeNull();
+    expect(results.queryByTestId('loadingSpinner')).not.toBeNull();
   });
 
   describe('managed instructions', () => {
     it('uses the agent policy selection step', () => {
-      const { exists } = testBed;
-      expect(exists('agentEnrollmentFlyout')).toBe(true);
-      expect(exists('agent-policy-selection-step')).toBe(true);
-      expect(exists('agent-enrollment-key-selection-step')).toBe(false);
+      expect(results.queryByTestId('agentEnrollmentFlyout')).not.toBeNull();
+      expect(results.queryByTestId('agent-policy-selection-step')).not.toBeNull();
+      expect(results.queryByTestId('agent-enrollment-key-selection-step')).toBeNull();
     });
 
     describe('with a specific policy', () => {
-      beforeEach(() => {
-        jest.clearAllMocks();
-        act(() => {
-          testBed = setup({
-            agentPolicy: testAgentPolicy,
-            onClose: jest.fn(),
-          });
-          testBed.component.update();
+      beforeEach(async () => {
+        results = render({
+          agentPolicy: testAgentPolicy,
+        });
+        await waitFor(() => {
+          expect(sendGetOneAgentPolicy).toBeCalled();
         });
       });
 
       it('uses the configure enrollment step, not the agent policy selection step', () => {
-        const { exists } = testBed;
-        expect(exists('agentEnrollmentFlyout')).toBe(true);
-        expect(exists('agent-policy-selection-step')).toBe(false);
-        expect(exists('agent-enrollment-key-selection-step')).toBe(true);
+        expect(results.queryByTestId('agentEnrollmentFlyout')).not.toBeNull();
+        expect(results.queryByTestId('agent-policy-selection-step')).toBeNull();
+        expect(results.queryByTestId('agent-enrollment-key-selection-step')).not.toBeNull();
       });
     });
 
     describe('with a specific policy when no agentPolicies set', () => {
-      beforeEach(() => {
+      beforeEach(async () => {
         jest.clearAllMocks();
-        act(() => {
-          testBed = setup({
-            agentPolicy: testAgentPolicy,
-            onClose: jest.fn(),
-          });
-          testBed.component.update();
+        results = render({
+          agentPolicy: testAgentPolicy,
+        });
+        await waitFor(() => {
+          expect(sendGetOneAgentPolicy).toBeCalled();
         });
       });
 
       it('should not show fleet server instructions', () => {
-        const { exists } = testBed;
-        expect(exists('agentEnrollmentFlyout')).toBe(true);
-        expect(exists('agent-enrollment-key-selection-step')).toBe(true);
+        expect(results.queryByTestId('agentEnrollmentFlyout')).not.toBeNull();
+        expect(results.queryByTestId('agent-enrollment-key-selection-step')).not.toBeNull();
       });
     });
 
-    // Skipped due to UI changing in https://github.com/elastic/kibana/issues/125534. These tests should be rethought overall
-    // to provide value around the new flyout structure
-    describe.skip('standalone instructions', () => {
+    describe('standalone instructions', () => {
+      function goToStandaloneTab() {
+        act(() => {
+          fireEvent.click(results.getByTestId('standaloneTab'));
+        });
+      }
+
+      beforeEach(() => {
+        results = render({
+          isIntegrationFlow: true,
+        });
+      });
+
       it('uses the agent policy selection step', async () => {
-        const { exists, actions } = testBed;
-        actions.goToStandaloneTab();
+        goToStandaloneTab();
 
-        expect(exists('agentEnrollmentFlyout')).toBe(true);
-        expect(exists('agent-policy-selection-step')).toBe(true);
-        expect(exists('agent-enrollment-key-selection-step')).toBe(false);
+        expect(results.queryByTestId('agentEnrollmentFlyout')).not.toBeNull();
+        expect(results.queryByTestId('agent-policy-selection-step')).not.toBeNull();
+        expect(results.queryByTestId('agent-enrollment-key-selection-step')).toBeNull();
+        expect(results.queryByTestId('configure-standalone-step')).not.toBeNull();
       });
 
       describe('with a specific policy', () => {
-        beforeEach(() => {
-          jest.clearAllMocks();
-          act(() => {
-            testBed = setup({
-              agentPolicy: testAgentPolicy,
-              onClose: jest.fn(),
-            });
-            testBed.component.update();
+        beforeEach(async () => {
+          results = render({
+            isIntegrationFlow: true,
+            agentPolicy: testAgentPolicy,
+          });
+          await waitFor(() => {
+            expect(sendGetOneAgentPolicy).toBeCalled();
           });
         });
 
         it('does not use either of the agent policy selection or enrollment key steps', () => {
-          const { exists, actions } = testBed;
-          jest.clearAllMocks();
-
-          actions.goToStandaloneTab();
+          goToStandaloneTab();
 
-          expect(exists('agentEnrollmentFlyout')).toBe(true);
-          expect(exists('agent-policy-selection-step')).toBe(false);
-          expect(exists('agent-enrollment-key-selection-step')).toBe(false);
+          expect(results.queryByTestId('agentEnrollmentFlyout')).not.toBeNull();
+          expect(results.queryByTestId('agent-policy-selection-step')).toBeNull();
+          expect(results.queryByTestId('agent-enrollment-key-selection-step')).toBeNull();
+          expect(results.queryByTestId('configure-standalone-step')).not.toBeNull();
         });
       });
     });
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/instructions.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/instructions.tsx
index ad2a5339aeea1..3a965d9f4e81f 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/instructions.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/instructions.tsx
@@ -62,9 +62,6 @@ export const Instructions = (props: InstructionProps) => {
 
   const fleetServers = agents?.items || [];
 
-  if (isLoadingAgents || isLoadingAgentPolicies || isLoadingFleetServerHealth)
-    return <Loading size="l" />;
-
   const hasNoFleetServerHost = fleetStatus.isReady && (fleetServerHosts?.length ?? 0) === 0;
 
   const showAgentEnrollment =
@@ -81,12 +78,16 @@ export const Instructions = (props: InstructionProps) => {
     (fleetServers.length === 0 ||
       isFleetServerUnhealthy ||
       (fleetStatus.missingRequirements ?? []).some((r) => r === FLEET_SERVER_PACKAGE));
+  useEffect(() => {
+    if (!isIntegrationFlow && showAgentEnrollment) {
+      setSelectionType('radio');
+    } else {
+      setSelectionType('tabs');
+    }
+  }, [isIntegrationFlow, showAgentEnrollment, setSelectionType]);
 
-  if (!isIntegrationFlow && showAgentEnrollment) {
-    setSelectionType('radio');
-  } else {
-    setSelectionType('tabs');
-  }
+  if (isLoadingAgents || isLoadingAgentPolicies || isLoadingFleetServerHealth)
+    return <Loading size="l" />;
 
   if (hasNoFleetServerHost) {
     return null;
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/install_managed_agent_step.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/install_managed_agent_step.tsx
index 997efe59c8fe6..8274939da374f 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/install_managed_agent_step.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/install_managed_agent_step.tsx
@@ -46,15 +46,18 @@ export const InstallManagedAgentStep = ({
     title: i18n.translate('xpack.fleet.agentEnrollment.stepEnrollAndRunAgentTitle', {
       defaultMessage: 'Install Elastic Agent on your host',
     }),
-    children: selectedApiKeyId && apiKeyData && (
-      <InstallSection
-        installCommand={installCommand}
-        isK8s={isK8s}
-        enrollToken={enrollToken}
-        onCopy={onCopy}
-        fullCopyButton={fullCopyButton}
-        cloudFormationTemplateUrl={cloudFormationTemplateUrl}
-      />
-    ),
+    children:
+      selectedApiKeyId && apiKeyData ? (
+        <InstallSection
+          installCommand={installCommand}
+          isK8s={isK8s}
+          enrollToken={enrollToken}
+          onCopy={onCopy}
+          fullCopyButton={fullCopyButton}
+          cloudFormationTemplateUrl={cloudFormationTemplateUrl}
+        />
+      ) : (
+        <React.Fragment />
+      ),
   };
 };
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/installation_mode_selection_step.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/installation_mode_selection_step.tsx
index c5213f061bceb..17dc6df6926ba 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/installation_mode_selection_step.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/installation_mode_selection_step.tsx
@@ -86,6 +86,8 @@ export const InstallationModeSelectionStep = ({
         onChange={onChangeCallback}
         name={`radio group ${radioSuffix}`}
       />
-    ) : null,
+    ) : (
+      <React.Fragment />
+    ),
   };
 };
diff --git a/x-pack/plugins/fleet/public/components/link_and_revision.test.tsx b/x-pack/plugins/fleet/public/components/link_and_revision.test.tsx
index f2d0a8970cfa3..46fdfe69c63bd 100644
--- a/x-pack/plugins/fleet/public/components/link_and_revision.test.tsx
+++ b/x-pack/plugins/fleet/public/components/link_and_revision.test.tsx
@@ -14,13 +14,6 @@ import type { AgentPolicy, Agent } from '../types';
 
 import { AgentPolicySummaryLine } from './link_and_revision';
 
-jest.mock('../hooks/use_fleet_status', () => ({
-  FleetStatusProvider: (props: any) => {
-    return props.children;
-  },
-  useFleetStatus: jest.fn().mockReturnValue({}),
-}));
-
 describe('AgentPolicySummaryLine', () => {
   let testRenderer: TestRenderer;
 
diff --git a/x-pack/plugins/fleet/public/hooks/use_fleet_status.tsx b/x-pack/plugins/fleet/public/hooks/use_fleet_status.tsx
index d0f3414a4d016..62c1a8f814f2a 100644
--- a/x-pack/plugins/fleet/public/hooks/use_fleet_status.tsx
+++ b/x-pack/plugins/fleet/public/hooks/use_fleet_status.tsx
@@ -12,7 +12,7 @@ import type { GetFleetStatusResponse } from '../types';
 import { useConfig } from './use_config';
 import { sendGetFleetStatus } from './use_request';
 
-interface FleetStatusState {
+export interface FleetStatusProviderProps {
   enabled: boolean;
   isLoading: boolean;
   isReady: boolean;
@@ -21,7 +21,7 @@ interface FleetStatusState {
   missingOptionalFeatures?: GetFleetStatusResponse['missing_optional_features'];
 }
 
-interface FleetStatus extends FleetStatusState {
+interface FleetStatus extends FleetStatusProviderProps {
   refresh: () => Promise<void>;
 
   // This flag allows us to opt into displaying the Fleet Server enrollment instructions even if
@@ -33,15 +33,19 @@ interface FleetStatus extends FleetStatusState {
 
 const FleetStatusContext = React.createContext<FleetStatus | undefined>(undefined);
 
-export const FleetStatusProvider: React.FC = ({ children }) => {
+export const FleetStatusProvider: React.FC<{
+  defaultFleetStatus?: FleetStatusProviderProps;
+}> = ({ defaultFleetStatus, children }) => {
   const config = useConfig();
   const [forceDisplayInstructions, setForceDisplayInstructions] = useState(false);
 
-  const [state, setState] = useState<FleetStatusState>({
-    enabled: config.agents.enabled,
-    isLoading: false,
-    isReady: false,
-  });
+  const [state, setState] = useState<FleetStatusProviderProps>(
+    defaultFleetStatus ?? {
+      enabled: config.agents.enabled,
+      isLoading: false,
+      isReady: false,
+    }
+  );
 
   // TODO: Refactor to use react-query
   const sendGetStatus = useCallback(
@@ -68,8 +72,10 @@ export const FleetStatusProvider: React.FC = ({ children }) => {
   );
 
   useEffect(() => {
-    sendGetStatus();
-  }, [sendGetStatus]);
+    if (!defaultFleetStatus) {
+      sendGetStatus();
+    }
+  }, [sendGetStatus, defaultFleetStatus]);
 
   const refresh = useCallback(() => sendGetStatus(), [sendGetStatus]);
 
diff --git a/x-pack/plugins/fleet/public/mock/create_test_renderer.tsx b/x-pack/plugins/fleet/public/mock/create_test_renderer.tsx
index 778dcdb32bc47..f0861582fd65f 100644
--- a/x-pack/plugins/fleet/public/mock/create_test_renderer.tsx
+++ b/x-pack/plugins/fleet/public/mock/create_test_renderer.tsx
@@ -96,6 +96,11 @@ export const createFleetTestRendererMock = (): TestRenderer => {
           extensions={extensions}
           routerHistory={testRendererMocks.history}
           theme$={themeServiceMock.createTheme$()}
+          fleetStatus={{
+            enabled: true,
+            isLoading: false,
+            isReady: true,
+          }}
         >
           {children}
         </FleetAppContext>
@@ -156,6 +161,11 @@ export const createIntegrationsTestRendererMock = (): TestRenderer => {
           routerHistory={testRendererMocks.history}
           theme$={themeServiceMock.createTheme$()}
           setHeaderActionMenu={() => {}}
+          fleetStatus={{
+            enabled: true,
+            isLoading: false,
+            isReady: true,
+          }}
         >
           {children}
         </IntegrationsAppContext>
diff --git a/x-pack/plugins/fleet/tsconfig.json b/x-pack/plugins/fleet/tsconfig.json
index f80d7d51686d8..0aafb8faacc28 100644
--- a/x-pack/plugins/fleet/tsconfig.json
+++ b/x-pack/plugins/fleet/tsconfig.json
@@ -63,7 +63,6 @@
     "@kbn/global-search-plugin",
     "@kbn/utility-types",
     "@kbn/utility-types-jest",
-    "@kbn/test-jest-helpers",
     "@kbn/es-query",
     "@kbn/ui-theme",
     "@kbn/rison",

From 17487b825c991739e670f8fca13700e6c1cc029f Mon Sep 17 00:00:00 2001
From: Ying Mao <ying.mao@elastic.co>
Date: Tue, 2 May 2023 11:31:48 -0400
Subject: [PATCH 13/33] [Response Ops][Alerting] Exposing background worker
 utilization load metric (#153600)

Resolves https://github.com/elastic/kibana/issues/155762,
https://github.com/elastic/kibana/issues/155761
## Summary

This PR exposes a metric that represents the background task worker
utilization load at the end of each polling cycle. This is calculated as
`(# of workers already busy + claimed tasks) / max workers`, which comes
out to the number of workers in use at the end of each claim cycle. This
metric is then averaged over the previous 15 seconds (or 5 polling
cycles). This window size is configurable using
`xpack.task_manager.worker_utilization_running_average_window`

This PR exposes this metric in the existing
`/internal/task_manager/_background_task_utilization` API but also adds
a public version of this API
(`/api/task_manager/_background_task_utilization`) that only exposes
this metric. We need the public API for serverless but I thought we
could keep the private route as well to expose experimental metrics
without the overhead of supporting them long term.

## To Verify

1. Run ES and Kibana with this branch
2. Navigate to `/internal/task_manager/_background_task_utilization` and
see the new metric exposed as `stats.value.load` along with the existing
`adhoc` and `recurring` metrics
3. Navigate to `/api/task_manager/_background_task_utilization` and see
only the load metric returned from the public API
4. You can also create some rules to see the load metric increase.

---------

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../resources/base/bin/kibana-docker          |   1 +
 .../task_manager/server/config.test.ts        |   3 +
 x-pack/plugins/task_manager/server/config.ts  |  12 +-
 .../server/ephemeral_task_lifecycle.test.ts   |   1 +
 .../managed_configuration.test.ts             |   1 +
 ...ground_task_utilization_statistics.test.ts | 923 +++++++++++-------
 .../background_task_utilization_statistics.ts | 113 ++-
 .../configuration_statistics.test.ts          |   1 +
 .../monitoring_stats_stream.test.ts           |   1 +
 .../monitoring/monitoring_stats_stream.ts     |   4 +-
 .../task_manager/server/plugin.test.ts        |   1 +
 .../server/polling_lifecycle.test.ts          |   1 +
 .../task_manager/server/polling_lifecycle.ts  |  18 +-
 .../background_task_utilization.test.ts       |  10 +-
 .../routes/background_task_utilization.ts     | 113 ++-
 .../task_manager/server/task_events.ts        |   8 +-
 .../task_manager_usage_collector.test.ts      |  13 +-
 .../usage/task_manager_usage_collector.ts     |  15 +-
 .../background_task_utilization_route.ts      |  78 +-
 19 files changed, 812 insertions(+), 505 deletions(-)

diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
index 3123aa7f391df..7eaae8b09629f 100755
--- a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
+++ b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
@@ -413,6 +413,7 @@ kibana_vars=(
     xpack.task_manager.version_conflict_threshold
     xpack.task_manager.event_loop_delay.monitor
     xpack.task_manager.event_loop_delay.warn_threshold
+    xpack.task_manager.worker_utilization_running_average_window
     xpack.uptime.index
     serverless
 )
diff --git a/x-pack/plugins/task_manager/server/config.test.ts b/x-pack/plugins/task_manager/server/config.test.ts
index 54e9562ec62fb..9e1e89e68624b 100644
--- a/x-pack/plugins/task_manager/server/config.test.ts
+++ b/x-pack/plugins/task_manager/server/config.test.ts
@@ -44,6 +44,7 @@ describe('config validation', () => {
           "exclude_task_types": Array [],
         },
         "version_conflict_threshold": 80,
+        "worker_utilization_running_average_window": 5,
       }
     `);
   });
@@ -95,6 +96,7 @@ describe('config validation', () => {
           "exclude_task_types": Array [],
         },
         "version_conflict_threshold": 80,
+        "worker_utilization_running_average_window": 5,
       }
     `);
   });
@@ -149,6 +151,7 @@ describe('config validation', () => {
           "exclude_task_types": Array [],
         },
         "version_conflict_threshold": 80,
+        "worker_utilization_running_average_window": 5,
       }
     `);
   });
diff --git a/x-pack/plugins/task_manager/server/config.ts b/x-pack/plugins/task_manager/server/config.ts
index 40b915e8979a2..ae6c7a9fb41eb 100644
--- a/x-pack/plugins/task_manager/server/config.ts
+++ b/x-pack/plugins/task_manager/server/config.ts
@@ -18,9 +18,12 @@ export const DEFAULT_MAX_EPHEMERAL_REQUEST_CAPACITY = MAX_WORKERS_LIMIT;
 // ===================
 // Refresh aggregated monitored stats at a default rate of once a minute
 export const DEFAULT_MONITORING_REFRESH_RATE = 60 * 1000;
-export const DEFAULT_MONITORING_STATS_RUNNING_AVERGAE_WINDOW = 50;
+export const DEFAULT_MONITORING_STATS_RUNNING_AVERAGE_WINDOW = 50;
 export const DEFAULT_MONITORING_STATS_WARN_DELAYED_TASK_START_IN_SECONDS = 60;
 
+// At the default poll interval of 3sec, this averages over the last 15sec.
+export const DEFAULT_WORKER_UTILIZATION_RUNNING_AVERAGE_WINDOW = 5;
+
 export const taskExecutionFailureThresholdSchema = schema.object(
   {
     error_threshold: schema.number({
@@ -98,7 +101,7 @@ export const configSchema = schema.object(
     }),
     /* The size of the running average window for monitored stats. */
     monitored_stats_running_average_window: schema.number({
-      defaultValue: DEFAULT_MONITORING_STATS_RUNNING_AVERGAE_WINDOW,
+      defaultValue: DEFAULT_MONITORING_STATS_RUNNING_AVERAGE_WINDOW,
       max: 100,
       min: 10,
     }),
@@ -130,6 +133,11 @@ export const configSchema = schema.object(
       }),
     }),
     event_loop_delay: eventLoopDelaySchema,
+    worker_utilization_running_average_window: schema.number({
+      defaultValue: DEFAULT_WORKER_UTILIZATION_RUNNING_AVERAGE_WINDOW,
+      max: 100,
+      min: 1,
+    }),
     /* These are not designed to be used by most users. Please use caution when changing these */
     unsafe: schema.object({
       exclude_task_types: schema.arrayOf(schema.string(), { defaultValue: [] }),
diff --git a/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.test.ts b/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.test.ts
index 374a52ea84b2f..c2c0f6e3aceed 100644
--- a/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.test.ts
+++ b/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.test.ts
@@ -77,6 +77,7 @@ describe('EphemeralTaskLifecycle', () => {
           monitor: true,
           warn_threshold: 5000,
         },
+        worker_utilization_running_average_window: 5,
         ...config,
       },
       elasticsearchAndSOAvailability$,
diff --git a/x-pack/plugins/task_manager/server/integration_tests/managed_configuration.test.ts b/x-pack/plugins/task_manager/server/integration_tests/managed_configuration.test.ts
index 308aa9f556797..db8981a186ab4 100644
--- a/x-pack/plugins/task_manager/server/integration_tests/managed_configuration.test.ts
+++ b/x-pack/plugins/task_manager/server/integration_tests/managed_configuration.test.ts
@@ -71,6 +71,7 @@ describe('managed configuration', () => {
         monitor: true,
         warn_threshold: 5000,
       },
+      worker_utilization_running_average_window: 5,
     });
     logger = context.logger.get('taskManager');
 
diff --git a/x-pack/plugins/task_manager/server/monitoring/background_task_utilization_statistics.test.ts b/x-pack/plugins/task_manager/server/monitoring/background_task_utilization_statistics.test.ts
index 45b29c44b1a4b..cdd67a07ff9e7 100644
--- a/x-pack/plugins/task_manager/server/monitoring/background_task_utilization_statistics.test.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/background_task_utilization_statistics.test.ts
@@ -9,7 +9,13 @@ import { v4 as uuidv4 } from 'uuid';
 import { Subject, Observable } from 'rxjs';
 import { take, bufferCount, skip, map } from 'rxjs/operators';
 import { ConcreteTaskInstance, TaskStatus } from '../task';
-import { asTaskRunEvent, TaskTiming, TaskPersistence } from '../task_events';
+import {
+  asTaskRunEvent,
+  TaskTiming,
+  TaskPersistence,
+  asTaskManagerStatEvent,
+  TaskManagerStats,
+} from '../task_events';
 import { asOk } from '../lib/result_type';
 import { TaskLifecycleEvent } from '../polling_lifecycle';
 import { TaskRunResult } from '../task_running';
@@ -18,9 +24,10 @@ import { taskPollingLifecycleMock } from '../polling_lifecycle.mock';
 import {
   BackgroundTaskUtilizationStat,
   createBackgroundTaskUtilizationAggregator,
+  summarizeUtilizationStats,
 } from './background_task_utilization_statistics';
 import { AdHocTaskCounter } from '../lib/adhoc_task_counter';
-import { sum } from 'lodash';
+import { sum, mean } from 'lodash';
 
 describe('Task Run Statistics', () => {
   const pollInterval = 3000;
@@ -29,404 +36,586 @@ describe('Task Run Statistics', () => {
     jest.resetAllMocks();
   });
 
-  test('returns a running count of adhoc actual service_time', async () => {
-    const serviceTimes = [1000, 2000, 500, 300, 400, 15000, 20000, 200];
-    const events$ = new Subject<TaskLifecycleEvent>();
-    const taskPollingLifecycle = taskPollingLifecycleMock.create({
-      events$: events$ as Observable<TaskLifecycleEvent>,
-    });
-    const adHocTaskCounter = new AdHocTaskCounter();
-
-    const runningAverageWindowSize = 5;
-    const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
-      taskPollingLifecycle,
-      runningAverageWindowSize,
-      adHocTaskCounter,
-      pollInterval
-    );
-
-    function expectWindowEqualsUpdate(
-      taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
-      window: number[]
-    ) {
-      expect(taskStat.value.adhoc.ran.service_time.actual).toEqual(sum(window));
-    }
-
-    return new Promise<void>((resolve) => {
-      const events = [];
-      const now = Date.now();
-      for (const time of serviceTimes) {
-        events.push({ start: runAtMillisecondsAgo(now, time).getTime(), stop: now });
+  describe('createBackgroundTaskUtilizationAggregator', () => {
+    test('returns a running count of adhoc actual service_time', async () => {
+      const serviceTimes = [1000, 2000, 500, 300, 400, 15000, 20000, 200];
+      const events$ = new Subject<TaskLifecycleEvent>();
+      const taskPollingLifecycle = taskPollingLifecycleMock.create({
+        events$: events$ as Observable<TaskLifecycleEvent>,
+      });
+      const adHocTaskCounter = new AdHocTaskCounter();
+
+      const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
+        taskPollingLifecycle,
+        adHocTaskCounter,
+        pollInterval
+      );
+
+      function expectWindowEqualsUpdate(
+        taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
+        window: number[]
+      ) {
+        expect(taskStat.value.adhoc.ran.service_time.actual).toEqual(sum(window));
       }
-      BackgroundTaskUtilizationAggregator.pipe(
-        // skip initial stat which is just initialized data which
-        // ensures we don't stall on combineLatest
-        skip(1),
-        // Use 'summarizeUtilizationStat' to receive summarize stats
-        map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
-          key,
-          value,
-        })),
-        take(serviceTimes.length),
-        bufferCount(serviceTimes.length)
-      ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
-        expectWindowEqualsUpdate(taskStats[0], serviceTimes.slice(0, 1));
-        expectWindowEqualsUpdate(taskStats[1], serviceTimes.slice(0, 2));
-        expectWindowEqualsUpdate(taskStats[2], serviceTimes.slice(0, 3));
-        expectWindowEqualsUpdate(taskStats[3], serviceTimes.slice(0, 4));
-        expectWindowEqualsUpdate(taskStats[4], serviceTimes.slice(0, 5));
-        // from the 6th value, begin to drop old values as out window is 5
-        expectWindowEqualsUpdate(taskStats[5], serviceTimes.slice(0, 6));
-        expectWindowEqualsUpdate(taskStats[6], serviceTimes.slice(0, 7));
-        expectWindowEqualsUpdate(taskStats[7], serviceTimes.slice(0, 8));
-        resolve();
+
+      return new Promise<void>((resolve) => {
+        const events = [];
+        const now = Date.now();
+        for (const time of serviceTimes) {
+          events.push({ start: runAtMillisecondsAgo(now, time).getTime(), stop: now });
+        }
+        BackgroundTaskUtilizationAggregator.pipe(
+          // skip initial stat which is just initialized data which
+          // ensures we don't stall on combineLatest
+          skip(1),
+          // Use 'summarizeUtilizationStat' to receive summarize stats
+          map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
+            key,
+            value,
+          })),
+          take(serviceTimes.length),
+          bufferCount(serviceTimes.length)
+        ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
+          expectWindowEqualsUpdate(taskStats[0], serviceTimes.slice(0, 1));
+          expectWindowEqualsUpdate(taskStats[1], serviceTimes.slice(0, 2));
+          expectWindowEqualsUpdate(taskStats[2], serviceTimes.slice(0, 3));
+          expectWindowEqualsUpdate(taskStats[3], serviceTimes.slice(0, 4));
+          expectWindowEqualsUpdate(taskStats[4], serviceTimes.slice(0, 5));
+          // from the 6th value, begin to drop old values as out window is 5
+          expectWindowEqualsUpdate(taskStats[5], serviceTimes.slice(0, 6));
+          expectWindowEqualsUpdate(taskStats[6], serviceTimes.slice(0, 7));
+          expectWindowEqualsUpdate(taskStats[7], serviceTimes.slice(0, 8));
+          resolve();
+        });
+
+        for (const event of events) {
+          events$.next(mockTaskRunEvent({}, event));
+        }
       });
+    });
 
-      for (const event of events) {
-        events$.next(mockTaskRunEvent({}, event));
+    test('returns a running count of adhoc adjusted service_time', async () => {
+      const serviceTimes = [1000, 2000, 500, 300, 400, 15000, 20000, 200];
+      const events$ = new Subject<TaskLifecycleEvent>();
+      const taskPollingLifecycle = taskPollingLifecycleMock.create({
+        events$: events$ as Observable<TaskLifecycleEvent>,
+      });
+      const adHocTaskCounter = new AdHocTaskCounter();
+
+      const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
+        taskPollingLifecycle,
+        adHocTaskCounter,
+        pollInterval
+      );
+
+      function expectWindowEqualsUpdate(
+        taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
+        window: number[]
+      ) {
+        expect(taskStat.value.adhoc.ran.service_time.adjusted).toEqual(sum(window));
       }
-    });
-  });
 
-  test('returns a running count of adhoc adjusted service_time', async () => {
-    const serviceTimes = [1000, 2000, 500, 300, 400, 15000, 20000, 200];
-    const events$ = new Subject<TaskLifecycleEvent>();
-    const taskPollingLifecycle = taskPollingLifecycleMock.create({
-      events$: events$ as Observable<TaskLifecycleEvent>,
+      return new Promise<void>((resolve) => {
+        const events = [];
+        const now = Date.now();
+        for (const time of serviceTimes) {
+          events.push({ start: runAtMillisecondsAgo(now, time).getTime(), stop: now });
+        }
+        BackgroundTaskUtilizationAggregator.pipe(
+          // skip initial stat which is just initialized data which
+          // ensures we don't stall on combineLatest
+          skip(1),
+          // Use 'summarizeUtilizationStat' to receive summarize stats
+          map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
+            key,
+            value,
+          })),
+          take(serviceTimes.length),
+          bufferCount(serviceTimes.length)
+        ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
+          expectWindowEqualsUpdate(taskStats[0], roundUpToNearestSec(serviceTimes.slice(0, 1), 3));
+          expectWindowEqualsUpdate(taskStats[1], roundUpToNearestSec(serviceTimes.slice(0, 2), 3));
+          expectWindowEqualsUpdate(taskStats[2], roundUpToNearestSec(serviceTimes.slice(0, 3), 3));
+          expectWindowEqualsUpdate(taskStats[3], roundUpToNearestSec(serviceTimes.slice(0, 4), 3));
+          expectWindowEqualsUpdate(taskStats[4], roundUpToNearestSec(serviceTimes.slice(0, 5), 3));
+          // from the 6th value, begin to drop old values as out window is 5
+          expectWindowEqualsUpdate(taskStats[5], roundUpToNearestSec(serviceTimes.slice(0, 6), 3));
+          expectWindowEqualsUpdate(taskStats[6], roundUpToNearestSec(serviceTimes.slice(0, 7), 3));
+          expectWindowEqualsUpdate(taskStats[7], roundUpToNearestSec(serviceTimes.slice(0, 8), 3));
+          resolve();
+        });
+
+        for (const event of events) {
+          events$.next(mockTaskRunEvent({}, event));
+        }
+      });
     });
-    const adHocTaskCounter = new AdHocTaskCounter();
-
-    const runningAverageWindowSize = 5;
-    const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
-      taskPollingLifecycle,
-      runningAverageWindowSize,
-      adHocTaskCounter,
-      pollInterval
-    );
-
-    function expectWindowEqualsUpdate(
-      taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
-      window: number[]
-    ) {
-      expect(taskStat.value.adhoc.ran.service_time.adjusted).toEqual(sum(window));
-    }
-
-    return new Promise<void>((resolve) => {
-      const events = [];
-      const now = Date.now();
-      for (const time of serviceTimes) {
-        events.push({ start: runAtMillisecondsAgo(now, time).getTime(), stop: now });
+
+    test('returns a running count of adhoc task_counter', async () => {
+      const tasks = [0, 0, 0, 0, 0, 0, 0, 0];
+      const events$ = new Subject<TaskLifecycleEvent>();
+      const taskPollingLifecycle = taskPollingLifecycleMock.create({
+        events$: events$ as Observable<TaskLifecycleEvent>,
+      });
+      const adHocTaskCounter = new AdHocTaskCounter();
+
+      const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
+        taskPollingLifecycle,
+        adHocTaskCounter,
+        pollInterval
+      );
+
+      function expectWindowEqualsUpdate(
+        taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
+        window: number[]
+      ) {
+        expect(taskStat.value.adhoc.ran.service_time.task_counter).toEqual(window.length);
       }
-      BackgroundTaskUtilizationAggregator.pipe(
-        // skip initial stat which is just initialized data which
-        // ensures we don't stall on combineLatest
-        skip(1),
-        // Use 'summarizeUtilizationStat' to receive summarize stats
-        map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
-          key,
-          value,
-        })),
-        take(serviceTimes.length),
-        bufferCount(serviceTimes.length)
-      ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
-        expectWindowEqualsUpdate(taskStats[0], roundUpToNearestSec(serviceTimes.slice(0, 1), 3));
-        expectWindowEqualsUpdate(taskStats[1], roundUpToNearestSec(serviceTimes.slice(0, 2), 3));
-        expectWindowEqualsUpdate(taskStats[2], roundUpToNearestSec(serviceTimes.slice(0, 3), 3));
-        expectWindowEqualsUpdate(taskStats[3], roundUpToNearestSec(serviceTimes.slice(0, 4), 3));
-        expectWindowEqualsUpdate(taskStats[4], roundUpToNearestSec(serviceTimes.slice(0, 5), 3));
-        // from the 6th value, begin to drop old values as out window is 5
-        expectWindowEqualsUpdate(taskStats[5], roundUpToNearestSec(serviceTimes.slice(0, 6), 3));
-        expectWindowEqualsUpdate(taskStats[6], roundUpToNearestSec(serviceTimes.slice(0, 7), 3));
-        expectWindowEqualsUpdate(taskStats[7], roundUpToNearestSec(serviceTimes.slice(0, 8), 3));
-        resolve();
+
+      return new Promise<void>((resolve) => {
+        BackgroundTaskUtilizationAggregator.pipe(
+          // skip initial stat which is just initialized data which
+          // ensures we don't stall on combineLatest
+          skip(1),
+          // Use 'summarizeUtilizationStat' to receive summarize stats
+          map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
+            key,
+            value,
+          })),
+          take(tasks.length),
+          bufferCount(tasks.length)
+        ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
+          expectWindowEqualsUpdate(taskStats[0], tasks.slice(0, 1));
+          expectWindowEqualsUpdate(taskStats[1], tasks.slice(0, 2));
+          expectWindowEqualsUpdate(taskStats[2], tasks.slice(0, 3));
+          expectWindowEqualsUpdate(taskStats[3], tasks.slice(0, 4));
+          expectWindowEqualsUpdate(taskStats[4], tasks.slice(0, 5));
+          // from the 6th value, begin to drop old values as out window is 5
+          expectWindowEqualsUpdate(taskStats[5], tasks.slice(0, 6));
+          expectWindowEqualsUpdate(taskStats[6], tasks.slice(0, 7));
+          expectWindowEqualsUpdate(taskStats[7], tasks.slice(0, 8));
+          resolve();
+        });
+
+        for (const task of tasks) {
+          events$.next(mockTaskRunEvent({}, { start: task, stop: task }));
+        }
       });
+    });
 
-      for (const event of events) {
-        events$.next(mockTaskRunEvent({}, event));
+    test('returns a running count of adhoc created counter', async () => {
+      const tasks = [1000, 2000, 500, 300, 400, 15000, 20000, 200];
+      const events$ = new Subject<TaskLifecycleEvent>();
+      const taskPollingLifecycle = taskPollingLifecycleMock.create({
+        events$: events$ as Observable<TaskLifecycleEvent>,
+      });
+      const adHocTaskCounter = new AdHocTaskCounter();
+
+      const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
+        taskPollingLifecycle,
+        adHocTaskCounter,
+        pollInterval
+      );
+
+      function expectWindowEqualsUpdate(
+        taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
+        window: number[]
+      ) {
+        expect(taskStat.value.adhoc.created.counter).toEqual(sum(window));
       }
-    });
-  });
 
-  test('returns a running count of adhoc task_counter', async () => {
-    const tasks = [0, 0, 0, 0, 0, 0, 0, 0];
-    const events$ = new Subject<TaskLifecycleEvent>();
-    const taskPollingLifecycle = taskPollingLifecycleMock.create({
-      events$: events$ as Observable<TaskLifecycleEvent>,
-    });
-    const adHocTaskCounter = new AdHocTaskCounter();
-
-    const runningAverageWindowSize = 5;
-    const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
-      taskPollingLifecycle,
-      runningAverageWindowSize,
-      adHocTaskCounter,
-      pollInterval
-    );
-
-    function expectWindowEqualsUpdate(
-      taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
-      window: number[]
-    ) {
-      expect(taskStat.value.adhoc.ran.service_time.task_counter).toEqual(window.length);
-    }
-
-    return new Promise<void>((resolve) => {
-      BackgroundTaskUtilizationAggregator.pipe(
-        // skip initial stat which is just initialized data which
-        // ensures we don't stall on combineLatest
-        skip(1),
-        // Use 'summarizeUtilizationStat' to receive summarize stats
-        map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
-          key,
-          value,
-        })),
-        take(tasks.length),
-        bufferCount(tasks.length)
-      ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
-        expectWindowEqualsUpdate(taskStats[0], tasks.slice(0, 1));
-        expectWindowEqualsUpdate(taskStats[1], tasks.slice(0, 2));
-        expectWindowEqualsUpdate(taskStats[2], tasks.slice(0, 3));
-        expectWindowEqualsUpdate(taskStats[3], tasks.slice(0, 4));
-        expectWindowEqualsUpdate(taskStats[4], tasks.slice(0, 5));
-        // from the 6th value, begin to drop old values as out window is 5
-        expectWindowEqualsUpdate(taskStats[5], tasks.slice(0, 6));
-        expectWindowEqualsUpdate(taskStats[6], tasks.slice(0, 7));
-        expectWindowEqualsUpdate(taskStats[7], tasks.slice(0, 8));
-        resolve();
+      return new Promise<void>((resolve) => {
+        BackgroundTaskUtilizationAggregator.pipe(
+          // skip initial stat which is just initialized data which
+          // ensures we don't stall on combineLatest
+          skip(1),
+          // Use 'summarizeUtilizationStat' to receive summarize stats
+          map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
+            key,
+            value,
+          })),
+          take(tasks.length),
+          bufferCount(tasks.length)
+        ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
+          expectWindowEqualsUpdate(taskStats[0], tasks.slice(0, 1));
+          expectWindowEqualsUpdate(taskStats[1], tasks.slice(0, 2));
+          expectWindowEqualsUpdate(taskStats[2], tasks.slice(0, 3));
+          expectWindowEqualsUpdate(taskStats[3], tasks.slice(0, 4));
+          expectWindowEqualsUpdate(taskStats[4], tasks.slice(0, 5));
+          // from the 6th value, begin to drop old values as out window is 5
+          expectWindowEqualsUpdate(taskStats[5], tasks.slice(0, 6));
+          expectWindowEqualsUpdate(taskStats[6], tasks.slice(0, 7));
+          expectWindowEqualsUpdate(taskStats[7], tasks.slice(0, 8));
+          resolve();
+        });
+
+        for (const task of tasks) {
+          adHocTaskCounter.increment(task);
+          events$.next(mockTaskRunEvent({}, { start: 0, stop: 0 }));
+        }
       });
+    });
 
-      for (const task of tasks) {
-        events$.next(mockTaskRunEvent({}, { start: task, stop: task }));
+    test('returns a running count of recurring actual service_time', async () => {
+      const serviceTimes = [1000, 2000, 500, 300, 400, 15000, 20000, 200];
+      const events$ = new Subject<TaskLifecycleEvent>();
+      const taskPollingLifecycle = taskPollingLifecycleMock.create({
+        events$: events$ as Observable<TaskLifecycleEvent>,
+      });
+      const adHocTaskCounter = new AdHocTaskCounter();
+
+      const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
+        taskPollingLifecycle,
+        adHocTaskCounter,
+        pollInterval
+      );
+
+      function expectWindowEqualsUpdate(
+        taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
+        window: number[]
+      ) {
+        expect(taskStat.value.recurring.ran.service_time.actual).toEqual(sum(window));
       }
-    });
-  });
 
-  test('returns a running count of adhoc created counter', async () => {
-    const tasks = [1000, 2000, 500, 300, 400, 15000, 20000, 200];
-    const events$ = new Subject<TaskLifecycleEvent>();
-    const taskPollingLifecycle = taskPollingLifecycleMock.create({
-      events$: events$ as Observable<TaskLifecycleEvent>,
-    });
-    const adHocTaskCounter = new AdHocTaskCounter();
-
-    const runningAverageWindowSize = 5;
-    const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
-      taskPollingLifecycle,
-      runningAverageWindowSize,
-      adHocTaskCounter,
-      pollInterval
-    );
-
-    function expectWindowEqualsUpdate(
-      taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
-      window: number[]
-    ) {
-      expect(taskStat.value.adhoc.created.counter).toEqual(sum(window));
-    }
-
-    return new Promise<void>((resolve) => {
-      BackgroundTaskUtilizationAggregator.pipe(
-        // skip initial stat which is just initialized data which
-        // ensures we don't stall on combineLatest
-        skip(1),
-        // Use 'summarizeUtilizationStat' to receive summarize stats
-        map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
-          key,
-          value,
-        })),
-        take(tasks.length),
-        bufferCount(tasks.length)
-      ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
-        expectWindowEqualsUpdate(taskStats[0], tasks.slice(0, 1));
-        expectWindowEqualsUpdate(taskStats[1], tasks.slice(0, 2));
-        expectWindowEqualsUpdate(taskStats[2], tasks.slice(0, 3));
-        expectWindowEqualsUpdate(taskStats[3], tasks.slice(0, 4));
-        expectWindowEqualsUpdate(taskStats[4], tasks.slice(0, 5));
-        // from the 6th value, begin to drop old values as out window is 5
-        expectWindowEqualsUpdate(taskStats[5], tasks.slice(0, 6));
-        expectWindowEqualsUpdate(taskStats[6], tasks.slice(0, 7));
-        expectWindowEqualsUpdate(taskStats[7], tasks.slice(0, 8));
-        resolve();
+      return new Promise<void>((resolve) => {
+        const events = [];
+        const now = Date.now();
+        for (const time of serviceTimes) {
+          events.push({ start: runAtMillisecondsAgo(now, time).getTime(), stop: now });
+        }
+        BackgroundTaskUtilizationAggregator.pipe(
+          // skip initial stat which is just initialized data which
+          // ensures we don't stall on combineLatest
+          skip(1),
+          // Use 'summarizeUtilizationStat' to receive summarize stats
+          map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
+            key,
+            value,
+          })),
+          take(serviceTimes.length),
+          bufferCount(serviceTimes.length)
+        ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
+          expectWindowEqualsUpdate(taskStats[0], serviceTimes.slice(0, 1));
+          expectWindowEqualsUpdate(taskStats[1], serviceTimes.slice(0, 2));
+          expectWindowEqualsUpdate(taskStats[2], serviceTimes.slice(0, 3));
+          expectWindowEqualsUpdate(taskStats[3], serviceTimes.slice(0, 4));
+          expectWindowEqualsUpdate(taskStats[4], serviceTimes.slice(0, 5));
+          // from the 6th value, begin to drop old values as out window is 5
+          expectWindowEqualsUpdate(taskStats[5], serviceTimes.slice(0, 6));
+          expectWindowEqualsUpdate(taskStats[6], serviceTimes.slice(0, 7));
+          expectWindowEqualsUpdate(taskStats[7], serviceTimes.slice(0, 8));
+          resolve();
+        });
+
+        for (const event of events) {
+          events$.next(mockTaskRunEvent({ schedule: { interval: '1h' } }, event));
+        }
       });
+    });
 
-      for (const task of tasks) {
-        adHocTaskCounter.increment(task);
-        events$.next(mockTaskRunEvent({}, { start: 0, stop: 0 }));
+    test('returns a running count of recurring adjusted service_time', async () => {
+      const serviceTimes = [1000, 2000, 500, 300, 400, 15000, 20000, 200];
+      const events$ = new Subject<TaskLifecycleEvent>();
+      const taskPollingLifecycle = taskPollingLifecycleMock.create({
+        events$: events$ as Observable<TaskLifecycleEvent>,
+      });
+      const adHocTaskCounter = new AdHocTaskCounter();
+
+      const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
+        taskPollingLifecycle,
+        adHocTaskCounter,
+        pollInterval
+      );
+
+      function expectWindowEqualsUpdate(
+        taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
+        window: number[]
+      ) {
+        expect(taskStat.value.recurring.ran.service_time.adjusted).toEqual(sum(window));
       }
-    });
-  });
 
-  test('returns a running count of recurring actual service_time', async () => {
-    const serviceTimes = [1000, 2000, 500, 300, 400, 15000, 20000, 200];
-    const events$ = new Subject<TaskLifecycleEvent>();
-    const taskPollingLifecycle = taskPollingLifecycleMock.create({
-      events$: events$ as Observable<TaskLifecycleEvent>,
+      return new Promise<void>((resolve) => {
+        const events = [];
+        const now = Date.now();
+        for (const time of serviceTimes) {
+          events.push({ start: runAtMillisecondsAgo(now, time).getTime(), stop: now });
+        }
+        BackgroundTaskUtilizationAggregator.pipe(
+          // skip initial stat which is just initialized data which
+          // ensures we don't stall on combineLatest
+          skip(1),
+          // Use 'summarizeUtilizationStat' to receive summarize stats
+          map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
+            key,
+            value,
+          })),
+          take(serviceTimes.length),
+          bufferCount(serviceTimes.length)
+        ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
+          expectWindowEqualsUpdate(taskStats[0], roundUpToNearestSec(serviceTimes.slice(0, 1), 3));
+          expectWindowEqualsUpdate(taskStats[1], roundUpToNearestSec(serviceTimes.slice(0, 2), 3));
+          expectWindowEqualsUpdate(taskStats[2], roundUpToNearestSec(serviceTimes.slice(0, 3), 3));
+          expectWindowEqualsUpdate(taskStats[3], roundUpToNearestSec(serviceTimes.slice(0, 4), 3));
+          expectWindowEqualsUpdate(taskStats[4], roundUpToNearestSec(serviceTimes.slice(0, 5), 3));
+          // from the 6th value, begin to drop old values as out window is 5
+          expectWindowEqualsUpdate(taskStats[5], roundUpToNearestSec(serviceTimes.slice(0, 6), 3));
+          expectWindowEqualsUpdate(taskStats[6], roundUpToNearestSec(serviceTimes.slice(0, 7), 3));
+          expectWindowEqualsUpdate(taskStats[7], roundUpToNearestSec(serviceTimes.slice(0, 8), 3));
+          resolve();
+        });
+
+        for (const event of events) {
+          events$.next(mockTaskRunEvent({ schedule: { interval: '1h' } }, event));
+        }
+      });
     });
-    const adHocTaskCounter = new AdHocTaskCounter();
-
-    const runningAverageWindowSize = 5;
-    const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
-      taskPollingLifecycle,
-      runningAverageWindowSize,
-      adHocTaskCounter,
-      pollInterval
-    );
-
-    function expectWindowEqualsUpdate(
-      taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
-      window: number[]
-    ) {
-      expect(taskStat.value.recurring.ran.service_time.actual).toEqual(sum(window));
-    }
-
-    return new Promise<void>((resolve) => {
-      const events = [];
-      const now = Date.now();
-      for (const time of serviceTimes) {
-        events.push({ start: runAtMillisecondsAgo(now, time).getTime(), stop: now });
+
+    test('returns a running count of recurring task_counter', async () => {
+      const tasks = [0, 0, 0, 0, 0, 0, 0, 0];
+      const events$ = new Subject<TaskLifecycleEvent>();
+      const taskPollingLifecycle = taskPollingLifecycleMock.create({
+        events$: events$ as Observable<TaskLifecycleEvent>,
+      });
+      const adHocTaskCounter = new AdHocTaskCounter();
+
+      const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
+        taskPollingLifecycle,
+        adHocTaskCounter,
+        pollInterval
+      );
+
+      function expectWindowEqualsUpdate(
+        taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
+        window: number[]
+      ) {
+        expect(taskStat.value.recurring.ran.service_time.task_counter).toEqual(window.length);
       }
-      BackgroundTaskUtilizationAggregator.pipe(
-        // skip initial stat which is just initialized data which
-        // ensures we don't stall on combineLatest
-        skip(1),
-        // Use 'summarizeUtilizationStat' to receive summarize stats
-        map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
-          key,
-          value,
-        })),
-        take(serviceTimes.length),
-        bufferCount(serviceTimes.length)
-      ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
-        expectWindowEqualsUpdate(taskStats[0], serviceTimes.slice(0, 1));
-        expectWindowEqualsUpdate(taskStats[1], serviceTimes.slice(0, 2));
-        expectWindowEqualsUpdate(taskStats[2], serviceTimes.slice(0, 3));
-        expectWindowEqualsUpdate(taskStats[3], serviceTimes.slice(0, 4));
-        expectWindowEqualsUpdate(taskStats[4], serviceTimes.slice(0, 5));
-        // from the 6th value, begin to drop old values as out window is 5
-        expectWindowEqualsUpdate(taskStats[5], serviceTimes.slice(0, 6));
-        expectWindowEqualsUpdate(taskStats[6], serviceTimes.slice(0, 7));
-        expectWindowEqualsUpdate(taskStats[7], serviceTimes.slice(0, 8));
-        resolve();
+
+      return new Promise<void>((resolve) => {
+        BackgroundTaskUtilizationAggregator.pipe(
+          // skip initial stat which is just initialized data which
+          // ensures we don't stall on combineLatest
+          skip(1),
+          // Use 'summarizeUtilizationStat' to receive summarize stats
+          map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
+            key,
+            value,
+          })),
+          take(tasks.length),
+          bufferCount(tasks.length)
+        ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
+          expectWindowEqualsUpdate(taskStats[0], tasks.slice(0, 1));
+          expectWindowEqualsUpdate(taskStats[1], tasks.slice(0, 2));
+          expectWindowEqualsUpdate(taskStats[2], tasks.slice(0, 3));
+          expectWindowEqualsUpdate(taskStats[3], tasks.slice(0, 4));
+          expectWindowEqualsUpdate(taskStats[4], tasks.slice(0, 5));
+          // from the 6th value, begin to drop old values as out window is 5
+          expectWindowEqualsUpdate(taskStats[5], tasks.slice(0, 6));
+          expectWindowEqualsUpdate(taskStats[6], tasks.slice(0, 7));
+          expectWindowEqualsUpdate(taskStats[7], tasks.slice(0, 8));
+          resolve();
+        });
+
+        for (const task of tasks) {
+          events$.next(
+            mockTaskRunEvent({ schedule: { interval: '1h' } }, { start: task, stop: task })
+          );
+        }
       });
+    });
 
-      for (const event of events) {
-        events$.next(mockTaskRunEvent({ schedule: { interval: '1h' } }, event));
+    test('returns a running count of load', async () => {
+      const loads = [40, 80, 100, 100, 10, 10, 60, 40];
+      const events$ = new Subject<TaskLifecycleEvent>();
+      const taskPollingLifecycle = taskPollingLifecycleMock.create({
+        events$: events$ as Observable<TaskLifecycleEvent>,
+      });
+
+      const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
+        taskPollingLifecycle,
+        new AdHocTaskCounter(),
+        pollInterval
+      );
+
+      function expectWindowEqualsUpdate(
+        taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
+        window: number[]
+      ) {
+        expect(taskStat.value.load).toEqual(mean(window));
       }
-    });
-  });
 
-  test('returns a running count of recurring adjusted service_time', async () => {
-    const serviceTimes = [1000, 2000, 500, 300, 400, 15000, 20000, 200];
-    const events$ = new Subject<TaskLifecycleEvent>();
-    const taskPollingLifecycle = taskPollingLifecycleMock.create({
-      events$: events$ as Observable<TaskLifecycleEvent>,
+      return new Promise<void>((resolve) => {
+        BackgroundTaskUtilizationAggregator.pipe(
+          // skip initial stat which is just initialized data which
+          // ensures we don't stall on combineLatest
+          skip(1),
+          map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
+            key,
+            value,
+          })),
+          take(loads.length),
+          bufferCount(loads.length)
+        ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
+          expectWindowEqualsUpdate(taskStats[0], loads.slice(0, 1));
+          expectWindowEqualsUpdate(taskStats[1], loads.slice(0, 2));
+          expectWindowEqualsUpdate(taskStats[2], loads.slice(0, 3));
+          expectWindowEqualsUpdate(taskStats[3], loads.slice(0, 4));
+          expectWindowEqualsUpdate(taskStats[4], loads.slice(0, 5));
+          // from the 6th value, begin to drop old values as our window is 5
+          expectWindowEqualsUpdate(taskStats[5], loads.slice(1, 6));
+          expectWindowEqualsUpdate(taskStats[6], loads.slice(2, 7));
+          expectWindowEqualsUpdate(taskStats[7], loads.slice(3, 8));
+          resolve();
+        });
+
+        for (const load of loads) {
+          events$.next(mockTaskStatEvent('workerUtilization', load));
+        }
+      });
     });
-    const adHocTaskCounter = new AdHocTaskCounter();
-
-    const runningAverageWindowSize = 5;
-    const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
-      taskPollingLifecycle,
-      runningAverageWindowSize,
-      adHocTaskCounter,
-      pollInterval
-    );
-
-    function expectWindowEqualsUpdate(
-      taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
-      window: number[]
-    ) {
-      expect(taskStat.value.recurring.ran.service_time.adjusted).toEqual(sum(window));
-    }
-
-    return new Promise<void>((resolve) => {
-      const events = [];
-      const now = Date.now();
-      for (const time of serviceTimes) {
-        events.push({ start: runAtMillisecondsAgo(now, time).getTime(), stop: now });
-      }
-      BackgroundTaskUtilizationAggregator.pipe(
-        // skip initial stat which is just initialized data which
-        // ensures we don't stall on combineLatest
-        skip(1),
-        // Use 'summarizeUtilizationStat' to receive summarize stats
-        map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
-          key,
-          value,
-        })),
-        take(serviceTimes.length),
-        bufferCount(serviceTimes.length)
-      ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
-        expectWindowEqualsUpdate(taskStats[0], roundUpToNearestSec(serviceTimes.slice(0, 1), 3));
-        expectWindowEqualsUpdate(taskStats[1], roundUpToNearestSec(serviceTimes.slice(0, 2), 3));
-        expectWindowEqualsUpdate(taskStats[2], roundUpToNearestSec(serviceTimes.slice(0, 3), 3));
-        expectWindowEqualsUpdate(taskStats[3], roundUpToNearestSec(serviceTimes.slice(0, 4), 3));
-        expectWindowEqualsUpdate(taskStats[4], roundUpToNearestSec(serviceTimes.slice(0, 5), 3));
-        // from the 6th value, begin to drop old values as out window is 5
-        expectWindowEqualsUpdate(taskStats[5], roundUpToNearestSec(serviceTimes.slice(0, 6), 3));
-        expectWindowEqualsUpdate(taskStats[6], roundUpToNearestSec(serviceTimes.slice(0, 7), 3));
-        expectWindowEqualsUpdate(taskStats[7], roundUpToNearestSec(serviceTimes.slice(0, 8), 3));
-        resolve();
+
+    test('returns a running count of load with custom window size', async () => {
+      const loads = [40, 80, 100, 100, 10, 10, 60, 40];
+      const events$ = new Subject<TaskLifecycleEvent>();
+      const taskPollingLifecycle = taskPollingLifecycleMock.create({
+        events$: events$ as Observable<TaskLifecycleEvent>,
       });
 
-      for (const event of events) {
-        events$.next(mockTaskRunEvent({ schedule: { interval: '1h' } }, event));
+      const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
+        taskPollingLifecycle,
+        new AdHocTaskCounter(),
+        pollInterval,
+        3
+      );
+
+      function expectWindowEqualsUpdate(
+        taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
+        window: number[]
+      ) {
+        expect(taskStat.value.load).toEqual(mean(window));
       }
+
+      return new Promise<void>((resolve) => {
+        BackgroundTaskUtilizationAggregator.pipe(
+          // skip initial stat which is just initialized data which
+          // ensures we don't stall on combineLatest
+          skip(1),
+          map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
+            key,
+            value,
+          })),
+          take(loads.length),
+          bufferCount(loads.length)
+        ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
+          expectWindowEqualsUpdate(taskStats[0], loads.slice(0, 1));
+          expectWindowEqualsUpdate(taskStats[1], loads.slice(0, 2));
+          expectWindowEqualsUpdate(taskStats[2], loads.slice(0, 3));
+          // from the 4th value, begin to drop old values as our window is 3
+          expectWindowEqualsUpdate(taskStats[3], loads.slice(1, 4));
+          expectWindowEqualsUpdate(taskStats[4], loads.slice(2, 5));
+          expectWindowEqualsUpdate(taskStats[5], loads.slice(3, 6));
+          expectWindowEqualsUpdate(taskStats[6], loads.slice(4, 7));
+          expectWindowEqualsUpdate(taskStats[7], loads.slice(5, 8));
+          resolve();
+        });
+
+        for (const load of loads) {
+          events$.next(mockTaskStatEvent('workerUtilization', load));
+        }
+      });
     });
   });
 
-  test('returns a running count of recurring task_counter', async () => {
-    const tasks = [0, 0, 0, 0, 0, 0, 0, 0];
-    const events$ = new Subject<TaskLifecycleEvent>();
-    const taskPollingLifecycle = taskPollingLifecycleMock.create({
-      events$: events$ as Observable<TaskLifecycleEvent>,
+  describe('summarizeUtilizationStats', () => {
+    const lastUpdate = '2023-04-02T17:34:41.371Z';
+    const monitoredStats = {
+      timestamp: '2023-04-01T17:34:41.371Z',
+      value: {
+        adhoc: {
+          created: {
+            counter: 1,
+          },
+          ran: {
+            service_time: {
+              actual: 10,
+              adjusted: 7,
+              task_counter: 3,
+            },
+          },
+        },
+        recurring: {
+          ran: {
+            service_time: {
+              actual: 79,
+              adjusted: 66,
+              task_counter: 10,
+            },
+          },
+        },
+        load: 63,
+      },
+    };
+
+    test('should return null if monitoredStats is null', () => {
+      expect(
+        summarizeUtilizationStats({
+          lastUpdate,
+          // @ts-expect-error
+          monitoredStats: null,
+          isInternal: false,
+        })
+      ).toEqual({
+        last_update: lastUpdate,
+        stats: null,
+      });
     });
-    const adHocTaskCounter = new AdHocTaskCounter();
-
-    const runningAverageWindowSize = 5;
-    const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
-      taskPollingLifecycle,
-      runningAverageWindowSize,
-      adHocTaskCounter,
-      pollInterval
-    );
-
-    function expectWindowEqualsUpdate(
-      taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
-      window: number[]
-    ) {
-      expect(taskStat.value.recurring.ran.service_time.task_counter).toEqual(window.length);
-    }
-
-    return new Promise<void>((resolve) => {
-      BackgroundTaskUtilizationAggregator.pipe(
-        // skip initial stat which is just initialized data which
-        // ensures we don't stall on combineLatest
-        skip(1),
-        // Use 'summarizeUtilizationStat' to receive summarize stats
-        map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
-          key,
-          value,
-        })),
-        take(tasks.length),
-        bufferCount(tasks.length)
-      ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
-        expectWindowEqualsUpdate(taskStats[0], tasks.slice(0, 1));
-        expectWindowEqualsUpdate(taskStats[1], tasks.slice(0, 2));
-        expectWindowEqualsUpdate(taskStats[2], tasks.slice(0, 3));
-        expectWindowEqualsUpdate(taskStats[3], tasks.slice(0, 4));
-        expectWindowEqualsUpdate(taskStats[4], tasks.slice(0, 5));
-        // from the 6th value, begin to drop old values as out window is 5
-        expectWindowEqualsUpdate(taskStats[5], tasks.slice(0, 6));
-        expectWindowEqualsUpdate(taskStats[6], tasks.slice(0, 7));
-        expectWindowEqualsUpdate(taskStats[7], tasks.slice(0, 8));
-        resolve();
+
+    test('should return null if monitoredStats value is not defined', () => {
+      expect(
+        summarizeUtilizationStats({
+          lastUpdate,
+          // @ts-expect-error
+          monitoredStats: {},
+          isInternal: false,
+        })
+      ).toEqual({
+        last_update: lastUpdate,
+        stats: null,
       });
+    });
 
-      for (const task of tasks) {
-        events$.next(
-          mockTaskRunEvent({ schedule: { interval: '1h' } }, { start: task, stop: task })
-        );
-      }
+    test('should return summary with all stats when isInternal is true', () => {
+      expect(
+        summarizeUtilizationStats({
+          lastUpdate,
+          monitoredStats,
+          isInternal: true,
+        })
+      ).toEqual({
+        last_update: lastUpdate,
+        stats: {
+          timestamp: monitoredStats.timestamp,
+          value: monitoredStats.value,
+        },
+      });
+    });
+
+    test('should return summary with only public stats when isInternal is false', () => {
+      expect(
+        summarizeUtilizationStats({
+          lastUpdate,
+          monitoredStats,
+          isInternal: false,
+        })
+      ).toEqual({
+        last_update: lastUpdate,
+        stats: {
+          timestamp: monitoredStats.timestamp,
+          value: {
+            load: 63,
+          },
+        },
+      });
     });
   });
 });
@@ -440,6 +629,10 @@ function roundUpToNearestSec(duration: number[], s: number): number[] {
   return duration.map((d) => Math.ceil(d / pollInterval) * pollInterval);
 }
 
+const mockTaskStatEvent = (type: TaskManagerStats, value: number) => {
+  return asTaskManagerStatEvent(type, asOk(value));
+};
+
 const mockTaskRunEvent = (
   overrides: Partial<ConcreteTaskInstance> = {},
   timing: TaskTiming,
diff --git a/x-pack/plugins/task_manager/server/monitoring/background_task_utilization_statistics.ts b/x-pack/plugins/task_manager/server/monitoring/background_task_utilization_statistics.ts
index 761ad4252ac83..fd116cbdd71d8 100644
--- a/x-pack/plugins/task_manager/server/monitoring/background_task_utilization_statistics.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/background_task_utilization_statistics.ts
@@ -6,17 +6,29 @@
  */
 
 import { JsonObject } from '@kbn/utility-types';
-import { get } from 'lodash';
+import { get, pick } from 'lodash';
+import stats from 'stats-lite';
 import { combineLatest, filter, map, Observable, startWith } from 'rxjs';
 import { AdHocTaskCounter } from '../lib/adhoc_task_counter';
-import { unwrap } from '../lib/result_type';
+import { mapOk, unwrap } from '../lib/result_type';
 import { TaskLifecycleEvent, TaskPollingLifecycle } from '../polling_lifecycle';
 import { ConcreteTaskInstance } from '../task';
-import { isTaskRunEvent, TaskRun, TaskTiming } from '../task_events';
+import {
+  isTaskManagerWorkerUtilizationStatEvent,
+  isTaskRunEvent,
+  TaskRun,
+  TaskTiming,
+} from '../task_events';
 import { MonitoredStat } from './monitoring_stats_stream';
 import { AggregatedStat, AggregatedStatProvider } from './runtime_statistics_aggregator';
+import { createRunningAveragedStat } from './task_run_calcultors';
+import { DEFAULT_WORKER_UTILIZATION_RUNNING_AVERAGE_WINDOW } from '../config';
 
-export interface BackgroundTaskUtilizationStat extends JsonObject {
+export interface PublicBackgroundTaskUtilizationStat extends JsonObject {
+  load: number;
+}
+
+export interface BackgroundTaskUtilizationStat extends PublicBackgroundTaskUtilizationStat {
   adhoc: AdhocTaskStat;
   recurring: TaskStat;
 }
@@ -39,11 +51,11 @@ interface AdhocTaskStat extends TaskStat {
 
 export function createBackgroundTaskUtilizationAggregator(
   taskPollingLifecycle: TaskPollingLifecycle,
-  runningAverageWindowSize: number,
   adHocTaskCounter: AdHocTaskCounter,
-  pollInterval: number
+  pollInterval: number,
+  workerUtilizationRunningAverageWindowSize: number = DEFAULT_WORKER_UTILIZATION_RUNNING_AVERAGE_WINDOW
 ): AggregatedStatProvider<BackgroundTaskUtilizationStat> {
-  const taskRunEventToAdhocStat = createTaskRunEventToAdhocStat(runningAverageWindowSize);
+  const taskRunEventToAdhocStat = createTaskRunEventToAdhocStat();
   const taskRunAdhocEvents$: Observable<Pick<BackgroundTaskUtilizationStat, 'adhoc'>> =
     taskPollingLifecycle.events.pipe(
       filter((taskEvent: TaskLifecycleEvent) => isTaskRunEvent(taskEvent) && hasTiming(taskEvent)),
@@ -57,7 +69,7 @@ export function createBackgroundTaskUtilizationAggregator(
       })
     );
 
-  const taskRunEventToRecurringStat = createTaskRunEventToRecurringStat(runningAverageWindowSize);
+  const taskRunEventToRecurringStat = createTaskRunEventToRecurringStat();
   const taskRunRecurringEvents$: Observable<Pick<BackgroundTaskUtilizationStat, 'recurring'>> =
     taskPollingLifecycle.events.pipe(
       filter((taskEvent: TaskLifecycleEvent) => isTaskRunEvent(taskEvent) && hasTiming(taskEvent)),
@@ -71,6 +83,18 @@ export function createBackgroundTaskUtilizationAggregator(
       })
     );
 
+  const taskManagerUtilizationEventToLoadStat = createTaskRunEventToLoadStat(
+    workerUtilizationRunningAverageWindowSize
+  );
+
+  const taskManagerWorkerUtilizationEvent$: Observable<
+    Pick<BackgroundTaskUtilizationStat, 'load'>
+  > = taskPollingLifecycle.events.pipe(
+    filter(isTaskManagerWorkerUtilizationStatEvent),
+    map((taskEvent: TaskLifecycleEvent) => taskEvent.event),
+    map(mapOk((num: number) => taskManagerUtilizationEventToLoadStat(num)))
+  );
+
   return combineLatest([
     taskRunAdhocEvents$.pipe(
       startWith({
@@ -101,17 +125,24 @@ export function createBackgroundTaskUtilizationAggregator(
         },
       })
     ),
+    taskManagerWorkerUtilizationEvent$.pipe(
+      startWith({
+        load: 0,
+      })
+    ),
   ]).pipe(
     map(
-      ([adhoc, recurring]: [
+      ([adhoc, recurring, load]: [
         Pick<BackgroundTaskUtilizationStat, 'adhoc'>,
-        Pick<BackgroundTaskUtilizationStat, 'recurring'>
+        Pick<BackgroundTaskUtilizationStat, 'recurring'>,
+        Pick<BackgroundTaskUtilizationStat, 'load'>
       ]) => {
         return {
           key: 'utilization',
           value: {
             ...adhoc,
             ...recurring,
+            ...load,
           },
         } as AggregatedStat<BackgroundTaskUtilizationStat>;
       }
@@ -123,31 +154,41 @@ function hasTiming(taskEvent: TaskLifecycleEvent) {
   return !!taskEvent?.timing;
 }
 
-export function summarizeUtilizationStats({
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  last_update,
-  stats,
-}: {
-  last_update: string;
-  stats: MonitoredStat<BackgroundTaskUtilizationStat> | undefined;
-}): {
+interface SummarizeUtilizationStatsOpts {
+  lastUpdate: string;
+  monitoredStats: MonitoredStat<BackgroundTaskUtilizationStat> | undefined;
+  isInternal: boolean;
+}
+
+interface SummarizeUtilizationStatsResult {
   last_update: string;
-  stats: MonitoredStat<BackgroundTaskUtilizationStat> | null;
-} {
-  const utilizationStats = stats?.value;
+  stats:
+    | MonitoredStat<BackgroundTaskUtilizationStat>
+    | MonitoredStat<PublicBackgroundTaskUtilizationStat>
+    | null;
+}
+
+export function summarizeUtilizationStats({
+  lastUpdate,
+  monitoredStats,
+  isInternal,
+}: SummarizeUtilizationStatsOpts): SummarizeUtilizationStatsResult {
+  const utilizationStats = monitoredStats?.value;
+
+  if (!monitoredStats || !utilizationStats) {
+    return { last_update: lastUpdate, stats: null };
+  }
+
   return {
-    last_update,
-    stats:
-      stats && utilizationStats
-        ? {
-            timestamp: stats.timestamp,
-            value: utilizationStats,
-          }
-        : null,
+    last_update: lastUpdate,
+    stats: {
+      timestamp: monitoredStats.timestamp,
+      value: isInternal ? utilizationStats : pick(utilizationStats, 'load'),
+    },
   };
 }
 
-function createTaskRunEventToAdhocStat(runningAverageWindowSize: number) {
+function createTaskRunEventToAdhocStat() {
   let createdCounter = 0;
   let actualCounter = 0;
   let adjustedCounter = 0;
@@ -177,7 +218,7 @@ function createTaskRunEventToAdhocStat(runningAverageWindowSize: number) {
   };
 }
 
-function createTaskRunEventToRecurringStat(runningAverageWindowSize: number) {
+function createTaskRunEventToRecurringStat() {
   let actualCounter = 0;
   let adjustedCounter = 0;
   let taskCounter = 0;
@@ -201,6 +242,16 @@ function createTaskRunEventToRecurringStat(runningAverageWindowSize: number) {
   };
 }
 
+function createTaskRunEventToLoadStat(workerUtilizationRunningAverageWindowSize: number) {
+  const loadQueue = createRunningAveragedStat<number>(workerUtilizationRunningAverageWindowSize);
+  return (load: number): Pick<BackgroundTaskUtilizationStat, 'load'> => {
+    const historicalLoad = loadQueue(load);
+    return {
+      load: stats.mean(historicalLoad),
+    };
+  };
+}
+
 function getServiceTimeStats(timing: TaskTiming, pollInterval: number) {
   const duration = timing!.stop - timing!.start;
   const adjusted = Math.ceil(duration / pollInterval) * pollInterval;
diff --git a/x-pack/plugins/task_manager/server/monitoring/configuration_statistics.test.ts b/x-pack/plugins/task_manager/server/monitoring/configuration_statistics.test.ts
index 764b7aa15335b..b63c52893c5d8 100644
--- a/x-pack/plugins/task_manager/server/monitoring/configuration_statistics.test.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/configuration_statistics.test.ts
@@ -45,6 +45,7 @@ describe('Configuration Statistics Aggregator', () => {
         monitor: true,
         warn_threshold: 5000,
       },
+      worker_utilization_running_average_window: 5,
     };
 
     const managedConfig = {
diff --git a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.test.ts b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.test.ts
index 610e0bf080b05..8d6df288e702d 100644
--- a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.test.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.test.ts
@@ -49,6 +49,7 @@ describe('createMonitoringStatsStream', () => {
       monitor: true,
       warn_threshold: 5000,
     },
+    worker_utilization_running_average_window: 5,
   };
 
   it('returns the initial config used to configure Task Manager', async () => {
diff --git a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts
index e192a72f7092d..e1ff38d1c9607 100644
--- a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts
@@ -108,9 +108,9 @@ export function createAggregators(
       createTaskRunAggregator(taskPollingLifecycle, config.monitored_stats_running_average_window),
       createBackgroundTaskUtilizationAggregator(
         taskPollingLifecycle,
-        config.monitored_stats_running_average_window,
         adHocTaskCounter,
-        config.poll_interval
+        config.poll_interval,
+        config.worker_utilization_running_average_window
       )
     );
   }
diff --git a/x-pack/plugins/task_manager/server/plugin.test.ts b/x-pack/plugins/task_manager/server/plugin.test.ts
index ad02e6d7490f5..fce648c87f6e9 100644
--- a/x-pack/plugins/task_manager/server/plugin.test.ts
+++ b/x-pack/plugins/task_manager/server/plugin.test.ts
@@ -70,6 +70,7 @@ const pluginInitializerContextParams = {
     monitor: true,
     warn_threshold: 5000,
   },
+  worker_utilization_running_average_window: 5,
 };
 
 describe('TaskManagerPlugin', () => {
diff --git a/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts b/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts
index 51cac494d3a67..9e62eec402b2d 100644
--- a/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts
+++ b/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts
@@ -75,6 +75,7 @@ describe('TaskPollingLifecycle', () => {
         monitor: true,
         warn_threshold: 5000,
       },
+      worker_utilization_running_average_window: 5,
     },
     taskStore: mockTaskStore,
     logger: taskManagerLogger,
diff --git a/x-pack/plugins/task_manager/server/polling_lifecycle.ts b/x-pack/plugins/task_manager/server/polling_lifecycle.ts
index ce5a142dc433e..e9b9eaca1e5d3 100644
--- a/x-pack/plugins/task_manager/server/polling_lifecycle.ts
+++ b/x-pack/plugins/task_manager/server/polling_lifecycle.ts
@@ -176,8 +176,13 @@ export class TaskPollingLifecycle {
               const capacity = this.pool.availableWorkers;
               if (!capacity) {
                 // if there isn't capacity, emit a load event so that we can expose how often
-                // high load causes the poller to skip work (work isn'tcalled when there is no capacity)
+                // high load causes the poller to skip work (work isn't called when there is no capacity)
                 this.emitEvent(asTaskManagerStatEvent('load', asOk(this.pool.workerLoad)));
+
+                // Emit event indicating task manager utilization
+                this.emitEvent(
+                  asTaskManagerStatEvent('workerUtilization', asOk(this.pool.workerLoad))
+                );
               }
               return capacity;
             },
@@ -187,7 +192,16 @@ export class TaskPollingLifecycle {
             // (such as polling for new work, marking tasks as running etc.) but does not
             // include the time of actually running the task
             workTimeout: pollInterval * maxPollInactivityCycles,
-          }),
+          }).pipe(
+            tap(
+              mapOk(() => {
+                // Emit event indicating task manager utilization % at the end of a polling cycle
+                this.emitEvent(
+                  asTaskManagerStatEvent('workerUtilization', asOk(this.pool.workerLoad))
+                );
+              })
+            )
+          ),
         {
           heartbeatInterval: pollInterval,
           // Time out the poller itself if it has failed to complete the entire stream for a certain amount of time.
diff --git a/x-pack/plugins/task_manager/server/routes/background_task_utilization.test.ts b/x-pack/plugins/task_manager/server/routes/background_task_utilization.test.ts
index 66052b095a258..1ccc0d89f804a 100644
--- a/x-pack/plugins/task_manager/server/routes/background_task_utilization.test.ts
+++ b/x-pack/plugins/task_manager/server/routes/background_task_utilization.test.ts
@@ -37,7 +37,7 @@ describe('backgroundTaskUtilizationRoute', () => {
     jest.resetAllMocks();
   });
 
-  it('registers the route', async () => {
+  it('registers internal and public route', async () => {
     const router = httpServiceMock.createRouter();
     backgroundTaskUtilizationRoute({
       router,
@@ -51,11 +51,15 @@ describe('backgroundTaskUtilizationRoute', () => {
       usageCounter: mockUsageCounter,
     });
 
-    const [config] = router.get.mock.calls[0];
+    const [config1] = router.get.mock.calls[0];
 
-    expect(config.path).toMatchInlineSnapshot(
+    expect(config1.path).toMatchInlineSnapshot(
       `"/internal/task_manager/_background_task_utilization"`
     );
+
+    const [config2] = router.get.mock.calls[1];
+
+    expect(config2.path).toMatchInlineSnapshot(`"/api/task_manager/_background_task_utilization"`);
   });
 
   it('checks user privileges and increments usage counter when API is accessed', async () => {
diff --git a/x-pack/plugins/task_manager/server/routes/background_task_utilization.ts b/x-pack/plugins/task_manager/server/routes/background_task_utilization.ts
index a1e0f5c4281f9..0d7eabee2a7ce 100644
--- a/x-pack/plugins/task_manager/server/routes/background_task_utilization.ts
+++ b/x-pack/plugins/task_manager/server/routes/background_task_utilization.ts
@@ -21,6 +21,7 @@ import { MonitoringStats } from '../monitoring';
 import { TaskManagerConfig } from '../config';
 import {
   BackgroundTaskUtilizationStat,
+  PublicBackgroundTaskUtilizationStat,
   summarizeUtilizationStats,
 } from '../monitoring/background_task_utilization_statistics';
 import { MonitoredStat } from '../monitoring/monitoring_stats_stream';
@@ -29,7 +30,10 @@ export interface MonitoredUtilization {
   process_uuid: string;
   timestamp: string;
   last_update: string;
-  stats: MonitoredStat<BackgroundTaskUtilizationStat> | null;
+  stats:
+    | MonitoredStat<BackgroundTaskUtilizationStat>
+    | MonitoredStat<PublicBackgroundTaskUtilizationStat>
+    | null;
 }
 
 export interface BackgroundTaskUtilRouteParams {
@@ -44,6 +48,12 @@ export interface BackgroundTaskUtilRouteParams {
   usageCounter?: UsageCounter;
 }
 
+// Create an internal and public route so we can test out experimental metrics
+const routeOptions = [
+  { basePath: 'internal', isInternal: true },
+  { basePath: 'api', isInternal: false },
+];
+
 export function backgroundTaskUtilizationRoute(
   params: BackgroundTaskUtilRouteParams
 ): Observable<MonitoredUtilization> {
@@ -61,10 +71,11 @@ export function backgroundTaskUtilizationRoute(
 
   const requiredHotStatsFreshness: number = config.monitored_stats_required_freshness;
 
-  function getBackgroundTaskUtilization(monitoredStats: MonitoringStats) {
+  function getBackgroundTaskUtilization(monitoredStats: MonitoringStats, isInternal: boolean) {
     const summarizedStats = summarizeUtilizationStats({
-      last_update: monitoredStats.last_update,
-      stats: monitoredStats.stats.utilization,
+      lastUpdate: monitoredStats.last_update,
+      monitoredStats: monitoredStats.stats.utilization,
+      isInternal,
     });
     const now = Date.now();
     const timestamp = new Date(now).toISOString();
@@ -83,7 +94,7 @@ export function backgroundTaskUtilizationRoute(
       }),
       // Only calculate the summarized stats (calculates all running averages and evaluates state)
       // when needed by throttling down to the requiredHotStatsFreshness
-      map((stats) => getBackgroundTaskUtilization(stats))
+      map((stats) => getBackgroundTaskUtilization(stats, true))
     )
     .subscribe((utilizationStats) => {
       monitoredUtilization$.next(utilizationStats);
@@ -92,58 +103,60 @@ export function backgroundTaskUtilizationRoute(
       }
     });
 
-  router.get(
-    {
-      path: '/internal/task_manager/_background_task_utilization',
-      // Uncomment when we determine that we can restrict API usage to Global admins based on telemetry
-      // options: { tags: ['access:taskManager'] },
-      validate: false,
-    },
-    async function (
-      context: RequestHandlerContext,
-      req: KibanaRequest<unknown, unknown, unknown>,
-      res: KibanaResponseFactory
-    ): Promise<IKibanaResponse> {
-      // If we are able to count usage, we want to check whether the user has access to
-      // the `taskManager` feature, which is only available as part of the Global All privilege.
-      if (usageCounter) {
-        const clusterClient = await getClusterClient();
-        const hasPrivilegesResponse = await clusterClient
-          .asScoped(req)
-          .asCurrentUser.security.hasPrivileges({
-            body: {
-              application: [
-                {
-                  application: `kibana-${kibanaIndexName}`,
-                  resources: ['*'],
-                  privileges: [`api:${kibanaVersion}:taskManager`],
-                },
-              ],
-            },
-          });
+  routeOptions.forEach((routeOption) => {
+    router.get(
+      {
+        path: `/${routeOption.basePath}/task_manager/_background_task_utilization`,
+        // Uncomment when we determine that we can restrict API usage to Global admins based on telemetry
+        // options: { tags: ['access:taskManager'] },
+        validate: false,
+      },
+      async function (
+        _: RequestHandlerContext,
+        req: KibanaRequest<unknown, unknown, unknown>,
+        res: KibanaResponseFactory
+      ): Promise<IKibanaResponse> {
+        // If we are able to count usage, we want to check whether the user has access to
+        // the `taskManager` feature, which is only available as part of the Global All privilege.
+        if (usageCounter) {
+          const clusterClient = await getClusterClient();
+          const hasPrivilegesResponse = await clusterClient
+            .asScoped(req)
+            .asCurrentUser.security.hasPrivileges({
+              body: {
+                application: [
+                  {
+                    application: `kibana-${kibanaIndexName}`,
+                    resources: ['*'],
+                    privileges: [`api:${kibanaVersion}:taskManager`],
+                  },
+                ],
+              },
+            });
 
-        // Keep track of total access vs admin access
-        usageCounter.incrementCounter({
-          counterName: `taskManagerBackgroundTaskUtilApiAccess`,
-          counterType: 'taskManagerBackgroundTaskUtilApi',
-          incrementBy: 1,
-        });
-        if (hasPrivilegesResponse.has_all_requested) {
+          // Keep track of total access vs admin access
           usageCounter.incrementCounter({
-            counterName: `taskManagerBackgroundTaskUtilApiAdminAccess`,
+            counterName: `taskManagerBackgroundTaskUtilApiAccess`,
             counterType: 'taskManagerBackgroundTaskUtilApi',
             incrementBy: 1,
           });
+          if (hasPrivilegesResponse.has_all_requested) {
+            usageCounter.incrementCounter({
+              counterName: `taskManagerBackgroundTaskUtilApiAdminAccess`,
+              counterType: 'taskManagerBackgroundTaskUtilApi',
+              incrementBy: 1,
+            });
+          }
         }
-      }
 
-      return res.ok({
-        body: lastMonitoredStats
-          ? getBackgroundTaskUtilization(lastMonitoredStats)
-          : { process_uuid: taskManagerId, timestamp: new Date().toISOString(), stats: {} },
-      });
-    }
-  );
+        return res.ok({
+          body: lastMonitoredStats
+            ? getBackgroundTaskUtilization(lastMonitoredStats, routeOption.isInternal)
+            : { process_uuid: taskManagerId, timestamp: new Date().toISOString(), stats: {} },
+        });
+      }
+    );
+  });
 
   return monitoredUtilization$;
 }
diff --git a/x-pack/plugins/task_manager/server/task_events.ts b/x-pack/plugins/task_manager/server/task_events.ts
index d0bcaf2724188..e8808322b397a 100644
--- a/x-pack/plugins/task_manager/server/task_events.ts
+++ b/x-pack/plugins/task_manager/server/task_events.ts
@@ -87,7 +87,8 @@ export type TaskManagerStats =
   | 'pollingDelay'
   | 'claimDuration'
   | 'queuedEphemeralTasks'
-  | 'ephemeralTaskDelay';
+  | 'ephemeralTaskDelay'
+  | 'workerUtilization';
 export type TaskManagerStat = TaskEvent<number, never, TaskManagerStats>;
 
 export type OkResultOf<EventType> = EventType extends TaskEvent<infer OkResult, infer ErrorResult>
@@ -211,6 +212,11 @@ export function isTaskManagerStatEvent(
 ): taskEvent is TaskManagerStat {
   return taskEvent.type === TaskEventType.TASK_MANAGER_STAT;
 }
+export function isTaskManagerWorkerUtilizationStatEvent(
+  taskEvent: TaskEvent<unknown, unknown>
+): taskEvent is TaskManagerStat {
+  return taskEvent.type === TaskEventType.TASK_MANAGER_STAT && taskEvent.id === 'workerUtilization';
+}
 export function isEphemeralTaskRejectedDueToCapacityEvent(
   taskEvent: TaskEvent<unknown, unknown>
 ): taskEvent is EphemeralTaskRejectedDueToCapacity {
diff --git a/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.test.ts b/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.test.ts
index f41a0598ff50c..c8cb2787a90fb 100644
--- a/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.test.ts
+++ b/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.test.ts
@@ -19,6 +19,8 @@ import { registerTaskManagerUsageCollector } from './task_manager_usage_collecto
 import { sleep } from '../test_utils';
 import { TaskManagerUsage } from './types';
 import { MonitoredUtilization } from '../routes/background_task_utilization';
+import { MonitoredStat } from '../monitoring/monitoring_stats_stream';
+import { BackgroundTaskUtilizationStat } from '../monitoring/background_task_utilization_statistics';
 
 describe('registerTaskManagerUsageCollector', () => {
   let collector: Collector<unknown>;
@@ -113,18 +115,20 @@ describe('registerTaskManagerUsageCollector', () => {
     const mockHealth = getMockMonitoredHealth();
     monitoringStats$.next(mockHealth);
     const mockUtilization = getMockMonitoredUtilization();
+    const mockUtilizationStats =
+      mockUtilization.stats as MonitoredStat<BackgroundTaskUtilizationStat>;
     monitoringUtilization$.next(mockUtilization);
     await sleep(1001);
 
     expect(usageCollectionMock.makeUsageCollector).toBeCalled();
     const telemetry: TaskManagerUsage = (await collector.fetch(fetchContext)) as TaskManagerUsage;
     expect(telemetry.recurring_tasks).toEqual({
-      actual_service_time: mockUtilization.stats?.value.recurring.ran.service_time.actual,
-      adjusted_service_time: mockUtilization.stats?.value.recurring.ran.service_time.adjusted,
+      actual_service_time: mockUtilizationStats?.value.recurring.ran.service_time.actual,
+      adjusted_service_time: mockUtilizationStats?.value.recurring.ran.service_time.adjusted,
     });
     expect(telemetry.adhoc_tasks).toEqual({
-      actual_service_time: mockUtilization.stats?.value.adhoc.ran.service_time.actual,
-      adjusted_service_time: mockUtilization.stats?.value.adhoc.ran.service_time.adjusted,
+      actual_service_time: mockUtilizationStats?.value.adhoc.ran.service_time.actual,
+      adjusted_service_time: mockUtilizationStats?.value.adhoc.ran.service_time.adjusted,
     });
   });
 
@@ -308,6 +312,7 @@ function getMockMonitoredUtilization(overrides = {}): MonitoredUtilization {
     stats: {
       timestamp: new Date().toISOString(),
       value: {
+        load: 6,
         adhoc: {
           created: {
             counter: 5,
diff --git a/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.ts b/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.ts
index a4bd3049a0b49..6c8809c5c3d98 100644
--- a/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.ts
+++ b/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.ts
@@ -9,6 +9,8 @@ import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { MonitoredHealth } from '../routes/health';
 import { TaskManagerUsage } from './types';
 import { MonitoredUtilization } from '../routes/background_task_utilization';
+import { BackgroundTaskUtilizationStat } from '../monitoring/background_task_utilization_statistics';
+import { MonitoredStat } from '../monitoring/monitoring_stats_stream';
 
 export function createTaskManagerUsageCollector(
   usageCollection: UsageCollectionSetup,
@@ -19,12 +21,13 @@ export function createTaskManagerUsageCollector(
   excludeTaskTypes: string[]
 ) {
   let lastMonitoredHealth: MonitoredHealth | null = null;
-  let lastMonitoredUtilization: MonitoredUtilization | null = null;
+  let lastMonitoredUtilizationStats: MonitoredStat<BackgroundTaskUtilizationStat> | null = null;
   combineLatest([monitoringStats$, monitoredUtilization$])
     .pipe()
     .subscribe(([health, utilization]) => {
       lastMonitoredHealth = health;
-      lastMonitoredUtilization = utilization;
+      lastMonitoredUtilizationStats =
+        (utilization?.stats as MonitoredStat<BackgroundTaskUtilizationStat>) ?? null;
     });
 
   return usageCollection.makeUsageCollector<TaskManagerUsage>({
@@ -69,15 +72,15 @@ export function createTaskManagerUsageCollector(
         ),
         recurring_tasks: {
           actual_service_time:
-            lastMonitoredUtilization?.stats?.value.recurring.ran.service_time.actual ?? 0,
+            lastMonitoredUtilizationStats?.value.recurring.ran.service_time.actual ?? 0,
           adjusted_service_time:
-            lastMonitoredUtilization?.stats?.value.recurring.ran.service_time.adjusted ?? 0,
+            lastMonitoredUtilizationStats?.value.recurring.ran.service_time.adjusted ?? 0,
         },
         adhoc_tasks: {
           actual_service_time:
-            lastMonitoredUtilization?.stats?.value.adhoc.ran.service_time.actual ?? 0,
+            lastMonitoredUtilizationStats?.value.adhoc.ran.service_time.actual ?? 0,
           adjusted_service_time:
-            lastMonitoredUtilization?.stats?.value.adhoc.ran.service_time.adjusted ?? 0,
+            lastMonitoredUtilizationStats?.value.adhoc.ran.service_time.adjusted ?? 0,
         },
         capacity:
           lastMonitoredHealth?.stats.capacity_estimation?.value.observed
diff --git a/x-pack/test/plugin_api_integration/test_suites/task_manager/background_task_utilization_route.ts b/x-pack/test/plugin_api_integration/test_suites/task_manager/background_task_utilization_route.ts
index f58a5d473ca79..9c9dcbbe15126 100644
--- a/x-pack/test/plugin_api_integration/test_suites/task_manager/background_task_utilization_route.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/task_manager/background_task_utilization_route.ts
@@ -8,39 +8,11 @@
 import expect from '@kbn/expect';
 import url from 'url';
 import supertest from 'supertest';
+import { MonitoredUtilization } from '@kbn/task-manager-plugin/server/routes/background_task_utilization';
+import { MonitoredStat } from '@kbn/task-manager-plugin/server/monitoring/monitoring_stats_stream';
+import { BackgroundTaskUtilizationStat } from '@kbn/task-manager-plugin/server/monitoring/background_task_utilization_statistics';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
-interface MonitoringStats {
-  last_update: string;
-  status: string;
-  stats: {
-    timestamp: string;
-    value: {
-      adhoc: {
-        created: {
-          counter: number;
-        };
-        ran: {
-          service_time: {
-            actual: number;
-            adjusted: number;
-            task_counter: number;
-          };
-        };
-      };
-      recurring: {
-        ran: {
-          service_time: {
-            actual: number;
-            adjusted: number;
-            task_counter: number;
-          };
-        };
-      };
-    };
-  };
-}
-
 export default function ({ getService }: FtrProviderContext) {
   const config = getService('config');
   const retry = getService('retry');
@@ -48,21 +20,21 @@ export default function ({ getService }: FtrProviderContext) {
 
   const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 
-  function getUtilizationRequest() {
+  function getUtilizationRequest(isInternal: boolean = true) {
     return request
-      .get('/internal/task_manager/_background_task_utilization')
+      .get(`/${isInternal ? 'internal' : 'api'}/task_manager/_background_task_utilization`)
       .set('kbn-xsrf', 'foo');
   }
 
-  function getUtilization(): Promise<MonitoringStats> {
-    return getUtilizationRequest()
+  function getUtilization(isInternal: boolean = true): Promise<MonitoredUtilization> {
+    return getUtilizationRequest(isInternal)
       .expect(200)
       .then((response) => response.body);
   }
 
-  function getBackgroundTaskUtilization(): Promise<MonitoringStats> {
+  function getBackgroundTaskUtilization(isInternal: boolean = true): Promise<MonitoredUtilization> {
     return retry.try(async () => {
-      const utilization = await getUtilization();
+      const utilization = await getUtilization(isInternal);
 
       if (utilization.stats) {
         return utilization;
@@ -79,7 +51,8 @@ export default function ({ getService }: FtrProviderContext) {
         value: {
           recurring: { ran },
         },
-      } = (await getBackgroundTaskUtilization()).stats;
+      } = (await getBackgroundTaskUtilization(true))
+        .stats as MonitoredStat<BackgroundTaskUtilizationStat>;
       const serviceTime = ran.service_time;
       expect(typeof serviceTime.actual).to.eql('number');
       expect(typeof serviceTime.adjusted).to.eql('number');
@@ -91,7 +64,8 @@ export default function ({ getService }: FtrProviderContext) {
         value: {
           adhoc: { created, ran },
         },
-      } = (await getBackgroundTaskUtilization()).stats;
+      } = (await getBackgroundTaskUtilization(true))
+        .stats as MonitoredStat<BackgroundTaskUtilizationStat>;
       const serviceTime = ran.service_time;
       expect(typeof created.counter).to.eql('number');
 
@@ -99,5 +73,31 @@ export default function ({ getService }: FtrProviderContext) {
       expect(typeof serviceTime.adjusted).to.eql('number');
       expect(typeof serviceTime.task_counter).to.eql('number');
     });
+
+    it('should include load stat', async () => {
+      const {
+        value: { load },
+      } = (await getBackgroundTaskUtilization(true))
+        .stats as MonitoredStat<BackgroundTaskUtilizationStat>;
+      expect(typeof load).to.eql('number');
+    });
+
+    it('should return expected fields for internal route', async () => {
+      const monitoredStat = (await getBackgroundTaskUtilization(true)).stats;
+      expect(monitoredStat?.timestamp).not.to.be(undefined);
+      expect(monitoredStat?.value).not.to.be(undefined);
+      expect(monitoredStat?.value?.adhoc).not.to.be(undefined);
+      expect(monitoredStat?.value?.recurring).not.to.be(undefined);
+      expect(monitoredStat?.value?.load).not.to.be(undefined);
+    });
+
+    it('should return expected fields for public route', async () => {
+      const monitoredStat = (await getBackgroundTaskUtilization(false)).stats;
+      expect(monitoredStat?.timestamp).not.to.be(undefined);
+      expect(monitoredStat?.value).not.to.be(undefined);
+      expect(monitoredStat?.value?.adhoc).to.be(undefined);
+      expect(monitoredStat?.value?.recurring).to.be(undefined);
+      expect(monitoredStat?.value?.load).not.to.be(undefined);
+    });
   });
 }

From 0324cdcd65b76b9819952ef9395f87c07468ec77 Mon Sep 17 00:00:00 2001
From: Liam Thompson <32779855+leemthompo@users.noreply.github.com>
Date: Tue, 2 May 2023 17:40:53 +0200
Subject: [PATCH 14/33] [Enterprise Search] Copyedit: remove redundant link,
 simplify wording (#156391)

---
 .../connector/connector_configuration.tsx     | 22 ++-----------------
 .../translations/translations/fr-FR.json      |  2 --
 .../translations/translations/ja-JP.json      |  2 --
 .../translations/translations/zh-CN.json      |  2 --
 4 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration.tsx
index 35624797f0488..7c2815eab946e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration.tsx
@@ -99,28 +99,10 @@ export const ConnectorConfiguration: React.FC = () => {
                 {
                   children: (
                     <>
-                      <EuiText size="s">
-                        {i18n.translate(
-                          'xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.description.firstParagraph',
-                          {
-                            defaultMessage:
-                              'The connectors repository contains several connector client examples to help you utilize our framework for accelerated development against custom data sources.',
-                          }
-                        )}
-                      </EuiText>
-                      <EuiLink href="https://github.com/elastic/connectors" target="_blank">
-                        {i18n.translate(
-                          'xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.button.label',
-                          {
-                            defaultMessage: 'Explore the connectors repository',
-                          }
-                        )}
-                      </EuiLink>
-                      <EuiSpacer />
                       <EuiText size="s">
                         <FormattedMessage
                           id="xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.description.secondParagraph"
-                          defaultMessage="The connectors repository contains several {link} to help you utilize our framework for accelerated development against custom data sources."
+                          defaultMessage="The connectors repository contains several {link}. Use our framework for accelerated development against custom data sources."
                           values={{
                             link: (
                               <EuiLink
@@ -266,7 +248,7 @@ export const ConnectorConfiguration: React.FC = () => {
                             'xpack.enterpriseSearch.content.indices.configurationConnector.scheduleSync.description',
                             {
                               defaultMessage:
-                                'Once your connectors are configured to your liking, don’t forget to set a recurring sync schedule to make sure your documents are indexed and relevant. You can also trigger a one-time sync without enabling a sync schedule.',
+                                'Once configured, set a recurring sync schedule to keep your documents in sync over time. You can also simply trigger a one-time sync.',
                             }
                           )}
                         </EuiText>
diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
index a82ea33392517..001ff56a7c3b1 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -12159,11 +12159,9 @@
     "xpack.enterpriseSearch.content.indices.configurationConnector.config.submitButton.title": "Enregistrer la configuration",
     "xpack.enterpriseSearch.content.indices.configurationConnector.config.warning.title": "Ce connecteur est lié à votre index Elastic",
     "xpack.enterpriseSearch.content.indices.configurationConnector.configuration.successToast.title": "Configuration mise à jour",
-    "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.button.label": "Explorer le référentiel de connecteurs",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.clientExamplesLink": "exemples de clients connecteurs",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.configurationFileLink": "fichier de configuration",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.connectorDeployedText": "Une fois que vous avez configuré le connecteur, déployez-le sur votre infrastructure autogérée.",
-    "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.description.firstParagraph": "Le référentiel de connecteurs contient plusieurs exemples de clients connecteurs pour vous aider à utiliser notre cadre de développement accéléré avec des sources de données personnalisées.",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.waitingForConnector.button.label": "Revérifier maintenant",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.waitingForConnectorText": "Votre connecteur ne s'est pas connecté à Enterprise Search. Résolvez vos problèmes de configuration et actualisez la page.",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.waitingForConnectorTitle": "En attente de votre connecteur",
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 3c793b60772bc..65b2c00933970 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -12158,11 +12158,9 @@
     "xpack.enterpriseSearch.content.indices.configurationConnector.config.submitButton.title": "構成を保存",
     "xpack.enterpriseSearch.content.indices.configurationConnector.config.warning.title": "このコネクターは、Elasticインデックスに関連付けられています",
     "xpack.enterpriseSearch.content.indices.configurationConnector.configuration.successToast.title": "構成が更新されました",
-    "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.button.label": "コネクターリポジトリを探索",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.clientExamplesLink": "コネクタークライアントの例",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.configurationFileLink": "構成ファイル",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.connectorDeployedText": "コネクターを構成したら、コネクターをセルフマネージドインフラストラクチャーにデプロイします。",
-    "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.description.firstParagraph": "コネクターリポジトリには、複数のコネクタークライアントの例があり、当社のフレームワークを利用して、カスタムデータソースに対する高速デプロイを実施できるようになっています。",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.waitingForConnector.button.label": "今すぐ再確認",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.waitingForConnectorText": "コネクターエンタープライズ サーチに接続されていません。構成のトラブルシューティングを行い、ページを更新してください。",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.waitingForConnectorTitle": "コネクターを待機しています",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index d20ad056909de..9bc9283638256 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -12160,11 +12160,9 @@
     "xpack.enterpriseSearch.content.indices.configurationConnector.config.submitButton.title": "保存配置",
     "xpack.enterpriseSearch.content.indices.configurationConnector.config.warning.title": "此连接器将绑定到您的 Elastic 索引",
     "xpack.enterpriseSearch.content.indices.configurationConnector.configuration.successToast.title": "已更新配置",
-    "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.button.label": "浏览连接器存储库",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.clientExamplesLink": "连接器客户端示例",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.configurationFileLink": "配置文件",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.connectorDeployedText": "配置连接器后，请将其部署到您的自管型基础架构。",
-    "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.description.firstParagraph": "连接器存储库包含几个连接器客户端示例，有助于您利用我们的框架针对定制数据源进行加速开发。",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.waitingForConnector.button.label": "立即重新检查",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.waitingForConnectorText": "您的连接器尚未连接到 Enterprise Search。排除配置故障并刷新页面。",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.waitingForConnectorTitle": "等候您的连接器",

From ee9d782793971cb8812c6cad3e2051c23836fb6c Mon Sep 17 00:00:00 2001
From: Gloria Hornero <gloria.hornero@elastic.co>
Date: Tue, 2 May 2023 17:57:16 +0200
Subject: [PATCH 15/33] [Security Solution] Fixes typo in edit rules step
 (#156397)

---
 .../components/rules/step_rule_actions/translations.tsx         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/translations.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/translations.tsx
index 06368eadc30df..938d8a8a6411f 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/translations.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/translations.tsx
@@ -40,6 +40,6 @@ export const RULE_SNOOZE_DESCRIPTION = i18n.translate(
 export const SNOOZED_ACTIONS_WARNING = i18n.translate(
   'xpack.securitySolution.detectionEngine.createRule.stepRuleActions.snoozedActionsWarning',
   {
-    defaultMessage: 'Actions will not be preformed until it is unsnoozed.',
+    defaultMessage: 'Actions will not be performed until it is unsnoozed.',
   }
 );

From 3cd35494aba67aaae6c3021d6a140ee7feb18b4e Mon Sep 17 00:00:00 2001
From: Dima Arnautov <dmitrii.arnautov@elastic.co>
Date: Tue, 2 May 2023 18:09:46 +0200
Subject: [PATCH 16/33] [ML] Rename ELSER model id (#156382)

---
 .../src/constants/trained_models.ts                   |  4 ++--
 .../technical_preview_badge.tsx                       |  4 ++--
 .../application/model_management/models_list.tsx      | 11 +++++++++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/x-pack/packages/ml/trained_models_utils/src/constants/trained_models.ts b/x-pack/packages/ml/trained_models_utils/src/constants/trained_models.ts
index 3376af46daa2b..e1a5d35afdc2e 100644
--- a/x-pack/packages/ml/trained_models_utils/src/constants/trained_models.ts
+++ b/x-pack/packages/ml/trained_models_utils/src/constants/trained_models.ts
@@ -50,14 +50,14 @@ export const BUILT_IN_MODEL_TAG = 'prepackaged';
 export const CURATED_MODEL_TAG = 'curated';
 
 export const CURATED_MODEL_DEFINITIONS = {
-  '.elser_model_1_SNAPSHOT': {
+  '.elser_model_1': {
     config: {
       input: {
         field_names: ['text_field'],
       },
     },
     description: i18n.translate('xpack.ml.trainedModels.modelsList.elserDescription', {
-      defaultMessage: 'Elastic Learned Sparse EncodeR',
+      defaultMessage: 'Elastic Learned Sparse EncodeR v1 (Tech Preview)',
     }),
   },
 } as const;
diff --git a/x-pack/plugins/ml/public/application/components/technical_preview_badge/technical_preview_badge.tsx b/x-pack/plugins/ml/public/application/components/technical_preview_badge/technical_preview_badge.tsx
index a216a7ce7fc75..95f1a0d54b10a 100644
--- a/x-pack/plugins/ml/public/application/components/technical_preview_badge/technical_preview_badge.tsx
+++ b/x-pack/plugins/ml/public/application/components/technical_preview_badge/technical_preview_badge.tsx
@@ -11,13 +11,13 @@ import { EuiBetaBadge } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 
-export const TechnicalPreviewBadge: FC = () => {
+export const TechnicalPreviewBadge: FC<{ compressed?: boolean }> = ({ compressed = false }) => {
   return (
     <EuiBetaBadge
       label={i18n.translate('xpack.ml.navMenu.trainedModelsTabBetaLabel', {
         defaultMessage: 'Technical preview',
       })}
-      size="m"
+      size={compressed ? 's' : 'm'}
       color="hollow"
       tooltipContent={i18n.translate('xpack.ml.navMenu.trainedModelsTabBetaTooltipContent', {
         defaultMessage:
diff --git a/x-pack/plugins/ml/public/application/model_management/models_list.tsx b/x-pack/plugins/ml/public/application/model_management/models_list.tsx
index 391136f3f2ada..80c8bef6971f5 100644
--- a/x-pack/plugins/ml/public/application/model_management/models_list.tsx
+++ b/x-pack/plugins/ml/public/application/model_management/models_list.tsx
@@ -39,6 +39,7 @@ import {
   CURATED_MODEL_TYPE,
   MODEL_STATE,
 } from '@kbn/ml-trained-models-utils/src/constants/trained_models';
+import { TechnicalPreviewBadge } from '../components/technical_preview_badge';
 import { useModelActions } from './model_actions';
 import { ModelsTableToConfigMapping } from '.';
 import { ModelsBarStats, StatsBar } from '../components/stats_bar';
@@ -407,6 +408,16 @@ export const ModelsList: FC<Props> = ({
       sortable: false,
       truncateText: false,
       'data-test-subj': 'mlModelsTableColumnDescription',
+      render: (description: string) => {
+        if (!description) return null;
+        const isTechPreview = description.includes('(Tech Preview)');
+        return (
+          <>
+            {description.replace('(Tech Preview)', '')}
+            {isTechPreview ? <TechnicalPreviewBadge compressed /> : null}
+          </>
+        );
+      },
     },
     {
       field: ModelsTableToConfigMapping.type,

From 0bf005a580501a7df450fde3444511b3c5ff199f Mon Sep 17 00:00:00 2001
From: Tim Sullivan <tsullivan@users.noreply.github.com>
Date: Tue, 2 May 2023 10:06:00 -0700
Subject: [PATCH 17/33] [Serverless/Side Nav] Light mode for side nav
 background (#156293)

## Summary

This removes the dark background of the side nav for serverless
projects.

Pulled from https://github.com/elastic/kibana/pull/153508

Context from @MichaelMarcialis
> current plans for the next revision is to ditch the high contrast nav
and header in favor of one that honors the current theme mode (light for
light and dark for dark).

## Screenshots
**Before**
<img width="1912" alt="light mode before"
src="https://user-images.githubusercontent.com/908371/235507715-5a094c83-b644-4cfa-946e-bc7183d393f5.png">

**After**
<img width="1912" alt="light mode after"
src="https://user-images.githubusercontent.com/908371/235507752-fa4e6548-f587-4bc2-93f4-f900aef542a1.png">
---
 .../src/ui/project/navigation.tsx             | 49 +++++++++----------
 1 file changed, 22 insertions(+), 27 deletions(-)

diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/project/navigation.tsx b/packages/core/chrome/core-chrome-browser-internal/src/ui/project/navigation.tsx
index 20549325ec851..445a80cca586d 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/ui/project/navigation.tsx
+++ b/packages/core/chrome/core-chrome-browser-internal/src/ui/project/navigation.tsx
@@ -11,7 +11,7 @@ import useLocalStorage from 'react-use/lib/useLocalStorage';
 import { css } from '@emotion/react';
 
 import { i18n } from '@kbn/i18n';
-import { EuiButtonIcon, EuiCollapsibleNav, EuiThemeProvider, useEuiTheme } from '@elastic/eui';
+import { EuiButtonIcon, EuiCollapsibleNav } from '@elastic/eui';
 
 const LOCAL_STORAGE_IS_OPEN_KEY = 'PROJECT_NAVIGATION_OPEN' as const;
 const SIZE_OPEN = 248;
@@ -33,8 +33,6 @@ const closedAriaLabel = i18n.translate('core.ui.chrome.projectNav.collapsibleNav
 });
 
 export const ProjectNavigation: React.FC = ({ children }) => {
-  const { euiTheme, colorMode } = useEuiTheme();
-
   const [isOpen, setIsOpen] = useLocalStorage(LOCAL_STORAGE_IS_OPEN_KEY, true);
 
   const toggleOpen = useCallback(() => {
@@ -43,34 +41,31 @@ export const ProjectNavigation: React.FC = ({ children }) => {
 
   const collabsibleNavCSS = css`
     border-inline-end-width: 1,
-    background: ${euiTheme.colors.darkestShade},
     display: flex,
     flex-direction: row,
   `;
 
   return (
-    <EuiThemeProvider colorMode={colorMode === 'DARK' ? 'LIGHT' : 'DARK'}>
-      <EuiCollapsibleNav
-        css={collabsibleNavCSS}
-        isOpen={true}
-        showButtonIfDocked={true}
-        onClose={toggleOpen}
-        isDocked={true}
-        size={isOpen ? SIZE_OPEN : SIZE_CLOSED}
-        hideCloseButton={false}
-        button={
-          <span css={buttonCSS}>
-            <EuiButtonIcon
-              iconType={isOpen ? 'menuLeft' : 'menuRight'}
-              aria-label={isOpen ? openAriaLabel : closedAriaLabel}
-              color="text"
-              onClick={toggleOpen}
-            />
-          </span>
-        }
-      >
-        {isOpen && children}
-      </EuiCollapsibleNav>
-    </EuiThemeProvider>
+    <EuiCollapsibleNav
+      css={collabsibleNavCSS}
+      isOpen={true}
+      showButtonIfDocked={true}
+      onClose={toggleOpen}
+      isDocked={true}
+      size={isOpen ? SIZE_OPEN : SIZE_CLOSED}
+      hideCloseButton={false}
+      button={
+        <span css={buttonCSS}>
+          <EuiButtonIcon
+            iconType={isOpen ? 'menuLeft' : 'menuRight'}
+            aria-label={isOpen ? openAriaLabel : closedAriaLabel}
+            color={isOpen ? 'ghost' : 'text'}
+            onClick={toggleOpen}
+          />
+        </span>
+      }
+    >
+      {isOpen && children}
+    </EuiCollapsibleNav>
   );
 };

From 6203acbe0516fed363d99b8c7a067b57d48e5f62 Mon Sep 17 00:00:00 2001
From: Jatin Kathuria <jatin.kathuria@elastic.co>
Date: Tue, 2 May 2023 19:24:11 +0200
Subject: [PATCH 18/33] [Security Solution] [Fix] Cypress test flakyness in
 Alert page Controls (#155988)

## Summary

Handles :  #153685 and #153686

This PR tries to fix the flakyness of cypress tests. Although, this
issue in cypress is very difficult to reproduce, I noticed that it is
coming mainly when adding extra control.

And it looks like during the course of dev one of the API of adding a
control called `addOptionsListControl` was changed to be a promise,
therefore, mainly the change is to await the promise before adding a new
control.


### Checklist

Delete any items that are not applicable to this PR.


- [x] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios
---
 .../detection_page_filters.cy.ts              |  32 +++-
 .../cypress/screens/common/filter_group.ts    |   6 +-
 .../cypress/tasks/common/filter_group.ts      |  23 +++
 .../components/filter_group/context_menu.tsx  |  12 +-
 .../filter_group/filter_group.test.tsx        |   3 -
 .../common/components/filter_group/index.tsx  |  19 +--
 .../common/lib/kibana/kibana_react.mock.ts    |   3 +
 .../detection_page_filters/index.test.tsx     | 144 ++++++++++++++++++
 .../detection_page_filters/index.tsx          |   2 +-
 9 files changed, 214 insertions(+), 30 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/public/detections/components/detection_page_filters/index.test.tsx

diff --git a/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/detection_page_filters.cy.ts b/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/detection_page_filters.cy.ts
index c16ccf35edbcc..a1a064eee6dc1 100644
--- a/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/detection_page_filters.cy.ts
+++ b/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/detection_page_filters.cy.ts
@@ -39,6 +39,7 @@ import {
   addNewFilterGroupControlValues,
   deleteFilterGroupControl,
   discardFilterGroupControls,
+  editFilterGroupControl,
   editFilterGroupControls,
   saveFilterGroupControls,
 } from '../../tasks/common/filter_group';
@@ -97,7 +98,7 @@ const assertFilterControlsWithFilterObject = (filterObject = DEFAULT_DETECTION_P
   });
 };
 
-describe.skip('Detections : Page Filters', { testIsolation: false }, () => {
+describe('Detections : Page Filters', { testIsolation: false }, () => {
   before(() => {
     cleanKibana();
     login();
@@ -116,10 +117,23 @@ describe.skip('Detections : Page Filters', { testIsolation: false }, () => {
   });
 
   context('Alert Page Filters Customization ', { testIsolation: false }, () => {
-    it('Add New Controls', () => {
+    beforeEach(() => {
+      resetFilters();
+    });
+    it('should be able to delete Controls', () => {
+      waitForPageFilters();
+      editFilterGroupControls();
+      deleteFilterGroupControl(3);
+      cy.get(CONTROL_FRAMES).should((sub) => {
+        expect(sub.length).lt(4);
+      });
+      discardFilterGroupControls();
+    });
+    it('should be able to add new Controls', () => {
       const fieldName = 'event.module';
       const label = 'EventModule';
       editFilterGroupControls();
+      deleteFilterGroupControl(3);
       addNewFilterGroupControlValues({
         fieldName,
         label,
@@ -129,18 +143,20 @@ describe.skip('Detections : Page Filters', { testIsolation: false }, () => {
       discardFilterGroupControls();
       cy.get(CONTROL_FRAME_TITLE).should('not.contain.text', label);
     });
-    it('Delete Controls', () => {
-      waitForPageFilters();
+    it('should be able to edit Controls', () => {
+      const fieldName = 'event.module';
+      const label = 'EventModule';
       editFilterGroupControls();
-      deleteFilterGroupControl(3);
-      cy.get(CONTROL_FRAMES).should((sub) => {
-        expect(sub.length).lt(4);
-      });
+      editFilterGroupControl({ idx: 3, fieldName, label });
+      cy.get(CONTROL_FRAME_TITLE).should('contain.text', label);
+      cy.get(FILTER_GROUP_SAVE_CHANGES_POPOVER).should('be.visible');
       discardFilterGroupControls();
+      cy.get(CONTROL_FRAME_TITLE).should('not.contain.text', label);
     });
     it('should not sync to the URL in edit mode but only in view mode', () => {
       cy.url().then((urlString) => {
         editFilterGroupControls();
+        deleteFilterGroupControl(3);
         addNewFilterGroupControlValues({ fieldName: 'event.module', label: 'Event Module' });
         cy.url().should('eq', urlString);
         saveFilterGroupControls();
diff --git a/x-pack/plugins/security_solution/cypress/screens/common/filter_group.ts b/x-pack/plugins/security_solution/cypress/screens/common/filter_group.ts
index f78fbcfa9e476..b36229a5cbeaa 100644
--- a/x-pack/plugins/security_solution/cypress/screens/common/filter_group.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/common/filter_group.ts
@@ -45,12 +45,12 @@ export const DETECTION_PAGE_FILTER_GROUP_CONTEXT_MENU = '[data-test-subj="filter
 export const DETECTION_PAGE_FILTER_GROUP_RESET_BUTTON =
   '[data-test-subj="filter-group__context--reset"]';
 
-export const FILTER_GROUP_CONTEXT_EDIT_CONTROLS = '[data-test-subj="filter_group__context--edit"]';
+export const FILTER_GROUP_CONTEXT_EDIT_CONTROLS = '[data-test-subj="filter-group__context--edit"]';
 
-export const FILTER_GROUP_CONTEXT_SAVE_CONTROLS = '[data-test-subj="filter_group__context--save"]';
+export const FILTER_GROUP_CONTEXT_SAVE_CONTROLS = '[data-test-subj="filter-group__context--save"]';
 
 export const FILTER_GROUP_CONTEXT_DISCARD_CHANGES =
-  '[data-test-subj="filter_group__context--discard"]';
+  '[data-test-subj="filter-group__context--discard"]';
 
 export const FILTER_GROUP_ADD_CONTROL = '[data-test-subj="filter-group__add-control"]';
 
diff --git a/x-pack/plugins/security_solution/cypress/tasks/common/filter_group.ts b/x-pack/plugins/security_solution/cypress/tasks/common/filter_group.ts
index e006e2cc030a4..e12d705ab1ca7 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/common/filter_group.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/common/filter_group.ts
@@ -22,6 +22,7 @@ import {
   DETECTION_PAGE_FILTERS_LOADING,
   OPTION_LISTS_LOADING,
   FILTER_GROUP_CONTEXT_DISCARD_CHANGES,
+  FILTER_GROUP_CONTROL_ACTION_EDIT,
 } from '../../screens/common/filter_group';
 import { waitForPageFilters } from '../alerts';
 
@@ -90,3 +91,25 @@ export const deleteFilterGroupControl = (idx: number) => {
   cy.get(FILTER_GROUP_CONTROL_CONFIRM_DIALOG).should('be.visible');
   cy.get(FILTER_GROUP_CONTROL_CONFIRM_BTN).trigger('click');
 };
+
+export const editFilterGroupControl = ({
+  idx,
+  fieldName,
+  label,
+}: {
+  idx: number;
+  fieldName: string;
+  label: string;
+}) => {
+  cy.get(CONTROL_FRAME_TITLE).eq(idx).trigger('mouseover');
+  cy.get(FILTER_GROUP_CONTROL_ACTION_EDIT(idx)).trigger('click', { force: true });
+  const { FIELD_SEARCH, FIELD_PICKER, FIELD_LABEL, SAVE } = FILTER_GROUP_EDIT_CONTROL_PANEL_ITEMS;
+  cy.get(FIELD_SEARCH).type(fieldName);
+  cy.get(FIELD_PICKER(fieldName)).should('exist').trigger('click');
+
+  cy.get(FIELD_LABEL).should('have.value', fieldName);
+  cy.get(FIELD_LABEL).clear();
+  cy.get(FIELD_LABEL).type(label).should('have.value', label);
+  cy.get(SAVE).trigger('click');
+  cy.get(FILTER_GROUP_EDIT_CONTROLS_PANEL).should('not.exist');
+};
diff --git a/x-pack/plugins/security_solution/public/common/components/filter_group/context_menu.tsx b/x-pack/plugins/security_solution/public/common/components/filter_group/context_menu.tsx
index bf672a5fabfa4..b7dc2f6f32457 100644
--- a/x-pack/plugins/security_solution/public/common/components/filter_group/context_menu.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/filter_group/context_menu.tsx
@@ -48,7 +48,7 @@ export const FilterGroupContextMenu = () => {
     [toggleContextMenu]
   );
 
-  const resetSelection = useCallback(() => {
+  const resetSelection = useCallback(async () => {
     if (!controlGroupInputUpdates) return;
 
     // remove existing embeddables
@@ -56,9 +56,10 @@ export const FilterGroupContextMenu = () => {
       panels: {},
     });
 
-    initialControls.forEach((control, idx) => {
-      controlGroup?.addOptionsListControl({
-        controlId: String(idx),
+    for (let counter = 0; counter < initialControls.length; counter++) {
+      const control = initialControls[counter];
+      await controlGroup?.addOptionsListControl({
+        controlId: String(counter),
         hideExclude: true,
         hideSort: true,
         hidePanelTitles: true,
@@ -68,9 +69,8 @@ export const FilterGroupContextMenu = () => {
         dataViewId: dataViewId ?? '',
         ...control,
       });
-    });
+    }
 
-    controlGroup?.reload();
     switchToViewMode();
     setShowFiltersChangedBanner(false);
   }, [
diff --git a/x-pack/plugins/security_solution/public/common/components/filter_group/filter_group.test.tsx b/x-pack/plugins/security_solution/public/common/components/filter_group/filter_group.test.tsx
index f066b022af04e..5da07f8add864 100644
--- a/x-pack/plugins/security_solution/public/common/components/filter_group/filter_group.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/filter_group/filter_group.test.tsx
@@ -462,14 +462,11 @@ describe(' Filter Group Component ', () => {
 
       controlGroupMock.addOptionsListControl.mockClear();
       controlGroupMock.updateInput.mockClear();
-      controlGroupMock.reload.mockClear();
       fireEvent.click(screen.getByTestId(TEST_IDS.CONTEXT_MENU.RESET));
 
       await waitFor(() => {
         // blanks the input
         expect(controlGroupMock.updateInput.mock.calls.length).toBe(2);
-        expect(controlGroupMock.reload.mock.calls.length).toBe(1);
-
         expect(controlGroupMock.addOptionsListControl.mock.calls.length).toBe(4);
       });
     });
diff --git a/x-pack/plugins/security_solution/public/common/components/filter_group/index.tsx b/x-pack/plugins/security_solution/public/common/components/filter_group/index.tsx
index 533bf19146dad..a4c61fb9c98a6 100644
--- a/x-pack/plugins/security_solution/public/common/components/filter_group/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/filter_group/index.tsx
@@ -334,7 +334,7 @@ const FilterGroupComponent = (props: PropsWithChildren<FilterGroupProps>) => {
     setShowFiltersChangedBanner(false);
   }, [controlGroup, switchToViewMode, getStoredControlInput, hasPendingChanges]);
 
-  const upsertPersistableControls = useCallback(() => {
+  const upsertPersistableControls = useCallback(async () => {
     const persistableControls = initialControls.filter((control) => control.persist === true);
     if (persistableControls.length > 0) {
       const currentPanels = Object.values(controlGroup?.getInput().panels ?? []) as Array<
@@ -342,7 +342,7 @@ const FilterGroupComponent = (props: PropsWithChildren<FilterGroupProps>) => {
       >;
       const orderedPanels = currentPanels.sort((a, b) => a.order - b.order);
       let filterControlsDeleted = false;
-      persistableControls.forEach((control) => {
+      for (const control of persistableControls) {
         const controlExists = currentPanels.some(
           (currControl) => control.fieldName === currControl.explicitInput.fieldName
         );
@@ -354,7 +354,7 @@ const FilterGroupComponent = (props: PropsWithChildren<FilterGroupProps>) => {
           }
 
           // add persitable controls
-          controlGroup?.addOptionsListControl({
+          await controlGroup?.addOptionsListControl({
             title: control.title,
             hideExclude: true,
             hideSort: true,
@@ -367,21 +367,22 @@ const FilterGroupComponent = (props: PropsWithChildren<FilterGroupProps>) => {
             ...control,
           });
         }
-      });
-      orderedPanels.forEach((panel) => {
+      }
+
+      for (const panel of orderedPanels) {
         if (panel.explicitInput.fieldName)
-          controlGroup?.addOptionsListControl({
+          await controlGroup?.addOptionsListControl({
             selectedOptions: [],
             fieldName: panel.explicitInput.fieldName,
             dataViewId: dataViewId ?? '',
             ...panel.explicitInput,
           });
-      });
+      }
     }
   }, [controlGroup, dataViewId, initialControls]);
 
-  const saveChangesHandler = useCallback(() => {
-    upsertPersistableControls();
+  const saveChangesHandler = useCallback(async () => {
+    await upsertPersistableControls();
     switchToViewMode();
     setShowFiltersChangedBanner(false);
   }, [switchToViewMode, upsertPersistableControls]);
diff --git a/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.mock.ts b/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.mock.ts
index 0383b4a700420..702e3f2bc39e8 100644
--- a/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.mock.ts
+++ b/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.mock.ts
@@ -45,6 +45,7 @@ import { triggersActionsUiMock } from '@kbn/triggers-actions-ui-plugin/public/mo
 import { mockApm } from '../apm/service.mock';
 import { cloudExperimentsMock } from '@kbn/cloud-experiments-plugin/common/mocks';
 import { guidedOnboardingMock } from '@kbn/guided-onboarding-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 import { of } from 'rxjs';
 
 const mockUiSettings: Record<string, unknown> = {
@@ -105,6 +106,7 @@ export const createStartServicesMock = (
   const fleet = fleetMock.createStartMock();
   const unifiedSearch = unifiedSearchPluginMock.createStartContract();
   const cases = mockCasesContract();
+  const dataViewServiceMock = dataViewPluginMocks.createStartContract();
   cases.helpers.getUICapabilities.mockReturnValue(noCasesPermissions());
   const triggersActionsUi = triggersActionsUiMock.createStart();
   const cloudExperiments = cloudExperimentsMock.createStartMock();
@@ -115,6 +117,7 @@ export const createStartServicesMock = (
     apm,
     cases,
     unifiedSearch,
+    dataViews: dataViewServiceMock,
     data: {
       ...data,
       dataViews: {
diff --git a/x-pack/plugins/security_solution/public/detections/components/detection_page_filters/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/detection_page_filters/index.test.tsx
new file mode 100644
index 0000000000000..1035f08bb902f
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/detections/components/detection_page_filters/index.test.tsx
@@ -0,0 +1,144 @@
+/*
+ * 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 type { ComponentProps } from 'react';
+import React from 'react';
+
+import { render, screen, waitFor } from '@testing-library/react';
+import { TestProviders } from '../../../common/mock';
+import { DetectionPageFilterSet } from '.';
+import { TEST_IDS } from '../../../common/components/filter_group/constants';
+import { createStartServicesMock } from '../../../common/lib/kibana/kibana_react.mock';
+import type { DataView } from '@kbn/data-views-plugin/common';
+import { useKibana } from '../../../common/lib/kibana';
+import { FilterGroup } from '../../../common/components/filter_group';
+import { getMockedFilterGroupWithCustomFilters } from '../../../common/components/filter_group/mocks';
+import type { DataViewsServicePublic } from '@kbn/data-views-plugin/public';
+
+jest.mock('../../../common/components/filter_group');
+
+jest.mock('../../../common/lib/kibana');
+
+const basicKibanaServicesMock = createStartServicesMock();
+
+const getFieldByNameMock = jest.fn(() => true);
+
+const mockedDataViewServiceGetter = jest.fn(() => {
+  return Promise.resolve({
+    getFieldByName: getFieldByNameMock,
+  } as unknown as DataView);
+});
+
+const getKibanaServiceWithMockedGetter = (
+  mockedDataViewGetter: DataViewsServicePublic['get'] = mockedDataViewServiceGetter
+) => {
+  return {
+    ...basicKibanaServicesMock,
+    dataViews: {
+      ...basicKibanaServicesMock.dataViews,
+      clearInstanceCache: jest.fn(),
+      get: mockedDataViewGetter,
+    },
+  };
+};
+
+const kibanaServiceDefaultMock = getKibanaServiceWithMockedGetter();
+
+const onFilterChangeMock = jest.fn();
+
+const TestComponent = (props: Partial<ComponentProps<typeof DetectionPageFilterSet>> = {}) => {
+  return (
+    <TestProviders>
+      <DetectionPageFilterSet
+        chainingSystem="HIERARCHICAL"
+        dataViewId=""
+        onFilterChange={onFilterChangeMock}
+        {...props}
+      />
+    </TestProviders>
+  );
+};
+
+describe('Detection Page Filters', () => {
+  beforeAll(() => {
+    (FilterGroup as jest.Mock).mockImplementation(getMockedFilterGroupWithCustomFilters());
+    (useKibana as jest.Mock).mockReturnValue({
+      services: {
+        ...kibanaServiceDefaultMock,
+      },
+    });
+  });
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+  it('should renders correctly', async () => {
+    render(<TestComponent />);
+    expect(screen.getByTestId(TEST_IDS.FILTER_LOADING)).toBeInTheDocument();
+    await waitFor(() => {
+      expect(screen.getByTestId(TEST_IDS.MOCKED_CONTROL)).toBeInTheDocument();
+    });
+  });
+
+  it('should check all the fields till any absent field is found', async () => {
+    render(<TestComponent />);
+    expect(screen.getByTestId(TEST_IDS.FILTER_LOADING)).toBeInTheDocument();
+    await waitFor(() => {
+      expect(getFieldByNameMock).toHaveBeenCalledTimes(4);
+      expect(kibanaServiceDefaultMock.dataViews.clearInstanceCache).toHaveBeenCalledTimes(0);
+    });
+  });
+
+  it('should stop checking fields if blank field is found and clear the cache', async () => {
+    const getFieldByNameLocalMock = jest.fn(() => false);
+    const mockGetter = jest.fn(() =>
+      Promise.resolve({ getFieldByName: getFieldByNameLocalMock } as unknown as DataView)
+    );
+    const modifiedKibanaServicesMock = getKibanaServiceWithMockedGetter(mockGetter);
+    (useKibana as jest.Mock).mockReturnValueOnce({ services: modifiedKibanaServicesMock });
+
+    render(<TestComponent />);
+    expect(screen.getByTestId(TEST_IDS.FILTER_LOADING)).toBeInTheDocument();
+    await waitFor(() => {
+      expect(getFieldByNameLocalMock).toHaveBeenCalledTimes(1);
+      expect(modifiedKibanaServicesMock.dataViews.clearInstanceCache).toHaveBeenCalledTimes(1);
+      expect(screen.getByTestId(TEST_IDS.MOCKED_CONTROL)).toBeInTheDocument();
+    });
+  });
+
+  it('should call onFilterChange', async () => {
+    const filtersToTest = [
+      {
+        meta: {
+          index: 'security-solution-default',
+          key: 'kibana.alert.severity',
+        },
+        query: {
+          match_phrase: {
+            'kibana.alert.severity': 'low',
+          },
+        },
+      },
+    ];
+    (FilterGroup as jest.Mock).mockImplementationOnce(
+      getMockedFilterGroupWithCustomFilters(filtersToTest)
+    );
+    render(<TestComponent />);
+
+    await waitFor(() => {
+      expect(onFilterChangeMock).toHaveBeenNthCalledWith(1, [
+        {
+          ...filtersToTest[0],
+          meta: {
+            ...filtersToTest[0].meta,
+            disabled: false,
+          },
+        },
+      ]);
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/detections/components/detection_page_filters/index.tsx b/x-pack/plugins/security_solution/public/detections/components/detection_page_filters/index.tsx
index 1454c63ffb398..d096f56f7faa5 100644
--- a/x-pack/plugins/security_solution/public/detections/components/detection_page_filters/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/detection_page_filters/index.tsx
@@ -41,8 +41,8 @@ const FilterItemSetComponent = (props: FilterItemSetProps) => {
           setLoadingPageFilters(false);
           return;
         }
-        setLoadingPageFilters(false);
       }
+      setLoadingPageFilters(false);
     })();
   }, [dataViewId, dataViewService]);
 

From 9816a6fdbb9080bbba92732d776d60b1019d690f Mon Sep 17 00:00:00 2001
From: Justin Kambic <jk@elastic.co>
Date: Tue, 2 May 2023 13:41:33 -0400
Subject: [PATCH 19/33] [Synthetics] Fix step number column on monitor detail
 page (#156222)

## Summary

Resolves #155921.

Adds `nowrap` to the step number column.

<img width="115" alt="image"
src="https://user-images.githubusercontent.com/18429259/235238832-95589bea-83ce-4571-8fc9-c508e5c6e6f7.png">


## Testing

On the detail page, look at the list. If the step number is not wrapping
like the image shown in the linked issue, the problem is fixed.

### Checklist

Delete any items that are not applicable to this PR.

- [ ] Any text added follows [EUI's writing
guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses
sentence case text and includes [i18n
support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)
- [ ]
[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)
was added for features that require explanation or tutorials
- [ ] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios
- [ ] Any UI touched in this PR is usable by keyboard only (learn more
about [keyboard accessibility](https://webaim.org/techniques/keyboard/))
- [ ] Any UI touched in this PR does not create any new axe failures
(run axe in browser:
[FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/),
[Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US))
- [ ] If a plugin configuration key changed, check if it needs to be
allowlisted in the cloud and added to the [docker
list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)
- [ ] This renders correctly on smaller devices using a responsive
layout. (You can test this [in your
browser](https://www.browserstack.com/guide/responsive-testing-on-local-server))
- [ ] This was checked for [cross-browser
compatibility](https://www.elastic.co/support/matrix#matrix_browsers)


### Risk Matrix

Delete this section if it is not applicable to this PR.

Before closing this PR, invite QA, stakeholders, and other developers to
identify risks that should be tested prior to the change/feature
release.

When forming the risk matrix, consider some of the following examples
and how they may potentially impact the change:

| Risk | Probability | Severity | Mitigation/Notes |

|---------------------------|-------------|----------|-------------------------|
| Multiple Spaces&mdash;unexpected behavior in non-default Kibana Space.
| Low | High | Integration tests will verify that all features are still
supported in non-default Kibana Space and when user switches between
spaces. |
| Multiple nodes&mdash;Elasticsearch polling might have race conditions
when multiple Kibana nodes are polling for the same tasks. | High | Low
| Tasks are idempotent, so executing them multiple times will not result
in logical error, but will degrade performance. To test for this case we
add plenty of unit tests around this logic and document manual testing
procedure. |
| Code should gracefully handle cases when feature X or plugin Y are
disabled. | Medium | High | Unit tests will verify that any feature flag
or plugin combination still results in our service operational. |
| [See more potential risk
examples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx) |


### For maintainers

- [ ] This was checked for breaking API changes and was [labeled
appropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)
---
 .../components/common/monitor_test_result/browser_steps_list.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/monitor_test_result/browser_steps_list.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/monitor_test_result/browser_steps_list.tsx
index ccec4c1e8f60d..fc534b1408f39 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/monitor_test_result/browser_steps_list.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/monitor_test_result/browser_steps_list.tsx
@@ -306,6 +306,7 @@ const StyleForStepStatus = ({
     <EuiText
       css={{
         fontWeight: euiTheme.font.weight.bold,
+        whiteSpace: 'nowrap',
       }}
       size={textSize}
       color={euiTheme.colors[getTextColorForMonitorStatus(status)] as CSSProperties['color']}

From 41f0b75f55e835f5411840ba266be1e8e39626d0 Mon Sep 17 00:00:00 2001
From: Justin Kambic <jk@elastic.co>
Date: Tue, 2 May 2023 13:42:09 -0400
Subject: [PATCH 20/33] [Synthetics] Support `hideInterval` when using rule
 edit form (#156187)

## Summary

Fixes https://github.com/elastic/kibana/issues/152430.

As
[noted](https://github.com/elastic/kibana/issues/152430#issuecomment-1523789944),
the previous fix for this does not work in all cases. We need to support
this flag in both `add` and `edit` modes, so this patch adds support for
the `hideInterval` flag for the rule edit form as well.

## Testing

Open Synthetics and attempt to modify the Monitor Status alert, and
observe that the interval edit field doesn't show up anymore.

<img width="593" alt="image"
src="https://user-images.githubusercontent.com/18429259/235187611-9e84b14e-180c-4ce2-b020-4cdd56ceb09f.png">


### Checklist

Delete any items that are not applicable to this PR.

- [ ] Any text added follows [EUI's writing
guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses
sentence case text and includes [i18n
support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)
- [ ]
[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)
was added for features that require explanation or tutorials
- [ ] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios
- [ ] Any UI touched in this PR is usable by keyboard only (learn more
about [keyboard accessibility](https://webaim.org/techniques/keyboard/))
- [ ] Any UI touched in this PR does not create any new axe failures
(run axe in browser:
[FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/),
[Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US))
- [ ] If a plugin configuration key changed, check if it needs to be
allowlisted in the cloud and added to the [docker
list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)
- [ ] This renders correctly on smaller devices using a responsive
layout. (You can test this [in your
browser](https://www.browserstack.com/guide/responsive-testing-on-local-server))
- [ ] This was checked for [cross-browser
compatibility](https://www.elastic.co/support/matrix#matrix_browsers)


### Risk Matrix

Delete this section if it is not applicable to this PR.

Before closing this PR, invite QA, stakeholders, and other developers to
identify risks that should be tested prior to the change/feature
release.

When forming the risk matrix, consider some of the following examples
and how they may potentially impact the change:

| Risk | Probability | Severity | Mitigation/Notes |

|---------------------------|-------------|----------|-------------------------|
| Multiple Spaces&mdash;unexpected behavior in non-default Kibana Space.
| Low | High | Integration tests will verify that all features are still
supported in non-default Kibana Space and when user switches between
spaces. |
| Multiple nodes&mdash;Elasticsearch polling might have race conditions
when multiple Kibana nodes are polling for the same tasks. | High | Low
| Tasks are idempotent, so executing them multiple times will not result
in logical error, but will degrade performance. To test for this case we
add plenty of unit tests around this logic and document manual testing
procedure. |
| Code should gracefully handle cases when feature X or plugin Y are
disabled. | Medium | High | Unit tests will verify that any feature flag
or plugin combination still results in our service operational. |
| [See more potential risk
examples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx) |


### For maintainers

- [ ] This was checked for breaking API changes and was [labeled
appropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)
---
 .../synthetics/alert_rules/default_status_alert.journey.ts      | 1 +
 .../public/apps/synthetics/lib/alert_types/monitor_status.tsx   | 2 +-
 .../public/application/sections/rule_form/rule_edit.tsx         | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/synthetics/e2e/journeys/synthetics/alert_rules/default_status_alert.journey.ts b/x-pack/plugins/synthetics/e2e/journeys/synthetics/alert_rules/default_status_alert.journey.ts
index b9fc467fc0bef..2373b9712a753 100644
--- a/x-pack/plugins/synthetics/e2e/journeys/synthetics/alert_rules/default_status_alert.journey.ts
+++ b/x-pack/plugins/synthetics/e2e/journeys/synthetics/alert_rules/default_status_alert.journey.ts
@@ -58,6 +58,7 @@ journey(`DefaultStatusAlert`, async ({ page, params }) => {
     await page.isDisabled(byTestId('xpack.synthetics.toggleAlertFlyout'));
     await page.click(byTestId('xpack.synthetics.toggleAlertFlyout'));
     await page.waitForSelector('text=Edit rule');
+    expect(await page.locator(`[data-test-subj="intervalFormRow"]`).count()).toEqual(0);
     await page.click(byTestId('saveEditedRuleButton'));
     await page.waitForSelector("text=Updated 'Synthetics internal alert'");
   });
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/lib/alert_types/monitor_status.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/lib/alert_types/monitor_status.tsx
index 278eb6d522db3..2c4d5055a0891 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/lib/alert_types/monitor_status.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/lib/alert_types/monitor_status.tsx
@@ -41,7 +41,7 @@ export const initMonitorStatusAlertType: AlertTypeInitializer = ({
   ruleParamsExpression: (paramProps: RuleTypeParamsExpressionProps<StatusRuleParams>) => (
     <MonitorStatusAlert core={core} plugins={plugins} params={paramProps} />
   ),
-  validate: (ruleParams: StatusRuleParams) => {
+  validate: (_ruleParams: StatusRuleParams) => {
     return { errors: {} };
   },
   defaultActionMessage,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_edit.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_edit.tsx
index 94d6b1b398824..b83d2f068e592 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_edit.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_edit.tsx
@@ -76,6 +76,7 @@ export const RuleEdit = ({
   onClose,
   reloadRules,
   onSave,
+  hideInterval,
   ruleTypeRegistry,
   actionTypeRegistry,
   metadata: initialMetadata,
@@ -233,6 +234,7 @@ export const RuleEdit = ({
                 dispatch={dispatch}
                 errors={ruleErrors}
                 actionTypeRegistry={actionTypeRegistry}
+                hideInterval={hideInterval}
                 ruleTypeRegistry={ruleTypeRegistry}
                 canChangeTrigger={false}
                 setHasActionsDisabled={setHasActionsDisabled}

From 06054cd4eca55b428a0617430ecf2d1ee005528c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Loix?= <sebastien.loix@elastic.co>
Date: Tue, 2 May 2023 19:07:30 +0100
Subject: [PATCH 21/33] [Chrome] Expose api to to set custom component for
 project left nav (#156205)

In this PR I've exposed a new api from the Chrome service to set a
custom React component for the side navigation.
Calling this API does not have any effect if Kibana is not started in
"project" ChromeStyle.

## Api

```ts
chrome.project.setSideNavComponent(/* component */);
```

## Example

```ts
// my_nav.tsx
import React, { type FC } from 'react';
import type { SideNavComponent } from '@kbn/core-chrome-browser';

// SideNavComponent will receive in its props Chrome service state (the current active route, the navTree...)
export const MyNav: SideNavComponent = (props) => {
  return <div>Custom navigation...</div>;
};

-------------------

// serverless plugin.ts (public)
import { MyNav } from './my_nav';
...

public start(core: CoreStart) {
  core.chrome.project.setSideNavComponent(MyNav);
  return {};
}
```
---
 ...ervice.test.ts => chrome_service.test.tsx} |  38 +++++-
 .../src/chrome_service.tsx                    | 116 ++++++++++++------
 .../src/project_navigation/index.ts           |   9 ++
 .../project_navigation_service.ts             |  49 ++++++++
 .../src/ui/index.ts                           |   2 +-
 .../src/ui/project/header.tsx                 |   8 +-
 .../src/ui/project/index.ts                   |   1 +
 .../src/ui/project/side_navigation.tsx        |  18 +++
 .../src/chrome_service.mock.ts                |   4 +
 .../core/chrome/core-chrome-browser/index.ts  |   5 +
 .../core-chrome-browser/src/contracts.ts      |  25 +++-
 .../chrome/core-chrome-browser/src/index.ts   |   8 ++
 .../src/project_navigation.ts                 |  46 +++++++
 13 files changed, 285 insertions(+), 44 deletions(-)
 rename packages/core/chrome/core-chrome-browser-internal/src/{chrome_service.test.ts => chrome_service.test.tsx} (92%)
 create mode 100644 packages/core/chrome/core-chrome-browser-internal/src/project_navigation/index.ts
 create mode 100644 packages/core/chrome/core-chrome-browser-internal/src/project_navigation/project_navigation_service.ts
 create mode 100644 packages/core/chrome/core-chrome-browser-internal/src/ui/project/side_navigation.tsx
 create mode 100644 packages/core/chrome/core-chrome-browser/src/project_navigation.ts

diff --git a/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.test.ts b/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.test.tsx
similarity index 92%
rename from packages/core/chrome/core-chrome-browser-internal/src/chrome_service.test.ts
rename to packages/core/chrome/core-chrome-browser-internal/src/chrome_service.test.tsx
index 0087c5d019f98..0e18b5b72c367 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.test.ts
+++ b/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.test.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { shallow } from 'enzyme';
+import { shallow, mount } from 'enzyme';
 import React from 'react';
 import * as Rx from 'rxjs';
 import { toArray } from 'rxjs/operators';
@@ -19,6 +19,7 @@ import { notificationServiceMock } from '@kbn/core-notifications-browser-mocks';
 import { uiSettingsServiceMock } from '@kbn/core-ui-settings-browser-mocks';
 import { customBrandingServiceMock } from '@kbn/core-custom-branding-browser-mocks';
 import { getAppInfo } from '@kbn/core-application-browser-internal';
+import { findTestSubject } from '@kbn/test-jest-helpers';
 import { ChromeService } from './chrome_service';
 
 class FakeApp implements App {
@@ -176,6 +177,41 @@ describe('start', () => {
       // Don't capture the snapshot because it's 600+ lines long.
       expect(shallow(React.createElement(() => chrome.getHeaderComponent()))).toBeDefined();
     });
+
+    it('renders the default project side navigation', async () => {
+      const { chrome } = await start();
+
+      chrome.setChromeStyle('project');
+
+      const component = mount(chrome.getHeaderComponent());
+
+      const projectHeader = findTestSubject(component, 'kibanaProjectHeader');
+      expect(projectHeader.length).toBe(1);
+
+      const defaultProjectSideNav = findTestSubject(component, 'defaultProjectSideNav');
+      expect(defaultProjectSideNav.length).toBe(1);
+    });
+
+    it('renders the custom project side navigation', async () => {
+      const { chrome } = await start();
+
+      const MyNav = function MyNav() {
+        return <div data-test-subj="customProjectSideNav">HELLO</div>;
+      };
+      chrome.setChromeStyle('project');
+      chrome.project.setSideNavComponent(MyNav);
+
+      const component = mount(chrome.getHeaderComponent());
+
+      const projectHeader = findTestSubject(component, 'kibanaProjectHeader');
+      expect(projectHeader.length).toBe(1);
+
+      const defaultProjectSideNav = findTestSubject(component, 'defaultProjectSideNav');
+      expect(defaultProjectSideNav.length).toBe(0); // Default side nav not mounted
+
+      const customProjectSideNav = findTestSubject(component, 'customProjectSideNav');
+      expect(customProjectSideNav.text()).toBe('HELLO');
+    });
   });
 
   describe('visibility', () => {
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx b/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx
index 41362b3d80dcd..7620b6b5cc153 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx
+++ b/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx
@@ -12,6 +12,7 @@ import { BehaviorSubject, combineLatest, merge, type Observable, of, ReplaySubje
 import { flatMap, map, takeUntil } from 'rxjs/operators';
 import { parse } from 'url';
 import { EuiLink } from '@elastic/eui';
+import useObservable from 'react-use/lib/useObservable';
 import type { InternalInjectedMetadataStart } from '@kbn/core-injected-metadata-browser-internal';
 import type { DocLinksStart } from '@kbn/core-doc-links-browser';
 import type { HttpStart } from '@kbn/core-http-browser';
@@ -27,14 +28,17 @@ import type {
   ChromeHelpExtension,
   ChromeUserBanner,
   ChromeStyle,
+  ChromeProjectNavigation,
 } from '@kbn/core-chrome-browser';
 import type { CustomBrandingStart } from '@kbn/core-custom-branding-browser';
+import type { SideNavComponent as ISideNavComponent } from '@kbn/core-chrome-browser';
 import { KIBANA_ASK_ELASTIC_LINK } from './constants';
 import { DocTitleService } from './doc_title';
 import { NavControlsService } from './nav_controls';
 import { NavLinksService } from './nav_links';
+import { ProjectNavigationService } from './project_navigation';
 import { RecentlyAccessedService } from './recently_accessed';
-import { Header, ProjectHeader } from './ui';
+import { Header, ProjectHeader, ProjectSideNavigation } from './ui';
 import type { InternalChromeStart } from './types';
 
 const IS_LOCKED_KEY = 'core.chrome.isLocked';
@@ -63,6 +67,7 @@ export class ChromeService {
   private readonly navLinks = new NavLinksService();
   private readonly recentlyAccessed = new RecentlyAccessedService();
   private readonly docTitle = new DocTitleService();
+  private readonly projectNavigation = new ProjectNavigationService();
 
   constructor(private readonly params: ConstructorParams) {}
 
@@ -147,6 +152,7 @@ export class ChromeService {
 
     const navControls = this.navControls.start();
     const navLinks = this.navLinks.start({ application, http });
+    const projectNavigation = this.projectNavigation.start({ application, navLinks });
     const recentlyAccessed = await this.recentlyAccessed.start({ http });
     const docTitle = this.docTitle.start({ document: window.document });
     const { customBranding$ } = customBranding;
@@ -170,6 +176,14 @@ export class ChromeService {
       chromeStyle$.next(style);
     };
 
+    const setProjectSideNavComponent = (component: ISideNavComponent | null) => {
+      projectNavigation.setProjectSideNavComponent(component);
+    };
+
+    const setProjectNavigation = (config: ChromeProjectNavigation) => {
+      projectNavigation.setProjectNavigation(config);
+    };
+
     const isIE = () => {
       const ua = window.navigator.userAgent;
       const msie = ua.indexOf('MSIE '); // IE 10 or older
@@ -211,8 +225,28 @@ export class ChromeService {
     }
 
     const getHeaderComponent = () => {
-      const Component = ({ style$ }: { style$: typeof chromeStyle$ }) => {
-        if (style$.getValue() === 'project') {
+      if (chromeStyle$.getValue() === 'project') {
+        // const projectNavigationConfig = projectNavigation.getProjectNavigation$();
+        // TODO: Uncommented when we support the project navigation config
+        // if (!projectNavigationConfig) {
+        //   throw new Erorr(`Project navigation config must be provided for project.`);
+        // }
+
+        const projectNavigationComponent$ = projectNavigation.getProjectSideNavComponent$();
+
+        const ProjectHeaderWithNavigation = () => {
+          const CustomSideNavComponent = useObservable(projectNavigationComponent$, undefined);
+
+          let SideNavComponent: ISideNavComponent = () => null;
+
+          if (CustomSideNavComponent !== undefined) {
+            // We have the state from the Observable
+            SideNavComponent =
+              CustomSideNavComponent.current !== null
+                ? CustomSideNavComponent.current
+                : ProjectSideNavigation;
+          }
+
           return (
             <ProjectHeader
               {...{
@@ -226,41 +260,45 @@ export class ChromeService {
               navControlsRight$={navControls.getRight$()}
               kibanaDocLink={docLinks.links.kibana.guide}
               kibanaVersion={injectedMetadata.getKibanaVersion()}
-            />
+            >
+              {/* TODO: pass down the SideNavCompProps once they are defined  */}
+              <SideNavComponent />
+            </ProjectHeader>
           );
-        }
-
-        return (
-          <Header
-            loadingCount$={http.getLoadingCount$()}
-            application={application}
-            headerBanner$={headerBanner$.pipe(takeUntil(this.stop$))}
-            badge$={badge$.pipe(takeUntil(this.stop$))}
-            basePath={http.basePath}
-            breadcrumbs$={breadcrumbs$.pipe(takeUntil(this.stop$))}
-            breadcrumbsAppendExtension$={breadcrumbsAppendExtension$.pipe(takeUntil(this.stop$))}
-            customNavLink$={customNavLink$.pipe(takeUntil(this.stop$))}
-            kibanaDocLink={docLinks.links.kibana.guide}
-            forceAppSwitcherNavigation$={navLinks.getForceAppSwitcherNavigation$()}
-            globalHelpExtensionMenuLinks$={globalHelpExtensionMenuLinks$}
-            helpExtension$={helpExtension$.pipe(takeUntil(this.stop$))}
-            helpSupportUrl$={helpSupportUrl$.pipe(takeUntil(this.stop$))}
-            homeHref={http.basePath.prepend('/app/home')}
-            isVisible$={this.isVisible$}
-            kibanaVersion={injectedMetadata.getKibanaVersion()}
-            navLinks$={navLinks.getNavLinks$()}
-            recentlyAccessed$={recentlyAccessed.get$()}
-            navControlsLeft$={navControls.getLeft$()}
-            navControlsCenter$={navControls.getCenter$()}
-            navControlsRight$={navControls.getRight$()}
-            navControlsExtension$={navControls.getExtension$()}
-            onIsLockedUpdate={setIsNavDrawerLocked}
-            isLocked$={getIsNavDrawerLocked$}
-            customBranding$={customBranding$}
-          />
-        );
-      };
-      return <Component {...{ style$: chromeStyle$ }} />;
+        };
+
+        return <ProjectHeaderWithNavigation />;
+      }
+
+      return (
+        <Header
+          loadingCount$={http.getLoadingCount$()}
+          application={application}
+          headerBanner$={headerBanner$.pipe(takeUntil(this.stop$))}
+          badge$={badge$.pipe(takeUntil(this.stop$))}
+          basePath={http.basePath}
+          breadcrumbs$={breadcrumbs$.pipe(takeUntil(this.stop$))}
+          breadcrumbsAppendExtension$={breadcrumbsAppendExtension$.pipe(takeUntil(this.stop$))}
+          customNavLink$={customNavLink$.pipe(takeUntil(this.stop$))}
+          kibanaDocLink={docLinks.links.kibana.guide}
+          forceAppSwitcherNavigation$={navLinks.getForceAppSwitcherNavigation$()}
+          globalHelpExtensionMenuLinks$={globalHelpExtensionMenuLinks$}
+          helpExtension$={helpExtension$.pipe(takeUntil(this.stop$))}
+          helpSupportUrl$={helpSupportUrl$.pipe(takeUntil(this.stop$))}
+          homeHref={http.basePath.prepend('/app/home')}
+          isVisible$={this.isVisible$}
+          kibanaVersion={injectedMetadata.getKibanaVersion()}
+          navLinks$={navLinks.getNavLinks$()}
+          recentlyAccessed$={recentlyAccessed.get$()}
+          navControlsLeft$={navControls.getLeft$()}
+          navControlsCenter$={navControls.getCenter$()}
+          navControlsRight$={navControls.getRight$()}
+          navControlsExtension$={navControls.getExtension$()}
+          onIsLockedUpdate={setIsNavDrawerLocked}
+          isLocked$={getIsNavDrawerLocked$}
+          customBranding$={customBranding$}
+        />
+      );
     };
 
     return {
@@ -335,6 +373,10 @@ export class ChromeService {
       getBodyClasses$: () => bodyClasses$.pipe(takeUntil(this.stop$)),
       setChromeStyle,
       getChromeStyle$: () => chromeStyle$.pipe(takeUntil(this.stop$)),
+      project: {
+        setNavigation: setProjectNavigation,
+        setSideNavComponent: setProjectSideNavComponent,
+      },
     };
   }
 
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/index.ts b/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/index.ts
new file mode 100644
index 0000000000000..5485faed25610
--- /dev/null
+++ b/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/index.ts
@@ -0,0 +1,9 @@
+/*
+ * 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 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export { ProjectNavigationService } from './project_navigation_service';
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/project_navigation_service.ts b/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/project_navigation_service.ts
new file mode 100644
index 0000000000000..97b696c18f6cb
--- /dev/null
+++ b/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/project_navigation_service.ts
@@ -0,0 +1,49 @@
+/*
+ * 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 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { InternalApplicationStart } from '@kbn/core-application-browser-internal';
+import {
+  ChromeNavLinks,
+  ChromeProjectNavigation,
+  SideNavComponent,
+} from '@kbn/core-chrome-browser';
+import { BehaviorSubject } from 'rxjs';
+
+interface StartDeps {
+  application: InternalApplicationStart;
+  navLinks: ChromeNavLinks;
+}
+
+export class ProjectNavigationService {
+  private customProjectSideNavComponent$ = new BehaviorSubject<{
+    current: SideNavComponent | null;
+  }>({ current: null });
+  private projectNavigation$ = new BehaviorSubject<ChromeProjectNavigation | undefined>(undefined);
+
+  public start({ application, navLinks }: StartDeps) {
+    // TODO: use application, navLink and projectNavigation$ to:
+    // 1. validate projectNavigation$ against navLinks,
+    // 2. filter disabled/missing links from projectNavigation
+    // 3. keep track of currently active link / path (path will be used to highlight the link in the sidenav and display part of the breadcrumbs)
+
+    return {
+      setProjectNavigation: (projectNavigation: ChromeProjectNavigation) => {
+        this.projectNavigation$.next(projectNavigation);
+      },
+      getProjectNavigation$: () => {
+        return this.projectNavigation$.asObservable();
+      },
+      setProjectSideNavComponent: (component: SideNavComponent | null) => {
+        this.customProjectSideNavComponent$.next({ current: component });
+      },
+      getProjectSideNavComponent$: () => {
+        return this.customProjectSideNavComponent$.asObservable();
+      },
+    };
+  }
+}
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/index.ts b/packages/core/chrome/core-chrome-browser-internal/src/ui/index.ts
index 7a5ecadd26f23..89c9b560ad018 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/ui/index.ts
+++ b/packages/core/chrome/core-chrome-browser-internal/src/ui/index.ts
@@ -7,6 +7,6 @@
  */
 
 export { Header } from './header';
-export { ProjectHeader } from './project';
+export { ProjectHeader, SideNavigation as ProjectSideNavigation } from './project';
 export { LoadingIndicator } from './loading_indicator';
 export type { NavType } from './header';
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/project/header.tsx b/packages/core/chrome/core-chrome-browser-internal/src/ui/project/header.tsx
index e85ae262c3bb7..208f3aac7100d 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/ui/project/header.tsx
+++ b/packages/core/chrome/core-chrome-browser-internal/src/ui/project/header.tsx
@@ -34,12 +34,14 @@ interface Props {
   kibanaVersion: string;
   application: InternalApplicationStart;
   navControlsRight$: Observable<ChromeNavControl[]>;
+  children: React.ReactNode;
 }
 
 export const ProjectHeader = ({
   application,
   kibanaDocLink,
   kibanaVersion,
+  children,
   ...observables
 }: Props) => {
   const renderLogo = () => (
@@ -53,7 +55,7 @@ export const ProjectHeader = ({
 
   return (
     <>
-      <EuiHeader position="fixed">
+      <EuiHeader position="fixed" data-test-subj="kibanaProjectHeader">
         <EuiHeaderSection grow={false}>
           <EuiHeaderSectionItem border="right">{renderLogo()}</EuiHeaderSectionItem>
           <EuiHeaderSectionItem>
@@ -81,9 +83,7 @@ export const ProjectHeader = ({
         </EuiHeaderSection>
       </EuiHeader>
       <Router history={application.history}>
-        <ProjectNavigation>
-          <span />
-        </ProjectNavigation>
+        <ProjectNavigation>{children}</ProjectNavigation>
       </Router>
     </>
   );
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/project/index.ts b/packages/core/chrome/core-chrome-browser-internal/src/ui/project/index.ts
index af18e057731b0..93f6c4ad054ce 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/ui/project/index.ts
+++ b/packages/core/chrome/core-chrome-browser-internal/src/ui/project/index.ts
@@ -7,3 +7,4 @@
  */
 
 export { ProjectHeader } from './header';
+export { SideNavigation } from './side_navigation';
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/project/side_navigation.tsx b/packages/core/chrome/core-chrome-browser-internal/src/ui/project/side_navigation.tsx
new file mode 100644
index 0000000000000..a76d760170a1a
--- /dev/null
+++ b/packages/core/chrome/core-chrome-browser-internal/src/ui/project/side_navigation.tsx
@@ -0,0 +1,18 @@
+/*
+ * 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 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import React from 'react';
+import { EuiText } from '@elastic/eui';
+import type { SideNavComponent } from '@kbn/core-chrome-browser';
+
+export const SideNavigation: SideNavComponent = () => {
+  return (
+    <div data-test-subj="defaultProjectSideNav">
+      <EuiText color="white">TODO - Build navigation from config</EuiText>
+    </div>
+  );
+};
diff --git a/packages/core/chrome/core-chrome-browser-mocks/src/chrome_service.mock.ts b/packages/core/chrome/core-chrome-browser-mocks/src/chrome_service.mock.ts
index c7c62c7811277..7025608bc969d 100644
--- a/packages/core/chrome/core-chrome-browser-mocks/src/chrome_service.mock.ts
+++ b/packages/core/chrome/core-chrome-browser-mocks/src/chrome_service.mock.ts
@@ -63,6 +63,10 @@ const createStartContractMock = () => {
     getBodyClasses$: jest.fn(),
     getChromeStyle$: jest.fn(),
     setChromeStyle: jest.fn(),
+    project: {
+      setNavigation: jest.fn(),
+      setSideNavComponent: jest.fn(),
+    },
   };
   startContract.navLinks.getAll.mockReturnValue([]);
   startContract.getIsVisible$.mockReturnValue(new BehaviorSubject(false));
diff --git a/packages/core/chrome/core-chrome-browser/index.ts b/packages/core/chrome/core-chrome-browser/index.ts
index 1d2dca4c957bc..dbf2cc59bb280 100644
--- a/packages/core/chrome/core-chrome-browser/index.ts
+++ b/packages/core/chrome/core-chrome-browser/index.ts
@@ -29,4 +29,9 @@ export type {
   ChromeStart,
   ChromeStyle,
   ChromeUserBanner,
+  ChromeProjectNavigationLink,
+  ChromeProjectNavigation,
+  ChromeProjectNavigationNode,
+  SideNavCompProps,
+  SideNavComponent,
 } from './src';
diff --git a/packages/core/chrome/core-chrome-browser/src/contracts.ts b/packages/core/chrome/core-chrome-browser/src/contracts.ts
index 3f6f756e2d2b1..5930b0e34e341 100644
--- a/packages/core/chrome/core-chrome-browser/src/contracts.ts
+++ b/packages/core/chrome/core-chrome-browser/src/contracts.ts
@@ -14,7 +14,8 @@ import type { ChromeNavControls } from './nav_controls';
 import type { ChromeHelpExtension } from './help_extension';
 import type { ChromeBreadcrumb, ChromeBreadcrumbsAppendExtension } from './breadcrumb';
 import type { ChromeBadge, ChromeStyle, ChromeUserBanner } from './types';
-import { ChromeGlobalHelpExtensionMenuLink } from './help_extension';
+import type { ChromeGlobalHelpExtensionMenuLink } from './help_extension';
+import type { ChromeProjectNavigation, SideNavComponent } from './project_navigation';
 
 /**
  * ChromeStart allows plugins to customize the global chrome header UI and
@@ -161,4 +162,26 @@ export interface ChromeStart {
    * Get an observable of the current style type of the chrome.
    */
   getChromeStyle$(): Observable<ChromeStyle>;
+  /**
+   * Configuration for serverless projects
+   */
+  project: {
+    /**
+     * Sets the project navigation config to be used for rendering project navigation.
+     * It is used for default project sidenav, project breadcrumbs, tracking active deep link.
+     * @param projectNavigation The project navigation config
+     *
+     * @remarks Has no effect if the chrome style is not `project`.
+     */
+    setNavigation(projectNavigation: ChromeProjectNavigation): void;
+
+    /**
+     * Set custom project sidenav component to be used instead of the default project sidenav.
+     * @param getter A function returning a CustomNavigationComponent.
+     * This component will receive Chrome navigation state as props (not yet implemented)
+     *
+     * @remarks Has no effect if the chrome style is not `project`.
+     */
+    setSideNavComponent(component: SideNavComponent | null): void;
+  };
 }
diff --git a/packages/core/chrome/core-chrome-browser/src/index.ts b/packages/core/chrome/core-chrome-browser/src/index.ts
index 89ba12d616d0e..1810c0ec0bac7 100644
--- a/packages/core/chrome/core-chrome-browser/src/index.ts
+++ b/packages/core/chrome/core-chrome-browser/src/index.ts
@@ -27,3 +27,11 @@ export type {
   ChromeRecentlyAccessedHistoryItem,
 } from './recently_accessed';
 export type { ChromeBadge, ChromeUserBanner, ChromeStyle } from './types';
+
+export type {
+  ChromeProjectNavigation,
+  ChromeProjectNavigationNode,
+  ChromeProjectNavigationLink,
+  SideNavCompProps,
+  SideNavComponent,
+} from './project_navigation';
diff --git a/packages/core/chrome/core-chrome-browser/src/project_navigation.ts b/packages/core/chrome/core-chrome-browser/src/project_navigation.ts
new file mode 100644
index 0000000000000..da5140d55266c
--- /dev/null
+++ b/packages/core/chrome/core-chrome-browser/src/project_navigation.ts
@@ -0,0 +1,46 @@
+/*
+ * 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 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import type { ComponentType } from 'react';
+
+/** @internal */
+type AppId = string;
+
+/** @internal */
+type DeepLinkId = string;
+
+/** @internal */
+export type AppDeepLinkId = `${AppId}:${DeepLinkId}`;
+
+/** @public */
+export type ChromeProjectNavigationLink = AppId | AppDeepLinkId;
+
+/** @public */
+export interface ChromeProjectNavigationNode {
+  id?: string;
+  link?: ChromeProjectNavigationLink;
+  children?: ChromeProjectNavigationNode[];
+
+  title?: string;
+  icon?: string;
+}
+
+/** @public */
+export interface ChromeProjectNavigation {
+  navigationTree: ChromeProjectNavigationNode[];
+}
+
+/** @public */
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface SideNavCompProps {
+  // TODO: provide the Chrome state to the component through props
+  // e.g. "navTree", "activeRoute", "recentItems"...
+}
+
+/** @public */
+export type SideNavComponent = ComponentType<SideNavCompProps>;

From d4f6cf703da8022aeedfabca6ff7689faf67e071 Mon Sep 17 00:00:00 2001
From: Francesco Gualazzi <inge4pres@users.noreply.github.com>
Date: Tue, 2 May 2023 20:24:54 +0200
Subject: [PATCH 22/33] Profiling: symbolization created on user opt-in
 (#156089)

Signed-off-by: inge4pres <francesco.gualazzi@elastic.co>

## Summary

Include the creation of symbolizer package policy in the setup initiated
by users when they opt-in Universal Profiling.

### Checklist

- [X]
[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)
was added for features that require explanation or tutorials
- [X] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios

### For maintainers

- [ ] This was checked for breaking API changes and was [labeled
appropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)

### Related issues or PRs
* https://github.com/elastic/kibana/pull/155642
* https://github.com/elastic/kibana/pull/150885

---------

Signed-off-by: inge4pres <francesco.gualazzi@elastic.co>
Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: Jen Huang <its.jenetic@gmail.com>
---
 .../lib/setup/steps/get_fleet_policy_step.ts  | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/x-pack/plugins/profiling/server/lib/setup/steps/get_fleet_policy_step.ts b/x-pack/plugins/profiling/server/lib/setup/steps/get_fleet_policy_step.ts
index 7f7222a8a6e9d..a89be86280114 100644
--- a/x-pack/plugins/profiling/server/lib/setup/steps/get_fleet_policy_step.ts
+++ b/x-pack/plugins/profiling/server/lib/setup/steps/get_fleet_policy_step.ts
@@ -101,6 +101,35 @@ export function getFleetPolicyStep({
         ...omit(apmPolicy, 'id', 'revision', 'updated_at', 'updated_by'),
         inputs: modifiedPolicyInputs,
       });
+
+      // We add here the creation of the new package_policy for symbolizer.
+      // We create the new policy and bind it to the Cloud default agent policy;
+      // to do so, force s required to be set to true.
+      const cloudAgentPolicyId = 'policy-elastic-agent-on-cloud';
+      await packagePolicyClient.create(
+        soClient,
+        esClient,
+        {
+          policy_id: cloudAgentPolicyId,
+          enabled: true,
+          package: {
+            name: 'profiler_symbolizer',
+            title: 'Universal Profiling Symbolizer',
+            version: '8.8.0-preview',
+          },
+          name: 'elastic-universal-profiling-symbolizer',
+          namespace: 'default',
+          inputs: [
+            {
+              policy_template: 'universal_profiling_symbolizer',
+              enabled: true,
+              streams: [],
+              type: 'pf-elastic-symbolizer',
+            },
+          ],
+        },
+        { force: true }
+      );
     },
   };
 }

From 1a485eca921fc5847eb742046ac9f2504b62f957 Mon Sep 17 00:00:00 2001
From: Ying Mao <ying.mao@elastic.co>
Date: Tue, 2 May 2023 14:25:06 -0400
Subject: [PATCH 23/33] [Response Ops][Alerting] Updating alerting README for
 FAAD (#155899)

Updated alerting README to describe assets installed for framework
alerts-as-data
---
 x-pack/plugins/alerting/README.md | 71 ++++++++++++++++++++++++++-----
 1 file changed, 61 insertions(+), 10 deletions(-)

diff --git a/x-pack/plugins/alerting/README.md b/x-pack/plugins/alerting/README.md
index e1225d8a9af0b..06188a199ba96 100644
--- a/x-pack/plugins/alerting/README.md
+++ b/x-pack/plugins/alerting/README.md
@@ -17,6 +17,7 @@ Table of Contents
 	- [Plugin Status](#plugin-status)
 	- [Rule Types](#rule-types)
 		- [Methods](#methods)
+		- [Alerts as Data](#alerts-as-data)
 		- [Executor](#executor)
 		- [Action variables](#action-variables)
 	- [Recovered Alerts](#recovered-alerts)
@@ -38,16 +39,13 @@ Table of Contents
 
 > Disclaimer: We are actively working to update the terminology of the Alerting Framework. While all user-facing terminology has been updated, much of the codebase is still a work in progress.
 
-
-> References to `rule` and `rule type` entities are still named `AlertType` within the codebase.
-
 **Rule Type**: A function that takes parameters and executes actions on alerts.
 
 **Rule**: A configuration that defines a schedule, a rule type w/ parameters, state information and actions.
 
 **Alert**: The alert(s) created from a rule execution.
 
-A Kibana rule detects a condition and executes one or more actions when that condition occurs.  Rules work by going through the followings steps:
+A Kibana rule checks the condition defined by its rule type and executes one or more actions when that condition is met.  Rules work by going through the followings steps:
 
 1. Run a periodic check to detect a condition (the check is provided by a rule type).
 2. Convert that condition into one or more stateful alerts.
@@ -88,20 +86,23 @@ The following table describes the properties of the `options` object.
 |name|A user-friendly name for the rule type. These will be displayed in dropdowns when choosing rule types.|string|
 |actionGroups|An explicit list of groups the rule type may schedule actions for, each specifying the ActionGroup's unique ID and human readable name. Each rule type's `actions` validation will use this list to ensure configured groups are valid. We highly encourage using `kbn-i18n` to translate the names of actionGroup  when registering the rule type. |Array<{id:string, name:string}>|
 |defaultActionGroupId|ID value for the default action group for the rule type.|string|
-|recoveryActionGroup|The action group to use when an alert goes from an active state to an inactive one. This action group should not be specified under the `actionGroups` property. If no recoveryActionGroup is specified, the default `recovered` action group will be used. |{id:string, name:string}|
-|actionVariables|An explicit list of action variables that the rule type makes available via context and state in action parameter templates, and a short human readable description for each. The Alerting UI  will use this to display prompts for the users for these variables, in action parameter editors. We highly encourage using `kbn-i18n` to translate the descriptions. |{ context: Array<{name:string, description:string}, state: Array<{name:string, description:string}>|
+|recoveryActionGroup|(Optional) The action group to use when an alert goes from an active state to an inactive one. This action group should not be specified under the `actionGroups` property. If no recoveryActionGroup is specified, the default `recovered` action group will be used. |{id:string, name:string}|
+|actionVariables|(Optional) An explicit list of action variables that the rule type makes available via context and state in action parameter templates, and a short human readable description for each. The Alerting UI  will use this to display prompts for the users for these variables, in action parameter editors. We highly encourage using `kbn-i18n` to translate the descriptions. |{ context: Array<{name:string, description:string}, state: Array<{name:string, description:string}>|
 |validate.params|When developing a rule type, you can choose to accept a series of parameters. You may also choose to have the parameters validated before they are passed to the `executor` function or created as a saved object. In order to do this, provide a `@kbn/config-schema` schema that we will use to validate the `params` attribute.|@kbn/config-schema|
 |executor|This is where the code for the rule type lives. This is a function to be called when executing a rule on an interval basis. For full details, see the executor section below.|Function|
 |producer|The id of the application producing this rule type.|string|
 |minimumLicenseRequired|The value of a minimum license. Most of the rules are licensed as "basic".|string|
-|ruleTaskTimeout|The length of time a rule can run before being cancelled due to timeout. By default, this value is "5m".|string|
-|cancelAlertsOnRuleTimeout|Whether to skip writing alerts and scheduling actions if a rule execution is cancelled due to timeout. By default, this value is set to "true".|boolean|
+|ruleTaskTimeout|(Optional) The length of time a rule can run before being cancelled due to timeout. If not specified, the default value of "5m" is used.|string|
+|cancelAlertsOnRuleTimeout|(Optional) Whether to skip writing alerts and scheduling actions if a rule execution is cancelled due to timeout. If not specified, the default value of "true" is used.|boolean|
 |useSavedObjectReferences.extractReferences|(Optional) When developing a rule type, you can choose to implement hooks for extracting saved object references from rule parameters. This hook will be invoked when a rule is created or updated. Implementing this hook is optional, but if an extract hook is implemented, an inject hook must also be implemented.|Function
 |useSavedObjectReferences.injectReferences|(Optional) When developing a rule type, you can choose to implement hooks for injecting saved object references into rule parameters. This hook will be invoked when a rule is retrieved (get or find). Implementing this hook is optional, but if an inject hook is implemented, an extract hook must also be implemented.|Function
 |isExportable|Whether the rule type is exportable from the Saved Objects Management UI.|boolean|
-|defaultScheduleInterval|The default interval that will show up in the UI when creating a rule of this rule type.|boolean|
-|doesSetRecoveryContext|Whether the rule type will set context variables for recovered alerts. Defaults to `false`. If this is set to true, context variables are made available for the recovery action group and executors will be provided with the ability to set recovery context.|boolean|
+|defaultScheduleInterval|(Optional) The default interval that will show up in the UI when creating a rule of this rule type.|boolean|
+|doesSetRecoveryContext|(Optional) Whether the rule type will set context variables for recovered alerts. Defaults to `false`. If this is set to true, context variables are made available for the recovery action group and executors will be provided with the ability to set recovery context.|boolean|
 |getSummarizedAlerts|(Optional) When developing a rule type, you can choose to implement this hook for retrieving summarized alerts based on execution UUID or time range. This hook will be invoked when an alert summary action is configured for the rule.|Function|
+|alerts|(Optional) Specify options for writing alerts as data documents for this rule type. This feature is currently under development so this field is optional but we will eventually make this a requirement of all rule types. For full details, see the alerts as data section below.|IRuleTypeAlerts|
+|autoRecoverAlerts|(Optional) Whether the framework should determine if alerts have recovered between rule runs. If not specified, the default value of `true` is used. |boolean|
+|getViewInAppRelativeUrl|(Optional) When developing a rule type, you can choose to implement this hook for generating a link back to the Kibana application that can be used in alert actions. If not specified, a generic link back to the Rule Management app is generated.|Function|
 
 ### Executor
 
@@ -140,6 +141,56 @@ This is the primary function for a rule type. Whenever the rule needs to execute
 |rule.throttle|The configured throttle interval for this rule.|
 |rule.notifyWhen|The configured notification type for this rule.|
 
+### Alerts as Data
+
+The `alerts` property on a rule type should contain the information needed for the framework to install the Elasticsearch assets required to support writing alert documents.
+
+|Property|Description|Type|
+|---|---|---|
+|context|The namespace to use for this rule type. Multiple rule types can specify the same value for their alert context.|string|
+|mappings|Specify custom mappings for this rule type. These mappings will be translated into a component template.|ComponentTemplateSpec|
+|useEcs|(Optional) Whether to include the ECS component template for this rule type's alerts. If not specified, this value defaults to `false`.|boolean|
+|useLegacyAlerts|(Optional) Whether to include the legacy alert component template for this rule type's alerts. This should only be used by rule types that previously registered with the rule registry. If not specified, this value defaults to `false`.|boolean|
+|isSpaceAware|(Optional) Whether this rule type's alerts should be space-aware. If set to `true`, space specific alerts indices will be created during rule execution. If not specified, this value defaults to `false`.|boolean|
+|secondaryAlias|(Optional) Secondary alias to include. This option is included to support the signals alias for detection rules.|string|
+
+Regardless of whether any rule type specifies an `alerts` definition, the alerting framework will install the following common Elasticsearch assets on plugin setup:
+
+|Type|Name|Descripton|
+|---|---|---|
+|ILM Policy|`.alerts-ilm-policy`|Roll over after 30 days or if index exceeds 50 gigabytes|
+|Component Template|`.alerts-framework-mappings`|Includes mappings for all framework alerting fields|
+|Component Template|`.alerts-legacy-alert-mappings`|Includes mappings for all legacy alert fields. Use these mappings along with the framework mappings to match the rule registry technical mappings.|
+|Component Template|`.alerts-ecs-mappings`|Includes mappings for all ECS fields, excluding those of type `constant_keyword`|
+
+When a rule type specifies an `alerts` definition, the alerting framework will install Elasticsearch assets for the rule type on plugin setup. The following example definition
+
+```js
+{
+  context: `mySpecialRule`,
+  mappings: {
+    fieldMap: {
+      mySpecialRuleField: {
+        type: 'keyword',
+        required: false
+      }
+    }
+  },
+  useEcs: true
+}
+```
+
+will result in the following assets being installed:
+
+|Type|Name|Descripton|
+|---|---|---|
+|Component Template|`.alerts-mySpecialRule-mappings`|Includes mappings for fields in the specified fieldMap|
+|Index Template|`.alerts-mySpecialRule.alerts-default-index-template`|Includes references to the framework component template, the `.alerts-mySpecialRule-mappings` component template and the ECS component templates because `useEcs: true`|
+|Alias|`.alerts-mySpecialRule.alerts-default`||
+|Index|`.internal.alerts-mySpecialRule.alerts-default-000001`|Concrete write index for the `.alerts-mySpecialRule.alerts-default` alias|
+
+It is important to note that while multiple rule types can specify the same `context` in order to consolidate their alerts into a single index, the `alerts` definition must be the same across all these rule types. If, for example, RuleTypeA registers alert context `ourRules` with `useEcs: true` and RuleTypeB registers alert context `ourRules` with `useEcs: false`, an error will be thrown during registration.
+
 ### Action Variables
 
 The `actionVariables` property should contain the **flattened** names of the state and context variables available when an executor calls `alertInstance.scheduleActions(actionGroup, context)`.  These names are meant to be used in prompters in the Alerting UI, are used as text values for display, and can be inserted into to an action parameter text entry field via a UI gesture (e.g., clicking a menu item from a menu built with these names).  They should be flattened, so if a state or context variable is an object with properties, these should be listed with the "parent" property/properties in the name, separated by a `.` (period).

From 44c40a38e7dafe566823f56edb167d6b3b17a6f3 Mon Sep 17 00:00:00 2001
From: Bena Kansara <69037875+benakansara@users.noreply.github.com>
Date: Tue, 2 May 2023 20:34:29 +0200
Subject: [PATCH 24/33] Fix search issue with Alert search bar (#155796)

Fixes https://github.com/elastic/kibana/issues/155655

Added `onQuerySubmit` ~as optional~ parameter to `AlertsSearchBar` and
made `onQueryChange` as optional parameter as this is not needed for
Observability Alerts.

### [Observability] Alerts page:


https://user-images.githubusercontent.com/69037875/234622864-c18e338c-2ea3-4c79-9340-30c5e8fa470e.mov

### [Security] Alerts filter in action:


https://user-images.githubusercontent.com/69037875/234623243-c882a866-83fa-4d09-a1fb-d36588922f30.mov
---
 .../alert_search_bar/alert_search_bar.tsx     |  2 +-
 .../action_alerts_filter_query.tsx            |  1 +
 .../alerts_search_bar/alerts_search_bar.tsx   | 22 ++++++++++++++-----
 .../sections/alerts_search_bar/types.ts       |  6 ++++-
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/x-pack/plugins/observability/public/components/shared/alert_search_bar/alert_search_bar.tsx b/x-pack/plugins/observability/public/components/shared/alert_search_bar/alert_search_bar.tsx
index 6abf6017cc0c2..1442dbb9dbf91 100644
--- a/x-pack/plugins/observability/public/components/shared/alert_search_bar/alert_search_bar.tsx
+++ b/x-pack/plugins/observability/public/components/shared/alert_search_bar/alert_search_bar.tsx
@@ -111,7 +111,7 @@ export function ObservabilityAlertSearchBar({
           rangeFrom={rangeFrom}
           rangeTo={rangeTo}
           query={kuery}
-          onQueryChange={onSearchBarParamsChange}
+          onQuerySubmit={onSearchBarParamsChange}
         />
       </EuiFlexItem>
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_alerts_filter_query.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_alerts_filter_query.tsx
index 682bdbb52d81d..4d99754eb2331 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_alerts_filter_query.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_alerts_filter_query.tsx
@@ -77,6 +77,7 @@ export const ActionAlertsFilterQuery: React.FC<ActionAlertsFilterQueryProps> = (
             query={query.kql}
             filters={query.filters ?? []}
             onQueryChange={onQueryChange}
+            onQuerySubmit={onQueryChange}
             onFiltersUpdated={onFiltersUpdated}
             showFilterBar
             submitOnBlur
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_search_bar/alerts_search_bar.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_search_bar/alerts_search_bar.tsx
index 49b1f9905cd7f..64c48606ff916 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_search_bar/alerts_search_bar.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_search_bar/alerts_search_bar.tsx
@@ -21,6 +21,7 @@ export function AlertsSearchBar({
   query,
   filters,
   onQueryChange,
+  onQuerySubmit,
   onFiltersUpdated,
   rangeFrom,
   rangeTo,
@@ -39,9 +40,20 @@ export function AlertsSearchBar({
   const [queryLanguage, setQueryLanguage] = useState<QueryLanguageType>('kuery');
   const { value: dataView, loading, error } = useAlertDataView(featureIds);
 
-  const onQuerySubmit = useCallback(
+  const onSearchQuerySubmit = useCallback(
     ({ dateRange, query: nextQuery }: { dateRange: TimeRange; query?: Query }) => {
-      onQueryChange({
+      onQuerySubmit({
+        dateRange,
+        query: typeof nextQuery?.query === 'string' ? nextQuery.query : undefined,
+      });
+      setQueryLanguage((nextQuery?.language ?? 'kuery') as QueryLanguageType);
+    },
+    [onQuerySubmit, setQueryLanguage]
+  );
+
+  const onSearchQueryChange = useCallback(
+    ({ dateRange, query: nextQuery }: { dateRange: TimeRange; query?: Query }) => {
+      onQueryChange?.({
         dateRange,
         query: typeof nextQuery?.query === 'string' ? nextQuery.query : undefined,
       });
@@ -50,7 +62,7 @@ export function AlertsSearchBar({
     [onQueryChange, setQueryLanguage]
   );
   const onRefresh = ({ dateRange }: { dateRange: TimeRange }) => {
-    onQueryChange({
+    onQuerySubmit({
       dateRange,
     });
   };
@@ -66,13 +78,13 @@ export function AlertsSearchBar({
       dateRangeTo={rangeTo}
       displayStyle="inPage"
       showFilterBar={showFilterBar}
-      onQuerySubmit={onQuerySubmit}
+      onQuerySubmit={onSearchQuerySubmit}
       onFiltersUpdated={onFiltersUpdated}
       onRefresh={onRefresh}
       showDatePicker={showDatePicker}
       showSubmitButton={showSubmitButton}
       submitOnBlur={submitOnBlur}
-      onQueryChange={onQuerySubmit}
+      onQueryChange={onSearchQueryChange}
     />
   );
 }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_search_bar/types.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_search_bar/types.ts
index b7616333c199a..958b0e05cbf3a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_search_bar/types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_search_bar/types.ts
@@ -22,7 +22,11 @@ export interface AlertsSearchBarProps {
   showSubmitButton?: boolean;
   placeholder?: string;
   submitOnBlur?: boolean;
-  onQueryChange: (query: {
+  onQueryChange?: (query: {
+    dateRange: { from: string; to: string; mode?: 'absolute' | 'relative' };
+    query?: string;
+  }) => void;
+  onQuerySubmit: (query: {
     dateRange: { from: string; to: string; mode?: 'absolute' | 'relative' };
     query?: string;
   }) => void;

From df279dc285f23e001733e8c1d7d785dd2d744e75 Mon Sep 17 00:00:00 2001
From: Coen Warmer <coen.warmer@gmail.com>
Date: Tue, 2 May 2023 20:38:35 +0200
Subject: [PATCH 25/33] [SLO] Improve optimistic updating when cloning or
 deleting (#156385)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../observability/public/hooks/slo/use_clone_slo.ts   |  4 ++--
 .../observability/public/hooks/slo/use_delete_slo.ts  | 11 ++++++++---
 .../public/hooks/slo/use_fetch_historical_summary.ts  |  1 +
 .../public/hooks/slo/use_fetch_slo_list.ts            |  2 +-
 .../public/pages/slos/components/slo_list_item.tsx    |  3 ++-
 .../public/pages/slos/components/slo_sparkline.tsx    |  2 +-
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/x-pack/plugins/observability/public/hooks/slo/use_clone_slo.ts b/x-pack/plugins/observability/public/hooks/slo/use_clone_slo.ts
index 00fddd8aebf14..3c32ecb227a35 100644
--- a/x-pack/plugins/observability/public/hooks/slo/use_clone_slo.ts
+++ b/x-pack/plugins/observability/public/hooks/slo/use_clone_slo.ts
@@ -33,7 +33,7 @@ export function useCloneSlo() {
     {
       onMutate: async ({ slo, idToCopyFrom }) => {
         // Cancel any outgoing refetches (so they don't overwrite our optimistic update)
-        await queryClient.cancelQueries(['fetchSloList']);
+        await queryClient.cancelQueries(['fetchSloList'], { exact: false });
 
         const latestFetchSloListRequest = (
           queryClient.getQueriesData<FindSLOResponse>(['fetchSloList']) || []
@@ -80,7 +80,7 @@ export function useCloneSlo() {
         );
       },
       onSuccess: () => {
-        queryClient.invalidateQueries(['fetchSloList']);
+        queryClient.invalidateQueries(['fetchSloList'], { exact: false });
       },
     }
   );
diff --git a/x-pack/plugins/observability/public/hooks/slo/use_delete_slo.ts b/x-pack/plugins/observability/public/hooks/slo/use_delete_slo.ts
index 2878b3e158684..a3829cbebf2dc 100644
--- a/x-pack/plugins/observability/public/hooks/slo/use_delete_slo.ts
+++ b/x-pack/plugins/observability/public/hooks/slo/use_delete_slo.ts
@@ -34,7 +34,7 @@ export function useDeleteSlo() {
     {
       onMutate: async (slo) => {
         // Cancel any outgoing refetches (so they don't overwrite our optimistic update)
-        await queryClient.cancelQueries(['fetchSloList']);
+        await queryClient.cancelQueries(['fetchSloList'], { exact: false });
 
         const latestFetchSloListRequest = (
           queryClient.getQueriesData<FindSLOResponse>(['fetchSloList']) || []
@@ -76,8 +76,13 @@ export function useDeleteSlo() {
           })
         );
       },
-      onSuccess: (_success, slo) => {
-        queryClient.invalidateQueries(['fetchSloList']);
+      onSuccess: () => {
+        if (
+          queryClient.getQueryCache().find(['fetchSloList'], { exact: false })?.options // @ts-ignore
+            .refetchInterval === undefined
+        ) {
+          queryClient.invalidateQueries(['fetchSloList'], { exact: false });
+        }
       },
     }
   );
diff --git a/x-pack/plugins/observability/public/hooks/slo/use_fetch_historical_summary.ts b/x-pack/plugins/observability/public/hooks/slo/use_fetch_historical_summary.ts
index fe9ffd92f579d..0eb59aa85bc83 100644
--- a/x-pack/plugins/observability/public/hooks/slo/use_fetch_historical_summary.ts
+++ b/x-pack/plugins/observability/public/hooks/slo/use_fetch_historical_summary.ts
@@ -50,6 +50,7 @@ export function useFetchHistoricalSummary({
     },
     refetchInterval: shouldRefetch ? LONG_REFETCH_INTERVAL : undefined,
     refetchOnWindowFocus: false,
+    keepPreviousData: true,
   });
 
   return {
diff --git a/x-pack/plugins/observability/public/hooks/slo/use_fetch_slo_list.ts b/x-pack/plugins/observability/public/hooks/slo/use_fetch_slo_list.ts
index 086ec0d8e77a9..990b303ea0342 100644
--- a/x-pack/plugins/observability/public/hooks/slo/use_fetch_slo_list.ts
+++ b/x-pack/plugins/observability/public/hooks/slo/use_fetch_slo_list.ts
@@ -84,7 +84,7 @@ export function useFetchSloList({
           return;
         }
 
-        if (results.find((slo) => slo.summary.status === 'NO_DATA')) {
+        if (results.find((slo) => slo.summary.status === 'NO_DATA' || !slo.summary)) {
           setStateRefetchInterval(SHORT_REFETCH_INTERVAL);
         } else {
           setStateRefetchInterval(LONG_REFETCH_INTERVAL);
diff --git a/x-pack/plugins/observability/public/pages/slos/components/slo_list_item.tsx b/x-pack/plugins/observability/public/pages/slos/components/slo_list_item.tsx
index eb3a29ea61958..4502e7a2d9d20 100644
--- a/x-pack/plugins/observability/public/pages/slos/components/slo_list_item.tsx
+++ b/x-pack/plugins/observability/public/pages/slos/components/slo_list_item.tsx
@@ -181,8 +181,9 @@ export function SloListItem({
             button={
               <EuiButtonIcon
                 aria-label="Actions"
-                display="empty"
                 color="text"
+                disabled={!slo.summary}
+                display="empty"
                 iconType="boxesVertical"
                 size="s"
                 onClick={handleClickActions}
diff --git a/x-pack/plugins/observability/public/pages/slos/components/slo_sparkline.tsx b/x-pack/plugins/observability/public/pages/slos/components/slo_sparkline.tsx
index 8b3586554abf8..c546d8306bb38 100644
--- a/x-pack/plugins/observability/public/pages/slos/components/slo_sparkline.tsx
+++ b/x-pack/plugins/observability/public/pages/slos/components/slo_sparkline.tsx
@@ -50,7 +50,7 @@ export function SloSparkline({ chart, data, id, isLoading, state }: Props) {
     ) : null;
 
   if (isLoading) {
-    return <EuiLoadingChart size="m" mono />;
+    return <EuiLoadingChart style={{ minWidth: 60, justifyContent: 'center' }} size="m" mono />;
   }
 
   return (

From 594e53a29f85ac9cb05dbd323cbdd76306e761cd Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiago.costa@elastic.co>
Date: Tue, 2 May 2023 19:47:34 +0100
Subject: [PATCH 26/33] chore(NA): update versions after v8.7.2 bump (#156368)

This PR is a simple update of our versions file after the recent bumps
---
 versions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions.json b/versions.json
index 5b24835e23d97..a8443efc72595 100644
--- a/versions.json
+++ b/versions.json
@@ -14,7 +14,7 @@
       "previousMinor": true
     },
     {
-      "version": "8.7.1",
+      "version": "8.7.2",
       "branch": "8.7",
       "currentMajor": true,
       "previousMinor": true

From 529987323365c6ff9211e9d15d82336f9f5e9305 Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiago.costa@elastic.co>
Date: Tue, 2 May 2023 19:58:31 +0100
Subject: [PATCH 27/33] chore(NA): update versions after v7.17.11 bump
 (#156371)

This PR is a simple update of our versions file after the recent bumps
---
 versions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions.json b/versions.json
index a8443efc72595..1569a8e6dff4f 100644
--- a/versions.json
+++ b/versions.json
@@ -20,7 +20,7 @@
       "previousMinor": true
     },
     {
-      "version": "7.17.10",
+      "version": "7.17.11",
       "branch": "7.17",
       "previousMajor": true
     }

From 296b05a0aabf57b02f0d4576df9af720eb5d9a66 Mon Sep 17 00:00:00 2001
From: Kathleen DeRusso <kathleen.derusso@elastic.co>
Date: Tue, 2 May 2023 15:23:07 -0400
Subject: [PATCH 28/33] [Enterprise Search] Bug fix: Show correct index doc
 counts when viewing search applications (#156431)

## Summary

Fixes a bug where replicas would be counted when reporting the total
document count in indices associated with a search application.

Thanks to @efegurkan for the help!
---
 .../lib/engines/fetch_indices_stats.test.ts   | 25 +++++++++++++++----
 .../server/lib/engines/fetch_indices_stats.ts |  2 +-
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/server/lib/engines/fetch_indices_stats.test.ts b/x-pack/plugins/enterprise_search/server/lib/engines/fetch_indices_stats.test.ts
index 3282fa37f4f4d..55905e40c6835 100644
--- a/x-pack/plugins/enterprise_search/server/lib/engines/fetch_indices_stats.test.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/engines/fetch_indices_stats.test.ts
@@ -22,11 +22,16 @@ describe('fetchIndicesStats lib function', () => {
     indices: {
       'test-index-name-1': {
         health: 'GREEN',
-        primaries: { docs: [{}] },
+        primaries: {
+          docs: {
+            count: 200,
+            deleted: 0,
+          },
+        },
         status: 'open',
         total: {
           docs: {
-            count: 200,
+            count: 400,
             deleted: 0,
           },
         },
@@ -34,7 +39,12 @@ describe('fetchIndicesStats lib function', () => {
       },
       'test-index-name-2': {
         health: 'YELLOW',
-        primaries: { docs: [{}] },
+        primaries: {
+          docs: {
+            count: 0,
+            deleted: 0,
+          },
+        },
         status: 'closed',
         total: {
           docs: {
@@ -46,11 +56,16 @@ describe('fetchIndicesStats lib function', () => {
       },
       'test-index-name-3': {
         health: 'RED',
-        primaries: { docs: [{}] },
+        primaries: {
+          docs: {
+            count: 150,
+            deleted: 0,
+          },
+        },
         status: 'open',
         total: {
           docs: {
-            count: 150,
+            count: 300,
             deleted: 0,
           },
         },
diff --git a/x-pack/plugins/enterprise_search/server/lib/engines/fetch_indices_stats.ts b/x-pack/plugins/enterprise_search/server/lib/engines/fetch_indices_stats.ts
index c682309bbae4a..234fab310cca3 100644
--- a/x-pack/plugins/enterprise_search/server/lib/engines/fetch_indices_stats.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/engines/fetch_indices_stats.ts
@@ -18,7 +18,7 @@ export const fetchIndicesStats = async (client: IScopedClusterClient, indices: s
   const indicesWithStats = indices.map((indexName: string) => {
     const indexStats = indicesStats[indexName];
     const hydratedIndex: EnterpriseSearchEngineIndex = {
-      count: indexStats?.total?.docs?.count ?? 0,
+      count: indexStats?.primaries?.docs?.count ?? 0,
       health: indexStats?.health ?? 'unknown',
       name: indexName,
     };

From de0498decb0992a6b20a4158aeae0d3bd39278b3 Mon Sep 17 00:00:00 2001
From: Thom Heymann <190132+thomheymann@users.noreply.github.com>
Date: Tue, 2 May 2023 20:46:37 +0100
Subject: [PATCH 29/33] Fix unable to create roles under Stack Management
 (#156381)

Resolves #156249

---------

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../roles/model/put_payload.test.ts           | 43 +++++++++++++++++++
 .../authorization/roles/model/put_payload.ts  |  2 +-
 .../routes/authorization/roles/put.test.ts    | 43 ++++++++++++++-----
 3 files changed, 77 insertions(+), 11 deletions(-)

diff --git a/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.test.ts b/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.test.ts
index 597396a5837ff..9dd2deb876c61 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.test.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.test.ts
@@ -389,6 +389,49 @@ describe('Put payload schema', () => {
       }
     `);
   });
+
+  test('passes through remote_indices when specified', () => {
+    expect(
+      getPutPayloadSchema(() => basePrivilegeNamesMap).validate({
+        elasticsearch: {
+          remote_indices: [
+            {
+              clusters: ['remote_cluster'],
+              names: ['remote_index'],
+              privileges: ['all'],
+            },
+          ],
+        },
+      })
+    ).toMatchInlineSnapshot(`
+      Object {
+        "elasticsearch": Object {
+          "remote_indices": Array [
+            Object {
+              "clusters": Array [
+                "remote_cluster",
+              ],
+              "names": Array [
+                "remote_index",
+              ],
+              "privileges": Array [
+                "all",
+              ],
+            },
+          ],
+        },
+      }
+    `);
+  });
+
+  // This is important for backwards compatibility
+  test('does not set default value for remote_indices when not specified', () => {
+    expect(getPutPayloadSchema(() => basePrivilegeNamesMap).validate({})).toMatchInlineSnapshot(`
+      Object {
+        "elasticsearch": Object {},
+      }
+    `);
+  });
 });
 
 describe('validateKibanaPrivileges', () => {
diff --git a/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.ts b/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.ts
index a52399d4a04ec..5c8a07d15000d 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.ts
@@ -37,7 +37,7 @@ export const transformPutPayloadToElasticsearchRole = (
     metadata: rolePayload.metadata,
     cluster: elasticsearch.cluster || [],
     indices: elasticsearch.indices || [],
-    remote_indices: elasticsearch.remote_indices || [],
+    remote_indices: elasticsearch.remote_indices,
     run_as: elasticsearch.run_as || [],
     applications: [
       ...transformPrivilegesToElasticsearchPrivileges(application, kibana),
diff --git a/x-pack/plugins/security/server/routes/authorization/roles/put.test.ts b/x-pack/plugins/security/server/routes/authorization/roles/put.test.ts
index 1e59f7a5d6a0f..6adbe8975b0a9 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/put.test.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/put.test.ts
@@ -325,7 +325,7 @@ describe('PUT role', () => {
               body: {
                 cluster: [],
                 indices: [],
-                remote_indices: [],
+                remote_indices: undefined,
                 run_as: [],
                 applications: [],
               },
@@ -359,7 +359,7 @@ describe('PUT role', () => {
               body: {
                 cluster: [],
                 indices: [],
-                remote_indices: [],
+                remote_indices: undefined,
                 run_as: [],
                 applications: [
                   {
@@ -402,7 +402,7 @@ describe('PUT role', () => {
               body: {
                 cluster: [],
                 indices: [],
-                remote_indices: [],
+                remote_indices: undefined,
                 run_as: [],
                 applications: [
                   {
@@ -443,7 +443,7 @@ describe('PUT role', () => {
               body: {
                 cluster: [],
                 indices: [],
-                remote_indices: [],
+                remote_indices: undefined,
                 run_as: [],
                 applications: [
                   {
@@ -480,6 +480,18 @@ describe('PUT role', () => {
               query: `{ "match": { "title": "foo" } }`,
             },
           ],
+          remote_indices: [
+            {
+              field_security: {
+                grant: ['test-field-security-grant-1', 'test-field-security-grant-2'],
+                except: ['test-field-security-except-1', 'test-field-security-except-2'],
+              },
+              clusters: ['test-cluster-name-1', 'test-cluster-name-2'],
+              names: ['test-index-name-1', 'test-index-name-2'],
+              privileges: ['test-index-privilege-1', 'test-index-privilege-2'],
+              query: `{ "match": { "title": "foo" } }`,
+            },
+          ],
           run_as: ['test-run-as-1', 'test-run-as-2'],
         },
         kibana: [
@@ -539,7 +551,18 @@ describe('PUT role', () => {
                     query: `{ "match": { "title": "foo" } }`,
                   },
                 ],
-                remote_indices: [],
+                remote_indices: [
+                  {
+                    field_security: {
+                      grant: ['test-field-security-grant-1', 'test-field-security-grant-2'],
+                      except: ['test-field-security-except-1', 'test-field-security-except-2'],
+                    },
+                    clusters: ['test-cluster-name-1', 'test-cluster-name-2'],
+                    names: ['test-index-name-1', 'test-index-name-2'],
+                    privileges: ['test-index-privilege-1', 'test-index-privilege-2'],
+                    query: `{ "match": { "title": "foo" } }`,
+                  },
+                ],
                 metadata: { foo: 'test-metadata' },
                 run_as: ['test-run-as-1', 'test-run-as-2'],
               },
@@ -661,7 +684,7 @@ describe('PUT role', () => {
                     query: `{ "match": { "title": "foo" } }`,
                   },
                 ],
-                remote_indices: [],
+                remote_indices: undefined,
                 metadata: { foo: 'test-metadata' },
                 run_as: ['test-run-as-1', 'test-run-as-2'],
               },
@@ -765,7 +788,7 @@ describe('PUT role', () => {
                     privileges: ['test-index-privilege-1', 'test-index-privilege-2'],
                   },
                 ],
-                remote_indices: [],
+                remote_indices: undefined,
                 metadata: { foo: 'test-metadata' },
                 run_as: ['test-run-as-1', 'test-run-as-2'],
               },
@@ -803,7 +826,7 @@ describe('PUT role', () => {
               body: {
                 cluster: [],
                 indices: [],
-                remote_indices: [],
+                remote_indices: undefined,
                 run_as: [],
                 applications: [
                   {
@@ -848,7 +871,7 @@ describe('PUT role', () => {
               body: {
                 cluster: [],
                 indices: [],
-                remote_indices: [],
+                remote_indices: undefined,
                 run_as: [],
                 applications: [
                   {
@@ -893,7 +916,7 @@ describe('PUT role', () => {
               body: {
                 cluster: [],
                 indices: [],
-                remote_indices: [],
+                remote_indices: undefined,
                 run_as: [],
                 applications: [
                   {

From f0b75b3108f78948a2dd5fc30662e440884d8529 Mon Sep 17 00:00:00 2001
From: Jonathan Buttner <56361221+jonathan-buttner@users.noreply.github.com>
Date: Tue, 2 May 2023 16:02:36 -0400
Subject: [PATCH 30/33] [Cases] Renaming user action type (#156113)

This PR creates a proper `UserAction` type and various attributes types
to be used in the service layer of the backend.

There shouldn't be any functionality changes here just type name
changes.
---
 .../api/cases/user_actions/operations/find.ts |  4 +--
 .../common/api/cases/user_actions/response.ts | 34 +++++++++---------
 x-pack/plugins/cases/common/ui/types.ts       |  6 ++--
 x-pack/plugins/cases/public/api/utils.ts      |  4 +--
 .../public/components/user_actions/common.tsx |  8 +++--
 .../public/components/user_actions/types.ts   |  4 +--
 .../use_user_actions_last_page.tsx            |  4 +--
 .../use_user_actions_pagination.tsx           |  6 ++--
 .../user_actions/user_actions_list.tsx        |  4 +--
 x-pack/plugins/cases/public/containers/api.ts |  4 +--
 .../plugins/cases/public/containers/mock.ts   | 35 ++++++++-----------
 .../plugins/cases/public/containers/utils.ts  | 11 +++---
 .../server/client/metrics/lifespan.test.ts    |  8 ++---
 .../cases/server/client/metrics/lifespan.ts   |  6 ++--
 .../client/metrics/test_utils/lifespan.ts     |  4 +--
 .../cases/server/client/typedoc_interfaces.ts |  4 +--
 .../server/client/user_actions/connectors.ts  | 12 +++----
 .../cases/server/client/user_actions/utils.ts |  8 ++---
 .../cases/server/common/types/user_actions.ts |  5 +++
 .../services/user_actions/audit_logger.ts     |  2 +-
 .../user_actions/builders/assignees.ts        |  4 +--
 .../builders/audit_logger_utils.ts            |  2 +-
 .../services/user_actions/builders/tags.ts    |  4 +--
 .../server/services/user_actions/index.ts     | 20 +++++------
 .../user_actions/operations/create.ts         |  4 +--
 .../services/user_actions/operations/find.ts  | 19 +++++-----
 .../services/user_actions/test_utils.ts       |  4 +--
 .../server/services/user_actions/transform.ts | 20 +++++------
 .../server/services/user_actions/types.ts     | 32 +++++++++++------
 29 files changed, 143 insertions(+), 139 deletions(-)

diff --git a/x-pack/plugins/cases/common/api/cases/user_actions/operations/find.ts b/x-pack/plugins/cases/common/api/cases/user_actions/operations/find.ts
index dc4524e2bf3e9..ce107c73010c1 100644
--- a/x-pack/plugins/cases/common/api/cases/user_actions/operations/find.ts
+++ b/x-pack/plugins/cases/common/api/cases/user_actions/operations/find.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import { CaseUserActionsResponseRt } from '../response';
+import { UserActionsRt } from '../response';
 import { ActionTypes } from '../common';
 import { NumberFromString } from '../../../saved_object';
 
@@ -36,7 +36,7 @@ export const UserActionFindRequestRt = rt.partial({
 export type UserActionFindRequest = rt.TypeOf<typeof UserActionFindRequestRt>;
 
 export const UserActionFindResponseRt = rt.type({
-  userActions: CaseUserActionsResponseRt,
+  userActions: UserActionsRt,
   page: rt.number,
   perPage: rt.number,
   total: rt.number,
diff --git a/x-pack/plugins/cases/common/api/cases/user_actions/response.ts b/x-pack/plugins/cases/common/api/cases/user_actions/response.ts
index 8f0ef5517db4f..e4d1e681b1572 100644
--- a/x-pack/plugins/cases/common/api/cases/user_actions/response.ts
+++ b/x-pack/plugins/cases/common/api/cases/user_actions/response.ts
@@ -39,7 +39,7 @@ const CommonUserActionsRt = rt.union([
   AssigneesUserActionRt,
 ]);
 
-export const UserActionsRt = rt.union([
+const UserActionPayloadRt = rt.union([
   CommonUserActionsRt,
   CreateCaseUserActionRt,
   ConnectorUserActionRt,
@@ -55,7 +55,7 @@ const UserActionsWithoutConnectorIdRt = rt.union([
   DeleteCaseUserActionRt,
 ]);
 
-const CaseUserActionBasicRt = rt.intersection([UserActionsRt, UserActionCommonAttributesRt]);
+const CaseUserActionBasicRt = rt.intersection([UserActionPayloadRt, UserActionCommonAttributesRt]);
 const CaseUserActionBasicWithoutConnectorIdRt = rt.intersection([
   UserActionsWithoutConnectorIdRt,
   UserActionCommonAttributesRt,
@@ -69,38 +69,38 @@ const CaseUserActionDeprecatedResponseRt = rt.intersection([
 /**
  * This includes the comment_id but not the action_id or case_id
  */
-const CaseUserActionInjectedAttributesRt = rt.intersection([
-  CaseUserActionBasicRt,
-  CaseUserActionInjectedIdsRt,
-]);
+const UserActionAttributes = rt.intersection([CaseUserActionBasicRt, CaseUserActionInjectedIdsRt]);
 
-const CaseUserActionResponseRt = rt.intersection([
-  CaseUserActionInjectedAttributesRt,
+const UserActionRt = rt.intersection([
+  UserActionAttributes,
   rt.type({
     id: rt.string,
     version: rt.string,
   }),
 ]);
 
-const CaseUserActionAttributesRt = CaseUserActionBasicRt;
-export const CaseUserActionsResponseRt = rt.array(CaseUserActionResponseRt);
+export const UserActionsRt = rt.array(UserActionRt);
 export const CaseUserActionsDeprecatedResponseRt = rt.array(CaseUserActionDeprecatedResponseRt);
 export const CaseUserActionStatsResponseRt = CaseUserActionStatsRt;
 
-export type CaseUserActionAttributes = rt.TypeOf<typeof CaseUserActionAttributesRt>;
 export type CaseUserActionAttributesWithoutConnectorId = rt.TypeOf<
   typeof CaseUserActionBasicWithoutConnectorIdRt
 >;
 export type CaseUserActionStatsResponse = rt.TypeOf<typeof CaseUserActionStatsRt>;
-export type CaseUserActionsResponse = rt.TypeOf<typeof CaseUserActionsResponseRt>;
-export type CaseUserActionResponse = rt.TypeOf<typeof CaseUserActionResponseRt>;
+export type UserActions = rt.TypeOf<typeof UserActionsRt>;
+export type UserAction = rt.TypeOf<typeof UserActionRt>;
 export type CaseUserActionsDeprecatedResponse = rt.TypeOf<
   typeof CaseUserActionsDeprecatedResponseRt
 >;
 export type CaseUserActionDeprecatedResponse = rt.TypeOf<typeof CaseUserActionDeprecatedResponseRt>;
-export type CaseUserActionInjectedAttributes = rt.TypeOf<typeof CaseUserActionInjectedAttributesRt>;
+export type UserActionAttributes = rt.TypeOf<typeof UserActionAttributes>;
 
-export type UserAction = rt.TypeOf<typeof ActionsRt>;
+/**
+ * This defines the high level category for the user action. Whether the user add, removed, updated something
+ */
+export type ActionCategory = rt.TypeOf<typeof ActionsRt>;
+/**
+ * This defines the type of the user action, meaning what individual action was taken, for example changing the status,
+ * adding an assignee etc.
+ */
 export type UserActionTypes = ActionTypeValues;
-
-export type CaseUserAction = rt.TypeOf<typeof CaseUserActionBasicRt>;
diff --git a/x-pack/plugins/cases/common/ui/types.ts b/x-pack/plugins/cases/common/ui/types.ts
index c513f5a8e2337..c8a1e2172651f 100644
--- a/x-pack/plugins/cases/common/ui/types.ts
+++ b/x-pack/plugins/cases/common/ui/types.ts
@@ -17,7 +17,7 @@ import type {
   CaseStatuses,
   User,
   ActionConnector,
-  CaseUserActionResponse,
+  UserAction,
   SingleCaseMetricsResponse,
   CommentResponse,
   Case as CaseSnakeCase,
@@ -87,9 +87,9 @@ export type Comment = SnakeToCamelCase<CommentResponse>;
 export type AlertComment = SnakeToCamelCase<CommentResponseAlertsType>;
 export type ExternalReferenceComment = SnakeToCamelCase<CommentResponseExternalReferenceType>;
 export type PersistableComment = SnakeToCamelCase<CommentResponseTypePersistableState>;
-export type CaseUserActions = SnakeToCamelCase<CaseUserActionResponse>;
+export type UserActionUI = SnakeToCamelCase<UserAction>;
 export type FindCaseUserActions = Omit<SnakeToCamelCase<UserActionFindResponse>, 'userActions'> & {
-  userActions: CaseUserActions[];
+  userActions: UserActionUI[];
 };
 export type CaseUserActionsStats = SnakeToCamelCase<CaseUserActionStatsResponse>;
 export type CaseUI = Omit<SnakeToCamelCase<CaseSnakeCase>, 'comments'> & { comments: Comment[] };
diff --git a/x-pack/plugins/cases/public/api/utils.ts b/x-pack/plugins/cases/public/api/utils.ts
index d463fb4304249..4f2dde86dfec1 100644
--- a/x-pack/plugins/cases/public/api/utils.ts
+++ b/x-pack/plugins/cases/public/api/utils.ts
@@ -14,7 +14,7 @@ import {
 import type {
   CasesFindResponse,
   Case,
-  CaseUserActionsResponse,
+  UserActions,
   CommentRequest,
   CommentResponse,
   CaseResolveResponse,
@@ -81,7 +81,7 @@ export const convertAttachmentToCamelCase = (attachment: CommentRequest): Commen
   return convertToCamelCase<CommentRequest, Comment>(attachment);
 };
 
-export const convertUserActionsToCamelCase = (userActions: CaseUserActionsResponse) => {
+export const convertUserActionsToCamelCase = (userActions: UserActions) => {
   return userActions.map((userAction) => {
     if (isCommentUserAction(userAction)) {
       const userActionWithoutPayload = omit(userAction, 'payload.comment');
diff --git a/x-pack/plugins/cases/public/components/user_actions/common.tsx b/x-pack/plugins/cases/public/components/user_actions/common.tsx
index 4d04f118bebe4..800831b4cc9b2 100644
--- a/x-pack/plugins/cases/public/components/user_actions/common.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/common.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import type { EuiCommentProps } from '@elastic/eui';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 
-import type { ConnectorUserAction, UserAction } from '../../../common/api';
+import type { ConnectorUserAction, ActionCategory } from '../../../common/api';
 import { Actions } from '../../../common/api';
 import { UserActionTimestamp } from './timestamp';
 import type { UserActionBuilder, UserActionBuilderArgs, UserActionResponse } from './types';
@@ -22,8 +22,10 @@ interface Props {
   handleOutlineComment: (id: string) => void;
 }
 
-const showMoveToReference = (action: UserAction, commentId: string | null): commentId is string =>
-  action === Actions.update && commentId != null;
+const showMoveToReference = (
+  action: ActionCategory,
+  commentId: string | null
+): commentId is string => action === Actions.update && commentId != null;
 
 const CommentListActions: React.FC<Props> = React.memo(({ userAction, handleOutlineComment }) => (
   <EuiFlexGroup responsive={false}>
diff --git a/x-pack/plugins/cases/public/components/user_actions/types.ts b/x-pack/plugins/cases/public/components/user_actions/types.ts
index f8ff85e05bf18..4e2660734052f 100644
--- a/x-pack/plugins/cases/public/components/user_actions/types.ts
+++ b/x-pack/plugins/cases/public/components/user_actions/types.ts
@@ -12,7 +12,7 @@ import type { ActionTypes, UserActionWithResponse } from '../../../common/api';
 import type {
   CaseUI,
   CaseConnectors,
-  CaseUserActions,
+  UserActionUI,
   Comment,
   UseFetchAlertData,
   CaseUserActionsStats,
@@ -54,7 +54,7 @@ export interface UserActionBuilderArgs {
   externalReferenceAttachmentTypeRegistry: ExternalReferenceAttachmentTypeRegistry;
   persistableStateAttachmentTypeRegistry: PersistableStateAttachmentTypeRegistry;
   caseConnectors: CaseConnectors;
-  userAction: CaseUserActions;
+  userAction: UserActionUI;
   comments: Comment[];
   index: number;
   commentRefs: React.MutableRefObject<
diff --git a/x-pack/plugins/cases/public/components/user_actions/use_user_actions_last_page.tsx b/x-pack/plugins/cases/public/components/user_actions/use_user_actions_last_page.tsx
index 800f1f94c4832..32fc45aa433ab 100644
--- a/x-pack/plugins/cases/public/components/user_actions/use_user_actions_last_page.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/use_user_actions_last_page.tsx
@@ -7,7 +7,7 @@
 
 import { useMemo } from 'react';
 
-import type { CaseUserActions } from '../../containers/types';
+import type { UserActionUI } from '../../containers/types';
 import { useFindCaseUserActions } from '../../containers/use_find_case_user_actions';
 import type { UserActivityParams } from '../user_actions_activity_bar/types';
 
@@ -25,7 +25,7 @@ export const useLastPageUserActions = ({
   const { data: lastPageUserActionsData, isLoading: isLoadingLastPageUserActions } =
     useFindCaseUserActions(caseId, { ...userActivityQueryParams, page: lastPage }, lastPage > 1);
 
-  const lastPageUserActions = useMemo<CaseUserActions[]>(() => {
+  const lastPageUserActions = useMemo<UserActionUI[]>(() => {
     if (isLoadingLastPageUserActions || !lastPageUserActionsData) {
       return [];
     }
diff --git a/x-pack/plugins/cases/public/components/user_actions/use_user_actions_pagination.tsx b/x-pack/plugins/cases/public/components/user_actions/use_user_actions_pagination.tsx
index ec9b931af0ab2..bdaaa68de0157 100644
--- a/x-pack/plugins/cases/public/components/user_actions/use_user_actions_pagination.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/use_user_actions_pagination.tsx
@@ -8,7 +8,7 @@
 import { useMemo } from 'react';
 
 import { useInfiniteFindCaseUserActions } from '../../containers/use_infinite_find_case_user_actions';
-import type { CaseUserActions } from '../../containers/types';
+import type { UserActionUI } from '../../containers/types';
 import type { UserActivityParams } from '../user_actions_activity_bar/types';
 
 interface UserActionsPagination {
@@ -32,12 +32,12 @@ export const useUserActionsPagination = ({
 
   const showBottomList = lastPage > 1;
 
-  const infiniteCaseUserActions = useMemo<CaseUserActions[]>(() => {
+  const infiniteCaseUserActions = useMemo<UserActionUI[]>(() => {
     if (!caseInfiniteUserActionsData?.pages?.length || isLoadingInfiniteUserActions) {
       return [];
     }
 
-    const userActionsData: CaseUserActions[] = [];
+    const userActionsData: UserActionUI[] = [];
 
     caseInfiniteUserActionsData.pages.forEach((page) => userActionsData.push(...page.userActions));
 
diff --git a/x-pack/plugins/cases/public/components/user_actions/user_actions_list.tsx b/x-pack/plugins/cases/public/components/user_actions/user_actions_list.tsx
index 72d8371734548..1b4508291bfc7 100644
--- a/x-pack/plugins/cases/public/components/user_actions/user_actions_list.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/user_actions_list.tsx
@@ -11,7 +11,7 @@ import { EuiCommentList } from '@elastic/eui';
 import React, { useMemo, useEffect, useState } from 'react';
 import styled from 'styled-components';
 
-import type { CaseUserActions } from '../../containers/types';
+import type { UserActionUI } from '../../containers/types';
 import type { UserActionBuilderArgs, UserActionTreeProps } from './types';
 import { isUserActionTypeSupported } from './helpers';
 import { useCasesContext } from '../cases_context/use_cases_context';
@@ -78,7 +78,7 @@ export type UserActionListProps = Omit<
   | 'statusActionButton'
 > &
   Pick<UserActionBuilderArgs, 'commentRefs' | 'handleManageQuote'> & {
-    caseUserActions: CaseUserActions[];
+    caseUserActions: UserActionUI[];
     loadingAlertData: boolean;
     manualAlertsData: Record<string, unknown>;
     bottomActions?: EuiCommentProps[];
diff --git a/x-pack/plugins/cases/public/containers/api.ts b/x-pack/plugins/cases/public/containers/api.ts
index 2d9e17658d156..c804d1d34f60c 100644
--- a/x-pack/plugins/cases/public/containers/api.ts
+++ b/x-pack/plugins/cases/public/containers/api.ts
@@ -72,7 +72,7 @@ import type {
   CaseUI,
   SingleCaseMetrics,
   SingleCaseMetricsFeature,
-  CaseUserActions,
+  UserActionUI,
 } from './types';
 
 import {
@@ -186,7 +186,7 @@ export const findCaseUserActions = async (
     ...response,
     userActions: convertUserActionsToCamelCase(
       decodeCaseUserActionsResponse(response.userActions)
-    ) as CaseUserActions[],
+    ) as UserActionUI[],
   };
 };
 
diff --git a/x-pack/plugins/cases/public/containers/mock.ts b/x-pack/plugins/cases/public/containers/mock.ts
index d2ff6a1c0de6f..d35d001d41bc4 100644
--- a/x-pack/plugins/cases/public/containers/mock.ts
+++ b/x-pack/plugins/cases/public/containers/mock.ts
@@ -6,14 +6,7 @@
  */
 import type { FileJSON } from '@kbn/shared-ux-file-types';
 
-import type {
-  ActionLicense,
-  CasesUI,
-  CaseUI,
-  CasesStatus,
-  CaseUserActions,
-  Comment,
-} from './types';
+import type { ActionLicense, CasesUI, CaseUI, CasesStatus, UserActionUI, Comment } from './types';
 
 import type {
   ResolvedCase,
@@ -33,10 +26,10 @@ import type {
   CasesFindResponse,
   Cases,
   CasesStatusResponse,
-  CaseUserActionResponse,
-  CaseUserActionsResponse,
-  CommentResponse,
   UserAction,
+  UserActions,
+  CommentResponse,
+  ActionCategory,
   UserActionTypes,
   UserActionWithResponse,
   CommentUserAction,
@@ -618,9 +611,9 @@ export const allCasesSnake: CasesFindResponse = {
 
 export const getUserAction = (
   type: UserActionTypes,
-  action: UserAction,
+  action: ActionCategory,
   overrides?: Record<string, unknown>
-): CaseUserActions => {
+): UserActionUI => {
   const commonProperties = {
     ...basicAction,
     id: `${type}-${action}`,
@@ -745,27 +738,27 @@ export const getUserAction = (
       return {
         ...commonProperties,
         ...overrides,
-      } as CaseUserActions;
+      } as UserActionUI;
   }
 };
 
 export const getUserActionSnake = (
   type: UserActionTypes,
-  action: UserAction,
+  action: ActionCategory,
   overrides?: Record<string, unknown>
-): CaseUserActionResponse => {
+): UserAction => {
   return {
     ...covertToSnakeCase(getUserAction(type, action, overrides)),
-  } as unknown as CaseUserActionResponse;
+  } as unknown as UserAction;
 };
 
-export const caseUserActionsSnake: CaseUserActionsResponse = [
+export const caseUserActionsSnake: UserActions = [
   getUserActionSnake('description', Actions.create),
   getUserActionSnake('comment', Actions.create),
   getUserActionSnake('description', Actions.update),
 ];
 
-export const caseUserActionsWithRegisteredAttachmentsSnake: CaseUserActionsResponse = [
+export const caseUserActionsWithRegisteredAttachmentsSnake: UserActions = [
   getUserActionSnake('description', Actions.create),
   {
     created_at: basicCreatedAt,
@@ -865,13 +858,13 @@ export const getHostIsolationUserAction = (
   ...overrides,
 });
 
-export const caseUserActions: CaseUserActions[] = [
+export const caseUserActions: UserActionUI[] = [
   getUserAction('description', Actions.create),
   getUserAction('comment', Actions.create),
   getUserAction('description', Actions.update),
 ];
 
-export const caseUserActionsWithRegisteredAttachments: CaseUserActions[] = [
+export const caseUserActionsWithRegisteredAttachments: UserActionUI[] = [
   getUserAction('description', Actions.create),
   {
     createdAt: basicCreatedAt,
diff --git a/x-pack/plugins/cases/public/containers/utils.ts b/x-pack/plugins/cases/public/containers/utils.ts
index 66b540040415f..c1d89dc81595c 100644
--- a/x-pack/plugins/cases/public/containers/utils.ts
+++ b/x-pack/plugins/cases/public/containers/utils.ts
@@ -15,7 +15,7 @@ import { NO_ASSIGNEES_FILTERING_KEYWORD } from '../../common/constants';
 import type {
   CasesConfigurationsResponse,
   CasesConfigureResponse,
-  CaseUserActionsResponse,
+  UserActions,
   CasePatchRequest,
   CaseResolveResponse,
   SingleCaseMetricsResponse,
@@ -30,7 +30,7 @@ import {
   throwErrors,
   CaseConfigurationsResponseRt,
   CaseConfigureResponseRt,
-  CaseUserActionsResponseRt,
+  UserActionsRt,
   CommentType,
   CaseResolveResponseRt,
   SingleCaseMetricsResponseRt,
@@ -80,11 +80,8 @@ export const decodeCaseConfigureResponse = (respCase?: CasesConfigureResponse) =
     fold(throwErrors(createToasterPlainError), identity)
   );
 
-export const decodeCaseUserActionsResponse = (respUserActions?: CaseUserActionsResponse) =>
-  pipe(
-    CaseUserActionsResponseRt.decode(respUserActions),
-    fold(throwErrors(createToasterPlainError), identity)
-  );
+export const decodeCaseUserActionsResponse = (respUserActions?: UserActions) =>
+  pipe(UserActionsRt.decode(respUserActions), fold(throwErrors(createToasterPlainError), identity));
 
 export const decodeCaseUserActionStatsResponse = (
   caseUserActionsStats: CaseUserActionStatsResponse
diff --git a/x-pack/plugins/cases/server/client/metrics/lifespan.test.ts b/x-pack/plugins/cases/server/client/metrics/lifespan.test.ts
index 808b6f334e15f..a36e9eb8a106b 100644
--- a/x-pack/plugins/cases/server/client/metrics/lifespan.test.ts
+++ b/x-pack/plugins/cases/server/client/metrics/lifespan.test.ts
@@ -6,7 +6,7 @@
  */
 
 import type { SavedObject } from '@kbn/core/server';
-import type { CaseUserActionInjectedAttributes } from '../../../common/api';
+import type { UserActionAttributes } from '../../../common/api';
 import { CaseStatuses } from '../../../common/api';
 import { getStatusInfo } from './lifespan';
 import { createStatusChangeSavedObject } from './test_utils/lifespan';
@@ -120,7 +120,7 @@ describe('lifespan', () => {
         [
           {
             attributes: { payload: { hello: 1, status: CaseStatuses.closed }, type: 'status' },
-          } as unknown as SavedObject<CaseUserActionInjectedAttributes>,
+          } as unknown as SavedObject<UserActionAttributes>,
         ],
         new Date(0)
       );
@@ -133,7 +133,7 @@ describe('lifespan', () => {
         [
           {
             attributes: { payload: { status: CaseStatuses.closed }, type: 'awesome' },
-          } as unknown as SavedObject<CaseUserActionInjectedAttributes>,
+          } as unknown as SavedObject<UserActionAttributes>,
         ],
         new Date(0)
       );
@@ -149,7 +149,7 @@ describe('lifespan', () => {
               payload: { status: CaseStatuses.closed, created_at: 'blah' },
               type: 'status',
             },
-          } as unknown as SavedObject<CaseUserActionInjectedAttributes>,
+          } as unknown as SavedObject<UserActionAttributes>,
         ],
         new Date(0)
       );
diff --git a/x-pack/plugins/cases/server/client/metrics/lifespan.ts b/x-pack/plugins/cases/server/client/metrics/lifespan.ts
index a78e5397b7a13..7e564c99f7fbc 100644
--- a/x-pack/plugins/cases/server/client/metrics/lifespan.ts
+++ b/x-pack/plugins/cases/server/client/metrics/lifespan.ts
@@ -7,7 +7,7 @@
 
 import type { SavedObject } from '@kbn/core/server';
 import type {
-  CaseUserActionInjectedAttributes,
+  UserActionAttributes,
   SingleCaseMetricsResponse,
   StatusInfo,
   StatusUserAction,
@@ -83,7 +83,7 @@ interface StatusCalculations {
 }
 
 export function getStatusInfo(
-  statusUserActions: Array<SavedObject<CaseUserActionInjectedAttributes>>,
+  statusUserActions: Array<SavedObject<UserActionAttributes>>,
   caseOpenTimestamp: Date
 ): StatusInfo {
   const accStatusInfo = statusUserActions.reduce<StatusCalculations>(
@@ -138,7 +138,7 @@ export function getStatusInfo(
 }
 
 function isValidStatusChangeUserAction(
-  attributes: CaseUserActionInjectedAttributes,
+  attributes: UserActionAttributes,
   newStatusChangeTimestamp: Date
 ): attributes is UserActionWithResponse<StatusUserAction> {
   return StatusUserActionRt.is(attributes) && isDateValid(newStatusChangeTimestamp);
diff --git a/x-pack/plugins/cases/server/client/metrics/test_utils/lifespan.ts b/x-pack/plugins/cases/server/client/metrics/test_utils/lifespan.ts
index 62593e39e7d5c..b54204003b8ee 100644
--- a/x-pack/plugins/cases/server/client/metrics/test_utils/lifespan.ts
+++ b/x-pack/plugins/cases/server/client/metrics/test_utils/lifespan.ts
@@ -6,12 +6,12 @@
  */
 
 import type { SavedObject } from '@kbn/core/server';
-import type { CaseStatuses, CaseUserActionInjectedAttributes } from '../../../../common/api';
+import type { CaseStatuses, UserActionAttributes } from '../../../../common/api';
 
 export function createStatusChangeSavedObject(
   status: CaseStatuses,
   createdAt: Date
-): SavedObject<CaseUserActionInjectedAttributes> {
+): SavedObject<UserActionAttributes> {
   return {
     references: [],
     id: '',
diff --git a/x-pack/plugins/cases/server/client/typedoc_interfaces.ts b/x-pack/plugins/cases/server/client/typedoc_interfaces.ts
index f67a1eff4631e..f0fe44d4d44da 100644
--- a/x-pack/plugins/cases/server/client/typedoc_interfaces.ts
+++ b/x-pack/plugins/cases/server/client/typedoc_interfaces.ts
@@ -25,7 +25,7 @@ import type {
   CasesFindResponse,
   CasesPatchRequest,
   Cases,
-  CaseUserActionsResponse,
+  UserActions,
   CommentsResponse,
   CasesBulkGetResponse,
 } from '../../common/api';
@@ -51,4 +51,4 @@ export interface ICasesConfigurePatch extends CasesConfigurePatch {}
 export interface ICommentsResponse extends CommentsResponse {}
 export interface IAllCommentsResponse extends AllCommentsResponse {}
 
-export interface ICaseUserActionsResponse extends CaseUserActionsResponse {}
+export interface ICaseUserActionsResponse extends UserActions {}
diff --git a/x-pack/plugins/cases/server/client/user_actions/connectors.ts b/x-pack/plugins/cases/server/client/user_actions/connectors.ts
index da949996d0fd7..79673389881d0 100644
--- a/x-pack/plugins/cases/server/client/user_actions/connectors.ts
+++ b/x-pack/plugins/cases/server/client/user_actions/connectors.ts
@@ -13,7 +13,7 @@ import type { SavedObject } from '@kbn/core-saved-objects-common/src/server_type
 import type {
   GetCaseConnectorsResponse,
   CaseConnector,
-  CaseUserActionInjectedAttributes,
+  UserActionAttributes,
   CaseExternalServiceBasic,
   GetCaseConnectorsPushDetails,
 } from '../../../common/api';
@@ -75,7 +75,7 @@ const checkConnectorsAuthorization = async ({
   authorization,
 }: {
   connectors: CaseConnectorActivity[];
-  latestUserAction?: SavedObject<CaseUserActionInjectedAttributes>;
+  latestUserAction?: SavedObject<UserActionAttributes>;
   authorization: PublicMethodsOf<Authorization>;
 }) => {
   const entities: OwnerEntity[] = latestUserAction
@@ -127,7 +127,7 @@ const getConnectorsInfo = async ({
 }: {
   caseId: string;
   connectors: CaseConnectorActivity[];
-  latestUserAction?: SavedObject<CaseUserActionInjectedAttributes>;
+  latestUserAction?: SavedObject<UserActionAttributes>;
   actionsClient: PublicMethodsOf<ActionsClient>;
   userActionService: CaseUserActionService;
   logger: CasesClientArgs['logger'];
@@ -224,7 +224,7 @@ const getPushDetails = (activity: CaseConnectorActivity[]) => {
 };
 
 const getExternalServiceFromSavedObject = (
-  savedObject: SavedObject<CaseUserActionInjectedAttributes> | undefined
+  savedObject: SavedObject<UserActionAttributes> | undefined
 ): CaseExternalServiceBasic | undefined => {
   if (savedObject != null && isPushedUserAction(savedObject.attributes)) {
     return savedObject.attributes.payload.externalService;
@@ -248,7 +248,7 @@ const isDateValid = (date: Date): boolean => {
 };
 
 const getConnectorInfoFromSavedObject = (
-  savedObject: SavedObject<CaseUserActionInjectedAttributes> | undefined
+  savedObject: SavedObject<UserActionAttributes> | undefined
 ): CaseConnector | undefined => {
   if (
     savedObject != null &&
@@ -268,7 +268,7 @@ const createConnectorInfoResult = ({
   actionConnectors: ActionResult[];
   connectors: CaseConnectorActivity[];
   pushInfo: Map<string, EnrichedPushInfo>;
-  latestUserAction?: SavedObject<CaseUserActionInjectedAttributes>;
+  latestUserAction?: SavedObject<UserActionAttributes>;
 }) => {
   const results: GetCaseConnectorsResponse = {};
   const actionConnectorsMap = new Map(
diff --git a/x-pack/plugins/cases/server/client/user_actions/utils.ts b/x-pack/plugins/cases/server/client/user_actions/utils.ts
index 98df79b6e94ab..bc2deb2b2caf6 100644
--- a/x-pack/plugins/cases/server/client/user_actions/utils.ts
+++ b/x-pack/plugins/cases/server/client/user_actions/utils.ts
@@ -7,8 +7,8 @@
 
 import type { SavedObjectsFindResponse } from '@kbn/core-saved-objects-api-server';
 import type {
-  CaseUserActionInjectedAttributes,
-  CaseUserActionsResponse,
+  UserActionAttributes,
+  UserActions,
   CaseUserActionsDeprecatedResponse,
   CaseUserActionDeprecatedResponse,
 } from '../../../common/api';
@@ -20,6 +20,6 @@ export const extractAttributes = (
 };
 
 export const formatSavedObjects = (
-  response: SavedObjectsFindResponse<CaseUserActionInjectedAttributes>
-): CaseUserActionsResponse =>
+  response: SavedObjectsFindResponse<UserActionAttributes>
+): UserActions =>
   response.saved_objects.map((so) => ({ id: so.id, version: so.version ?? '', ...so.attributes }));
diff --git a/x-pack/plugins/cases/server/common/types/user_actions.ts b/x-pack/plugins/cases/server/common/types/user_actions.ts
index bc5366a2adaa8..14823f159a408 100644
--- a/x-pack/plugins/cases/server/common/types/user_actions.ts
+++ b/x-pack/plugins/cases/server/common/types/user_actions.ts
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import type { SavedObject } from '@kbn/core/server';
+import type { UserActionAttributes } from '../../../common/api';
 import type { User } from './user';
 
 interface UserActionCommonPersistedAttributes {
@@ -18,3 +20,6 @@ export interface UserActionPersistedAttributes extends UserActionCommonPersisted
   type: string;
   payload: Record<string, unknown>;
 }
+
+export type UserActionTransformedAttributes = UserActionAttributes;
+export type UserActionSavedObjectTransformed = SavedObject<UserActionTransformedAttributes>;
diff --git a/x-pack/plugins/cases/server/services/user_actions/audit_logger.ts b/x-pack/plugins/cases/server/services/user_actions/audit_logger.ts
index af3599c11c67b..fc1d60684949d 100644
--- a/x-pack/plugins/cases/server/services/user_actions/audit_logger.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/audit_logger.ts
@@ -8,7 +8,7 @@
 import type { EcsEvent } from '@kbn/ecs';
 import type { AuditLogger } from '@kbn/security-plugin/server';
 import type { ArrayElement } from '@kbn/utility-types';
-import type { UserAction as Action } from '../../../common/api';
+import type { ActionCategory as Action } from '../../../common/api';
 import type { EventDetails } from './types';
 
 const actionsToEcsType: Record<Action, ArrayElement<EcsEvent['type']>> = {
diff --git a/x-pack/plugins/cases/server/services/user_actions/builders/assignees.ts b/x-pack/plugins/cases/server/services/user_actions/builders/assignees.ts
index ffd695e62df37..9c21bf916758d 100644
--- a/x-pack/plugins/cases/server/services/user_actions/builders/assignees.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/builders/assignees.ts
@@ -6,7 +6,7 @@
  */
 
 import { CASE_SAVED_OBJECT } from '../../../../common/constants';
-import type { UserAction } from '../../../../common/api';
+import type { ActionCategory } from '../../../../common/api';
 import { ActionTypes, Actions } from '../../../../common/api';
 import { UserActionBuilder } from '../abstract_builder';
 import type { EventDetails, UserActionParameters, UserActionEvent } from '../types';
@@ -44,7 +44,7 @@ export class AssigneesUserActionBuilder extends UserActionBuilder {
   }
 }
 
-const getVerbMessage = (action: UserAction, uids: string[]) => {
+const getVerbMessage = (action: ActionCategory, uids: string[]) => {
   const uidText = `uids: [${uids}]`;
 
   switch (action) {
diff --git a/x-pack/plugins/cases/server/services/user_actions/builders/audit_logger_utils.ts b/x-pack/plugins/cases/server/services/user_actions/builders/audit_logger_utils.ts
index 4010c358ce601..396301a648e42 100644
--- a/x-pack/plugins/cases/server/services/user_actions/builders/audit_logger_utils.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/builders/audit_logger_utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { UserAction as Action } from '../../../../common/api';
+import type { ActionCategory as Action } from '../../../../common/api';
 
 const actionsToVerbs: Record<Action, string> = {
   add: 'added',
diff --git a/x-pack/plugins/cases/server/services/user_actions/builders/tags.ts b/x-pack/plugins/cases/server/services/user_actions/builders/tags.ts
index 1a9066cbbf224..5dc4197185761 100644
--- a/x-pack/plugins/cases/server/services/user_actions/builders/tags.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/builders/tags.ts
@@ -6,7 +6,7 @@
  */
 
 import { CASE_SAVED_OBJECT } from '../../../../common/constants';
-import type { UserAction } from '../../../../common/api';
+import type { ActionCategory } from '../../../../common/api';
 import { ActionTypes, Actions } from '../../../../common/api';
 import { UserActionBuilder } from '../abstract_builder';
 import type { EventDetails, UserActionParameters, UserActionEvent } from '../types';
@@ -45,7 +45,7 @@ export class TagsUserActionBuilder extends UserActionBuilder {
   }
 }
 
-const getPreposition = (action: UserAction): string => {
+const getPreposition = (action: ActionCategory): string => {
   switch (action) {
     case Actions.add:
       return 'to';
diff --git a/x-pack/plugins/cases/server/services/user_actions/index.ts b/x-pack/plugins/cases/server/services/user_actions/index.ts
index 167f0e123fb07..521cee600469b 100644
--- a/x-pack/plugins/cases/server/services/user_actions/index.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/index.ts
@@ -5,14 +5,11 @@
  * 2.0.
  */
 
-import type { SavedObject, SavedObjectsFindResponse, SavedObjectsRawDoc } from '@kbn/core/server';
+import type { SavedObjectsFindResponse, SavedObjectsRawDoc } from '@kbn/core/server';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { KueryNode } from '@kbn/es-query';
-import type {
-  CaseUserActionDeprecatedResponse,
-  CaseUserActionInjectedAttributes,
-} from '../../../common/api';
+import type { CaseUserActionDeprecatedResponse } from '../../../common/api';
 import { ActionTypes } from '../../../common/api';
 import {
   CASE_SAVED_OBJECT,
@@ -38,7 +35,10 @@ import { defaultSortField } from '../../common/utils';
 import { UserActionPersister } from './operations/create';
 import { UserActionFinder } from './operations/find';
 import { transformToExternalModel, legacyTransformFindResponseToExternalModel } from './transform';
-import type { UserActionPersistedAttributes } from '../../common/types/user_actions';
+import type {
+  UserActionPersistedAttributes,
+  UserActionSavedObjectTransformed,
+} from '../../common/types/user_actions';
 
 export class CaseUserActionService {
   private readonly _creator: UserActionPersister;
@@ -222,7 +222,7 @@ export class CaseUserActionService {
 
   public async getMostRecentUserAction(
     caseId: string
-  ): Promise<SavedObject<CaseUserActionInjectedAttributes> | undefined> {
+  ): Promise<UserActionSavedObjectTransformed | undefined> {
     try {
       this.context.log.debug(
         `Attempting to retrieve the most recent user action for case id: ${caseId}`
@@ -327,7 +327,7 @@ export class CaseUserActionService {
         rawFieldsDoc = createCase.mostRecent.hits.hits[0];
       }
 
-      let fieldsDoc: SavedObject<CaseUserActionInjectedAttributes> | undefined;
+      let fieldsDoc: UserActionSavedObjectTransformed | undefined;
       if (rawFieldsDoc != null) {
         const doc =
           this.context.savedObjectsSerializer.rawToSavedObject<UserActionPersistedAttributes>(
@@ -368,9 +368,7 @@ export class CaseUserActionService {
     }
   }
 
-  private getTopHitsDoc(
-    topHits: TopHits
-  ): SavedObject<CaseUserActionInjectedAttributes> | undefined {
+  private getTopHitsDoc(topHits: TopHits): UserActionSavedObjectTransformed | undefined {
     if (topHits.hits.hits.length > 0) {
       const rawPushDoc = topHits.hits.hits[0];
 
diff --git a/x-pack/plugins/cases/server/services/user_actions/operations/create.ts b/x-pack/plugins/cases/server/services/user_actions/operations/create.ts
index 25096baddf479..d4b5c0d283630 100644
--- a/x-pack/plugins/cases/server/services/user_actions/operations/create.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/operations/create.ts
@@ -15,7 +15,7 @@ import type {
   ActionTypeValues,
   CaseAssignees,
   CaseUserProfile,
-  UserAction as Action,
+  ActionCategory,
 } from '../../../../common/api';
 import { Actions, ActionTypes } from '../../../../common/api';
 import { BuilderFactory } from '../builder_factory';
@@ -184,7 +184,7 @@ export class UserActionPersister {
   }: {
     commonArgs: CommonUserActionArgs;
     actionType: ActionType;
-    action: Action;
+    action: ActionCategory;
     createPayload: CreatePayloadFunction<Item, ActionType>;
     modifiedItems?: Item[] | null;
   }) {
diff --git a/x-pack/plugins/cases/server/services/user_actions/operations/find.ts b/x-pack/plugins/cases/server/services/user_actions/operations/find.ts
index 5ce99d41a5ed2..c1b3a49ed6507 100644
--- a/x-pack/plugins/cases/server/services/user_actions/operations/find.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/operations/find.ts
@@ -8,14 +8,9 @@
 import type { KueryNode } from '@kbn/es-query';
 import { fromKueryExpression } from '@kbn/es-query';
 import type { SavedObjectsFindResponse } from '@kbn/core-saved-objects-api-server';
-import type { SavedObject } from '@kbn/core-saved-objects-server';
 import { DEFAULT_PAGE, DEFAULT_PER_PAGE } from '../../../routes/api';
 import { defaultSortField } from '../../../common/utils';
-import type {
-  ActionTypeValues,
-  FindTypeField,
-  CaseUserActionInjectedAttributes,
-} from '../../../../common/api';
+import type { ActionTypeValues, FindTypeField } from '../../../../common/api';
 import { Actions, ActionTypes, CommentType } from '../../../../common/api';
 import {
   CASE_SAVED_OBJECT,
@@ -26,7 +21,11 @@ import {
 import type { FindOptions, ServiceContext } from '../types';
 import { transformFindResponseToExternalModel, transformToExternalModel } from '../transform';
 import { buildFilter, combineFilters, NodeBuilderOperators } from '../../../client/utils';
-import type { UserActionPersistedAttributes } from '../../../common/types/user_actions';
+import type {
+  UserActionPersistedAttributes,
+  UserActionSavedObjectTransformed,
+  UserActionTransformedAttributes,
+} from '../../../common/types/user_actions';
 
 export class UserActionFinder {
   constructor(private readonly context: ServiceContext) {}
@@ -38,7 +37,7 @@ export class UserActionFinder {
     page,
     perPage,
     filter,
-  }: FindOptions): Promise<SavedObjectsFindResponse<CaseUserActionInjectedAttributes>> {
+  }: FindOptions): Promise<SavedObjectsFindResponse<UserActionTransformedAttributes>> {
     try {
       this.context.log.debug(`Attempting to find user actions for case id: ${caseId}`);
 
@@ -168,7 +167,7 @@ export class UserActionFinder {
   }: {
     caseId: string;
     filter?: KueryNode;
-  }): Promise<Array<SavedObject<CaseUserActionInjectedAttributes>>> {
+  }): Promise<UserActionSavedObjectTransformed[]> {
     try {
       this.context.log.debug('Attempting to find status changes');
 
@@ -200,7 +199,7 @@ export class UserActionFinder {
           }
         );
 
-      let userActions: Array<SavedObject<CaseUserActionInjectedAttributes>> = [];
+      let userActions: UserActionSavedObjectTransformed[] = [];
       for await (const findResults of finder.find()) {
         userActions = userActions.concat(
           findResults.saved_objects.map((so) =>
diff --git a/x-pack/plugins/cases/server/services/user_actions/test_utils.ts b/x-pack/plugins/cases/server/services/user_actions/test_utils.ts
index 49d47b13f8d04..b4dbb114fc2fe 100644
--- a/x-pack/plugins/cases/server/services/user_actions/test_utils.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/test_utils.ts
@@ -21,7 +21,7 @@ import {
 import type {
   CaseUserActionAttributesWithoutConnectorId,
   ConnectorUserAction,
-  UserAction,
+  ActionCategory,
 } from '../../../common/api';
 import { CaseSeverity, CaseStatuses, Actions } from '../../../common/api';
 import {
@@ -76,7 +76,7 @@ export const createUserActionSO = ({
   type,
   references = [],
 }: {
-  action: UserAction;
+  action: ActionCategory;
   type?: string;
   payload?: Record<string, unknown>;
   attributesOverrides?: Partial<CaseUserActionAttributesWithoutConnectorId>;
diff --git a/x-pack/plugins/cases/server/services/user_actions/transform.ts b/x-pack/plugins/cases/server/services/user_actions/transform.ts
index 10a6104e15807..fb0a17fc6a57b 100644
--- a/x-pack/plugins/cases/server/services/user_actions/transform.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/transform.ts
@@ -14,11 +14,7 @@ import {
   isCreateCaseUserAction,
   isCommentUserAction,
 } from '../../../common/utils/user_actions';
-import type {
-  CaseUserActionAttributes,
-  CaseUserActionDeprecatedResponse,
-  CaseUserActionInjectedAttributes,
-} from '../../../common/api';
+import type { CaseUserActionDeprecatedResponse, UserActionAttributes } from '../../../common/api';
 import { NONE_CONNECTOR_ID } from '../../../common/api';
 import { CASE_SAVED_OBJECT, CASE_COMMENT_SAVED_OBJECT } from '../../../common/constants';
 import {
@@ -33,12 +29,16 @@ import { isCommentRequestTypeExternalReferenceSO } from '../type_guards';
 import type { PersistableStateAttachmentTypeRegistry } from '../../attachment_framework/persistable_state_registry';
 import { injectPersistableReferencesToSO } from '../../attachment_framework/so_references';
 import { findReferenceId } from '../../common/references';
-import type { UserActionPersistedAttributes } from '../../common/types/user_actions';
+import type {
+  UserActionPersistedAttributes,
+  UserActionSavedObjectTransformed,
+  UserActionTransformedAttributes,
+} from '../../common/types/user_actions';
 
 export function transformFindResponseToExternalModel(
   userActions: SavedObjectsFindResponse<UserActionPersistedAttributes>,
   persistableStateAttachmentTypeRegistry: PersistableStateAttachmentTypeRegistry
-): SavedObjectsFindResponse<CaseUserActionInjectedAttributes> {
+): SavedObjectsFindResponse<UserActionTransformedAttributes> {
   return {
     ...userActions,
     saved_objects: userActions.saved_objects.map((so) => ({
@@ -51,7 +51,7 @@ export function transformFindResponseToExternalModel(
 export function transformToExternalModel(
   userAction: SavedObject<UserActionPersistedAttributes>,
   persistableStateAttachmentTypeRegistry: PersistableStateAttachmentTypeRegistry
-): SavedObject<CaseUserActionInjectedAttributes> {
+): UserActionSavedObjectTransformed {
   const { references } = userAction;
 
   const commentId =
@@ -64,7 +64,7 @@ export function transformToExternalModel(
       ...userAction.attributes,
       comment_id: commentId,
       payload,
-    } as CaseUserActionInjectedAttributes,
+    } as UserActionTransformedAttributes,
   };
 }
 
@@ -116,7 +116,7 @@ function legacyTransformToExternalModel(
 const addReferenceIdToPayload = (
   userAction: SavedObject<UserActionPersistedAttributes>,
   persistableStateAttachmentTypeRegistry: PersistableStateAttachmentTypeRegistry
-): CaseUserActionAttributes['payload'] => {
+): UserActionAttributes['payload'] => {
   const connectorId = getConnectorIdFromReferences(userAction);
   const userActionAttributes = userAction.attributes;
 
diff --git a/x-pack/plugins/cases/server/services/user_actions/types.ts b/x-pack/plugins/cases/server/services/user_actions/types.ts
index f88bd2ba3fe15..addea6ddfa763 100644
--- a/x-pack/plugins/cases/server/services/user_actions/types.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/types.ts
@@ -10,7 +10,6 @@ import type {
   SavedObjectsClientContract,
   Logger,
   ISavedObjectsSerializer,
-  SavedObject,
   SavedObjectsRawDoc,
   SavedObjectsUpdateResponse,
 } from '@kbn/core/server';
@@ -25,18 +24,20 @@ import type {
   CaseSeverity,
   CaseStatuses,
   CaseUserActionAttributesWithoutConnectorId,
-  CaseUserActionInjectedAttributes,
   CommentRequest,
   CommentUserAction,
   ConnectorUserAction,
   PushedUserAction,
   User,
-  UserAction,
+  ActionCategory,
   UserActionFindRequest,
   UserActionTypes,
 } from '../../../common/api';
 import type { PersistableStateAttachmentTypeRegistry } from '../../attachment_framework/persistable_state_registry';
-import type { UserActionPersistedAttributes } from '../../common/types/user_actions';
+import type {
+  UserActionPersistedAttributes,
+  UserActionSavedObjectTransformed,
+} from '../../common/types/user_actions';
 import type { IndexRefresh } from '../types';
 import type { CaseSavedObjectTransformed } from '../../common/types/case';
 
@@ -105,7 +106,16 @@ export interface CommonArguments {
   owner: string;
   attachmentId?: string;
   connectorId?: string;
-  action?: UserAction;
+  action?: ActionCategory;
+}
+
+export interface Attributes {
+  action: ActionCategory;
+  created_at: string;
+  created_by: User;
+  owner: string;
+  type: UserActionTypes;
+  payload: Record<string, unknown>;
 }
 
 export interface SavedObjectParameters {
@@ -115,7 +125,7 @@ export interface SavedObjectParameters {
 
 export interface EventDetails {
   getMessage: (storedUserActionId?: string) => string;
-  action: UserAction;
+  action: ActionCategory;
   descriptiveAction: string;
   savedObjectId: string;
   savedObjectType: string;
@@ -127,7 +137,7 @@ export interface UserActionEvent {
 }
 
 export type CommonBuilderArguments = CommonArguments & {
-  action: UserAction;
+  action: ActionCategory;
   type: UserActionTypes;
   value: unknown;
   valueKey: string;
@@ -146,17 +156,17 @@ export interface ServiceContext {
 }
 
 export interface PushTimeFrameInfo {
-  mostRecent: SavedObject<CaseUserActionInjectedAttributes>;
-  oldest: SavedObject<CaseUserActionInjectedAttributes>;
+  mostRecent: UserActionSavedObjectTransformed;
+  oldest: UserActionSavedObjectTransformed;
 }
 
 export interface CaseConnectorActivity {
   connectorId: string;
-  fields: SavedObject<CaseUserActionInjectedAttributes>;
+  fields: UserActionSavedObjectTransformed;
   push?: PushTimeFrameInfo;
 }
 
-export type CaseConnectorFields = Map<string, SavedObject<CaseUserActionInjectedAttributes>>;
+export type CaseConnectorFields = Map<string, UserActionSavedObjectTransformed>;
 
 export interface PushInfo {
   date: Date;

From 291cdb6de23a2464bfe7e311d170765c6292159a Mon Sep 17 00:00:00 2001
From: Kathleen DeRusso <kathleen.derusso@elastic.co>
Date: Tue, 2 May 2023 16:03:17 -0400
Subject: [PATCH 31/33] [Enterprise Search] Remove BA CTA from search
 application API page (#156378)

## Summary

Removes a call to action to connect search applications to behavioral
analytics. This will not be supported for 8.8.0.

<img width="1278" alt="image"
src="https://user-images.githubusercontent.com/63422879/235670262-c537f790-6d75-40c1-96a8-d7a21473b30b.png">

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
---
 .../engine_connect/search_application_api.tsx | 46 -------------------
 1 file changed, 46 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_connect/search_application_api.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_connect/search_application_api.tsx
index 6934de4051bdb..7e42fa80c11d7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_connect/search_application_api.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_connect/search_application_api.tsx
@@ -21,12 +21,9 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { ANALYTICS_PLUGIN } from '../../../../../../common/constants';
-import { COLLECTION_INTEGRATE_PATH } from '../../../../analytics/routes';
 import { CloudDetails, useCloudDetails } from '../../../../shared/cloud_details/cloud_details';
 import { decodeCloudId } from '../../../../shared/decode_cloud_id/decode_cloud_id';
 import { docLinks } from '../../../../shared/doc_links';
-import { generateEncodedPath } from '../../../../shared/encode_path_params';
 import { KibanaLogic } from '../../../../shared/kibana';
 
 import { EngineViewLogic } from '../engine_view_logic';
@@ -46,7 +43,6 @@ export const SearchApplicationAPI = () => {
   const { engineName } = useValues(EngineViewLogic);
   const { isGenerateModalOpen } = useValues(EngineApiLogic);
   const { openGenerateModal, closeGenerateModal } = useActions(EngineApiLogic);
-  const { navigateToUrl } = useValues(KibanaLogic);
   const cloudContext = useCloudDetails();
 
   const steps = [
@@ -153,48 +149,6 @@ export const SearchApplicationAPI = () => {
       }),
       children: <EngineApiIntegrationStage />,
     },
-    {
-      title: i18n.translate('xpack.enterpriseSearch.content.searchApplication.api.step4.title', {
-        defaultMessage: '(Optional) Power up your analytics',
-      }),
-      children: (
-        <>
-          <EuiText>
-            <p>
-              {i18n.translate('xpack.enterpriseSearch.content.searchApplication.api.step4.copy', {
-                defaultMessage:
-                  'Your search application provides basic analytics data as part of this installation. To receive more granular and custom metrics, integrate our Behavioral Analytics script on your platform.',
-              })}
-            </p>
-          </EuiText>
-          <EuiSpacer size="l" />
-          <EuiFlexGroup>
-            <EuiFlexItem grow={false}>
-              <EuiButton
-                data-telemetry-id="entSearchContent-searchApplications-api-step4-learnHowLink"
-                onClick={() =>
-                  navigateToUrl(
-                    generateEncodedPath(`${ANALYTICS_PLUGIN.URL}${COLLECTION_INTEGRATE_PATH}`, {
-                      id: engineName,
-                    }),
-                    { shouldNotCreateHref: true }
-                  )
-                }
-                iconSide="left"
-                iconType="popout"
-              >
-                {i18n.translate(
-                  'xpack.enterpriseSearch.content.searchApplication.api.step4.learnHowLink',
-                  {
-                    defaultMessage: 'Learn how',
-                  }
-                )}
-              </EuiButton>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </>
-      ),
-    },
   ];
 
   return (

From 52633391082d0332d0f41b45c81989e41f875ccf Mon Sep 17 00:00:00 2001
From: Adam Demjen <demjened@gmail.com>
Date: Tue, 2 May 2023 16:42:13 -0400
Subject: [PATCH 32/33] [Enterprise Search] Show error panel on API call errors
 (#156273)

## Summary

This PR adds generic error handling for API calls that manage the ELSER
model: creation (download), fetching and starting the deployment. If an
error occurs, the ELSER panel is replaced with the error panel. The user
can navigate to the ML Notifications page with a link, which might
contain diagnostic information about the error.


![ELSER_error_handling](https://user-images.githubusercontent.com/14224983/235535266-93e8e822-0603-4a10-8aab-ec77cd167bf6.gif)


### Checklist

- [x] Any text added follows [EUI's writing
guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses
sentence case text and includes [i18n
support](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)
- [x] [Unit or functional
tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)
were updated or added to match the most common scenarios
- [x] Any UI touched in this PR is usable by keyboard only (learn more
about [keyboard accessibility](https://webaim.org/techniques/keyboard/))
- [x] This renders correctly on smaller devices using a responsive
layout. (You can test this [in your
browser](https://www.browserstack.com/guide/responsive-testing-on-local-server))

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
---
 .../create_text_expansion_model_api_logic.ts  |  3 +-
 .../fetch_text_expansion_model_api_logic.ts   |  3 +-
 .../start_text_expansion_model_api_logic.ts   |  3 +-
 .../text_expansion_callout.test.tsx           | 20 +++++
 .../ml_inference/text_expansion_callout.tsx   | 14 +++-
 .../text_expansion_callout_logic.test.ts      | 37 ++++++++-
 .../text_expansion_callout_logic.ts           | 79 +++++++++++++++++--
 .../text_expansion_errors.test.tsx            | 34 ++++++++
 .../ml_inference/text_expansion_errors.tsx    | 38 +++++++++
 .../enterprise_search_content/routes.ts       |  1 +
 .../flash_messages/handle_api_errors.ts       |  2 +-
 11 files changed, 220 insertions(+), 14 deletions(-)
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_errors.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_errors.tsx

diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/ml_models/text_expansion/create_text_expansion_model_api_logic.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/ml_models/text_expansion/create_text_expansion_model_api_logic.ts
index 315815a02ef08..643352e0a833e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/ml_models/text_expansion/create_text_expansion_model_api_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/ml_models/text_expansion/create_text_expansion_model_api_logic.ts
@@ -24,7 +24,8 @@ export const createTextExpansionModel = async (): Promise<CreateTextExpansionMod
 
 export const CreateTextExpansionModelApiLogic = createApiLogic(
   ['create_text_expansion_model_api_logic'],
-  createTextExpansionModel
+  createTextExpansionModel,
+  { showErrorFlash: false }
 );
 
 export type CreateTextExpansionModelApiLogicActions = Actions<
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/ml_models/text_expansion/fetch_text_expansion_model_api_logic.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/ml_models/text_expansion/fetch_text_expansion_model_api_logic.ts
index dd9430dfb07cc..03129c68ad333 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/ml_models/text_expansion/fetch_text_expansion_model_api_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/ml_models/text_expansion/fetch_text_expansion_model_api_logic.ts
@@ -23,7 +23,8 @@ export const fetchTextExpansionModelStatus = async () => {
 
 export const FetchTextExpansionModelApiLogic = createApiLogic(
   ['fetch_text_expansion_model_api_logic'],
-  fetchTextExpansionModelStatus
+  fetchTextExpansionModelStatus,
+  { showErrorFlash: false }
 );
 
 export type FetchTextExpansionModelApiLogicActions = Actions<
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/ml_models/text_expansion/start_text_expansion_model_api_logic.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/ml_models/text_expansion/start_text_expansion_model_api_logic.ts
index fa925be4bce00..d8e1116154b64 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/ml_models/text_expansion/start_text_expansion_model_api_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/ml_models/text_expansion/start_text_expansion_model_api_logic.ts
@@ -24,7 +24,8 @@ export const startTextExpansionModel = async (): Promise<StartTextExpansionModel
 
 export const StartTextExpansionModelApiLogic = createApiLogic(
   ['start_text_expansion_model_api_logic'],
-  startTextExpansionModel
+  startTextExpansionModel,
+  { showErrorFlash: false }
 );
 
 export type StartTextExpansionModelApiLogicActions = Actions<
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout.test.tsx
index 2ba6da3b4843f..9480f4b1a0ce5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout.test.tsx
@@ -13,6 +13,8 @@ import { shallow } from 'enzyme';
 
 import { EuiButton } from '@elastic/eui';
 
+import { HttpError } from '../../../../../../../common/types/api';
+
 import {
   TextExpansionCallOut,
   DeployModel,
@@ -22,6 +24,8 @@ import {
   ModelStarted,
 } from './text_expansion_callout';
 
+import { TextExpansionErrors } from './text_expansion_errors';
+
 jest.mock('./text_expansion_callout_data', () => ({
   useTextExpansionCallOutData: jest.fn(() => ({
     dismiss: jest.fn(),
@@ -33,6 +37,7 @@ jest.mock('./text_expansion_callout_data', () => ({
 }));
 
 const DEFAULT_VALUES = {
+  startTextExpansionModelError: undefined,
   isCreateButtonDisabled: false,
   isModelDownloadInProgress: false,
   isModelDownloaded: false,
@@ -45,6 +50,21 @@ describe('TextExpansionCallOut', () => {
     jest.clearAllMocks();
     setMockValues(DEFAULT_VALUES);
   });
+  it('renders error panel instead of normal panel if there are some errors', () => {
+    setMockValues({
+      ...DEFAULT_VALUES,
+      startTextExpansionModelError: {
+        body: {
+          error: 'some-error',
+          message: 'some-error-message',
+          statusCode: 500,
+        },
+      } as HttpError,
+    });
+
+    const wrapper = shallow(<TextExpansionCallOut />);
+    expect(wrapper.find(TextExpansionErrors).length).toBe(1);
+  });
   it('renders panel with deployment instructions if the model is not deployed', () => {
     const wrapper = shallow(<TextExpansionCallOut />);
     expect(wrapper.find(DeployModel).length).toBe(1);
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout.tsx
index 94a4d4d05fc96..a72a328188c6f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout.tsx
@@ -29,7 +29,8 @@ import { docLinks } from '../../../../../shared/doc_links';
 import { KibanaLogic } from '../../../../../shared/kibana';
 
 import { useTextExpansionCallOutData } from './text_expansion_callout_data';
-import { TextExpansionCalloutLogic } from './text_expansion_callout_logic';
+import { getTextExpansionError, TextExpansionCalloutLogic } from './text_expansion_callout_logic';
+import { TextExpansionErrors } from './text_expansion_errors';
 
 export interface TextExpansionCallOutState {
   dismiss: () => void;
@@ -327,13 +328,24 @@ export const ModelStarted = ({
 export const TextExpansionCallOut: React.FC<TextExpansionCallOutProps> = (props) => {
   const { dismiss, isDismissable, show } = useTextExpansionCallOutData(props);
   const {
+    createTextExpansionModelError,
+    fetchTextExpansionModelError,
     isCreateButtonDisabled,
     isModelDownloadInProgress,
     isModelDownloaded,
     isModelStarted,
     isStartButtonDisabled,
+    startTextExpansionModelError,
   } = useValues(TextExpansionCalloutLogic);
 
+  // In case of an error, show the error callout only
+  const error = getTextExpansionError(
+    createTextExpansionModelError,
+    fetchTextExpansionModelError,
+    startTextExpansionModelError
+  );
+  if (error) return <TextExpansionErrors error={error} />;
+
   if (!show) return null;
 
   if (isModelDownloadInProgress) {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout_logic.test.ts
index 099e6b31e2b6a..ae781bfb3bd1d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout_logic.test.ts
@@ -9,25 +9,29 @@ import { LogicMounter } from '../../../../../__mocks__/kea_logic';
 
 import { HttpResponse } from '@kbn/core/public';
 
-import { ErrorResponse, Status } from '../../../../../../../common/types/api';
+import { ErrorResponse, HttpError, Status } from '../../../../../../../common/types/api';
 import { MlModelDeploymentState } from '../../../../../../../common/types/ml';
 import { CreateTextExpansionModelApiLogic } from '../../../../api/ml_models/text_expansion/create_text_expansion_model_api_logic';
 import { FetchTextExpansionModelApiLogic } from '../../../../api/ml_models/text_expansion/fetch_text_expansion_model_api_logic';
 
 import {
+  getTextExpansionError,
   TextExpansionCalloutLogic,
   TextExpansionCalloutValues,
 } from './text_expansion_callout_logic';
 
 const DEFAULT_VALUES: TextExpansionCalloutValues = {
+  createTextExpansionModelError: undefined,
   createTextExpansionModelStatus: Status.IDLE,
   createdTextExpansionModel: undefined,
+  fetchTextExpansionModelError: undefined,
   isCreateButtonDisabled: false,
   isModelDownloadInProgress: false,
   isModelDownloaded: false,
   isModelStarted: false,
   isPollingTextExpansionModelActive: false,
   isStartButtonDisabled: false,
+  startTextExpansionModelError: undefined,
   startTextExpansionModelStatus: Status.IDLE,
   textExpansionModel: undefined,
   textExpansionModelPollTimeoutId: null,
@@ -55,6 +59,37 @@ describe('TextExpansionCalloutLogic', () => {
     expect(TextExpansionCalloutLogic.values).toEqual(DEFAULT_VALUES);
   });
 
+  describe('getTextExpansionError', () => {
+    const error = {
+      body: {
+        error: 'some-error',
+        message: 'some-error-message',
+        statusCode: 500,
+      },
+    } as HttpError;
+    it('returns null if there is no error', () => {
+      expect(getTextExpansionError(undefined, undefined, undefined)).toBe(null);
+    });
+    it('uses the correct title and message from a create error', () => {
+      expect(getTextExpansionError(error, undefined, undefined)).toEqual({
+        title: 'Error with ELSER deployment',
+        message: error.body?.message,
+      });
+    });
+    it('uses the correct title and message from a fetch error', () => {
+      expect(getTextExpansionError(undefined, error, undefined)).toEqual({
+        title: 'Error fetching ELSER model',
+        message: error.body?.message,
+      });
+    });
+    it('uses the correct title and message from a start error', () => {
+      expect(getTextExpansionError(undefined, undefined, error)).toEqual({
+        title: 'Error starting ELSER deployment',
+        message: error.body?.message,
+      });
+    });
+  });
+
   describe('listeners', () => {
     describe('createTextExpansionModelPollingTimeout', () => {
       const duration = 5000;
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout_logic.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout_logic.ts
index 7d301e1bdf59d..dda1be828ee0a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout_logic.ts
@@ -7,8 +7,11 @@
 
 import { kea, MakeLogicType } from 'kea';
 
-import { Status } from '../../../../../../../common/types/api';
+import { i18n } from '@kbn/i18n';
+
+import { HttpError, Status } from '../../../../../../../common/types/api';
 import { MlModelDeploymentState } from '../../../../../../../common/types/ml';
+import { getErrorsFromHttpResponse } from '../../../../../shared/flash_messages/handle_api_errors';
 import {
   CreateTextExpansionModelApiLogic,
   CreateTextExpansionModelApiLogicActions,
@@ -46,19 +49,67 @@ interface TextExpansionCalloutActions {
 }
 
 export interface TextExpansionCalloutValues {
+  createTextExpansionModelError: HttpError | undefined;
   createTextExpansionModelStatus: Status;
   createdTextExpansionModel: CreateTextExpansionModelResponse | undefined;
+  fetchTextExpansionModelError: HttpError | undefined;
   isCreateButtonDisabled: boolean;
   isModelDownloadInProgress: boolean;
   isModelDownloaded: boolean;
   isModelStarted: boolean;
   isPollingTextExpansionModelActive: boolean;
   isStartButtonDisabled: boolean;
+  startTextExpansionModelError: HttpError | undefined;
   startTextExpansionModelStatus: Status;
   textExpansionModel: FetchTextExpansionModelResponse | undefined;
   textExpansionModelPollTimeoutId: null | ReturnType<typeof setTimeout>;
 }
 
+/**
+ * Extracts the topmost error in precedence order (create > start > fetch).
+ * @param createError
+ * @param fetchError
+ * @param startError
+ * @returns the extracted error or null if there is no error
+ */
+export const getTextExpansionError = (
+  createError: HttpError | undefined,
+  fetchError: HttpError | undefined,
+  startError: HttpError | undefined
+) => {
+  return createError !== undefined
+    ? {
+        title: i18n.translate(
+          'xpack.enterpriseSearch.content.indices.pipelines.textExpansionCreateError.title',
+          {
+            defaultMessage: 'Error with ELSER deployment',
+          }
+        ),
+        message: getErrorsFromHttpResponse(createError)[0],
+      }
+    : startError !== undefined
+    ? {
+        title: i18n.translate(
+          'xpack.enterpriseSearch.content.indices.pipelines.textExpansionStartError.title',
+          {
+            defaultMessage: 'Error starting ELSER deployment',
+          }
+        ),
+        message: getErrorsFromHttpResponse(startError)[0],
+      }
+    : fetchError !== undefined
+    ? {
+        title: i18n.translate(
+          'xpack.enterpriseSearch.content.indices.pipelines.textExpansionFetchError.title',
+          {
+            defaultMessage: 'Error fetching ELSER model',
+          }
+        ),
+        message: getErrorsFromHttpResponse(fetchError)[0],
+      }
+    : null;
+};
+
 export const TextExpansionCalloutLogic = kea<
   MakeLogicType<TextExpansionCalloutValues, TextExpansionCalloutActions>
 >({
@@ -74,7 +125,11 @@ export const TextExpansionCalloutLogic = kea<
   connect: {
     actions: [
       CreateTextExpansionModelApiLogic,
-      ['makeRequest as createTextExpansionModel', 'apiSuccess as createTextExpansionModelSuccess'],
+      [
+        'makeRequest as createTextExpansionModel',
+        'apiSuccess as createTextExpansionModelSuccess',
+        'apiError as createTextExpansionModelError',
+      ],
       FetchTextExpansionModelApiLogic,
       [
         'makeRequest as fetchTextExpansionModel',
@@ -82,15 +137,23 @@ export const TextExpansionCalloutLogic = kea<
         'apiError as fetchTextExpansionModelError',
       ],
       StartTextExpansionModelApiLogic,
-      ['makeRequest as startTextExpansionModel', 'apiSuccess as startTextExpansionModelSuccess'],
+      [
+        'makeRequest as startTextExpansionModel',
+        'apiSuccess as startTextExpansionModelSuccess',
+        'apiError as startTextExpansionModelError',
+      ],
     ],
     values: [
       CreateTextExpansionModelApiLogic,
-      ['data as createdTextExpansionModel', 'status as createTextExpansionModelStatus'],
+      [
+        'data as createdTextExpansionModel',
+        'status as createTextExpansionModelStatus',
+        'error as createTextExpansionModelError',
+      ],
       FetchTextExpansionModelApiLogic,
-      ['data as textExpansionModel'],
+      ['data as textExpansionModel', 'error as fetchTextExpansionModelError'],
       StartTextExpansionModelApiLogic,
-      ['status as startTextExpansionModelStatus'],
+      ['status as startTextExpansionModelStatus', 'error as startTextExpansionModelError'],
     ],
   },
   events: ({ actions, values }) => ({
@@ -169,7 +232,7 @@ export const TextExpansionCalloutLogic = kea<
   selectors: ({ selectors }) => ({
     isCreateButtonDisabled: [
       () => [selectors.createTextExpansionModelStatus],
-      (status: Status) => status !== Status.IDLE,
+      (status: Status) => status !== Status.IDLE && status !== Status.ERROR,
     ],
     isModelDownloadInProgress: [
       () => [selectors.textExpansionModel],
@@ -195,7 +258,7 @@ export const TextExpansionCalloutLogic = kea<
     ],
     isStartButtonDisabled: [
       () => [selectors.startTextExpansionModelStatus],
-      (status: Status) => status !== Status.IDLE,
+      (status: Status) => status !== Status.IDLE && status !== Status.ERROR,
     ],
   }),
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_errors.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_errors.test.tsx
new file mode 100644
index 0000000000000..cb15c2c5c5411
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_errors.test.tsx
@@ -0,0 +1,34 @@
+/*
+ * 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 { setMockValues } from '../../../../../__mocks__/kea_logic';
+
+import React from 'react';
+
+import { shallow } from 'enzyme';
+
+import { EuiCallOut } from '@elastic/eui';
+
+import { TextExpansionErrors } from './text_expansion_errors';
+
+describe('TextExpansionErrors', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    setMockValues({});
+  });
+  const error = {
+    title: 'some-error-title',
+    message: 'some-error-message',
+  };
+  it('extracts error panel with the given title and message', () => {
+    const wrapper = shallow(<TextExpansionErrors error={error} />);
+    expect(wrapper.find(EuiCallOut).length).toBe(1);
+    expect(wrapper.find(EuiCallOut).prop('title')).toEqual(error.title);
+    expect(wrapper.find(EuiCallOut).find('p').length).toBe(1);
+    expect(wrapper.find(EuiCallOut).find('p').text()).toEqual(error.message);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_errors.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_errors.tsx
new file mode 100644
index 0000000000000..d9b1d1f1f2bc2
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_errors.tsx
@@ -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 React from 'react';
+
+import { useValues } from 'kea';
+
+import { EuiCallOut, EuiLink } from '@elastic/eui';
+
+import { i18n } from '@kbn/i18n';
+
+import { HttpLogic } from '../../../../../shared/http';
+
+import { ML_NOTIFICATIONS_PATH } from '../../../../routes';
+
+export const TextExpansionErrors = ({ error }: { error: { title: string; message: string } }) => {
+  const { http } = useValues(HttpLogic);
+
+  return (
+    <>
+      <EuiCallOut color="danger" iconType="error" title={error.title}>
+        <p>{error.message}</p>
+        <EuiLink href={http.basePath.prepend(ML_NOTIFICATIONS_PATH)} target="_blank">
+          {i18n.translate(
+            'xpack.enterpriseSearch.content.indices.pipelines.textExpansionCreateError.mlNotificationsLink',
+            {
+              defaultMessage: 'Machine Learning notifications',
+            }
+          )}
+        </EuiLink>
+      </EuiCallOut>
+    </>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/routes.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/routes.ts
index 7b5bc7bf286f5..cfd2447b9aa8b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/routes.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/routes.ts
@@ -46,3 +46,4 @@ export enum SearchApplicationContentTabs {
 }
 
 export const ML_MANAGE_TRAINED_MODELS_PATH = '/app/ml/trained_models';
+export const ML_NOTIFICATIONS_PATH = '/app/ml/notifications';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/handle_api_errors.ts b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/handle_api_errors.ts
index bb0f9c9253771..9e74d90605dc0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/handle_api_errors.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/handle_api_errors.ts
@@ -33,7 +33,7 @@ interface Options {
   isQueued?: boolean;
 }
 
-export const defaultErrorMessage = i18n.translate(
+export const defaultErrorMessage: string = i18n.translate(
   'xpack.enterpriseSearch.shared.flashMessages.defaultErrorMessage',
   {
     defaultMessage: 'An unexpected error occurred',

From 589ea3affc6c64ef69c81bc01da767388b246dc9 Mon Sep 17 00:00:00 2001
From: Dominique Clarke <dominique.clarke@elastic.co>
Date: Tue, 2 May 2023 17:23:04 -0400
Subject: [PATCH 33/33] [Synthetics] Adjust content (#156029)

## Summary

Resolves https://github.com/elastic/kibana/issues/155936
Relates to https://github.com/elastic/kibana/issues/152915
Resolves https://github.com/elastic/kibana/issues/150944
Resolves https://github.com/elastic/kibana/issues/156166

Copy fixes:

- Alerting config: Address Typo
(https://github.com/elastic/kibana/issues/152915#issuecomment-1516614675)
- Alerting config: Address success toast wording
- Getting started ("Create your first monitor") locations: Repeated text
between placeholder and hint text. To address this, I changed the
helptext to give more detail
- Private locations -> "Monitors" column: replaced `Running` with
`configured`
- Overview page: Search bar placeholder: `url` is now uppercase `URL`
- Monitor status alert - Updates text for viewer user to be consistent
with other tooltips
- Run once errors - Remove extra error toast
- Run once errors - Remove excess phrase from error
- Sync errors - Made content more user friendly
- Synthetics App - replace references to Monitor Management with
Synthetics App
- Enable/disable - clarify when actions apply to all monitors
- Project monitors - add reference to enabling/disabling alerting on
project monitor page
- Enablement - Adjust content for less privileged users

Some screenshots of the fixes are below. These are not exhaustive
<img width="1417" alt="Screen Shot 2023-04-25 at 12 12 38 PM"
src="https://user-images.githubusercontent.com/11356435/234906460-529d48d4-f682-4d45-b439-7bd7189c37ea.png">
<img width="772" alt="Screen Shot 2023-04-25 at 12 12 31 PM"
src="https://user-images.githubusercontent.com/11356435/234906462-b85d6fe0-2d32-42f0-81fb-2f528c5c0d87.png">
<img width="909" alt="Screen Shot 2023-04-25 at 12 12 10 PM"
src="https://user-images.githubusercontent.com/11356435/234906466-49286af9-29c4-4bcb-9d10-dc84bcddd66f.png">
<img width="1414" alt="Screen Shot 2023-04-25 at 11 59 57 AM"
src="https://user-images.githubusercontent.com/11356435/234906468-48b27002-5771-42df-9ee5-5852dabeaaeb.png">
<img width="623" alt="Screen Shot 2023-04-25 at 11 57 53 AM"
src="https://user-images.githubusercontent.com/11356435/234906470-4ea5acf7-bff2-41af-a679-7e4b9f43c377.png">
<img width="735" alt="Screen Shot 2023-04-27 at 4 16 17 PM"
src="https://user-images.githubusercontent.com/11356435/234982914-128af18e-204a-4df6-a791-ac3155d8b5b9.png">
<img width="1240" alt="Screen Shot 2023-04-28 at 2 09 29 PM"
src="https://user-images.githubusercontent.com/11356435/235223171-f2177983-f8cc-45a3-8ff8-76850508e63e.png">
<img width="602" alt="Screen Shot 2023-04-28 at 11 12 49 AM"
src="https://user-images.githubusercontent.com/11356435/235223288-7b01dd85-2311-4b42-bb91-92e4a4f454e3.png">
<img width="552" alt="Screen Shot 2023-04-28 at 11 12 25 AM"
src="https://user-images.githubusercontent.com/11356435/235223290-00cc6a8c-7f9c-46f1-b8ae-5c98eaeaa35d.png">
<img width="1448" alt="Screen Shot 2023-04-28 at 2 56 58 PM"
src="https://user-images.githubusercontent.com/11356435/235230906-093d720c-9ac9-4cf1-b04a-34a1409d7379.png">

---------

Co-authored-by: florent-leborgne <florent.leborgne@elastic.co>
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../server/types/models/preconfiguration.ts   |  2 +-
 .../synthetics/management_list.journey.ts     |  6 +--
 .../alerts/toggle_alert_flyout_button.tsx     |  4 +-
 .../components/monitor_details_panel.tsx      |  2 +-
 .../wrappers/service_allowed_wrapper.tsx      |  4 +-
 .../form_fields/service_locations.tsx         |  9 +++-
 .../steps/read_only_callout.tsx               |  2 +-
 .../monitors_page/common/search_field.tsx     |  2 +-
 .../monitors_page/management/labels.ts        | 14 +++---
 .../monitor_errors/monitor_async_error.tsx    |  4 +-
 .../synthetics_enablement/labels.ts           | 40 ++++-----------
 .../synthetics_enablement.tsx                 | 49 ++++---------------
 .../overview/actions_popover.test.tsx         |  4 +-
 .../overview/overview/actions_popover.tsx     |  8 +--
 .../overview/monitor_detail_flyout.tsx        |  2 +-
 .../components/monitors_page/route_config.tsx |  2 +-
 .../alerting_defaults/alert_defaults_form.tsx |  2 +-
 .../alerting_defaults/translations.ts         |  2 +-
 .../private_locations/delete_location.tsx     |  4 +-
 .../view_location_monitors.tsx                |  4 +-
 .../browser/browser_test_results.tsx          |  2 +-
 .../hooks/use_run_once_errors.ts              | 29 +++--------
 .../synthetics/state/alert_rules/effects.ts   |  2 +-
 .../state/synthetics_enablement/effects.ts    |  2 +-
 .../components/settings/translations.ts       |  2 +-
 .../server/synthetics_service/get_api_key.ts  |  2 +-
 .../translations/translations/fr-FR.json      |  5 --
 .../translations/translations/ja-JP.json      |  5 --
 .../translations/translations/zh-CN.json      |  5 --
 .../apis/synthetics/synthetics_enablement.ts  |  2 +-
 30 files changed, 72 insertions(+), 150 deletions(-)

diff --git a/x-pack/plugins/fleet/server/types/models/preconfiguration.ts b/x-pack/plugins/fleet/server/types/models/preconfiguration.ts
index a8b121aa9c374..65427544420f5 100644
--- a/x-pack/plugins/fleet/server/types/models/preconfiguration.ts
+++ b/x-pack/plugins/fleet/server/types/models/preconfiguration.ts
@@ -134,7 +134,7 @@ export const PreconfiguredAgentPoliciesSchema = schema.arrayOf(
               if (value === 'synthetics') {
                 return i18n.translate('xpack.fleet.config.disableSynthetics', {
                   defaultMessage:
-                    'Synthetics package is not supported via kibana.yml config. Please use synthetics app to create monitors in private locations. https://www.elastic.co/guide/en/observability/current/synthetics-private-location.html',
+                    'Synthetics package is not supported via kibana.yml config. Please use Synthetics App to create monitors in private locations. https://www.elastic.co/guide/en/observability/current/synthetics-private-location.html',
                 });
               }
             },
diff --git a/x-pack/plugins/synthetics/e2e/journeys/synthetics/management_list.journey.ts b/x-pack/plugins/synthetics/e2e/journeys/synthetics/management_list.journey.ts
index 357ab213819eb..d4110ca7508c3 100644
--- a/x-pack/plugins/synthetics/e2e/journeys/synthetics/management_list.journey.ts
+++ b/x-pack/plugins/synthetics/e2e/journeys/synthetics/management_list.journey.ts
@@ -25,7 +25,7 @@ journey(`MonitorManagementList`, async ({ page, params }) => {
 
   const pageBaseUrl = 'http://localhost:5620/app/synthetics/monitors';
   const searchBarInput = page.locator(
-    '[placeholder="Search by name, url, host, tag, project or location"]'
+    '[placeholder="Search by name, URL, host, tag, project or location"]'
   );
 
   page.setDefaultTimeout(60 * 1000);
@@ -72,12 +72,12 @@ journey(`MonitorManagementList`, async ({ page, params }) => {
     await page.click('span >> text="Journey / Page"');
     await page.click('[aria-label="Apply the selected filters for Type"]');
     expect(page.url()).toBe(`${pageBaseUrl}?monitorTypes=%5B%22browser%22%5D`);
-    await page.click('[placeholder="Search by name, url, host, tag, project or location"]');
+    await page.click('[placeholder="Search by name, URL, host, tag, project or location"]');
     await Promise.all([
       page.waitForNavigation({
         url: `${pageBaseUrl}?monitorTypes=%5B%22browser%22%5D&query=3`,
       }),
-      page.fill('[placeholder="Search by name, url, host, tag, project or location"]', '3'),
+      page.fill('[placeholder="Search by name, URL, host, tag, project or location"]', '3'),
     ]);
     await page.click('text=1-1');
     await page.waitForSelector('text=Showing 1-1 of 1 Configuration');
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/alerts/toggle_alert_flyout_button.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/alerts/toggle_alert_flyout_button.tsx
index 0ff7d0518e7d6..96c00d08843b5 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/alerts/toggle_alert_flyout_button.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/alerts/toggle_alert_flyout_button.tsx
@@ -100,8 +100,8 @@ export const ToggleAlertFlyoutButton = () => {
 };
 
 const noWritePermissionsTooltipContent = i18n.translate(
-  'xpack.synthetics.alertDropdown.noWritePermissions',
+  'xpack.synthetics.alertDropdown.noPermissions',
   {
-    defaultMessage: 'You need read-write access to Uptime to create alerts in this app.',
+    defaultMessage: 'You do not have sufficient permissions to perform this action.',
   }
 );
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/components/monitor_details_panel.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/components/monitor_details_panel.tsx
index 5cddb55074c24..dffc3b1f357b6 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/components/monitor_details_panel.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/components/monitor_details_panel.tsx
@@ -235,7 +235,7 @@ const TAGS_LABEL = i18n.translate('xpack.synthetics.management.monitorList.tags'
 });
 
 const ENABLED_LABEL = i18n.translate('xpack.synthetics.detailsPanel.monitorDetails.enabled', {
-  defaultMessage: 'Enabled',
+  defaultMessage: 'Enabled (all locations)',
 });
 
 const MONITOR_TYPE_LABEL = i18n.translate(
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/wrappers/service_allowed_wrapper.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/wrappers/service_allowed_wrapper.tsx
index bbed7797e94e3..32fa6cba8f5a1 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/wrappers/service_allowed_wrapper.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/wrappers/service_allowed_wrapper.tsx
@@ -51,13 +51,13 @@ const REQUEST_ACCESS_LABEL = i18n.translate('xpack.synthetics.monitorManagement.
 });
 
 export const MONITOR_MANAGEMENT_LABEL = i18n.translate('xpack.synthetics.monitorManagement.label', {
-  defaultMessage: 'Monitor Management',
+  defaultMessage: 'Synthetics App',
 });
 
 const LOADING_MONITOR_MANAGEMENT_LABEL = i18n.translate(
   'xpack.synthetics.monitorManagement.loading.label',
   {
-    defaultMessage: 'Loading Monitor Management',
+    defaultMessage: 'Loading Synthetics App',
   }
 );
 
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/getting_started/form_fields/service_locations.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/getting_started/form_fields/service_locations.tsx
index 5c6d242f87b37..e59ca668ac81c 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/getting_started/form_fields/service_locations.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/getting_started/form_fields/service_locations.tsx
@@ -31,7 +31,7 @@ export const ServiceLocationsField = ({
     <EuiFormRow
       fullWidth
       label={LOCATIONS_LABEL}
-      helpText={!errors?.[ConfigKey.LOCATIONS] ? SELECT_ONE_OR_MORE_LOCATIONS : undefined}
+      helpText={!errors?.[ConfigKey.LOCATIONS] ? SELECT_ONE_OR_MORE_LOCATIONS_DETAILS : undefined}
       isInvalid={!!errors?.[ConfigKey.LOCATIONS]}
       error={SELECT_ONE_OR_MORE_LOCATIONS}
     >
@@ -70,6 +70,13 @@ const SELECT_ONE_OR_MORE_LOCATIONS = i18n.translate(
   }
 );
 
+const SELECT_ONE_OR_MORE_LOCATIONS_DETAILS = i18n.translate(
+  'xpack.synthetics.monitorManagement.selectOneOrMoreLocationsDetails',
+  {
+    defaultMessage: 'Select locations where monitors will be executed.',
+  }
+);
+
 const LOCATIONS_LABEL = i18n.translate('xpack.synthetics.monitorManagement.locationsLabel', {
   defaultMessage: 'Locations',
 });
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/steps/read_only_callout.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/steps/read_only_callout.tsx
index 6a3d2fda361f0..d20453be1c2ed 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/steps/read_only_callout.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/steps/read_only_callout.tsx
@@ -22,7 +22,7 @@ export const ReadOnlyCallout = ({ projectId }: { projectId?: string }) => {
       <p>
         <FormattedMessage
           id="xpack.synthetics.project.readOnly.callout.content"
-          defaultMessage="This monitor was added from an external project: {projectId}. From this page, you can only enable, disable, or remove it. To make configuration changes, you have to edit its source file and push it again from that project."
+          defaultMessage="This monitor was added from an external project: {projectId}. From this page, you can only enable and disable the monitor and its alerts, or remove it. To make configuration changes, you have to edit its source file and push it again from that project."
           values={{ projectId: <strong>{projectId}</strong> }}
         />
       </p>
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/common/search_field.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/common/search_field.tsx
index 01e9beda8a7e1..5ff1eaf742fca 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/common/search_field.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/common/search_field.tsx
@@ -56,5 +56,5 @@ export function SearchField() {
 }
 
 const PLACEHOLDER_TEXT = i18n.translate('xpack.synthetics.monitorManagement.filter.placeholder', {
-  defaultMessage: `Search by name, url, host, tag, project or location`,
+  defaultMessage: `Search by name, URL, host, tag, project or location`,
 });
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/labels.ts b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/labels.ts
index ff297267dcb62..45100e71fda61 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/labels.ts
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/labels.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 export const LOADING_LABEL = i18n.translate(
   'xpack.synthetics.monitorManagement.manageMonitorLoadingLabel',
   {
-    defaultMessage: 'Loading Monitor Management',
+    defaultMessage: 'Loading Synthetics App',
   }
 );
 
@@ -24,14 +24,14 @@ export const LEARN_MORE_LABEL = i18n.translate(
 export const CALLOUT_MANAGEMENT_DISABLED = i18n.translate(
   'xpack.synthetics.monitorManagement.callout.disabled',
   {
-    defaultMessage: 'Monitor Management is currently disabled',
+    defaultMessage: 'Synthetics App is currently disabled',
   }
 );
 
 export const CALLOUT_MANAGEMENT_CONTACT_ADMIN = i18n.translate(
   'xpack.synthetics.monitorManagement.callout.disabled.adminContact',
   {
-    defaultMessage: 'Monitor Management will be enabled when an admin visits the Synthetics app.',
+    defaultMessage: 'Synthetics App will be enabled when an admin visits the Synthetics app.',
   }
 );
 
@@ -39,28 +39,28 @@ export const CALLOUT_MANAGEMENT_DESCRIPTION = i18n.translate(
   'xpack.synthetics.monitorManagement.callout.description.disabled',
   {
     defaultMessage:
-      "Monitor Management requires a valid API key to run your monitors on Elastic's global managed testing locations. If you already had enabled Monitor Management previously, the API key may no longer be valid.",
+      "Synthetics App requires a valid API key to run your monitors on Elastic's global managed testing locations. If you already had enabled Synthetics App previously, the API key may no longer be valid.",
   }
 );
 
 export const ERROR_HEADING_BODY = i18n.translate(
   'xpack.synthetics.monitorManagement.editMonitorError.description',
   {
-    defaultMessage: 'Monitor Management settings could not be loaded. Please contact Support.',
+    defaultMessage: 'Synthetics App settings could not be loaded. Please contact Support.',
   }
 );
 
 export const SYNTHETICS_ENABLE_LABEL = i18n.translate(
   'xpack.synthetics.monitorManagement.syntheticsEnableLabel.management',
   {
-    defaultMessage: 'Enable Monitor Management',
+    defaultMessage: 'Enable Synthetics App',
   }
 );
 
 export const ERROR_HEADING_LABEL = i18n.translate(
   'xpack.synthetics.monitorManagement.editMonitorError',
   {
-    defaultMessage: 'Error loading Monitor Management',
+    defaultMessage: 'Error loading Synthetics App',
   }
 );
 
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_errors/monitor_async_error.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_errors/monitor_async_error.tsx
index d6dbf0465b066..ae5a035b76b54 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_errors/monitor_async_error.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_errors/monitor_async_error.tsx
@@ -24,7 +24,7 @@ export const MonitorAsyncError = () => {
         title={
           <FormattedMessage
             id="xpack.synthetics.monitorManagement.monitorSync.failure.title"
-            defaultMessage="Monitors failed to sync with the Synthetics service"
+            defaultMessage="Some monitors are not running correctly"
           />
         }
         color="warning"
@@ -33,7 +33,7 @@ export const MonitorAsyncError = () => {
         <p>
           <FormattedMessage
             id="xpack.synthetics.monitorManagement.monitorSync.failure.content"
-            defaultMessage="There was a problem syncing your monitors for one or more locations:"
+            defaultMessage="There was a problem running your monitors for one or more locations:"
           />
         </p>
         <ul>
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/synthetics_enablement/labels.ts b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/synthetics_enablement/labels.ts
index 961e0c3782e81..506e446fe8a74 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/synthetics_enablement/labels.ts
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/synthetics_enablement/labels.ts
@@ -7,47 +7,25 @@
 
 import { i18n } from '@kbn/i18n';
 
-export const SYNTHETICS_ENABLE_SUCCESS = i18n.translate(
-  'xpack.synthetics.monitorManagement.syntheticsEnableSuccess',
+export const SYNTHETICS_APP_ENABLEMENT_TITLE = i18n.translate(
+  'xpack.synthetics.emptyState.enablement.title',
   {
-    defaultMessage: 'Monitor Management enabled successfully.',
+    defaultMessage: 'Monitor the status of your services and applications with Synthetics',
   }
 );
 
-export const SYNTHETICS_DISABLE_SUCCESS = i18n.translate(
-  'xpack.synthetics.monitorManagement.syntheticsDisabledSuccess',
-  {
-    defaultMessage: 'Monitor Management disabled successfully.',
-  }
-);
-
-export const MONITOR_MANAGEMENT_ENABLEMENT_LABEL = i18n.translate(
-  'xpack.synthetics.monitorManagement.emptyState.enablement.enabled.title',
-  {
-    defaultMessage: 'Enable Monitor Management',
-  }
-);
-
-export const SYNTHETICS_APP_DISABLED_LABEL = i18n.translate(
-  'xpack.synthetics.emptyState.enablement.disabled.title',
-  {
-    defaultMessage: 'Synthetics App is disabled',
-  }
-);
-
-export const MONITOR_MANAGEMENT_ENABLEMENT_MESSAGE = i18n.translate(
-  'xpack.synthetics.monitorManagement.emptyState.enablement',
+export const MONITOR_MANAGEMENT_DISABLED_MESSAGE = i18n.translate(
+  'xpack.synthetics.emptyState.enablement.disabledDescription',
   {
     defaultMessage:
-      'Enable Monitor Management to run lightweight and real-browser monitors from hosted testing locations around the world. Enabling Monitor Management will generate an API key to allow the Synthetics Service to write back to your Elasticsearch cluster.',
+      'Run automated checks based on real-browser simulations and lightweight endpoint pings to measure the experience of your users from any location worldwide.',
   }
 );
 
-export const MONITOR_MANAGEMENT_DISABLED_MESSAGE = i18n.translate(
-  'xpack.synthetics.emptyState.enablement.disabledDescription',
+export const MONITOR_MANAGEMENT_CONTACT_ADMINISTRATOR = i18n.translate(
+  'xpack.synthetics.emptyState.enablement.contactAdministrator',
   {
-    defaultMessage:
-      'Synthetics App is currently disabled. Synthetics App allows you to run lightweight and real-browser monitors from hosted testing locations around the world. To enable Synthetics App, please contact an administrator.',
+    defaultMessage: 'Only administrators can enable this feature.',
   }
 );
 
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/synthetics_enablement/synthetics_enablement.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/synthetics_enablement/synthetics_enablement.tsx
index e4fcee12f65a5..4324bba250a1a 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/synthetics_enablement/synthetics_enablement.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/synthetics_enablement/synthetics_enablement.tsx
@@ -5,55 +5,24 @@
  * 2.0.
  */
 
-import React, { useState, useEffect, useRef } from 'react';
+import React from 'react';
 import { EuiEmptyPrompt, EuiTitle, EuiLink } from '@elastic/eui';
 import { useEnablement } from '../../../../hooks/use_enablement';
-import { kibanaService } from '../../../../../../utils/kibana_service';
 import * as labels from './labels';
 
 export const EnablementEmptyState = () => {
-  const { error, enablement, loading } = useEnablement();
-  const [shouldFocusEnablementButton, setShouldFocusEnablementButton] = useState(false);
-  const [isEnabling, setIsEnabling] = useState(false);
+  const { enablement, loading } = useEnablement();
   const { isEnabled } = enablement;
-  const isEnabledRef = useRef(isEnabled);
-  const buttonRef = useRef<HTMLButtonElement>(null);
-
-  useEffect(() => {
-    if (!isEnabled && isEnabledRef.current === true) {
-      /* shift focus to enable button when enable toggle disappears. Prevent
-       * focus loss on the page */
-      setShouldFocusEnablementButton(true);
-    }
-    isEnabledRef.current = Boolean(isEnabled);
-  }, [isEnabled]);
-
-  useEffect(() => {
-    if (isEnabling && isEnabled) {
-      setIsEnabling(false);
-      kibanaService.toasts.addSuccess({
-        title: labels.SYNTHETICS_ENABLE_SUCCESS,
-        toastLifeTimeMs: 3000,
-      });
-    } else if (isEnabling && error) {
-      setIsEnabling(false);
-      kibanaService.toasts.addSuccess({
-        title: labels.SYNTHETICS_DISABLE_SUCCESS,
-        toastLifeTimeMs: 3000,
-      });
-    }
-  }, [isEnabled, isEnabling, error]);
-
-  useEffect(() => {
-    if (shouldFocusEnablementButton) {
-      buttonRef.current?.focus();
-    }
-  }, [shouldFocusEnablementButton]);
 
   return !isEnabled && !loading ? (
     <EuiEmptyPrompt
-      title={<h2>{labels.SYNTHETICS_APP_DISABLED_LABEL}</h2>}
-      body={<p>{labels.MONITOR_MANAGEMENT_DISABLED_MESSAGE}</p>}
+      title={<h2>{labels.SYNTHETICS_APP_ENABLEMENT_TITLE}</h2>}
+      body={
+        <>
+          <p>{labels.MONITOR_MANAGEMENT_DISABLED_MESSAGE}</p>
+          <p>{labels.MONITOR_MANAGEMENT_CONTACT_ADMINISTRATOR}</p>
+        </>
+      }
       footer={
         <>
           <EuiTitle size="xxs">
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/actions_popover.test.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/actions_popover.test.tsx
index 99f199b52498e..ce8d29ca345c4 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/actions_popover.test.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/actions_popover.test.tsx
@@ -140,7 +140,7 @@ describe('ActionsPopover', () => {
         locationId={testMonitor.location.id}
       />
     );
-    const enableButton = getByText('Disable monitor');
+    const enableButton = getByText('Disable monitor (all locations)');
     fireEvent.click(enableButton);
     expect(updateMonitorEnabledState).toHaveBeenCalledTimes(1);
     expect(updateMonitorEnabledState.mock.calls[0]).toEqual([false]);
@@ -162,7 +162,7 @@ describe('ActionsPopover', () => {
         locationId={testMonitor.location.id}
       />
     );
-    const enableButton = getByText('Enable monitor');
+    const enableButton = getByText('Enable monitor (all locations)');
     fireEvent.click(enableButton);
     expect(updateMonitorEnabledState).toHaveBeenCalledTimes(1);
     expect(updateMonitorEnabledState.mock.calls[0]).toEqual([true]);
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/actions_popover.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/actions_popover.tsx
index 90822b63dccfa..26e752f62a274 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/actions_popover.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/actions_popover.tsx
@@ -350,28 +350,28 @@ const loadingLabel = (isEnabled: boolean) =>
 const enableMonitorLabel = i18n.translate(
   'xpack.synthetics.overview.actions.enableLabelEnableMonitor',
   {
-    defaultMessage: 'Enable monitor',
+    defaultMessage: 'Enable monitor (all locations)',
   }
 );
 
 const disableMonitorLabel = i18n.translate(
   'xpack.synthetics.overview.actions.enableLabelDisableMonitor',
   {
-    defaultMessage: 'Disable monitor',
+    defaultMessage: 'Disable monitor (all locations)',
   }
 );
 
 const disableAlertLabel = i18n.translate(
   'xpack.synthetics.overview.actions.disableLabelDisableAlert',
   {
-    defaultMessage: 'Disable status alerts',
+    defaultMessage: 'Disable status alerts (all locations)',
   }
 );
 
 const enableMonitorAlertLabel = i18n.translate(
   'xpack.synthetics.overview.actions.enableLabelDisableAlert',
   {
-    defaultMessage: 'Enable status alerts',
+    defaultMessage: 'Enable status alerts (all locations)',
   }
 );
 
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/monitor_detail_flyout.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/monitor_detail_flyout.tsx
index 33138c33851c9..18f7b25055a6b 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/monitor_detail_flyout.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/monitor_detail_flyout.tsx
@@ -391,7 +391,7 @@ const PREVIOUS_PERIOD_SERIES_NAME = i18n.translate(
 );
 
 const ENABLED_ITEM_TEXT = i18n.translate('xpack.synthetics.monitorList.enabledItemText', {
-  defaultMessage: 'Enabled',
+  defaultMessage: 'Enabled (all locations)',
 });
 
 const CLOSE_FLYOUT_TEXT = i18n.translate('xpack.synthetics.monitorList.closeFlyoutText', {
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/route_config.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/route_config.tsx
index 57f40f5676593..0ac6a3ccc0f7e 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/route_config.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/route_config.tsx
@@ -44,7 +44,7 @@ export const getMonitorsRoute = (
     },
     {
       title: i18n.translate('xpack.synthetics.monitorManagementRoute.title', {
-        defaultMessage: 'Monitor Management | {baseTitle}',
+        defaultMessage: 'Synthetics Management | {baseTitle}',
         values: { baseTitle },
       }),
       path: MONITORS_ROUTE,
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/alerting_defaults/alert_defaults_form.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/alerting_defaults/alert_defaults_form.tsx
index 2c81ccf1d86e7..f87f1267efcc3 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/alerting_defaults/alert_defaults_form.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/alerting_defaults/alert_defaults_form.tsx
@@ -93,7 +93,7 @@ export const AlertDefaultsForm = () => {
         description={
           <FormattedMessage
             id="xpack.synthetics.settings.defaultConnectors.description"
-            defaultMessage="Selector one or more connectors to be used for alerts. These settings will be applied to all synthetics based alerts."
+            defaultMessage="Select one or more connectors to be used for alerts. These settings apply to all synthetics-based alerts."
           />
         }
       >
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/alerting_defaults/translations.ts b/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/alerting_defaults/translations.ts
index 12d30b2d6b912..a6761c4cc6994 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/alerting_defaults/translations.ts
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/alerting_defaults/translations.ts
@@ -11,7 +11,7 @@ export const alertFormI18n = {
   inputPlaceHolder: i18n.translate(
     'xpack.synthetics.sourceConfiguration.alertDefaultForm.selectConnector',
     {
-      defaultMessage: 'Please select one or more connectors',
+      defaultMessage: 'Select one or more connectors',
     }
   ),
   emailPlaceHolder: i18n.translate(
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/private_locations/delete_location.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/private_locations/delete_location.tsx
index 959520c911469..cfaf62f891599 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/private_locations/delete_location.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/private_locations/delete_location.tsx
@@ -37,8 +37,8 @@ export const DeleteLocation = ({
   const deleteDisabledReason = !canSaveIntegrations
     ? CANNOT_SAVE_INTEGRATION_LABEL
     : i18n.translate('xpack.synthetics.monitorManagement.cannotDelete.description', {
-        defaultMessage: `This location cannot be deleted, because it has {monCount, number} {monCount, plural,one {monitor} other {monitors}} running.
-                Please remove this location from your monitors before deleting this location.`,
+        defaultMessage: `You can't delete this location because it is used in {monCount, number} {monCount, plural,one {monitor} other {monitors}}.
+                Remove this location from all monitors first.`,
         values: { monCount },
       });
 
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/private_locations/view_location_monitors.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/private_locations/view_location_monitors.tsx
index a008da59751b1..525b088f1f6c0 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/private_locations/view_location_monitors.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/private_locations/view_location_monitors.tsx
@@ -35,7 +35,7 @@ export const ViewLocationMonitors = ({
     <EuiPopover button={button} isOpen={isPopoverOpen} closePopover={closePopover}>
       <FormattedMessage
         id="xpack.synthetics.monitorManagement.viewMonitors"
-        defaultMessage="Location {name} has {count, number} {count, plural,one {monitor} other {monitors}} running."
+        defaultMessage='Location "{name}" is used in {count, number} {count, plural,one {monitor} other {monitors}}.'
         values={{ count, name: <strong>{locationName}</strong> }}
       />
       <EuiSpacer size="s" />
@@ -66,7 +66,7 @@ export const ViewLocationMonitors = ({
 const VIEW_LOCATION_MONITORS = i18n.translate(
   'xpack.synthetics.monitorManagement.viewLocationMonitors',
   {
-    defaultMessage: 'View location monitors',
+    defaultMessage: 'View monitors',
   }
 );
 
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/test_now_mode/browser/browser_test_results.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/test_now_mode/browser/browser_test_results.tsx
index 7665538d7682b..6e0ebbf2d4aa8 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/test_now_mode/browser/browser_test_results.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/test_now_mode/browser/browser_test_results.tsx
@@ -174,7 +174,7 @@ export const FAILED_TO_RUN = i18n.translate('xpack.synthetics.monitorManagement.
   defaultMessage: 'Failed to run steps',
 });
 
-export const ERROR_RUNNING_TEST = i18n.translate('xpack.synthetics.testRun.runErrorLabel', {
+export const ERROR_RUNNING_TEST = i18n.translate('xpack.synthetics.testRun.testErrorLabel', {
   defaultMessage: 'Error running test',
 });
 
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/test_now_mode/hooks/use_run_once_errors.ts b/x-pack/plugins/synthetics/public/apps/synthetics/components/test_now_mode/hooks/use_run_once_errors.ts
index 9859b5b0216bc..36611914264db 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/test_now_mode/hooks/use_run_once_errors.ts
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/test_now_mode/hooks/use_run_once_errors.ts
@@ -7,7 +7,6 @@
 
 import { useEffect, useMemo, useState } from 'react';
 import { i18n } from '@kbn/i18n';
-import { kibanaService } from '../../../../../utils/kibana_service';
 import { Locations, ServiceLocationErrors } from '../../monitor_add_edit/types';
 
 export function useRunOnceErrors({
@@ -77,7 +76,7 @@ export function useRunOnceErrors({
               title: RunErrorLabel,
             },
           ]
-        : [{ name: 'Error', message: PushErrorService, title: PushErrorLabel }];
+        : [{ name: 'Error', message: PushErrorService, title: RunErrorLabel }];
     } else if (locationErrors?.length > 0) {
       // If only some of the locations were unsuccessful
       return locationErrors
@@ -93,41 +92,25 @@ export function useRunOnceErrors({
     return [];
   }, [locationsById, locationErrors, locationErrorReasons, hasBlockingError]);
 
-  useEffect(() => {
-    if (showErrors) {
-      errorMessages.forEach(
-        ({ name, message, title }: { name: string; message: string; title: string }) => {
-          kibanaService.toasts.addError({ name, message }, { title });
-        }
-      );
-    }
-  }, [errorMessages, showErrors]);
-
   return {
     expectPings,
     hasBlockingError,
-    blockingErrorTitle: hasBlockingError ? PushErrorLabel : null,
-    blockingErrorMessage: hasBlockingError
-      ? `${PushErrorService} ${errorMessages[0]?.message}`
-      : null,
+    blockingErrorTitle: hasBlockingError ? RunErrorLabel : null,
+    blockingErrorMessage: hasBlockingError ? `${errorMessages[0]?.message}` : null,
     errorMessages,
   };
 }
 
-const PushErrorLabel = i18n.translate('xpack.synthetics.testRun.pushErrorLabel', {
-  defaultMessage: 'Push error',
-});
-
 const RunErrorLabel = i18n.translate('xpack.synthetics.testRun.runErrorLabel', {
-  defaultMessage: 'Error running test',
+  defaultMessage: "Can't run the test now",
 });
 
 const getLocationTestErrorLabel = (locationName: string, reason: string) =>
   i18n.translate('xpack.synthetics.testRun.runErrorLocation.reason', {
-    defaultMessage: 'Failed to run monitor on location {locationName}. {reason}',
+    defaultMessage: 'Failed to run test on location {locationName}. {reason}',
     values: { locationName, reason },
   });
 
 const PushErrorService = i18n.translate('xpack.synthetics.testRun.pushError', {
-  defaultMessage: 'Failed to push the monitor to service.',
+  defaultMessage: 'This test cannot be executed at this time. Try again later.',
 });
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/state/alert_rules/effects.ts b/x-pack/plugins/synthetics/public/apps/synthetics/state/alert_rules/effects.ts
index e49d84ba9c6b6..fb092adbcab33 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/state/alert_rules/effects.ts
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/state/alert_rules/effects.ts
@@ -39,7 +39,7 @@ export function* updateDefaultAlertingEffect() {
 
 const successMessage = i18n.translate('xpack.synthetics.settings.enableAlerting', {
   defaultMessage:
-    'Monitor status rule type successfully updated. Next rule alerts will take the changes into account.',
+    'Monitor status rule successfully updated. Changes will take effect on the next rule execution.',
 });
 
 const failureMessage = i18n.translate('xpack.synthetics.settings.enabledAlert.fail', {
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/state/synthetics_enablement/effects.ts b/x-pack/plugins/synthetics/public/apps/synthetics/state/synthetics_enablement/effects.ts
index 14c912b07ce99..a840d7d4057bc 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/state/synthetics_enablement/effects.ts
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/state/synthetics_enablement/effects.ts
@@ -29,5 +29,5 @@ export function* fetchSyntheticsEnablementEffect() {
 }
 
 const failureMessage = i18n.translate('xpack.synthetics.settings.enablement.fail', {
-  defaultMessage: 'Failed to enable Monitor Management',
+  defaultMessage: 'Failed to enable Synthetics App',
 });
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/components/settings/translations.ts b/x-pack/plugins/synthetics/public/legacy_uptime/components/settings/translations.ts
index 5f5afc048f840..8d00c6ca948da 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/components/settings/translations.ts
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/components/settings/translations.ts
@@ -28,7 +28,7 @@ export const alertFormI18n = {
   inputPlaceHolder: i18n.translate(
     'xpack.synthetics.sourceConfiguration.alertDefaultForm.selectConnector',
     {
-      defaultMessage: 'Please select one or more connectors',
+      defaultMessage: 'Select one or more connectors',
     }
   ),
   emailPlaceHolder: i18n.translate(
diff --git a/x-pack/plugins/synthetics/server/synthetics_service/get_api_key.ts b/x-pack/plugins/synthetics/server/synthetics_service/get_api_key.ts
index 79af4d6cfc718..e92f5956741b5 100644
--- a/x-pack/plugins/synthetics/server/synthetics_service/get_api_key.ts
+++ b/x-pack/plugins/synthetics/server/synthetics_service/get_api_key.ts
@@ -126,7 +126,7 @@ export const generateAPIKey = async ({
 
   /* Not exposed to the user. May grant as internal user */
   return security.authc.apiKeys?.grantAsInternalUser(request, {
-    name: 'synthetics-api-key (required for monitor management)',
+    name: 'synthetics-api-key (required for Synthetics App)',
     role_descriptors: {
       synthetics_writer: serviceApiKeyPrivileges,
     },
diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
index 001ff56a7c3b1..eac17d48bc9bc 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -34711,9 +34711,7 @@
     "xpack.synthetics.monitorManagement.editMonitorCrumb": "Modifier le moniteur",
     "xpack.synthetics.monitorManagement.editMonitorError": "Erreur lors du chargement de la liste Gestion des moniteurs",
     "xpack.synthetics.monitorManagement.editMonitorError.description": "Les paramètres de Gestion des moniteurs n'ont pas pu être chargés. Veuillez contacter le support technique.",
-    "xpack.synthetics.monitorManagement.emptyState.enablement": "Activez la Gestion des moniteurs pour exécuter des moniteurs légers et basés sur un navigateur réel à partir d'emplacements de test hébergés dans le monde entier. L'activation de la Gestion des moniteurs générera une clé d'API pour autoriser le service Synthetics à mettre à jour votre cluster Elasticsearch.",
     "xpack.synthetics.monitorManagement.emptyState.enablement.doc": "Lisez les documents",
-    "xpack.synthetics.monitorManagement.emptyState.enablement.enabled.title": "Activer la Gestion des moniteurs",
     "xpack.synthetics.monitorManagement.emptyState.enablement.learnMore": "Envie d'en savoir plus ?",
     "xpack.synthetics.monitorManagement.emptyState.enablement.title": "Activer",
     "xpack.synthetics.monitorManagement.failed": "ÉCHOUÉ",
@@ -34779,9 +34777,7 @@
     "xpack.synthetics.monitorManagement.startAddingLocationsDescription": "Les emplacements privés vous permettent d'exploiter des moniteurs depuis vos propres locaux. Ils nécessitent un agent Elastic et une politique d'agent que vous pouvez contrôler et maintenir via Fleet.",
     "xpack.synthetics.monitorManagement.steps": "Étapes",
     "xpack.synthetics.monitorManagement.summary.heading": "Résumé",
-    "xpack.synthetics.monitorManagement.syntheticsDisabledSuccess": "Gestion des moniteurs désactivée avec succès.",
     "xpack.synthetics.monitorManagement.syntheticsEnableLabel.management": "Activer la Gestion des moniteurs",
-    "xpack.synthetics.monitorManagement.syntheticsEnableSuccess": "Gestion des moniteurs activée avec succès.",
     "xpack.synthetics.monitorManagement.testResult": "Résultat du test",
     "xpack.synthetics.monitorManagement.testResults": "Résultats de test",
     "xpack.synthetics.monitorManagement.testRuns.label": "Exécutions de test",
@@ -35165,7 +35161,6 @@
     "xpack.synthetics.testResults.expandedRow.response_body.notRecorded": "Corps non enregistré. Définissez l'option du corps de la réponse de l'index sur \"Toujours activé\" dans les options avancées de la configuration du moniteur pour enregistrer le corps.",
     "xpack.synthetics.testRun.description": "Tester votre moniteur et vérifier les résultats avant d'enregistrer",
     "xpack.synthetics.testRun.pushError": "Impossible d'envoyer le moniteur vers le service.",
-    "xpack.synthetics.testRun.pushErrorLabel": "Erreur d'envoi",
     "xpack.synthetics.testRun.pushing.description": "Envoi du moniteur vers le service...",
     "xpack.synthetics.testRun.runErrorLabel": "Erreur lors de l'exécution du test",
     "xpack.synthetics.testRunDetailsRoute.page.title": "Détails de l'exécution du test",
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 65b2c00933970..8800f9f6547d3 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -34690,9 +34690,7 @@
     "xpack.synthetics.monitorManagement.editMonitorCrumb": "モニターを編集",
     "xpack.synthetics.monitorManagement.editMonitorError": "モニター管理の読み込みエラー",
     "xpack.synthetics.monitorManagement.editMonitorError.description": "モニター管理設定を読み込めませんでした。サポートに問い合わせてください。",
-    "xpack.synthetics.monitorManagement.emptyState.enablement": "モニター管理を有効にすると、世界中のホスティングされたテスト場所から軽量でリアルなブラウザーモニターを実行できます。モニター管理を有効にすると、APIキーが生成され、SyntheticsサービスはElasticsearchクラスターに書き込むことができます。",
     "xpack.synthetics.monitorManagement.emptyState.enablement.doc": "<b>ドキュメント</b><b>を読む</b>",
-    "xpack.synthetics.monitorManagement.emptyState.enablement.enabled.title": "モニター管理を有効にする",
     "xpack.synthetics.monitorManagement.emptyState.enablement.learnMore": "詳細について",
     "xpack.synthetics.monitorManagement.emptyState.enablement.title": "有効にする",
     "xpack.synthetics.monitorManagement.failed": "失敗",
@@ -34758,9 +34756,7 @@
     "xpack.synthetics.monitorManagement.startAddingLocationsDescription": "非公開の場所では、独自の施設からモニターを実行できます。Fleet経由で制御および保守できるElasticエージェントとエージェントポリシーが必要です。",
     "xpack.synthetics.monitorManagement.steps": "ステップ",
     "xpack.synthetics.monitorManagement.summary.heading": "まとめ",
-    "xpack.synthetics.monitorManagement.syntheticsDisabledSuccess": "モニター管理は正常に無効にされました。",
     "xpack.synthetics.monitorManagement.syntheticsEnableLabel.management": "モニター管理を有効にする",
-    "xpack.synthetics.monitorManagement.syntheticsEnableSuccess": "モニター管理は正常に有効にされました。",
     "xpack.synthetics.monitorManagement.testResult": "テスト結果",
     "xpack.synthetics.monitorManagement.testResults": "テスト結果",
     "xpack.synthetics.monitorManagement.testRuns.label": "テスト実行",
@@ -35144,7 +35140,6 @@
     "xpack.synthetics.testResults.expandedRow.response_body.notRecorded": "本文が記録されていません。モニター設定の詳細オプションで、インデックス応答オプションを［常時］に設定して、本文を記録します。",
     "xpack.synthetics.testRun.description": "モニターをテストし、保存する前に結果を検証します",
     "xpack.synthetics.testRun.pushError": "モニターをサービスにプッシュできませんでした。",
-    "xpack.synthetics.testRun.pushErrorLabel": "プッシュエラー",
     "xpack.synthetics.testRun.pushing.description": "モニターをサービスにプッシュしています...",
     "xpack.synthetics.testRun.runErrorLabel": "テストの実行エラー",
     "xpack.synthetics.testRunDetailsRoute.page.title": "テスト実行詳細",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 9bc9283638256..90564505290d1 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -34707,9 +34707,7 @@
     "xpack.synthetics.monitorManagement.editMonitorCrumb": "编辑监测",
     "xpack.synthetics.monitorManagement.editMonitorError": "加载监测管理时出错",
     "xpack.synthetics.monitorManagement.editMonitorError.description": "无法加载监测管理设置。请联系支持人员。",
-    "xpack.synthetics.monitorManagement.emptyState.enablement": "启用监测管理以从全球托管测试地点运行轻量级、真正的浏览器监测。启用监测管理将生成 API 密钥，以便 Synthetics 服务回写 Elasticsearch 集群。",
     "xpack.synthetics.monitorManagement.emptyState.enablement.doc": "阅读文档",
-    "xpack.synthetics.monitorManagement.emptyState.enablement.enabled.title": "启用监测管理",
     "xpack.synthetics.monitorManagement.emptyState.enablement.learnMore": "希望了解详情？",
     "xpack.synthetics.monitorManagement.emptyState.enablement.title": "启用",
     "xpack.synthetics.monitorManagement.failed": "失败",
@@ -34775,9 +34773,7 @@
     "xpack.synthetics.monitorManagement.startAddingLocationsDescription": "专用位置供您从自己的场所运行监测。它们需要可以通过 Fleet 进行控制和维护的 Elastic 代理和代理策略。",
     "xpack.synthetics.monitorManagement.steps": "步长",
     "xpack.synthetics.monitorManagement.summary.heading": "摘要",
-    "xpack.synthetics.monitorManagement.syntheticsDisabledSuccess": "已成功禁用监测管理。",
     "xpack.synthetics.monitorManagement.syntheticsEnableLabel.management": "启用监测管理",
-    "xpack.synthetics.monitorManagement.syntheticsEnableSuccess": "已成功启用监测管理。",
     "xpack.synthetics.monitorManagement.testResult": "测试结果",
     "xpack.synthetics.monitorManagement.testResults": "测试结果",
     "xpack.synthetics.monitorManagement.testRuns.label": "测试运行",
@@ -35161,7 +35157,6 @@
     "xpack.synthetics.testResults.expandedRow.response_body.notRecorded": "正文未记录。在监测配置的高级选项中将索引响应正文选项设置为“始终打开”以记录正文。",
     "xpack.synthetics.testRun.description": "请在保存前测试您的监测并验证结果",
     "xpack.synthetics.testRun.pushError": "无法推送监测到服务。",
-    "xpack.synthetics.testRun.pushErrorLabel": "推送错误",
     "xpack.synthetics.testRun.pushing.description": "正在推送监测到服务......",
     "xpack.synthetics.testRun.runErrorLabel": "运行测试时出错",
     "xpack.synthetics.testRunDetailsRoute.page.title": "测试运行详情",
diff --git a/x-pack/test/api_integration/apis/synthetics/synthetics_enablement.ts b/x-pack/test/api_integration/apis/synthetics/synthetics_enablement.ts
index bf68da4c148f5..3a0713431efb4 100644
--- a/x-pack/test/api_integration/apis/synthetics/synthetics_enablement.ts
+++ b/x-pack/test/api_integration/apis/synthetics/synthetics_enablement.ts
@@ -248,7 +248,7 @@ export default function ({ getService }: FtrProviderContext) {
             overwrite: true,
             attributes: {
               id: apiKeyResult.body.id,
-              name: 'synthetics-api-key (required for monitor management)',
+              name: 'synthetics-api-key (required for Synthetics App)',
               apiKey: apiKeyResult.body.api_key,
             },
           });