From 970de9147ea2b51488e63dd71e28b9df7a7bf138 Mon Sep 17 00:00:00 2001
From: Cristina Amico <criamico@users.noreply.github.com>
Date: Tue, 18 Apr 2023 08:44:16 +0200
Subject: [PATCH 001/100] [Fleet] Surface new overview dashboards in fleet
 (#154914)

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

## Summary
- Adds two link buttons on top of agent list page to access "Ingest
overview" and "Agent Info" dashboards
<img width="1444" alt="Screenshot 2023-04-13 at 15 22 53"
src="https://user-images.githubusercontent.com/16084106/231772174-00c00a8e-62f1-43ea-a935-bc12f56f3e50.png">

The links are built using the new URL service
[locator](https://github.com/elastic/kibana/blob/e80abe810837eeeff7fdcd594c6f8950590b49cd/x-pack/plugins/fleet/public/hooks/use_locator.ts#L14)
and the
[getRedirectLink](https://github.com/elastic/kibana/blob/main/src/plugins/share/README.mdx#using-locator-of-another-app)
method;

- Refactoring existing instances of `useKibanaLink` to use the url
locator instead;

These new dashboards were already accessible from the ` elastic_agent.*`
datastreams table actions, however I replaced the `useKibanaLink` hook
there as well:

<img width="1412" alt="Screenshot 2023-04-13 at 16 03 47"
src="https://user-images.githubusercontent.com/16084106/231784273-693c7f36-4545-4c06-a05e-4f09e53bd903.png">


TODO: I don't know where to add the "Integrations" dashboard yet, I'm
not sure it should go on the Integrations details page.

### Checklist

- [ ] [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
- [ ] 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: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 x-pack/plugins/fleet/common/constants/epm.ts  |  3 --
 .../plugins/fleet/common/constants/index.ts   |  1 +
 .../fleet/common/constants/locators.ts        | 19 +++++++
 x-pack/plugins/fleet/common/index.ts          |  2 +
 .../components/agent_dashboard_link.test.tsx  | 11 ++++
 .../components/agent_dashboard_link.tsx       | 22 +++++---
 .../components/dashboards_buttons.tsx         | 53 +++++++++++++++++++
 .../components/search_and_filter_bar.test.tsx | 11 ++++
 .../components/search_and_filter_bar.tsx      | 21 ++++----
 .../components/data_stream_row_actions.tsx    | 10 ++--
 .../plugins/fleet/public/constants/index.ts   |  5 +-
 x-pack/plugins/fleet/public/hooks/index.ts    |  1 +
 .../plugins/fleet/public/hooks/use_locator.ts |  6 ++-
 .../apis/integrations/elastic_agent.ts        | 11 ++--
 14 files changed, 140 insertions(+), 36 deletions(-)
 create mode 100644 x-pack/plugins/fleet/common/constants/locators.ts
 create mode 100644 x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/dashboards_buttons.tsx

diff --git a/x-pack/plugins/fleet/common/constants/epm.ts b/x-pack/plugins/fleet/common/constants/epm.ts
index f380d66d0223c..a1d73b452cf72 100644
--- a/x-pack/plugins/fleet/common/constants/epm.ts
+++ b/x-pack/plugins/fleet/common/constants/epm.ts
@@ -22,9 +22,6 @@ export const FLEET_CLOUD_SECURITY_POSTURE_KSPM_POLICY_TEMPLATE = 'kspm';
 export const PACKAGE_TEMPLATE_SUFFIX = '@package';
 export const USER_SETTINGS_TEMPLATE_SUFFIX = '@custom';
 
-export const FLEET_ELASTIC_AGENT_DETAILS_DASHBOARD_ID =
-  'elastic_agent-f47f18cc-9c7d-4278-b2ea-a6dee816d395';
-
 export const DATASET_VAR_NAME = 'data_stream.dataset';
 /*
  Package rules:
diff --git a/x-pack/plugins/fleet/common/constants/index.ts b/x-pack/plugins/fleet/common/constants/index.ts
index 4dcc2d58d65ba..9892c883805f7 100644
--- a/x-pack/plugins/fleet/common/constants/index.ts
+++ b/x-pack/plugins/fleet/common/constants/index.ts
@@ -20,6 +20,7 @@ export * from './fleet_server_policy_config';
 export * from './authz';
 export * from './file_storage';
 export * from './message_signing_keys';
+export * from './locators';
 
 // TODO: This is the default `index.max_result_window` ES setting, which dictates
 // the maximum amount of results allowed to be returned from a search. It's possible
diff --git a/x-pack/plugins/fleet/common/constants/locators.ts b/x-pack/plugins/fleet/common/constants/locators.ts
new file mode 100644
index 0000000000000..daa00bcae46e0
--- /dev/null
+++ b/x-pack/plugins/fleet/common/constants/locators.ts
@@ -0,0 +1,19 @@
+/*
+ * 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 LOCATORS_IDS = {
+  APM_LOCATOR: 'APM_LOCATOR',
+  DASHBOARD_APP: 'DASHBOARD_APP_LOCATOR',
+} as const;
+
+// Dashboards ids
+export const DASHBOARD_LOCATORS_IDS = {
+  ELASTIC_AGENT_OVERVIEW: 'elastic_agent-a148dc70-6b3c-11ed-98de-67bdecd21824',
+  ELASTIC_AGENT_AGENT_INFO: 'elastic_agent-0600ffa0-6b5e-11ed-98de-67bdecd21824',
+  ELASTIC_AGENT_AGENT_METRICS: 'elastic_agent-f47f18cc-9c7d-4278-b2ea-a6dee816d395',
+  ELASTIC_AGENT_INTEGRATIONS: 'elastic_agent-1a4e7280-6b5e-11ed-98de-67bdecd21824',
+} as const;
diff --git a/x-pack/plugins/fleet/common/index.ts b/x-pack/plugins/fleet/common/index.ts
index 3cdfa354a8c5f..3ca552966a7c5 100644
--- a/x-pack/plugins/fleet/common/index.ts
+++ b/x-pack/plugins/fleet/common/index.ts
@@ -52,6 +52,8 @@ export {
   // Statuses
   // Authz
   ENDPOINT_PRIVILEGES,
+  // dashboards ids
+  DASHBOARD_LOCATORS_IDS,
 } from './constants';
 export {
   // Route services
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_dashboard_link.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_dashboard_link.test.tsx
index 7a65be0a460c9..79908819ff863 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_dashboard_link.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_dashboard_link.test.tsx
@@ -25,6 +25,17 @@ jest.mock('../../../../../../hooks/use_fleet_status', () => ({
 
 jest.mock('../../../../../../hooks/use_request/epm');
 
+jest.mock('../../../../../../hooks/use_locator', () => {
+  return {
+    useDashboardLocator: jest.fn().mockImplementation(() => {
+      return {
+        id: 'DASHBOARD_APP_LOCATOR',
+        getRedirectUrl: jest.fn().mockResolvedValue('app/dashboards#/view/elastic_agent-a0001'),
+      };
+    }),
+  };
+});
+
 describe('AgentDashboardLink', () => {
   it('should enable the button if elastic_agent package is installed and policy has monitoring enabled', async () => {
     mockedUseGetPackageInfoByKeyQuery.mockReturnValue({
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_dashboard_link.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_dashboard_link.tsx
index 6c7479fd8c801..6832f81961ddb 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_dashboard_link.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_dashboard_link.tsx
@@ -10,21 +10,26 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiButton, EuiToolTip } from '@elastic/eui';
 import styled from 'styled-components';
 
-import { useGetPackageInfoByKeyQuery, useKibanaLink, useLink } from '../../../../hooks';
+import { useGetPackageInfoByKeyQuery, useLink, useDashboardLocator } from '../../../../hooks';
 import type { Agent, AgentPolicy } from '../../../../types';
 import {
   FLEET_ELASTIC_AGENT_PACKAGE,
-  FLEET_ELASTIC_AGENT_DETAILS_DASHBOARD_ID,
+  DASHBOARD_LOCATORS_IDS,
 } from '../../../../../../../common/constants';
 
 function useAgentDashboardLink(agent: Agent) {
   const { isLoading, data } = useGetPackageInfoByKeyQuery(FLEET_ELASTIC_AGENT_PACKAGE);
 
   const isInstalled = data?.item.status === 'installed';
+  const dashboardLocator = useDashboardLocator();
 
-  const dashboardLink = useKibanaLink(`/dashboard/${FLEET_ELASTIC_AGENT_DETAILS_DASHBOARD_ID}`);
-  const query = `_a=(query:(language:kuery,query:'elastic_agent.id:${agent.id}'))`;
-  const link = `${dashboardLink}?${query}`;
+  const link = dashboardLocator?.getRedirectUrl({
+    dashboardId: DASHBOARD_LOCATORS_IDS.ELASTIC_AGENT_AGENT_METRICS,
+    query: {
+      language: 'kuery',
+      query: `elastic_agent.id:${agent.id}`,
+    },
+  });
 
   return {
     isLoading,
@@ -50,7 +55,12 @@ export const AgentDashboardLink: React.FunctionComponent<{
     !isInstalled || isLoading || !isLogAndMetricsEnabled ? { disabled: true } : { href: link };
 
   const button = (
-    <EuiButtonCompressed {...buttonArgs} isLoading={isLoading} color="primary">
+    <EuiButtonCompressed
+      {...buttonArgs}
+      isLoading={isLoading}
+      color="primary"
+      iconType="dashboardApp"
+    >
       <FormattedMessage
         data-test-subj="agentDetails.viewMoreMetricsButton"
         id="xpack.fleet.agentDetails.viewDashboardButtonLabel"
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/dashboards_buttons.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/dashboards_buttons.tsx
new file mode 100644
index 0000000000000..e42dfd997d241
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/dashboards_buttons.tsx
@@ -0,0 +1,53 @@
+/*
+ * 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 { EuiFlexGroup, EuiFlexItem, EuiButtonEmpty } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+
+import { DASHBOARD_LOCATORS_IDS } from '../../../../../../../common/constants';
+
+import { useDashboardLocator } from '../../../../hooks';
+
+export const DashboardsButtons: React.FunctionComponent = () => {
+  const dashboardLocator = useDashboardLocator();
+
+  const getDashboardHref = (dashboardId: string) => {
+    return dashboardLocator?.getRedirectUrl({ dashboardId }) || '';
+  };
+
+  return (
+    <>
+      <EuiFlexGroup gutterSize="s" justifyContent="flexStart">
+        <EuiFlexItem grow={false}>
+          <EuiButtonEmpty
+            iconType="dashboardApp"
+            href={getDashboardHref(DASHBOARD_LOCATORS_IDS.ELASTIC_AGENT_OVERVIEW)}
+            data-test-subj="ingestOverviewLinkButton"
+          >
+            <FormattedMessage
+              id="xpack.fleet.agentList.ingestOverviewlinkButton"
+              defaultMessage="Ingest Overview Metrics"
+            />
+          </EuiButtonEmpty>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiButtonEmpty
+            iconType="dashboardApp"
+            href={getDashboardHref(DASHBOARD_LOCATORS_IDS.ELASTIC_AGENT_AGENT_INFO)}
+            data-test-subj="agentInfoLinkButton"
+          >
+            <FormattedMessage
+              id="xpack.fleet.agentList.agentInfoLinkButton"
+              defaultMessage="Agent Info Metrics"
+            />
+          </EuiButtonEmpty>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </>
+  );
+};
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 e239f31ed3adc..9af04b04761a6 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
@@ -36,6 +36,17 @@ jest.mock('../../../../components', () => {
   };
 });
 
+jest.mock('../../../../../../hooks/use_locator', () => {
+  return {
+    useDashboardLocator: jest.fn().mockImplementation(() => {
+      return {
+        id: 'DASHBOARD_APP_LOCATOR',
+        getRedirectUrl: jest.fn().mockResolvedValue('app/dashboards#/view/elastic_agent-a0002'),
+      };
+    }),
+  };
+});
+
 const TestComponent = (props: any) => (
   <KibanaContextProvider services={coreMock.createStart()}>
     <ConfigContext.Provider value={{ agents: { enabled: true, elasticsearch: {} }, enabled: true }}>
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 4ca43020e132a..c9c527ba36e0a 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
@@ -31,15 +31,12 @@ import { AgentBulkActions } from './bulk_actions';
 import type { SelectionMode } from './types';
 import { AgentActivityButton } from './agent_activity_button';
 import { AgentStatusFilter } from './agent_status_filter';
+import { DashboardsButtons } from './dashboards_buttons';
 
 const ClearAllTagsFilterItem = styled(EuiFilterSelectItem)`
   padding: ${(props) => props.theme.eui.euiSizeS};
 `;
 
-const FlexEndEuiFlexItem = styled(EuiFlexItem)`
-  align-self: flex-end;
-`;
-
 export const SearchAndFilterBar: React.FunctionComponent<{
   agentPolicies: AgentPolicy[];
   draftKuery: string;
@@ -118,17 +115,18 @@ export const SearchAndFilterBar: React.FunctionComponent<{
 
   return (
     <>
-      {/* Search and filter bar */}
       <EuiFlexGroup direction="column">
-        <FlexEndEuiFlexItem>
-          <EuiFlexGroup gutterSize="s">
-            <EuiFlexItem>
+        {/* Top Buttons and Links */}
+        <EuiFlexGroup>
+          <EuiFlexItem>{totalAgents > 0 && <DashboardsButtons />}</EuiFlexItem>
+          <EuiFlexGroup gutterSize="s" justifyContent="flexEnd">
+            <EuiFlexItem grow={false}>
               <AgentActivityButton
                 onClickAgentActivity={onClickAgentActivity}
                 showAgentActivityTour={showAgentActivityTour}
               />
             </EuiFlexItem>
-            <EuiFlexItem>
+            <EuiFlexItem grow={false}>
               <EuiToolTip
                 content={
                   <FormattedMessage
@@ -145,7 +143,7 @@ export const SearchAndFilterBar: React.FunctionComponent<{
                 </EuiButton>
               </EuiToolTip>
             </EuiFlexItem>
-            <EuiFlexItem>
+            <EuiFlexItem grow={false}>
               <EuiToolTip
                 content={
                   <FormattedMessage
@@ -163,7 +161,8 @@ export const SearchAndFilterBar: React.FunctionComponent<{
               </EuiToolTip>
             </EuiFlexItem>
           </EuiFlexGroup>
-        </FlexEndEuiFlexItem>
+        </EuiFlexGroup>
+        {/* Search and filters */}
         <EuiFlexItem grow={4}>
           <EuiFlexGroup gutterSize="s">
             <EuiFlexItem grow={6}>
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/data_stream/list_page/components/data_stream_row_actions.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/data_stream/list_page/components/data_stream_row_actions.tsx
index 7d88327e73fd6..8822117f56d67 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/data_stream/list_page/components/data_stream_row_actions.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/data_stream/list_page/components/data_stream_row_actions.tsx
@@ -10,13 +10,15 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
 import type { DataStream } from '../../../../types';
-import { useKibanaLink } from '../../../../hooks';
+import { useDashboardLocator } from '../../../../hooks';
 import { ContextMenuActions } from '../../../../components';
 
 import { useAPMServiceDetailHref } from '../../../../hooks/use_apm_service_href';
 
 export const DataStreamRowActions = memo<{ datastream: DataStream }>(({ datastream }) => {
   const { dashboards } = datastream;
+  const dashboardLocator = useDashboardLocator();
+
   const actionNameSingular = (
     <FormattedMessage
       id="xpack.fleet.dataStreamList.viewDashboardActionText"
@@ -82,8 +84,7 @@ export const DataStreamRowActions = memo<{ datastream: DataStream }>(({ datastre
         items: [
           {
             icon: 'dashboardApp',
-            /* eslint-disable-next-line react-hooks/rules-of-hooks */
-            href: useKibanaLink(`/dashboard/${dashboards[0].id || ''}`),
+            href: dashboardLocator?.getRedirectUrl({ dashboardId: dashboards[0]?.id } || ''),
             name: actionNameSingular,
           },
         ],
@@ -109,8 +110,7 @@ export const DataStreamRowActions = memo<{ datastream: DataStream }>(({ datastre
       items: dashboards.map((dashboard) => {
         return {
           icon: 'dashboardApp',
-          /* eslint-disable-next-line react-hooks/rules-of-hooks */
-          href: useKibanaLink(`/dashboard/${dashboard.id || ''}`),
+          href: dashboardLocator?.getRedirectUrl({ dashboardId: dashboard?.id } || ''),
           name: dashboard.title,
         };
       }),
diff --git a/x-pack/plugins/fleet/public/constants/index.ts b/x-pack/plugins/fleet/public/constants/index.ts
index 22ba08f3f9a1a..2c682af1fcbcc 100644
--- a/x-pack/plugins/fleet/public/constants/index.ts
+++ b/x-pack/plugins/fleet/public/constants/index.ts
@@ -22,6 +22,7 @@ export {
   AUTO_UPDATE_PACKAGES,
   KEEP_POLICIES_UP_TO_DATE_PACKAGES,
   AUTO_UPGRADE_POLICIES_PACKAGES,
+  LOCATORS_IDS,
 } from '../../common/constants';
 
 export * from './page_paths';
@@ -37,7 +38,3 @@ export const DURATION_APM_SETTINGS_VARS = {
   TAIL_SAMPLING_INTERVAL: 'tail_sampling_interval',
   WRITE_TIMEOUT: 'write_timeout',
 };
-
-export const LOCATORS_IDS = {
-  APM_LOCATOR: 'APM_LOCATOR',
-} as const;
diff --git a/x-pack/plugins/fleet/public/hooks/index.ts b/x-pack/plugins/fleet/public/hooks/index.ts
index 0f7f6b2f4d165..a9fb6ef7758c7 100644
--- a/x-pack/plugins/fleet/public/hooks/index.ts
+++ b/x-pack/plugins/fleet/public/hooks/index.ts
@@ -31,3 +31,4 @@ export * from './use_flyout_context';
 export * from './use_is_guided_onboarding_active';
 export * from './use_fleet_server_hosts_for_policy';
 export * from './use_fleet_server_standalone';
+export * from './use_locator';
diff --git a/x-pack/plugins/fleet/public/hooks/use_locator.ts b/x-pack/plugins/fleet/public/hooks/use_locator.ts
index 46ec3e4c75d13..a3fed97679456 100644
--- a/x-pack/plugins/fleet/public/hooks/use_locator.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_locator.ts
@@ -7,7 +7,7 @@
 import type { SerializableRecord } from '@kbn/utility-types';
 import type { ValuesType } from 'utility-types';
 
-import type { LOCATORS_IDS } from '../constants';
+import { LOCATORS_IDS } from '../constants';
 
 import { useStartServices } from './use_core';
 
@@ -17,3 +17,7 @@ export function useLocator<T extends SerializableRecord>(
   const services = useStartServices();
   return services.share.url.locators.get<T>(locatorId);
 }
+
+export function useDashboardLocator() {
+  return useLocator(LOCATORS_IDS.DASHBOARD_APP);
+}
diff --git a/x-pack/test/fleet_api_integration/apis/integrations/elastic_agent.ts b/x-pack/test/fleet_api_integration/apis/integrations/elastic_agent.ts
index 7fad10904a4f4..7cd94543cad30 100644
--- a/x-pack/test/fleet_api_integration/apis/integrations/elastic_agent.ts
+++ b/x-pack/test/fleet_api_integration/apis/integrations/elastic_agent.ts
@@ -6,10 +6,9 @@
  */
 
 import expect from '@kbn/expect';
-import {
-  FLEET_ELASTIC_AGENT_PACKAGE,
-  FLEET_ELASTIC_AGENT_DETAILS_DASHBOARD_ID,
-} from '@kbn/fleet-plugin/common/constants/epm';
+import { FLEET_ELASTIC_AGENT_PACKAGE } from '@kbn/fleet-plugin/common/constants/epm';
+
+import { DASHBOARD_LOCATORS_IDS } from '@kbn/fleet-plugin/common';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { skipIfNoDockerRegistry } from '../../helpers';
 import { setupFleetAndAgents } from '../agents/services';
@@ -47,10 +46,10 @@ export default function (providerContext: FtrProviderContext) {
     it('Install elastic agent details dashboard with the correct id', async () => {
       const resDashboard = await kibanaServer.savedObjects.get({
         type: 'dashboard',
-        id: FLEET_ELASTIC_AGENT_DETAILS_DASHBOARD_ID,
+        id: DASHBOARD_LOCATORS_IDS.ELASTIC_AGENT_AGENT_METRICS,
       });
 
-      expect(resDashboard.id).to.eql(FLEET_ELASTIC_AGENT_DETAILS_DASHBOARD_ID);
+      expect(resDashboard.id).to.eql(DASHBOARD_LOCATORS_IDS.ELASTIC_AGENT_AGENT_METRICS);
     });
 
     after(async () => {

From 682f12ea77e8845c79952ccef4c5da2b0dee3e33 Mon Sep 17 00:00:00 2001
From: Julia Rechkunova <julia.rechkunova@elastic.co>
Date: Tue, 18 Apr 2023 09:11:07 +0200
Subject: [PATCH 002/100] [Discover][Saved Query] Add schema for Saved Query SO
 (#154230)

## Summary

A follow up for https://github.com/elastic/kibana/pull/153131
This PR adds schema for Saved Query SO type.
---
 .../group2/check_registered_types.test.ts     |  2 +-
 .../data/server/saved_objects/query.ts        | 16 +++-------
 .../server/saved_objects/schemas/query.ts     | 32 +++++++++++++++++++
 3 files changed, 38 insertions(+), 12 deletions(-)
 create mode 100644 src/plugins/data/server/saved_objects/schemas/query.ts

diff --git a/src/core/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts
index 541bfa046b0d3..09977e1c272ab 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts
@@ -123,7 +123,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "osquery-pack": "edd84b2c59ef36214ece0676706da8f22175c660",
         "osquery-pack-asset": "18e08979d46ee7e5538f54c080aec4d8c58516ca",
         "osquery-saved-query": "f5e4e303f65c7607248ea8b2672f1ee30e4fb15e",
-        "query": "ec6000b775f06f81470df42d23f7a88cb31d64ba",
+        "query": "cfc049e1f0574fb4fdb2d653d7c10bdc970a2610",
         "rules-settings": "9854495c3b54b16a6625fb250c35e5504da72266",
         "sample-data-telemetry": "c38daf1a49ed24f2a4fb091e6e1e833fccf19935",
         "search": "ed3a9b1681b57d69560909d51933fdf17576ea68",
diff --git a/src/plugins/data/server/saved_objects/query.ts b/src/plugins/data/server/saved_objects/query.ts
index c32a13e85888a..cf75c28743d4f 100644
--- a/src/plugins/data/server/saved_objects/query.ts
+++ b/src/plugins/data/server/saved_objects/query.ts
@@ -8,6 +8,7 @@
 
 import { SavedObjectsType } from '@kbn/core/server';
 import { savedQueryMigrations } from './migrations/query';
+import { SCHEMA_QUERY_V8_8_0 } from './schemas/query';
 
 export const querySavedObjectType: SavedObjectsType = {
   name: 'query',
@@ -29,21 +30,14 @@ export const querySavedObjectType: SavedObjectsType = {
     },
   },
   mappings: {
+    dynamic: false,
     properties: {
       title: { type: 'text' },
       description: { type: 'text' },
-      query: {
-        dynamic: false,
-        properties: {
-          language: { type: 'keyword' },
-        },
-      },
-      filters: {
-        dynamic: false,
-        properties: {},
-      },
-      timefilter: { dynamic: false, properties: {} },
     },
   },
   migrations: savedQueryMigrations,
+  schemas: {
+    '8.8.0': SCHEMA_QUERY_V8_8_0,
+  },
 };
diff --git a/src/plugins/data/server/saved_objects/schemas/query.ts b/src/plugins/data/server/saved_objects/schemas/query.ts
new file mode 100644
index 0000000000000..c460a06b9727a
--- /dev/null
+++ b/src/plugins/data/server/saved_objects/schemas/query.ts
@@ -0,0 +1,32 @@
+/*
+ * 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 { schema } from '@kbn/config-schema';
+
+// As per `SavedQueryAttributes`
+export const SCHEMA_QUERY_V8_8_0 = schema.object({
+  title: schema.string(),
+  description: schema.string({ defaultValue: '' }),
+  query: schema.object({
+    language: schema.string(),
+    query: schema.oneOf([schema.string(), schema.object({}, { unknowns: 'allow' })]),
+  }),
+  filters: schema.maybe(schema.arrayOf(schema.object({}, { unknowns: 'allow' }))),
+  timefilter: schema.maybe(
+    schema.object({
+      from: schema.string(),
+      to: schema.string(),
+      refreshInterval: schema.maybe(
+        schema.object({
+          value: schema.number(),
+          pause: schema.boolean(),
+        })
+      ),
+    })
+  ),
+});

From 823cc3f49b5cb2c91f0edc29edc1f52ab3585770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?=
 <alejandro.haro@elastic.co>
Date: Tue, 18 Apr 2023 10:15:35 +0200
Subject: [PATCH 003/100] [`getSavedObjectsCount`] Use `soClient` instead of
 `.kibana` searches (#155035)

## Summary

As part of #154888, we need to stop making direct requests to the index
`.kibana`, and use the SO Clients instead.

This PR changes the utility `getSavedObjectsCount` to use aggregations
in the SO client.

### 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

### For maintainers

- [x] 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)

I'm pointing to `main` because it's an improvement we needed anyway.

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
---
 .../src/lib/aggregations/validation.test.ts   |  17 +++
 .../src/lib/aggregations/validation.ts        |   8 ++
 .../get_saved_object_counts.test.ts           | 116 ++++++------------
 .../get_saved_object_counts.ts                |  44 +++----
 .../kibana_usage_collector.test.ts            |  12 +-
 .../kibana_usage_collector.ts                 |  11 +-
 .../saved_objects_count_collector.test.ts     |   7 +-
 .../saved_objects_count_collector.ts          |   5 +-
 .../kibana_usage_collection/server/plugin.ts  |   2 +-
 .../kibana_usage_collection/tsconfig.json     |   1 +
 10 files changed, 95 insertions(+), 128 deletions(-)

diff --git a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/aggregations/validation.test.ts b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/aggregations/validation.test.ts
index 0120ecf75c797..0b5d750e57040 100644
--- a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/aggregations/validation.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/aggregations/validation.test.ts
@@ -522,4 +522,21 @@ describe('validateAndConvertAggregations', () => {
       '"[aggName.cardinality.field] Invalid attribute path: alert.alert.actions.group"'
     );
   });
+
+  it('allows aggregations for root fields', () => {
+    const aggregations: AggsMap = {
+      types: {
+        terms: {
+          field: 'type',
+        },
+      },
+    };
+    expect(validateAndConvertAggregations(['foo'], aggregations, mockMappings)).toEqual({
+      types: {
+        terms: {
+          field: 'type',
+        },
+      },
+    });
+  });
 });
diff --git a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/aggregations/validation.ts b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/aggregations/validation.ts
index b3a6bbae5e956..c673f73d8d844 100644
--- a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/aggregations/validation.ts
+++ b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/aggregations/validation.ts
@@ -18,6 +18,7 @@ import {
   rewriteRootLevelAttribute,
 } from './validation_utils';
 import { aggregationSchemas } from './aggs_types';
+import { getRootFields } from '../included_fields';
 
 const aggregationKeys = ['aggs', 'aggregations'];
 
@@ -226,6 +227,10 @@ const isAttributeValue = (fieldName: string, fieldValue: unknown): boolean => {
   return attributeFields.includes(fieldName) && typeof fieldValue === 'string';
 };
 
+const isRootField = (fieldName: string): boolean => {
+  return getRootFields().includes(fieldName);
+};
+
 const validateAndRewriteAttributePath = (
   attributePath: string,
   { allowedTypes, indexMapping, currentPath }: ValidationContext
@@ -236,5 +241,8 @@ const validateAndRewriteAttributePath = (
   if (isObjectTypeAttribute(attributePath, indexMapping, allowedTypes)) {
     return rewriteObjectTypeAttribute(attributePath);
   }
+  if (isRootField(attributePath)) {
+    return attributePath;
+  }
   throw new Error(`[${currentPath.join('.')}] Invalid attribute path: ${attributePath}`);
 };
diff --git a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/get_saved_object_counts/get_saved_object_counts.test.ts b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/get_saved_object_counts/get_saved_object_counts.test.ts
index 173453e9e2420..f83200f56f27c 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/get_saved_object_counts/get_saved_object_counts.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/get_saved_object_counts/get_saved_object_counts.test.ts
@@ -6,48 +6,41 @@
  * Side Public License, v 1.
  */
 
-import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
+import type { SavedObjectsClientContract } from '@kbn/core-saved-objects-api-server';
+import { createCollectorFetchContextMock } from '@kbn/usage-collection-plugin/server/mocks';
 import { getSavedObjectsCounts } from './get_saved_object_counts';
 
-function mockGetSavedObjectsCounts<TBody>(params: TBody) {
-  const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser;
-  // @ts-expect-error arbitrary type
-  esClient.search.mockResponse(params);
-  return esClient;
-}
+const soEmptyResponse = { total: 0, saved_objects: [], per_page: 0, page: 1 };
 
 describe('getSavedObjectsCounts', () => {
+  const fetchContextMock = createCollectorFetchContextMock();
+  const soClient = fetchContextMock.soClient as jest.Mocked<SavedObjectsClientContract>;
+
+  beforeEach(() => {
+    soClient.find.mockReset();
+  });
+
   test('should not fail if no body returned', async () => {
-    const esClient = mockGetSavedObjectsCounts({});
+    soClient.find.mockResolvedValueOnce(soEmptyResponse);
 
-    const results = await getSavedObjectsCounts(esClient, '.kibana', ['type-a']);
+    const results = await getSavedObjectsCounts(soClient, ['type-a']);
     // Make sure ES.search is triggered (we'll test the actual params in other specific tests)
-    expect(esClient.search).toHaveBeenCalledTimes(1);
+    expect(soClient.find).toHaveBeenCalledTimes(1);
     expect(results).toStrictEqual({ total: 0, per_type: [], non_expected_types: [], others: 0 });
   });
 
   test('should match all and request the `missing` bucket (size + 1) when `exclusive === false`', async () => {
-    const esClient = mockGetSavedObjectsCounts({});
-    await getSavedObjectsCounts(esClient, '.kibana', ['type-a', 'type_2']);
-    expect(esClient.search).toHaveBeenCalledWith({
-      index: '.kibana',
-      ignore_unavailable: true,
-      filter_path: [
-        'aggregations.types.buckets',
-        'aggregations.types.sum_other_doc_count',
-        'hits.total',
-      ],
-      body: {
-        size: 0,
-        track_total_hits: true,
-        query: { match_all: {} },
-        aggs: {
-          types: {
-            terms: {
-              field: 'type',
-              size: 3,
-              missing: 'missing_so_type',
-            },
+    soClient.find.mockResolvedValueOnce(soEmptyResponse);
+    await getSavedObjectsCounts(soClient, ['type-a', 'type_2']);
+    expect(soClient.find).toHaveBeenCalledWith({
+      type: ['type-a', 'type_2'],
+      perPage: 0,
+      aggs: {
+        types: {
+          terms: {
+            field: 'type',
+            size: 3,
+            missing: 'missing_so_type',
           },
         },
       },
@@ -55,22 +48,12 @@ describe('getSavedObjectsCounts', () => {
   });
 
   test('should apply the terms query and aggregation with the size matching the length of the list when `exclusive === true`', async () => {
-    const esClient = mockGetSavedObjectsCounts({});
-    await getSavedObjectsCounts(esClient, '.kibana', ['type_one', 'type_two'], true);
-    expect(esClient.search).toHaveBeenCalledWith({
-      index: '.kibana',
-      ignore_unavailable: true,
-      filter_path: [
-        'aggregations.types.buckets',
-        'aggregations.types.sum_other_doc_count',
-        'hits.total',
-      ],
-      body: {
-        size: 0,
-        track_total_hits: true,
-        query: { terms: { type: ['type_one', 'type_two'] } },
-        aggs: { types: { terms: { field: 'type', size: 2 } } },
-      },
+    soClient.find.mockResolvedValueOnce(soEmptyResponse);
+    await getSavedObjectsCounts(soClient, ['type_one', 'type_two'], true);
+    expect(soClient.find).toHaveBeenCalledWith({
+      type: ['type_one', 'type_two'],
+      perPage: 0,
+      aggs: { types: { terms: { field: 'type', size: 2 } } },
     });
   });
 
@@ -80,39 +63,13 @@ describe('getSavedObjectsCounts', () => {
       { key: 'type-two', doc_count: 2 },
     ];
 
-    const esClient = mockGetSavedObjectsCounts({
-      hits: { total: { value: 13 } },
-      aggregations: { types: { buckets, sum_other_doc_count: 10 } },
-    });
-
-    const results = await getSavedObjectsCounts(esClient, '.kibana', [
-      'type_one',
-      'type-two',
-      'type-3',
-    ]);
-    expect(results).toStrictEqual({
+    soClient.find.mockResolvedValueOnce({
+      ...soEmptyResponse,
       total: 13,
-      per_type: [
-        { key: 'type_one', doc_count: 1 },
-        { key: 'type-two', doc_count: 2 },
-      ],
-      non_expected_types: [],
-      others: 10,
-    });
-  });
-
-  test('supports ES returning total as a number (just in case)', async () => {
-    const buckets = [
-      { key: 'type_one', doc_count: 1 },
-      { key: 'type-two', doc_count: 2 },
-    ];
-
-    const esClient = mockGetSavedObjectsCounts({
-      hits: { total: 13 },
       aggregations: { types: { buckets, sum_other_doc_count: 10 } },
     });
 
-    const results = await getSavedObjectsCounts(esClient, '.kibana', ['type_one', 'type-two']);
+    const results = await getSavedObjectsCounts(soClient, ['type_one', 'type-two', 'type-3']);
     expect(results).toStrictEqual({
       total: 13,
       per_type: [
@@ -132,12 +89,13 @@ describe('getSavedObjectsCounts', () => {
       { key: 'type-four', doc_count: 2 },
     ];
 
-    const esClient = mockGetSavedObjectsCounts({
-      hits: { total: { value: 13 } },
+    soClient.find.mockResolvedValueOnce({
+      ...soEmptyResponse,
+      total: 13,
       aggregations: { types: { buckets, sum_other_doc_count: 6 } },
     });
 
-    const results = await getSavedObjectsCounts(esClient, '.kibana', ['type_one', 'type-two']);
+    const results = await getSavedObjectsCounts(soClient, ['type_one', 'type-two']);
     expect(results).toStrictEqual({
       total: 13,
       per_type: [
diff --git a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/get_saved_object_counts/get_saved_object_counts.ts b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/get_saved_object_counts/get_saved_object_counts.ts
index 812933eeb3e69..cdca68e5d6006 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/get_saved_object_counts/get_saved_object_counts.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/get_saved_object_counts/get_saved_object_counts.ts
@@ -7,7 +7,7 @@
  */
 
 import { estypes } from '@elastic/elasticsearch';
-import { ElasticsearchClient } from '@kbn/core/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
 const MISSING_TYPE_KEY = 'missing_so_type';
 
@@ -39,40 +39,28 @@ export interface SavedObjectsCounts {
  * It also returns a break-down of the document count for all the built-in SOs in Kibana (or the types specified in `soTypes`).
  * Finally, it completes the information with an `others` counter, that indicates the number of documents that do not match the SO type breakdown.
  *
- * @param esClient The {@link ElasticsearchClient} to use when performing the aggregation.
- * @param kibanaIndex The index where SOs are stored. Typically '.kibana'.
+ * @param soClient The {@link SavedObjectsClientContract} to use when performing the aggregation.
  * @param soTypes The SO types we want to know about.
  * @param exclusive If `true`, the results will only contain the breakdown for the specified `soTypes`. Otherwise, it'll also return `missing` and `others` bucket.
  * @returns {@link SavedObjectsCounts}
  */
 export async function getSavedObjectsCounts(
-  esClient: ElasticsearchClient,
-  kibanaIndex: string, // Typically '.kibana'. We might need a way to obtain it from the SavedObjects client (or the SavedObjects client to provide a way to run aggregations?)
+  soClient: SavedObjectsClientContract,
   soTypes: string[],
   exclusive: boolean = false
 ): Promise<SavedObjectsCounts> {
-  const body = await esClient.search<void, { types: estypes.AggregationsStringTermsAggregate }>({
-    index: kibanaIndex,
-    ignore_unavailable: true,
-    filter_path: [
-      'aggregations.types.buckets',
-      'aggregations.types.sum_other_doc_count',
-      'hits.total',
-    ],
-    body: {
-      size: 0,
-      track_total_hits: true,
-      query: exclusive ? { terms: { type: soTypes } } : { match_all: {} },
-      aggs: {
-        types: {
-          terms: {
-            field: 'type',
-            // If `exclusive == true`, we only care about the strict length of the provided SO types.
-            // Otherwise, we want to account for the `missing` bucket (size and missing option).
-            ...(exclusive
-              ? { size: soTypes.length }
-              : { missing: MISSING_TYPE_KEY, size: soTypes.length + 1 }),
-          },
+  const body = await soClient.find<void, { types: estypes.AggregationsStringTermsAggregate }>({
+    type: soTypes,
+    perPage: 0,
+    aggs: {
+      types: {
+        terms: {
+          field: 'type',
+          // If `exclusive == true`, we only care about the strict length of the provided SO types.
+          // Otherwise, we want to account for the `missing` bucket (size and missing option).
+          ...(exclusive
+            ? { size: soTypes.length }
+            : { missing: MISSING_TYPE_KEY, size: soTypes.length + 1 }),
         },
       },
     },
@@ -93,7 +81,7 @@ export async function getSavedObjectsCounts(
   });
 
   return {
-    total: (typeof body.hits?.total === 'number' ? body.hits?.total : body.hits?.total?.value) ?? 0,
+    total: body.total,
     per_type: perType,
     non_expected_types: nonExpectedTypes,
     others: body.aggregations?.types?.sum_other_doc_count ?? 0,
diff --git a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/kibana_usage_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/kibana_usage_collector.test.ts
index 65003ff99c22a..cdf2ca35d6ecc 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/kibana_usage_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/kibana_usage_collector.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { loggingSystemMock, elasticsearchServiceMock } from '@kbn/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 import {
   Collector,
   createCollectorFetchContextMock,
@@ -52,7 +52,8 @@ describe('kibana_usage', () => {
 });
 
 describe('getKibanaSavedObjectCounts', () => {
-  const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser;
+  const fetchContextMock = createCollectorFetchContextMock();
+  const soClient = fetchContextMock.soClient;
 
   test('Get all the saved objects equal to 0 because no results were found', async () => {
     getSavedObjectsCountsMock.mockResolvedValueOnce({
@@ -61,7 +62,7 @@ describe('getKibanaSavedObjectCounts', () => {
       non_expected_types: [],
       others: 0,
     });
-    const results = await getKibanaSavedObjectCounts(esClient, '.kibana');
+    const results = await getKibanaSavedObjectCounts(soClient);
     expect(results).toStrictEqual({
       dashboard: { total: 0 },
       visualization: { total: 0 },
@@ -83,7 +84,7 @@ describe('getKibanaSavedObjectCounts', () => {
       others: 0,
     });
 
-    const results = await getKibanaSavedObjectCounts(esClient, '.kibana');
+    const results = await getKibanaSavedObjectCounts(soClient);
     expect(results).toStrictEqual({
       dashboard: { total: 1 },
       visualization: { total: 0 },
@@ -93,8 +94,7 @@ describe('getKibanaSavedObjectCounts', () => {
     });
 
     expect(getSavedObjectsCountsMock).toHaveBeenCalledWith(
-      esClient,
-      '.kibana',
+      soClient,
       ['dashboard', 'visualization', 'search', 'index-pattern', 'graph-workspace'],
       true
     );
diff --git a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/kibana_usage_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/kibana_usage_collector.ts
index dbff86fb23ad7..9a128888f05d5 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/kibana_usage_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/kibana_usage_collector.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import type { ElasticsearchClient } from '@kbn/core/server';
 import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { snakeCase } from 'lodash';
+import { SavedObjectsClientContract } from '@kbn/core/server';
 import { getSavedObjectsCounts } from './get_saved_object_counts';
 
 interface KibanaSavedObjectCounts {
@@ -26,10 +26,9 @@ interface KibanaUsage extends KibanaSavedObjectCounts {
 const TYPES = ['dashboard', 'visualization', 'search', 'index-pattern', 'graph-workspace'];
 
 export async function getKibanaSavedObjectCounts(
-  esClient: ElasticsearchClient,
-  kibanaIndex: string
+  soClient: SavedObjectsClientContract
 ): Promise<KibanaSavedObjectCounts> {
-  const { per_type: buckets } = await getSavedObjectsCounts(esClient, kibanaIndex, TYPES, true);
+  const { per_type: buckets } = await getSavedObjectsCounts(soClient, TYPES, true);
 
   const allZeros = Object.fromEntries(
     TYPES.map((type) => [snakeCase(type), { total: 0 }])
@@ -80,10 +79,10 @@ export function registerKibanaUsageCollector(
           },
         },
       },
-      async fetch({ esClient }) {
+      async fetch({ soClient }) {
         return {
           index: kibanaIndex,
-          ...(await getKibanaSavedObjectCounts(esClient, kibanaIndex)),
+          ...(await getKibanaSavedObjectCounts(soClient)),
         };
       },
     })
diff --git a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/saved_objects_count_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/saved_objects_count_collector.test.ts
index 25ac79f88e523..53168be3c34b6 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/saved_objects_count_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/saved_objects_count_collector.test.ts
@@ -17,10 +17,8 @@ describe('saved_objects_count_collector', () => {
   const usageCollectionMock = createUsageCollectionSetupMock();
   const fetchContextMock = createCollectorFetchContextMock();
 
-  const kibanaIndex = '.kibana-tests';
-
   beforeAll(() =>
-    registerSavedObjectsCountUsageCollector(usageCollectionMock, kibanaIndex, () =>
+    registerSavedObjectsCountUsageCollector(usageCollectionMock, () =>
       Promise.resolve(['type_one', 'type_two', 'type-three', 'type-four'])
     )
   );
@@ -81,8 +79,7 @@ describe('saved_objects_count_collector', () => {
     });
 
     expect(getSavedObjectsCountsMock).toHaveBeenCalledWith(
-      fetchContextMock.esClient,
-      kibanaIndex,
+      fetchContextMock.soClient,
       ['type_one', 'type_two', 'type-three', 'type-four'],
       false
     );
diff --git a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/saved_objects_count_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/saved_objects_count_collector.ts
index 376a036a0f24a..49bfb7819389d 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/saved_objects_count_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/saved_objects_counts/saved_objects_count_collector.ts
@@ -23,7 +23,6 @@ interface SavedObjectsCountUsage {
 
 export function registerSavedObjectsCountUsageCollector(
   usageCollection: UsageCollectionSetup,
-  kibanaIndex: string,
   getAllSavedObjectTypes: () => Promise<string[]>
 ) {
   usageCollection.registerCollector(
@@ -68,14 +67,14 @@ export function registerSavedObjectsCountUsageCollector(
           },
         },
       },
-      async fetch({ esClient }) {
+      async fetch({ soClient }) {
         const allRegisteredSOTypes = await getAllSavedObjectTypes();
         const {
           total,
           per_type: buckets,
           non_expected_types: nonRegisteredTypes,
           others,
-        } = await getSavedObjectsCounts(esClient, kibanaIndex, allRegisteredSOTypes, false);
+        } = await getSavedObjectsCounts(soClient, allRegisteredSOTypes, false);
         return {
           total,
           by_type: buckets.map(({ key: type, doc_count: count }) => ({ type, count })),
diff --git a/src/plugins/kibana_usage_collection/server/plugin.ts b/src/plugins/kibana_usage_collection/server/plugin.ts
index 784ab3ef4af62..8787d085c692e 100644
--- a/src/plugins/kibana_usage_collection/server/plugin.ts
+++ b/src/plugins/kibana_usage_collection/server/plugin.ts
@@ -148,7 +148,7 @@ export class KibanaUsageCollectionPlugin implements Plugin {
         .getAllTypes()
         .map(({ name }) => name);
     };
-    registerSavedObjectsCountUsageCollector(usageCollection, kibanaIndex, getAllSavedObjectTypes);
+    registerSavedObjectsCountUsageCollector(usageCollection, getAllSavedObjectTypes);
     registerManagementUsageCollector(usageCollection, getUiSettingsClient);
     registerUiMetricUsageCollector(usageCollection, registerType, getSavedObjectsClient);
     registerApplicationUsageCollector(
diff --git a/src/plugins/kibana_usage_collection/tsconfig.json b/src/plugins/kibana_usage_collection/tsconfig.json
index 271032000d510..d56cb860cd463 100644
--- a/src/plugins/kibana_usage_collection/tsconfig.json
+++ b/src/plugins/kibana_usage_collection/tsconfig.json
@@ -18,6 +18,7 @@
     "@kbn/logging",
     "@kbn/core-test-helpers-kbn-server",
     "@kbn/core-usage-data-server",
+    "@kbn/core-saved-objects-api-server",
   ],
   "exclude": [
     "target/**/*",

From 617debdf79a9af77164e89755f4d2defdd72fafa Mon Sep 17 00:00:00 2001
From: Sean Story <sean.j.story@gmail.com>
Date: Tue, 18 Apr 2023 03:42:26 -0500
Subject: [PATCH 004/100] Generate the sample doc differently for sourceField
 vs fieldMappings (#154980)

## Summary

Generates the sample document for testing your pipeline differently
depending on if you are working with `sourceField` and
`destinationField` vs if you're using a `FieldMapping[]`.

Before:
<img width="339" alt="Screenshot 2023-04-14 at 2 05 58 PM"
src="https://user-images.githubusercontent.com/5288246/232134387-d57f5368-c01d-4556-92af-9bfbe570db76.png">


After:
<img width="442" alt="Screenshot 2023-04-14 at 2 06 06 PM"
src="https://user-images.githubusercontent.com/5288246/232134403-0c759823-1fa0-4968-95fa-267f86157e42.png">



### Checklist


- [ ] [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))
- [ ] This was checked for [cross-browser
compatibility](https://www.elastic.co/support/matrix#matrix_browsers)



### 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)
---
 .../pipelines/ml_inference/test_pipeline.tsx  | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/test_pipeline.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/test_pipeline.tsx
index 2e7fbd51e9147..5d6332b7c0475 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/test_pipeline.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/test_pipeline.tsx
@@ -34,7 +34,7 @@ import './add_inference_pipeline_flyout.scss';
 export const TestPipeline: React.FC = () => {
   const {
     addInferencePipelineModal: {
-      configuration: { sourceField },
+      configuration: { sourceField, fieldMappings },
       indexName,
     },
     getDocumentsErr,
@@ -49,6 +49,12 @@ export const TestPipeline: React.FC = () => {
 
   const isSmallerViewport = useIsWithinMaxBreakpoint('s');
   const inputRef = useRef<HTMLInputElement>();
+  const sampleFieldValue = i18n.translate(
+    'xpack.enterpriseSearch.content.indices.pipelines.addInferencePipelineModal.steps.test.sampleValue',
+    {
+      defaultMessage: 'REPLACE ME',
+    }
+  );
 
   return (
     <>
@@ -152,7 +158,22 @@ export const TestPipeline: React.FC = () => {
                   </p>
                 </EuiText>
                 <EuiCodeBlock fontSize="m" isCopyable language="json" paddingSize="m">
-                  {`[{"_index":"index","_id":"id","_source":{"${sourceField}":"bar"}}]`}
+                  {JSON.stringify(
+                    JSON.parse(
+                      `[{"_index":"index", "_id":"id", "_source":{${
+                        fieldMappings
+                          ? fieldMappings
+                              .map(
+                                (fieldMapping) =>
+                                  `"${fieldMapping.sourceField}": "${sampleFieldValue}"`
+                              )
+                              .join(', ')
+                          : `"${sourceField}":"${sampleFieldValue}"`
+                      }}}]`
+                    ),
+                    null,
+                    2
+                  )}
                 </EuiCodeBlock>
               </EuiFlexItem>
             </EuiFlexGroup>

From c75863385d374b2716972f67e60f67256c899bf8 Mon Sep 17 00:00:00 2001
From: Coen Warmer <coen.warmer@gmail.com>
Date: Tue, 18 Apr 2023 11:03:44 +0200
Subject: [PATCH 005/100] Use Observability Page Template from Observability
 Shared in APM and Profiling (#154776)

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
---
 x-pack/packages/ml/agg_utils/tsconfig.json                | 2 +-
 x-pack/plugins/apm/kibana.jsonc                           | 6 ++----
 x-pack/plugins/apm/public/application/index.tsx           | 1 +
 .../apm/public/components/routing/apm_error_boundary.tsx  | 4 ++--
 .../components/routing/templates/apm_main_template.tsx    | 6 +++---
 .../routing/templates/settings_template.stories.tsx       | 2 +-
 .../public/context/apm_plugin/mock_apm_plugin_context.tsx | 1 +
 x-pack/plugins/apm/public/plugin.ts                       | 8 +++++++-
 x-pack/plugins/apm/tsconfig.json                          | 1 +
 x-pack/plugins/profiling/kibana.jsonc                     | 6 ++----
 x-pack/plugins/profiling/public/plugin.tsx                | 2 +-
 x-pack/plugins/profiling/public/types.ts                  | 2 ++
 x-pack/plugins/profiling/tsconfig.json                    | 1 +
 13 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/x-pack/packages/ml/agg_utils/tsconfig.json b/x-pack/packages/ml/agg_utils/tsconfig.json
index 53328adab80f2..fc8993c828529 100644
--- a/x-pack/packages/ml/agg_utils/tsconfig.json
+++ b/x-pack/packages/ml/agg_utils/tsconfig.json
@@ -17,7 +17,7 @@
     "@kbn/ml-is-populated-object",
     "@kbn/ml-string-hash",
     "@kbn/data-views-plugin",
-    "@kbn/ml-random-sampler-utils"
+    "@kbn/ml-random-sampler-utils",
   ],
   "exclude": [
     "target/**/*",
diff --git a/x-pack/plugins/apm/kibana.jsonc b/x-pack/plugins/apm/kibana.jsonc
index 02ca85e30f0ad..f8038cad8fff7 100644
--- a/x-pack/plugins/apm/kibana.jsonc
+++ b/x-pack/plugins/apm/kibana.jsonc
@@ -7,10 +7,7 @@
     "id": "apm",
     "server": true,
     "browser": true,
-    "configPath": [
-      "xpack",
-      "apm"
-    ],
+    "configPath": ["xpack", "apm"],
     "requiredPlugins": [
       "data",
       "embeddable",
@@ -19,6 +16,7 @@
       "inspector",
       "licensing",
       "observability",
+      "observabilityShared",
       "exploratoryView",
       "ruleRegistry",
       "triggersActionsUi",
diff --git a/x-pack/plugins/apm/public/application/index.tsx b/x-pack/plugins/apm/public/application/index.tsx
index 5711b5a1f41c8..9bad342c7669e 100644
--- a/x-pack/plugins/apm/public/application/index.tsx
+++ b/x-pack/plugins/apm/public/application/index.tsx
@@ -49,6 +49,7 @@ export const renderApp = ({
     data: pluginsStart.data,
     inspector: pluginsStart.inspector,
     observability: pluginsStart.observability,
+    observabilityShared: pluginsStart.observabilityShared,
     observabilityRuleTypeRegistry,
     dataViews: pluginsStart.dataViews,
     unifiedSearch: pluginsStart.unifiedSearch,
diff --git a/x-pack/plugins/apm/public/components/routing/apm_error_boundary.tsx b/x-pack/plugins/apm/public/components/routing/apm_error_boundary.tsx
index 26b641a25896d..3b7849ddacf30 100644
--- a/x-pack/plugins/apm/public/components/routing/apm_error_boundary.tsx
+++ b/x-pack/plugins/apm/public/components/routing/apm_error_boundary.tsx
@@ -45,9 +45,9 @@ const pageHeader = {
 
 function ErrorWithTemplate({ error }: { error: Error }) {
   const { services } = useKibana<ApmPluginStartDeps>();
-  const { observability } = services;
+  const { observabilityShared } = services;
 
-  const ObservabilityPageTemplate = observability.navigation.PageTemplate;
+  const ObservabilityPageTemplate = observabilityShared.navigation.PageTemplate;
 
   if (error instanceof NotFoundRouteException) {
     return (
diff --git a/x-pack/plugins/apm/public/components/routing/templates/apm_main_template.tsx b/x-pack/plugins/apm/public/components/routing/templates/apm_main_template.tsx
index c4bcc4e5fc612..5704fd18058bd 100644
--- a/x-pack/plugins/apm/public/components/routing/templates/apm_main_template.tsx
+++ b/x-pack/plugins/apm/public/components/routing/templates/apm_main_template.tsx
@@ -7,7 +7,7 @@
 
 import { EuiPageHeaderProps } from '@elastic/eui';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
-import { ObservabilityPageTemplateProps } from '@kbn/observability-plugin/public/components/shared/page_template/page_template';
+import { ObservabilityPageTemplateProps } from '@kbn/observability-shared-plugin/public';
 import type { KibanaPageTemplateProps } from '@kbn/shared-ux-page-kibana-template';
 import React from 'react';
 import { useLocation } from 'react-router-dom';
@@ -54,10 +54,10 @@ export function ApmMainTemplate({
   const location = useLocation();
 
   const { services } = useKibana<ApmPluginStartDeps>();
-  const { http, docLinks, observability, application } = services;
+  const { http, docLinks, observabilityShared, application } = services;
   const basePath = http?.basePath.get();
 
-  const ObservabilityPageTemplate = observability.navigation.PageTemplate;
+  const ObservabilityPageTemplate = observabilityShared.navigation.PageTemplate;
 
   const { data, status } = useFetcher((callApmApi) => {
     return callApmApi('GET /internal/apm/has_data');
diff --git a/x-pack/plugins/apm/public/components/routing/templates/settings_template.stories.tsx b/x-pack/plugins/apm/public/components/routing/templates/settings_template.stories.tsx
index ec3188f4ff197..b214a79b7a1f8 100644
--- a/x-pack/plugins/apm/public/components/routing/templates/settings_template.stories.tsx
+++ b/x-pack/plugins/apm/public/components/routing/templates/settings_template.stories.tsx
@@ -16,7 +16,7 @@ import { SettingsTemplate } from './settings_template';
 type Args = ComponentProps<typeof SettingsTemplate>;
 
 const coreMock = {
-  observability: {
+  observabilityShared: {
     navigation: {
       PageTemplate: () => {
         return <>hello world</>;
diff --git a/x-pack/plugins/apm/public/context/apm_plugin/mock_apm_plugin_context.tsx b/x-pack/plugins/apm/public/context/apm_plugin/mock_apm_plugin_context.tsx
index ffca2a1b3cc4a..6924277f229c0 100644
--- a/x-pack/plugins/apm/public/context/apm_plugin/mock_apm_plugin_context.tsx
+++ b/x-pack/plugins/apm/public/context/apm_plugin/mock_apm_plugin_context.tsx
@@ -94,6 +94,7 @@ const mockCorePlugins = {
   inspector: {},
   maps: {},
   observability: {},
+  observabilityShared: {},
   data: {},
 };
 
diff --git a/x-pack/plugins/apm/public/plugin.ts b/x-pack/plugins/apm/public/plugin.ts
index ba7b455c05bb6..ac1d7294a27be 100644
--- a/x-pack/plugins/apm/public/plugin.ts
+++ b/x-pack/plugins/apm/public/plugin.ts
@@ -38,6 +38,10 @@ import type { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
 import type { MapsStartApi } from '@kbn/maps-plugin/public';
 import type { MlPluginSetup, MlPluginStart } from '@kbn/ml-plugin/public';
 import type { SharePluginSetup } from '@kbn/share-plugin/public';
+import type {
+  ObservabilitySharedPluginSetup,
+  ObservabilitySharedPluginStart,
+} from '@kbn/observability-shared-plugin/public';
 import {
   FetchDataParams,
   METRIC_TYPE,
@@ -80,6 +84,7 @@ export interface ApmPluginSetupDeps {
   licensing: LicensingPluginSetup;
   ml?: MlPluginSetup;
   observability: ObservabilityPublicSetup;
+  observabilityShared: ObservabilitySharedPluginSetup;
   triggersActionsUi: TriggersAndActionsUIPublicPluginSetup;
   share: SharePluginSetup;
 }
@@ -96,6 +101,7 @@ export interface ApmPluginStartDeps {
   ml?: MlPluginStart;
   triggersActionsUi: TriggersAndActionsUIPublicPluginStart;
   observability: ObservabilityPublicStart;
+  observabilityShared: ObservabilitySharedPluginStart;
   fleet?: FleetStart;
   fieldFormats?: FieldFormatsStart;
   security?: SecurityPluginStart;
@@ -162,7 +168,7 @@ export class ApmPlugin implements Plugin<ApmPluginSetup, ApmPluginStart> {
     }
 
     // register observability nav if user has access to plugin
-    plugins.observability.navigation.registerSections(
+    plugins.observabilityShared.navigation.registerSections(
       from(core.getStartServices()).pipe(
         map(([coreStart, pluginsStart]) => {
           if (coreStart.application.capabilities.apm.show) {
diff --git a/x-pack/plugins/apm/tsconfig.json b/x-pack/plugins/apm/tsconfig.json
index 5419244c7cb15..e049bed128afa 100644
--- a/x-pack/plugins/apm/tsconfig.json
+++ b/x-pack/plugins/apm/tsconfig.json
@@ -83,6 +83,7 @@
     "@kbn/alerts-as-data-utils",
     "@kbn/exploratory-view-plugin",
     "@kbn/logging-mocks",
+    "@kbn/observability-shared-plugin",
   ],
   "exclude": [
     "target/**/*",
diff --git a/x-pack/plugins/profiling/kibana.jsonc b/x-pack/plugins/profiling/kibana.jsonc
index a1290cc79b499..bf7f17fb5e5ec 100644
--- a/x-pack/plugins/profiling/kibana.jsonc
+++ b/x-pack/plugins/profiling/kibana.jsonc
@@ -6,16 +6,14 @@
     "id": "profiling",
     "server": true,
     "browser": true,
-    "configPath": [
-      "xpack",
-      "profiling"
-    ],
+    "configPath": ["xpack", "profiling"],
     "requiredPlugins": [
       "navigation",
       "data",
       "kibanaUtils",
       "share",
       "observability",
+      "observabilityShared",
       "features",
       "kibanaReact",
       "unifiedSearch",
diff --git a/x-pack/plugins/profiling/public/plugin.tsx b/x-pack/plugins/profiling/public/plugin.tsx
index ae3030b528efb..4d700d1b028fb 100644
--- a/x-pack/plugins/profiling/public/plugin.tsx
+++ b/x-pack/plugins/profiling/public/plugin.tsx
@@ -77,7 +77,7 @@ export class ProfilingPlugin implements Plugin {
       })
     );
 
-    pluginsSetup.observability.navigation.registerSections(section$);
+    pluginsSetup.observabilityShared.navigation.registerSections(section$);
 
     coreSetup.application.register({
       id: 'profiling',
diff --git a/x-pack/plugins/profiling/public/types.ts b/x-pack/plugins/profiling/public/types.ts
index 42563dd3258fb..da0bc65f02d34 100644
--- a/x-pack/plugins/profiling/public/types.ts
+++ b/x-pack/plugins/profiling/public/types.ts
@@ -13,11 +13,13 @@ import type {
   ObservabilityPublicSetup,
   ObservabilityPublicStart,
 } from '@kbn/observability-plugin/public';
+import { ObservabilitySharedPluginSetup } from '@kbn/observability-shared-plugin/public/plugin';
 import { ChartsPluginSetup, ChartsPluginStart } from '@kbn/charts-plugin/public';
 import { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
 
 export interface ProfilingPluginPublicSetupDeps {
   observability: ObservabilityPublicSetup;
+  observabilityShared: ObservabilitySharedPluginSetup;
   dataViews: DataViewsPublicPluginSetup;
   data: DataPublicPluginSetup;
   charts: ChartsPluginSetup;
diff --git a/x-pack/plugins/profiling/tsconfig.json b/x-pack/plugins/profiling/tsconfig.json
index 4002050ee8e79..effbfc83a3716 100644
--- a/x-pack/plugins/profiling/tsconfig.json
+++ b/x-pack/plugins/profiling/tsconfig.json
@@ -44,6 +44,7 @@
     "@kbn/i18n-react",
     "@kbn/ml-plugin",
     "@kbn/share-plugin",
+    "@kbn/observability-shared-plugin",
     "@kbn/licensing-plugin",
     // add references to other TypeScript projects the plugin depends on
 

From 9d096c5623066fbd8464d61cd745fbea8a1692bf Mon Sep 17 00:00:00 2001
From: Marco Liberati <dej611@users.noreply.github.com>
Date: Tue, 18 Apr 2023 11:31:21 +0200
Subject: [PATCH 006/100] [Lens] Improve reporting size for Lens visualizations
 (#154931)

## Summary

Fix #154894

This PR "rotate" most of Lens visualizations to have a landscape version
of the PNG/PDF exports.

### 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)
---
 .../plugins/lens/public/app_plugin/lens_top_nav.tsx  | 12 +++++++++++-
 .../plugins/lens/public/app_plugin/share_action.ts   |  8 ++++++++
 x-pack/plugins/lens/public/types.ts                  |  4 ++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx b/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx
index 2678b5a0368fb..50d70bb58ae75 100644
--- a/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx
@@ -37,7 +37,7 @@ import {
 import { combineQueryAndFilters, getLayerMetaInfo } from './show_underlying_data';
 import { changeIndexPattern } from '../state_management/lens_slice';
 import { LensByReferenceInput } from '../embeddable';
-import { getShareURL } from './share_action';
+import { DEFAULT_LENS_LAYOUT_DIMENSIONS, getShareURL } from './share_action';
 
 function getSaveButtonMeta({
   contextFromEmbeddable,
@@ -578,6 +578,10 @@ export const LensTopNavMenu = ({
               return;
             }
 
+            if (visualization.activeId == null || !visualizationMap[visualization.activeId]) {
+              return;
+            }
+
             const {
               shareableUrl,
               savedObjectURL,
@@ -608,6 +612,12 @@ export const LensTopNavMenu = ({
                 id: LENS_APP_LOCATOR,
                 params: locatorParams,
               },
+              layout: {
+                dimensions:
+                  visualizationMap[visualization.activeId].getReportingLayout?.(
+                    visualization.state
+                  ) ?? DEFAULT_LENS_LAYOUT_DIMENSIONS,
+              },
             };
 
             share.toggleShareContextMenu({
diff --git a/x-pack/plugins/lens/public/app_plugin/share_action.ts b/x-pack/plugins/lens/public/app_plugin/share_action.ts
index 55e4b978f015d..c9ec3a11ef5e7 100644
--- a/x-pack/plugins/lens/public/app_plugin/share_action.ts
+++ b/x-pack/plugins/lens/public/app_plugin/share_action.ts
@@ -27,6 +27,14 @@ interface ShareableConfiguration
   adHocDataViews?: DataViewSpec[];
 }
 
+// This approximate Lens workspace dimensions ratio on a typical widescreen
+export const DEFAULT_LENS_LAYOUT_DIMENSIONS = {
+  width: 1793,
+  // this is a magic number from the reporting tool implementation
+  // see: x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.ts#L146
+  height: 1086,
+};
+
 function getShareURLForSavedObject(
   { application, data }: Pick<LensAppServices, 'application' | 'data'>,
   currentDoc: Document | undefined
diff --git a/x-pack/plugins/lens/public/types.ts b/x-pack/plugins/lens/public/types.ts
index 786d75816cafa..786fc50450a94 100644
--- a/x-pack/plugins/lens/public/types.ts
+++ b/x-pack/plugins/lens/public/types.ts
@@ -1292,6 +1292,10 @@ export interface Visualization<T = unknown, P = T> {
   ) => Suggestion<T> | undefined;
 
   getVisualizationInfo?: (state: T) => VisualizationInfo;
+  /**
+   * A visualization can return custom dimensions for the reporting tool
+   */
+  getReportingLayout?: (state: T) => { height: number; width: number };
 }
 
 // Use same technique as TriggerContext

From 779e553f811477a9454783ab14e3596bfa508431 Mon Sep 17 00:00:00 2001
From: Marco Liberati <dej611@users.noreply.github.com>
Date: Tue, 18 Apr 2023 11:31:37 +0200
Subject: [PATCH 007/100] [Lens] Improve Ignore global filters UI (#154441)

## Summary

Fixes #154316

This PR revisits partially the Layer Settings UI in order to support the
`Data` and `Appereance` split in the UI and enhance the `ignore global
filters` UI to make it clearer for the user the state of this setting.

<img width="353" alt="Screenshot 2023-04-05 at 11 57 55"
src="https://user-images.githubusercontent.com/924948/230057975-37f92e6f-c70c-4509-a351-6eb932889d0c.png">

when the setting is disabled (to use global filters) then nothing is
shown:
<img width="336" alt="Screenshot 2023-04-05 at 11 59 18"
src="https://user-images.githubusercontent.com/924948/230058311-6f8f6dab-7a2f-42f1-b899-de371ed9f0b0.png">

On Annotations layer that is the only available setting:

<img width="374" alt="Screenshot 2023-04-05 at 11 58 03"
src="https://user-images.githubusercontent.com/924948/230058004-016e99b0-0786-46fa-aaed-a0c42ebc18b6.png">

The new refactoring can now handle multiple settings for each panel
section as shown in the Partition charts settings panel:

<img width="375" alt="Screenshot 2023-04-05 at 12 20 35"
src="https://user-images.githubusercontent.com/924948/230058207-fe2c7d64-e25b-43a3-a612-b63aa46e35c6.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)

---------

Co-authored-by: Stratoula Kalafateli <efstratia.kalafateli@elastic.co>
---
 .../datasources/form_based/form_based.tsx     |   6 +-
 .../datasources/form_based/layer_settings.tsx | 161 ++++++++----------
 .../datasources/form_based/layerpanel.tsx     |  25 ++-
 .../form_based}/sampling_icon.tsx             |   0
 .../editor_frame/config_panel/layer_panel.tsx |  62 ++++++-
 .../dataview_picker/dataview_picker.tsx       | 103 +----------
 .../dataview_picker/trigger.tsx               | 101 +++++++++++
 x-pack/plugins/lens/public/types.ts           |   4 +-
 .../partition/layer_settings.test.tsx         |   9 +-
 .../partition/layer_settings.tsx              |  59 ++++---
 .../partition/visualization.test.ts           |  21 ++-
 .../partition/visualization.tsx               |   2 +-
 .../visualizations/xy/annotations/actions.ts  |  35 +---
 .../visualizations/xy/layer_settings.tsx      |  53 ++++++
 .../visualizations/xy/visualization.test.ts   |  98 ++++++-----
 .../visualizations/xy/visualization.tsx       |  47 +++--
 .../xy/xy_config_panel/layer_header.tsx       |  31 +++-
 .../translations/translations/fr-FR.json      |   4 -
 .../translations/translations/ja-JP.json      |   4 -
 .../translations/translations/zh-CN.json      |   4 -
 .../apps/lens/group1/layer_actions.ts         |  14 +-
 21 files changed, 488 insertions(+), 355 deletions(-)
 rename x-pack/plugins/lens/public/{shared_components/dataview_picker => datasources/form_based}/sampling_icon.tsx (100%)
 create mode 100644 x-pack/plugins/lens/public/shared_components/dataview_picker/trigger.tsx
 create mode 100644 x-pack/plugins/lens/public/visualizations/xy/layer_settings.tsx

diff --git a/x-pack/plugins/lens/public/datasources/form_based/form_based.tsx b/x-pack/plugins/lens/public/datasources/form_based/form_based.tsx
index 4152212e51fea..dbe6fcafd0ed0 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/form_based.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/form_based.tsx
@@ -37,7 +37,6 @@ import type {
   IndexPatternField,
   IndexPattern,
   IndexPatternRef,
-  DatasourceLayerSettingsProps,
   DataSourceInfo,
   UserMessage,
   FrameDatasourceAPI,
@@ -429,10 +428,7 @@ export function getFormBasedDatasource({
     toExpression: (state, layerId, indexPatterns, dateRange, searchSessionId) =>
       toExpression(state, layerId, indexPatterns, uiSettings, dateRange, searchSessionId),
 
-    renderLayerSettings(
-      domElement: Element,
-      props: DatasourceLayerSettingsProps<FormBasedPrivateState>
-    ) {
+    renderLayerSettings(domElement, props) {
       render(
         <KibanaThemeProvider theme$={core.theme.theme$}>
           <I18nProvider>
diff --git a/x-pack/plugins/lens/public/datasources/form_based/layer_settings.tsx b/x-pack/plugins/lens/public/datasources/form_based/layer_settings.tsx
index 38da5475e22e1..c79bc41dd7dd7 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/layer_settings.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/layer_settings.tsx
@@ -109,101 +109,86 @@ export function LayerSettingsPanel({
   setState,
   layerId,
 }: DatasourceLayerSettingsProps<FormBasedPrivateState>) {
-  const { euiTheme } = useEuiTheme();
   const isSamplingValueDisabled = !isSamplingValueEnabled(state.layers[layerId]);
   const currentValue = isSamplingValueDisabled
     ? samplingValues[samplingValues.length - 1]
     : state.layers[layerId].sampling;
   return (
-    <div id={layerId}>
-      <EuiText
-        size="s"
-        css={css`
-          margin-bottom: ${euiTheme.size.base};
-        `}
-      >
-        <h4>
-          {i18n.translate('xpack.lens.indexPattern.layerSettings.headingData', {
-            defaultMessage: 'Data',
-          })}
-        </h4>
-      </EuiText>
-      <EuiFormRow
-        display="rowCompressed"
-        data-test-subj="lns-indexPattern-random-sampling-row"
-        fullWidth
-        helpText={
-          <>
-            <EuiSpacer size="s" />
-            <p>
-              <FormattedMessage
-                id="xpack.lens.indexPattern.randomSampling.help"
-                defaultMessage="Lower sampling percentages increases the performance, but lowers the accuracy. Lower sampling percentages are best for large datasets. {link}"
-                values={{
-                  link: (
-                    <EuiLink
-                      href="https://www.elastic.co/guide/en/elasticsearch/reference/master/search-aggregations-random-sampler-aggregation.html"
-                      target="_blank"
-                      external
-                    >
-                      <FormattedMessage
-                        id="xpack.lens.indexPattern.randomSampling.learnMore"
-                        defaultMessage="View documentation"
-                      />
-                    </EuiLink>
-                  ),
-                }}
-              />
-            </p>
-          </>
-        }
-        label={
-          <>
-            {i18n.translate('xpack.lens.indexPattern.randomSampling.label', {
-              defaultMessage: 'Sampling',
-            })}{' '}
-            <EuiToolTip
-              content={i18n.translate('xpack.lens.indexPattern.randomSampling.experimentalLabel', {
+    <EuiFormRow
+      display="rowCompressed"
+      data-test-subj="lns-indexPattern-random-sampling-row"
+      fullWidth
+      helpText={
+        <>
+          <EuiSpacer size="s" />
+          <p>
+            <FormattedMessage
+              id="xpack.lens.indexPattern.randomSampling.help"
+              defaultMessage="Lower sampling percentages increases the performance, but lowers the accuracy. Lower sampling percentages are best for large datasets. {link}"
+              values={{
+                link: (
+                  <EuiLink
+                    href="https://www.elastic.co/guide/en/elasticsearch/reference/master/search-aggregations-random-sampler-aggregation.html"
+                    target="_blank"
+                    external
+                  >
+                    <FormattedMessage
+                      id="xpack.lens.indexPattern.randomSampling.learnMore"
+                      defaultMessage="View documentation"
+                    />
+                  </EuiLink>
+                ),
+              }}
+            />
+          </p>
+        </>
+      }
+      label={
+        <>
+          {i18n.translate('xpack.lens.indexPattern.randomSampling.label', {
+            defaultMessage: 'Sampling',
+          })}{' '}
+          <EuiToolTip
+            content={i18n.translate('xpack.lens.indexPattern.randomSampling.experimentalLabel', {
+              defaultMessage: 'Technical preview',
+            })}
+          >
+            <EuiBetaBadge
+              css={css`
+                vertical-align: middle;
+              `}
+              iconType="beaker"
+              label={i18n.translate('xpack.lens.indexPattern.randomSampling.experimentalLabel', {
                 defaultMessage: 'Technical preview',
               })}
-            >
-              <EuiBetaBadge
-                css={css`
-                  vertical-align: middle;
-                `}
-                iconType="beaker"
-                label={i18n.translate('xpack.lens.indexPattern.randomSampling.experimentalLabel', {
-                  defaultMessage: 'Technical preview',
-                })}
-                size="s"
-              />
-            </EuiToolTip>
-          </>
-        }
-      >
-        <SamplingSlider
-          disabled={isSamplingValueDisabled}
-          disabledReason={i18n.translate('xpack.lens.indexPattern.randomSampling.disabledMessage', {
-            defaultMessage:
-              'In order to select a reduced sampling percentage, you must remove any maximum or minimum functions applied on this layer.',
-          })}
-          values={samplingValues}
-          currentValue={currentValue}
-          data-test-subj="lns-indexPattern-random-sampling-slider"
-          onChange={(newSamplingValue) => {
-            setState({
-              ...state,
-              layers: {
-                ...state.layers,
-                [layerId]: {
-                  ...state.layers[layerId],
-                  sampling: newSamplingValue,
-                },
+              size="s"
+            />
+          </EuiToolTip>
+        </>
+      }
+    >
+      <SamplingSlider
+        disabled={isSamplingValueDisabled}
+        disabledReason={i18n.translate('xpack.lens.indexPattern.randomSampling.disabledMessage', {
+          defaultMessage:
+            'In order to select a reduced sampling percentage, you must remove any maximum or minimum functions applied on this layer.',
+        })}
+        values={samplingValues}
+        currentValue={currentValue}
+        data-test-subj="lns-indexPattern-random-sampling-slider"
+        onChange={(newSamplingValue) => {
+          setState({
+            ...state,
+            layers: {
+              ...state.layers,
+              [layerId]: {
+                ...state.layers[layerId],
+                sampling: newSamplingValue,
               },
-            });
-          }}
-        />
-      </EuiFormRow>
-    </div>
+            },
+          });
+        }}
+      />
+    </EuiFormRow>
   );
 }
diff --git a/x-pack/plugins/lens/public/datasources/form_based/layerpanel.tsx b/x-pack/plugins/lens/public/datasources/form_based/layerpanel.tsx
index 1de4d0844245f..5832f8094a856 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/layerpanel.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/layerpanel.tsx
@@ -8,10 +8,12 @@
 import React from 'react';
 import { I18nProvider } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
+import { useEuiTheme } from '@elastic/eui';
 import { DatasourceLayerPanelProps } from '../../types';
 import { FormBasedPrivateState } from './types';
 import { ChangeIndexPattern } from '../../shared_components/dataview_picker/dataview_picker';
 import { getSamplingValue } from './utils';
+import { RandomSamplingIcon } from './sampling_icon';
 
 export interface FormBasedLayerPanelProps extends DatasourceLayerPanelProps<FormBasedPrivateState> {
   state: FormBasedPrivateState;
@@ -25,6 +27,7 @@ export function LayerPanel({
   dataViews,
 }: FormBasedLayerPanelProps) {
   const layer = state.layers[layerId];
+  const { euiTheme } = useEuiTheme();
 
   const indexPattern = dataViews.indexPatterns[layer.indexPatternId];
   const notFoundTitleLabel = i18n.translate('xpack.lens.layerPanel.missingDataView', {
@@ -38,6 +41,26 @@ export function LayerPanel({
     };
   });
 
+  const samplingValue = getSamplingValue(layer);
+  const extraIconLabelProps =
+    samplingValue !== 1
+      ? {
+          icon: {
+            component: (
+              <RandomSamplingIcon color={euiTheme.colors.disabledText} fill="currentColor" />
+            ),
+            value: `${samplingValue * 100}%`,
+            tooltipValue: i18n.translate('xpack.lens.indexPattern.randomSamplingInfo', {
+              defaultMessage: '{value}% sampling',
+              values: {
+                value: samplingValue * 100,
+              },
+            }),
+            'data-test-subj': 'lnsChangeIndexPatternSamplingInfo',
+          },
+        }
+      : {};
+
   return (
     <I18nProvider>
       <ChangeIndexPattern
@@ -48,7 +71,7 @@ export function LayerPanel({
           'data-test-subj': 'lns_layerIndexPatternLabel',
           size: 's',
           fontWeight: 'normal',
-          samplingValue: getSamplingValue(layer),
+          ...extraIconLabelProps,
         }}
         indexPatternId={layer.indexPatternId}
         indexPatternRefs={indexPatternRefs}
diff --git a/x-pack/plugins/lens/public/shared_components/dataview_picker/sampling_icon.tsx b/x-pack/plugins/lens/public/datasources/form_based/sampling_icon.tsx
similarity index 100%
rename from x-pack/plugins/lens/public/shared_components/dataview_picker/sampling_icon.tsx
rename to x-pack/plugins/lens/public/datasources/form_based/sampling_icon.tsx
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx
index 17df0a527c145..f8b17d330b5e5 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx
@@ -318,6 +318,16 @@ export function LayerPanel(
   const [datasource] = Object.values(framePublicAPI.datasourceLayers);
   const isTextBasedLanguage = Boolean(datasource?.isTextBasedLanguage());
 
+  const visualizationLayerSettings = useMemo(
+    () =>
+      activeVisualization.hasLayerSettings?.({
+        layerId,
+        state: visualizationState,
+        frame: props.framePublicAPI,
+      }) || { data: false, appearance: false },
+    [activeVisualization, layerId, props.framePublicAPI, visualizationState]
+  );
+
   const compatibleActions = useMemo<LayerAction[]>(
     () =>
       [
@@ -341,11 +351,7 @@ export function LayerPanel(
           isOnlyLayer,
           isTextBasedLanguage,
           hasLayerSettings: Boolean(
-            (activeVisualization.hasLayerSettings?.({
-              layerId,
-              state: visualizationState,
-              frame: props.framePublicAPI,
-            }) &&
+            (Object.values(visualizationLayerSettings).some(Boolean) &&
               activeVisualization.renderLayerSettings) ||
               layerDatasource?.renderLayerSettings
           ),
@@ -364,8 +370,8 @@ export function LayerPanel(
       layerIndex,
       onCloneLayer,
       onRemoveLayer,
-      props.framePublicAPI,
       updateVisualization,
+      visualizationLayerSettings,
       visualizationState,
     ]
   );
@@ -682,15 +688,56 @@ export function LayerPanel(
         >
           <div id={layerId}>
             <div className="lnsIndexPatternDimensionEditor--padded">
+              {layerDatasource?.renderLayerSettings || visualizationLayerSettings.data ? (
+                <EuiText
+                  size="s"
+                  css={css`
+                    margin-bottom: ${euiThemeVars.euiSize};
+                  `}
+                >
+                  <h4>
+                    {i18n.translate('xpack.lens.editorFrame.layerSettings.headingData', {
+                      defaultMessage: 'Data',
+                    })}
+                  </h4>
+                </EuiText>
+              ) : null}
               {layerDatasource?.renderLayerSettings && (
                 <>
                   <NativeRenderer
                     render={layerDatasource.renderLayerSettings}
                     nativeProps={layerDatasourceConfigProps}
                   />
-                  <EuiSpacer size="m" />
                 </>
               )}
+              {layerDatasource?.renderLayerSettings && visualizationLayerSettings.data ? (
+                <EuiSpacer size="m" />
+              ) : null}
+              {activeVisualization?.renderLayerSettings && visualizationLayerSettings.data ? (
+                <NativeRenderer
+                  render={activeVisualization?.renderLayerSettings}
+                  nativeProps={{
+                    ...layerVisualizationConfigProps,
+                    setState: props.updateVisualization,
+                    panelRef: settingsPanelRef,
+                    section: 'data',
+                  }}
+                />
+              ) : null}
+              {visualizationLayerSettings.appearance ? (
+                <EuiText
+                  size="s"
+                  css={css`
+                    margin-bottom: ${euiThemeVars.euiSize};
+                  `}
+                >
+                  <h4>
+                    {i18n.translate('xpack.lens.editorFrame.layerSettings.headingAppearance', {
+                      defaultMessage: 'Appearance',
+                    })}
+                  </h4>
+                </EuiText>
+              ) : null}
               {activeVisualization?.renderLayerSettings && (
                 <NativeRenderer
                   render={activeVisualization?.renderLayerSettings}
@@ -698,6 +745,7 @@ export function LayerPanel(
                     ...layerVisualizationConfigProps,
                     setState: props.updateVisualization,
                     panelRef: settingsPanelRef,
+                    section: 'appearance',
                   }}
                 />
               )}
diff --git a/x-pack/plugins/lens/public/shared_components/dataview_picker/dataview_picker.tsx b/x-pack/plugins/lens/public/shared_components/dataview_picker/dataview_picker.tsx
index 6467cbcb58494..9d55284cc36c8 100644
--- a/x-pack/plugins/lens/public/shared_components/dataview_picker/dataview_picker.tsx
+++ b/x-pack/plugins/lens/public/shared_components/dataview_picker/dataview_picker.tsx
@@ -7,109 +7,10 @@
 
 import { i18n } from '@kbn/i18n';
 import React, { useState } from 'react';
-import {
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiPopover,
-  EuiPopoverTitle,
-  EuiSelectableProps,
-  EuiTextColor,
-  EuiToolTip,
-  useEuiTheme,
-} from '@elastic/eui';
+import { EuiPopover, EuiPopoverTitle, EuiSelectableProps } from '@elastic/eui';
 import { DataViewsList } from '@kbn/unified-search-plugin/public';
-import { css } from '@emotion/react';
 import { type IndexPatternRef } from '../../types';
-import { type ToolbarButtonProps, ToolbarButton } from './toolbar_button';
-import { RandomSamplingIcon } from './sampling_icon';
-
-export type ChangeIndexPatternTriggerProps = ToolbarButtonProps & {
-  label: string;
-  title?: string;
-  isDisabled?: boolean;
-  samplingValue?: number;
-};
-
-function TriggerButton({
-  label,
-  title,
-  togglePopover,
-  isMissingCurrent,
-  samplingValue,
-  ...rest
-}: ChangeIndexPatternTriggerProps &
-  ToolbarButtonProps & {
-    togglePopover: () => void;
-    isMissingCurrent?: boolean;
-  }) {
-  const { euiTheme } = useEuiTheme();
-  // be careful to only add color with a value, otherwise it will fallbacks to "primary"
-  const colorProp = isMissingCurrent
-    ? {
-        color: 'danger' as const,
-      }
-    : {};
-  const content =
-    samplingValue != null && samplingValue !== 1 ? (
-      <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false}>
-        <EuiFlexItem
-          className="eui-textTruncate"
-          css={css`
-            display: block;
-            min-width: 0;
-          `}
-        >
-          {label}
-        </EuiFlexItem>
-        <EuiFlexItem
-          grow={false}
-          data-test-subj="lnsChangeIndexPatternSamplingInfo"
-          css={css`
-            display: block;
-            *:hover &,
-            *:focus & {
-              text-decoration: none !important;
-            }
-          `}
-        >
-          <EuiToolTip
-            content={i18n.translate('xpack.lens.indexPattern.randomSamplingInfo', {
-              defaultMessage: '{value}% sampling',
-              values: {
-                value: samplingValue * 100,
-              },
-            })}
-            position="top"
-          >
-            <EuiFlexGroup alignItems="center" gutterSize="xs" responsive={false}>
-              <EuiFlexItem grow={false}>
-                <RandomSamplingIcon color={euiTheme.colors.disabledText} fill="currentColor" />
-              </EuiFlexItem>
-              <EuiFlexItem grow={false}>
-                <EuiTextColor color={euiTheme.colors.disabledText}>
-                  {samplingValue * 100}%
-                </EuiTextColor>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </EuiToolTip>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    ) : (
-      label
-    );
-  return (
-    <ToolbarButton
-      title={title}
-      onClick={() => togglePopover()}
-      fullWidth
-      {...colorProp}
-      {...rest}
-      textProps={{ style: { width: '100%' } }}
-    >
-      {content}
-    </ToolbarButton>
-  );
-}
+import { type ChangeIndexPatternTriggerProps, TriggerButton } from './trigger';
 
 export function ChangeIndexPattern({
   indexPatternRefs,
diff --git a/x-pack/plugins/lens/public/shared_components/dataview_picker/trigger.tsx b/x-pack/plugins/lens/public/shared_components/dataview_picker/trigger.tsx
new file mode 100644
index 0000000000000..038b1d5aec960
--- /dev/null
+++ b/x-pack/plugins/lens/public/shared_components/dataview_picker/trigger.tsx
@@ -0,0 +1,101 @@
+/*
+ * 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 { useEuiTheme, EuiFlexGroup, EuiFlexItem, EuiToolTip, EuiTextColor } from '@elastic/eui';
+import { css } from '@emotion/react';
+import React from 'react';
+import { ToolbarButton, ToolbarButtonProps } from './toolbar_button';
+
+interface TriggerLabelProps {
+  label: string;
+  icon?: {
+    component: React.ReactElement;
+    value?: string;
+    tooltipValue?: string;
+    'data-test-subj': string;
+  };
+}
+
+export type ChangeIndexPatternTriggerProps = ToolbarButtonProps &
+  TriggerLabelProps & {
+    label: string;
+    title?: string;
+    isDisabled?: boolean;
+  };
+
+function TriggerLabel({ label, icon }: TriggerLabelProps) {
+  const { euiTheme } = useEuiTheme();
+  if (!icon) {
+    return <>{label}</>;
+  }
+  return (
+    <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false}>
+      <EuiFlexItem
+        className="eui-textTruncate"
+        css={css`
+          display: block;
+          min-width: 0;
+        `}
+      >
+        {label}
+      </EuiFlexItem>
+      <EuiFlexItem
+        grow={false}
+        data-test-subj={icon['data-test-subj']}
+        css={css`
+          display: block;
+          *:hover &,
+          *:focus & {
+            text-decoration: none !important;
+          }
+        `}
+      >
+        <EuiToolTip content={icon.tooltipValue} position="top">
+          <EuiFlexGroup alignItems="center" gutterSize="xs" responsive={false}>
+            <EuiFlexItem grow={false}>{icon.component}</EuiFlexItem>
+            {icon.value ? (
+              <EuiFlexItem grow={false}>
+                <EuiTextColor color={euiTheme.colors.disabledText}>{icon.value}</EuiTextColor>
+              </EuiFlexItem>
+            ) : null}
+          </EuiFlexGroup>
+        </EuiToolTip>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+}
+
+export function TriggerButton({
+  label,
+  title,
+  togglePopover,
+  isMissingCurrent,
+  icon,
+  ...rest
+}: ChangeIndexPatternTriggerProps & {
+  togglePopover: () => void;
+  isMissingCurrent?: boolean;
+}) {
+  // be careful to only add color with a value, otherwise it will fallbacks to "primary"
+  const colorProp = isMissingCurrent
+    ? {
+        color: 'danger' as const,
+      }
+    : {};
+  return (
+    <ToolbarButton
+      title={title}
+      onClick={() => togglePopover()}
+      fullWidth
+      {...colorProp}
+      {...rest}
+      textProps={{ style: { width: '100%' } }}
+    >
+      <TriggerLabel label={label} icon={icon} />
+    </ToolbarButton>
+  );
+}
diff --git a/x-pack/plugins/lens/public/types.ts b/x-pack/plugins/lens/public/types.ts
index 786fc50450a94..faa3d8e14e5bd 100644
--- a/x-pack/plugins/lens/public/types.ts
+++ b/x-pack/plugins/lens/public/types.ts
@@ -1189,11 +1189,11 @@ export interface Visualization<T = unknown, P = T> {
   /**
    * Allows the visualization to announce whether or not it has any settings to show
    */
-  hasLayerSettings?: (props: VisualizationConfigProps<T>) => boolean;
+  hasLayerSettings?: (props: VisualizationConfigProps<T>) => Record<'data' | 'appearance', boolean>;
 
   renderLayerSettings?: (
     domElement: Element,
-    props: VisualizationLayerSettingsProps<T>
+    props: VisualizationLayerSettingsProps<T> & { section: 'data' | 'appearance' }
   ) => ((cleanupElement: Element) => void) | void;
 
   /**
diff --git a/x-pack/plugins/lens/public/visualizations/partition/layer_settings.test.tsx b/x-pack/plugins/lens/public/visualizations/partition/layer_settings.test.tsx
index 9acedbc9b8dd2..2fed483cddfaf 100644
--- a/x-pack/plugins/lens/public/visualizations/partition/layer_settings.test.tsx
+++ b/x-pack/plugins/lens/public/visualizations/partition/layer_settings.test.tsx
@@ -25,12 +25,15 @@ describe('layer settings', () => {
     });
 
     const layerId = 'layer-id';
-    const props: VisualizationLayerSettingsProps<PieVisualizationState> = {
+    const props: VisualizationLayerSettingsProps<PieVisualizationState> & {
+      section: 'data' | 'appearance';
+    } = {
       setState: jest.fn(),
       layerId,
       state: getState(false),
       frame: {} as FramePublicAPI,
       panelRef: {} as React.MutableRefObject<HTMLDivElement | null>,
+      section: 'data',
     };
 
     it('toggles multiple metrics', () => {
@@ -90,5 +93,9 @@ describe('layer settings', () => {
         ).isEmptyRender()
       ).toBeTruthy();
     });
+
+    test('should not render anything for the appearance section', () => {
+      expect(shallow(<LayerSettings {...props} section="appearance" />).isEmptyRender());
+    });
   });
 });
diff --git a/x-pack/plugins/lens/public/visualizations/partition/layer_settings.tsx b/x-pack/plugins/lens/public/visualizations/partition/layer_settings.tsx
index 39da4fbfe0595..6f13800a91a2c 100644
--- a/x-pack/plugins/lens/public/visualizations/partition/layer_settings.tsx
+++ b/x-pack/plugins/lens/public/visualizations/partition/layer_settings.tsx
@@ -12,7 +12,12 @@ import { PieChartTypes } from '../../../common/constants';
 import { PieVisualizationState } from '../..';
 import { VisualizationLayerSettingsProps } from '../../types';
 
-export function LayerSettings(props: VisualizationLayerSettingsProps<PieVisualizationState>) {
+export function LayerSettings(
+  props: VisualizationLayerSettingsProps<PieVisualizationState> & { section: 'data' | 'appearance' }
+) {
+  if (props.section === 'appearance') {
+    return null;
+  }
   if (props.state.shape === PieChartTypes.MOSAIC) {
     return null;
   }
@@ -24,29 +29,33 @@ export function LayerSettings(props: VisualizationLayerSettingsProps<PieVisualiz
   }
 
   return (
-    <>
-      <EuiFormRow>
-        <EuiSwitch
-          label={i18n.translate('xpack.lens.pieChart.multipleMetrics', {
-            defaultMessage: 'Multiple metrics',
-          })}
-          compressed={true}
-          checked={Boolean(currentLayer.allowMultipleMetrics)}
-          onChange={() => {
-            props.setState({
-              ...props.state,
-              layers: props.state.layers.map((layer) =>
-                layer.layerId !== props.layerId
-                  ? layer
-                  : {
-                      ...layer,
-                      allowMultipleMetrics: !layer.allowMultipleMetrics,
-                    }
-              ),
-            });
-          }}
-        />
-      </EuiFormRow>
-    </>
+    <EuiFormRow
+      display="columnCompressedSwitch"
+      label={i18n.translate('xpack.lens.pieChart.multipleMetrics', {
+        defaultMessage: 'Multiple metrics',
+      })}
+    >
+      <EuiSwitch
+        label={i18n.translate('xpack.lens.pieChart.multipleMetrics', {
+          defaultMessage: 'Multiple metrics',
+        })}
+        compressed
+        showLabel={false}
+        checked={Boolean(currentLayer.allowMultipleMetrics)}
+        onChange={() => {
+          props.setState({
+            ...props.state,
+            layers: props.state.layers.map((layer) =>
+              layer.layerId !== props.layerId
+                ? layer
+                : {
+                    ...layer,
+                    allowMultipleMetrics: !layer.allowMultipleMetrics,
+                  }
+            ),
+          });
+        }}
+      />
+    </EuiFormRow>
   );
 }
diff --git a/x-pack/plugins/lens/public/visualizations/partition/visualization.test.ts b/x-pack/plugins/lens/public/visualizations/partition/visualization.test.ts
index 02932a0aa5e1c..3a4b0545a42ea 100644
--- a/x-pack/plugins/lens/public/visualizations/partition/visualization.test.ts
+++ b/x-pack/plugins/lens/public/visualizations/partition/visualization.test.ts
@@ -617,10 +617,10 @@ describe('pie_visualization', () => {
       });
     });
 
-    it.each(Object.values(PieChartTypes).filter((type) => type !== 'mosaic'))(
+    it.each(Object.values(PieChartTypes).filter((type) => type !== PieChartTypes.MOSAIC))(
       '%s adds fake dimension',
       (type) => {
-        const state = { ...getExampleState(), type };
+        const state = { ...getExampleState(), shape: type };
         state.layers[0].metrics.push('1', '2');
         state.layers[0].allowMultipleMetrics = true;
         expect(
@@ -645,4 +645,21 @@ describe('pie_visualization', () => {
       }
     );
   });
+
+  describe('layer settings', () => {
+    describe('hasLayerSettings', () => {
+      it('should have data settings for all partition chart types but mosaic', () => {
+        for (const type of Object.values(PieChartTypes)) {
+          const state = { ...getExampleState(), shape: type };
+          expect(
+            pieVisualization.hasLayerSettings?.({
+              state,
+              frame: mockFrame(),
+              layerId: state.layers[0].layerId,
+            })
+          ).toEqual({ data: type !== PieChartTypes.MOSAIC, appearance: false });
+        }
+      });
+    });
+  });
 });
diff --git a/x-pack/plugins/lens/public/visualizations/partition/visualization.tsx b/x-pack/plugins/lens/public/visualizations/partition/visualization.tsx
index 8340b5a5e254b..da52c6efc105b 100644
--- a/x-pack/plugins/lens/public/visualizations/partition/visualization.tsx
+++ b/x-pack/plugins/lens/public/visualizations/partition/visualization.tsx
@@ -504,7 +504,7 @@ export const getPieVisualization = ({
   },
 
   hasLayerSettings(props) {
-    return props.state.shape !== 'mosaic';
+    return { data: props.state.shape !== PieChartTypes.MOSAIC, appearance: false };
   },
 
   renderLayerSettings(domElement, props) {
diff --git a/x-pack/plugins/lens/public/visualizations/xy/annotations/actions.ts b/x-pack/plugins/lens/public/visualizations/xy/annotations/actions.ts
index 68938fbee5211..cb3afbcb14c91 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/annotations/actions.ts
+++ b/x-pack/plugins/lens/public/visualizations/xy/annotations/actions.ts
@@ -5,13 +5,10 @@
  * 2.0.
  */
 
-import { i18n } from '@kbn/i18n';
 import type { LayerActionFromVisualization } from '../../../types';
 import type { XYState, XYAnnotationLayerConfig } from '../types';
 
-export const IGNORE_GLOBAL_FILTERS_ACTION_ID = 'ignoreGlobalFilters';
-export const KEEP_GLOBAL_FILTERS_ACTION_ID = 'keepGlobalFilters';
-
+// Leaving the stub for annotation groups
 export const createAnnotationActions = ({
   state,
   layer,
@@ -21,33 +18,5 @@ export const createAnnotationActions = ({
   layer: XYAnnotationLayerConfig;
   layerIndex: number;
 }): LayerActionFromVisualization[] => {
-  const label = !layer.ignoreGlobalFilters
-    ? i18n.translate('xpack.lens.xyChart.annotations.ignoreGlobalFiltersLabel', {
-        defaultMessage: 'Ignore global filters',
-      })
-    : i18n.translate('xpack.lens.xyChart.annotations.keepGlobalFiltersLabel', {
-        defaultMessage: 'Keep global filters',
-      });
-  return [
-    {
-      id: !layer.ignoreGlobalFilters
-        ? IGNORE_GLOBAL_FILTERS_ACTION_ID
-        : KEEP_GLOBAL_FILTERS_ACTION_ID,
-      displayName: label,
-      description: !layer.ignoreGlobalFilters
-        ? i18n.translate('xpack.lens.xyChart.annotations.ignoreGlobalFiltersDescription', {
-            defaultMessage:
-              'All the dimensions configured in this layer ignore filters defined at kibana level.',
-          })
-        : i18n.translate('xpack.lens.xyChart.annotations.keepGlobalFiltersDescription', {
-            defaultMessage:
-              'All the dimensions configured in this layer respect filters defined at kibana level.',
-          }),
-      icon: !layer.ignoreGlobalFilters ? 'filterIgnore' : 'filter',
-      isCompatible: true,
-      'data-test-subj': !layer.ignoreGlobalFilters
-        ? 'lnsXY_annotationLayer_ignoreFilters'
-        : 'lnsXY_annotationLayer_keepFilters',
-    },
-  ];
+  return [];
 };
diff --git a/x-pack/plugins/lens/public/visualizations/xy/layer_settings.tsx b/x-pack/plugins/lens/public/visualizations/xy/layer_settings.tsx
new file mode 100644
index 0000000000000..55091aa0d1d40
--- /dev/null
+++ b/x-pack/plugins/lens/public/visualizations/xy/layer_settings.tsx
@@ -0,0 +1,53 @@
+/*
+ * 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 { EuiFormRow, EuiSwitch } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import React from 'react';
+import type { VisualizationLayerSettingsProps } from '../../types';
+import type { XYState } from './types';
+import { isAnnotationsLayer } from './visualization_helpers';
+
+export function LayerSettings({
+  state,
+  setState,
+  section,
+  layerId,
+}: VisualizationLayerSettingsProps<XYState> & { section: 'data' | 'appearance' }) {
+  if (section === 'appearance') {
+    return null;
+  }
+  const layer = state.layers.find((l) => l.layerId === layerId);
+  if (!layer || !isAnnotationsLayer(layer)) {
+    return null;
+  }
+  return (
+    <EuiFormRow
+      display="columnCompressedSwitch"
+      label={i18n.translate('xpack.lens.xyChart.ignoreGlobalFilters', {
+        defaultMessage: 'Use global filters',
+      })}
+    >
+      <EuiSwitch
+        label={i18n.translate('xpack.lens.xyChart.ignoreGlobalFilters', {
+          defaultMessage: 'Use global filters',
+        })}
+        showLabel={false}
+        checked={!layer.ignoreGlobalFilters}
+        data-test-subj="lnsXY-layerSettings-ignoreGlobalFilters"
+        onChange={() => {
+          const layerIndex = state.layers.findIndex((l) => l === layer);
+          const newLayer = { ...layer, ignoreGlobalFilters: !layer.ignoreGlobalFilters };
+          const newLayers = [...state.layers];
+          newLayers[layerIndex] = newLayer;
+          setState({ ...state, layers: newLayers });
+        }}
+        compressed
+      />
+    </EuiFormRow>
+  );
+}
diff --git a/x-pack/plugins/lens/public/visualizations/xy/visualization.test.ts b/x-pack/plugins/lens/public/visualizations/xy/visualization.test.ts
index 159014b043aec..9b82ab8c0d90e 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/visualization.test.ts
+++ b/x-pack/plugins/lens/public/visualizations/xy/visualization.test.ts
@@ -37,7 +37,6 @@ import { DataViewsState } from '../../state_management';
 import { createMockedIndexPattern } from '../../datasources/form_based/mocks';
 import { createMockDataViewsState } from '../../data_views_service/mocks';
 import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
-import { KEEP_GLOBAL_FILTERS_ACTION_ID } from './annotations/actions';
 import { layerTypes, Visualization } from '../..';
 
 const DATE_HISTORGRAM_COLUMN_ID = 'date_histogram_column';
@@ -3022,7 +3021,7 @@ describe('xy_visualization', () => {
       );
     });
 
-    it('should return one action for an annotation layer', () => {
+    it('should return no action for an annotation layer', () => {
       const baseState = exampleState();
       expect(
         xyVisualization.getSupportedActionsForLayer?.('annotation', {
@@ -3038,53 +3037,64 @@ describe('xy_visualization', () => {
             },
           ],
         })
-      ).toEqual([
-        expect.objectContaining({
-          displayName: 'Keep global filters',
-          description:
-            'All the dimensions configured in this layer respect filters defined at kibana level.',
-          icon: 'filter',
-          isCompatible: true,
-          'data-test-subj': 'lnsXY_annotationLayer_keepFilters',
-        }),
-      ]);
+      ).toHaveLength(0);
     });
+  });
 
-    it('should handle an annotation action', () => {
-      const baseState = exampleState();
-      const state = {
-        ...baseState,
-        layers: [
-          ...baseState.layers,
-          {
-            layerId: 'annotation',
-            layerType: layerTypes.ANNOTATIONS,
-            annotations: [exampleAnnotation2],
-            ignoreGlobalFilters: true,
-            indexPatternId: 'myIndexPattern',
-          },
-        ],
-      };
+  describe('layer settings', () => {
+    describe('hasLayerSettings', () => {
+      it('should expose no settings for a data or reference lines layer', () => {
+        const baseState = exampleState();
+        expect(
+          xyVisualization.hasLayerSettings?.({
+            state: baseState,
+            frame: createMockFramePublicAPI(),
+            layerId: 'first',
+          })
+        ).toEqual({ data: false, appearance: false });
 
-      const newState = xyVisualization.onLayerAction!(
-        'annotation',
-        KEEP_GLOBAL_FILTERS_ACTION_ID,
-        state
-      );
+        expect(
+          xyVisualization.hasLayerSettings?.({
+            state: {
+              ...baseState,
+              layers: [
+                ...baseState.layers,
+                {
+                  layerId: 'referenceLine',
+                  layerType: layerTypes.REFERENCELINE,
+                  accessors: [],
+                  yConfig: [{ axisMode: 'left', forAccessor: 'a' }],
+                },
+              ],
+            },
+            frame: createMockFramePublicAPI(),
+            layerId: 'referenceLine',
+          })
+        ).toEqual({ data: false, appearance: false });
+      });
 
-      expect(newState).toEqual(
-        expect.objectContaining({
-          layers: expect.arrayContaining([
-            {
-              layerId: 'annotation',
-              layerType: layerTypes.ANNOTATIONS,
-              annotations: [exampleAnnotation2],
-              ignoreGlobalFilters: false,
-              indexPatternId: 'myIndexPattern',
+      it('should expose data settings for an annotation layer', () => {
+        const baseState = exampleState();
+        expect(
+          xyVisualization.hasLayerSettings?.({
+            state: {
+              ...baseState,
+              layers: [
+                ...baseState.layers,
+                {
+                  layerId: 'annotation',
+                  layerType: layerTypes.ANNOTATIONS,
+                  annotations: [exampleAnnotation2],
+                  ignoreGlobalFilters: true,
+                  indexPatternId: 'myIndexPattern',
+                },
+              ],
             },
-          ]),
-        })
-      );
+            frame: createMockFramePublicAPI(),
+            layerId: 'annotation',
+          })
+        ).toEqual({ data: true, appearance: false });
+      });
     });
   });
 });
diff --git a/x-pack/plugins/lens/public/visualizations/xy/visualization.tsx b/x-pack/plugins/lens/public/visualizations/xy/visualization.tsx
index 274b82e5a1cf4..2f5df56c7b42d 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/visualization.tsx
+++ b/x-pack/plugins/lens/public/visualizations/xy/visualization.tsx
@@ -49,7 +49,6 @@ import {
   type XYDataLayerConfig,
   type SeriesType,
   type PersistedState,
-  type XYAnnotationLayerConfig,
   visualizationTypes,
 } from './types';
 import {
@@ -103,12 +102,8 @@ import { AnnotationsPanel } from './xy_config_panel/annotations_config_panel';
 import { DimensionTrigger } from '../../shared_components/dimension_trigger';
 import { defaultAnnotationLabel } from './annotations/helpers';
 import { onDropForVisualization } from '../../editor_frame_service/editor_frame/config_panel/buttons/drop_targets_utils';
-import {
-  createAnnotationActions,
-  IGNORE_GLOBAL_FILTERS_ACTION_ID,
-  KEEP_GLOBAL_FILTERS_ACTION_ID,
-} from './annotations/actions';
 import { IgnoredGlobalFiltersEntries } from './info_badges';
+import { LayerSettings } from './layer_settings';
 
 const XY_ID = 'lnsXY';
 export const getXyVisualization = ({
@@ -263,31 +258,27 @@ export const getXyVisualization = ({
     ];
   },
 
-  getSupportedActionsForLayer(layerId, state) {
-    const layerIndex = state.layers.findIndex((l) => l.layerId === layerId);
-    const layer = state.layers[layerIndex];
-    const actions = [];
-    if (isAnnotationsLayer(layer)) {
-      actions.push(...createAnnotationActions({ state, layerIndex, layer }));
-    }
-    return actions;
+  getSupportedActionsForLayer() {
+    return [];
   },
 
-  onLayerAction(layerId, actionId, state) {
-    if ([IGNORE_GLOBAL_FILTERS_ACTION_ID, KEEP_GLOBAL_FILTERS_ACTION_ID].includes(actionId)) {
-      return {
-        ...state,
-        layers: state.layers.map((layer) =>
-          layer.layerId === layerId
-            ? {
-                ...layer,
-                ignoreGlobalFilters: !(layer as XYAnnotationLayerConfig).ignoreGlobalFilters,
-              }
-            : layer
-        ),
-      };
-    }
+  hasLayerSettings({ state, layerId: currentLayerId }) {
+    const layer = state.layers?.find(({ layerId }) => layerId === currentLayerId);
+    return { data: Boolean(layer && isAnnotationsLayer(layer)), appearance: false };
+  },
+
+  renderLayerSettings(domElement, props) {
+    render(
+      <KibanaThemeProvider theme$={kibanaTheme.theme$}>
+        <I18nProvider>
+          <LayerSettings {...props} />
+        </I18nProvider>
+      </KibanaThemeProvider>,
+      domElement
+    );
+  },
 
+  onLayerAction(layerId, actionId, state) {
     return state;
   },
 
diff --git a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/layer_header.tsx b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/layer_header.tsx
index 819dfe13c2ba2..1983094f483b9 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/layer_header.tsx
+++ b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/layer_header.tsx
@@ -7,9 +7,17 @@
 
 import React, { useState } from 'react';
 import { i18n } from '@kbn/i18n';
-import { EuiIcon, EuiPopover, EuiSelectable, EuiText, EuiPopoverTitle } from '@elastic/eui';
+import {
+  EuiIcon,
+  EuiPopover,
+  EuiSelectable,
+  EuiText,
+  EuiPopoverTitle,
+  useEuiTheme,
+} from '@elastic/eui';
 import { ToolbarButton } from '@kbn/kibana-react-plugin/public';
 import { IconChartBarReferenceLine, IconChartBarAnnotations } from '@kbn/chart-icons';
+import { css } from '@emotion/react';
 import type {
   VisualizationLayerHeaderContentProps,
   VisualizationLayerWidgetProps,
@@ -71,6 +79,7 @@ function AnnotationLayerHeaderContent({
   layerId,
   onChangeIndexPattern,
 }: VisualizationLayerHeaderContentProps<State>) {
+  const { euiTheme } = useEuiTheme();
   const notFoundTitleLabel = i18n.translate('xpack.lens.layerPanel.missingDataView', {
     defaultMessage: 'Data view not found',
   });
@@ -78,6 +87,25 @@ function AnnotationLayerHeaderContent({
   const layer = state.layers[layerIndex] as XYAnnotationLayerConfig;
   const currentIndexPattern = frame.dataViews.indexPatterns[layer.indexPatternId];
 
+  const extraIconLabelProps = !layer.ignoreGlobalFilters
+    ? {}
+    : {
+        icon: {
+          component: (
+            <EuiIcon
+              type={'filterIgnore'}
+              color={euiTheme.colors.disabledText}
+              css={css`
+                margin-top: 15px;
+              `}
+            />
+          ),
+          tooltipValue: i18n.translate('xpack.lens.layerPanel.ignoreGlobalFilters', {
+            defaultMessage: 'Ignore global filters',
+          }),
+          'data-test-subj': 'lnsChangeIndexPatternIgnoringFilters',
+        },
+      };
   return (
     <ChangeIndexPattern
       data-test-subj="indexPattern-switcher"
@@ -87,6 +115,7 @@ function AnnotationLayerHeaderContent({
         'data-test-subj': 'lns_layerIndexPatternLabel',
         size: 's',
         fontWeight: 'normal',
+        ...extraIconLabelProps,
       }}
       indexPatternId={layer.indexPatternId}
       indexPatternRefs={frame.dataViews.indexPatternRefs}
diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
index bd29bb8a2554f..3756275f49b70 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -20022,10 +20022,6 @@
     "xpack.lens.xyChart.annotationDate.placementType": "Type de placement",
     "xpack.lens.xyChart.annotationDate.to": "À",
     "xpack.lens.xyChart.annotationError.timeFieldEmpty": "Le champ temporel est manquant",
-    "xpack.lens.xyChart.annotations.ignoreGlobalFiltersDescription": "Toutes les dimensions configurées dans ce calque ignorent les filtres définis au niveau de Kibana.",
-    "xpack.lens.xyChart.annotations.ignoreGlobalFiltersLabel": "Ignorer les filtres globaux",
-    "xpack.lens.xyChart.annotations.keepGlobalFiltersDescription": "Toutes les dimensions configurées dans ce calque respectent les filtres définis au niveau de Kibana.",
-    "xpack.lens.xyChart.annotations.keepGlobalFiltersLabel": "Conserver les filtres globaux",
     "xpack.lens.xyChart.appearance": "Apparence",
     "xpack.lens.xyChart.applyAsRange": "Appliquer en tant que plage",
     "xpack.lens.xyChart.axisOrientation.angled": "En angle",
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index ea8da1ed62a78..f209a10ee17fa 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -20022,10 +20022,6 @@
     "xpack.lens.xyChart.annotationDate.placementType": "配置タイプ",
     "xpack.lens.xyChart.annotationDate.to": "終了：",
     "xpack.lens.xyChart.annotationError.timeFieldEmpty": "時刻フィールドがありません",
-    "xpack.lens.xyChart.annotations.ignoreGlobalFiltersDescription": "このレイヤーで構成されたすべてのディメンションは、Kibanaレベルで定義されたフィルターを無視します。",
-    "xpack.lens.xyChart.annotations.ignoreGlobalFiltersLabel": "グローバルフィルターを無視",
-    "xpack.lens.xyChart.annotations.keepGlobalFiltersDescription": "このレイヤーで構成されたすべてのディメンションは、Kibanaレベルで定義されたフィルターを適用します。",
-    "xpack.lens.xyChart.annotations.keepGlobalFiltersLabel": "グローバルフィルターを保持",
     "xpack.lens.xyChart.appearance": "見た目",
     "xpack.lens.xyChart.applyAsRange": "範囲として適用",
     "xpack.lens.xyChart.axisOrientation.angled": "傾斜",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index f5b0a3c84a6ee..8543c48afec38 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -20023,10 +20023,6 @@
     "xpack.lens.xyChart.annotationDate.placementType": "位置类型",
     "xpack.lens.xyChart.annotationDate.to": "至",
     "xpack.lens.xyChart.annotationError.timeFieldEmpty": "缺少时间字段",
-    "xpack.lens.xyChart.annotations.ignoreGlobalFiltersDescription": "在此图层中配置的所有维度将忽略在 Kibana 级别定义的筛选。",
-    "xpack.lens.xyChart.annotations.ignoreGlobalFiltersLabel": "忽略全局筛选",
-    "xpack.lens.xyChart.annotations.keepGlobalFiltersDescription": "在此图层中配置的所有维度将采用在 Kibana 级别定义的筛选。",
-    "xpack.lens.xyChart.annotations.keepGlobalFiltersLabel": "保留全局筛选",
     "xpack.lens.xyChart.appearance": "外观",
     "xpack.lens.xyChart.applyAsRange": "应用为范围",
     "xpack.lens.xyChart.axisOrientation.angled": "带角度",
diff --git a/x-pack/test/functional/apps/lens/group1/layer_actions.ts b/x-pack/test/functional/apps/lens/group1/layer_actions.ts
index f3104a7a81c7a..aec1efeebb454 100644
--- a/x-pack/test/functional/apps/lens/group1/layer_actions.ts
+++ b/x-pack/test/functional/apps/lens/group1/layer_actions.ts
@@ -50,7 +50,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       expect(await testSubjects.getVisibleText('lnsChangeIndexPatternSamplingInfo')).to.be('1%');
     });
 
-    it('should add an annotation layer and settings shoud not be available', async () => {
+    it('should add an annotation layer and settings shoud be available with ignore filters', async () => {
       // configure a date histogram
       await PageObjects.lens.configureDimension({
         dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
@@ -65,10 +65,16 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       });
       // add annotation layer
       await PageObjects.lens.createLayer('annotations');
+
+      expect(await testSubjects.exists('lnsChangeIndexPatternIgnoringFilters')).to.be(true);
+
       await PageObjects.lens.openLayerContextMenu(1);
-      await testSubjects.existOrFail('lnsXY_annotationLayer_keepFilters');
-      // layer settings not available
-      await testSubjects.missingOrFail('lnsLayerSettings');
+      await testSubjects.click('lnsLayerSettings');
+      // annotations settings have only ignore filters
+      await testSubjects.click('lnsXY-layerSettings-ignoreGlobalFilters');
+      // now close the panel and check the dataView picker has no icon
+      await testSubjects.click('lns-indexPattern-dimensionContainerBack');
+      expect(await testSubjects.exists('lnsChangeIndexPatternIgnoringFilters')).to.be(false);
     });
 
     it('should add a new visualization layer and disable the sampling if max operation is chosen', async () => {

From e472ed5fbac5c13e669274365daac39ce20e627a Mon Sep 17 00:00:00 2001
From: Marco Antonio Ghiani <marcoantonio.ghiani01@gmail.com>
Date: Tue, 18 Apr 2023 12:03:24 +0200
Subject: [PATCH 008/100] [Logs UI]: Fix log error on fetching previous entries
 (#154459)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## 📓 Summary

Closes #151700

As shown in the video on [this
comment](https://github.com/elastic/kibana/issues/151700#issuecomment-1497246729),
the issue was reproduced when jumping to the lowest possible edge of the
available logs in the lateral timeline.
In case there are no existing logs before the selected time cursor, the
`topCursor` value required for the previous logs call is set to `null`
and the error was triggered.

I believe in this case the conditional to trigger the error should not
only rely on the missing `topCursor` variable existence, but we should
also check whether previous logs exist with the `hasMoreBefore` state
value.

These are the conditionals in order of execution:
- Top cursor missing but has more previous entries ➡️ trigger the Error
- No more previous entries and the request is not forced ➡️ Short
circuit data fetching
- Top cursor exists => Trigger the request for previous entries.

These changes also spotted an existing bug where the `hasMoreBefore` was
never set to the API response value, but was always `true`, preventing
also showing the "Expand time range" call to action on the scenario
described above.

## 🧪 Testing

- Navigate to Logs stream
- Jump to a point in time that has no logs previously ingested
- Verify the error is not logged when scrolling and that the "extend
range" button is shown


https://user-images.githubusercontent.com/34506779/230292210-c2690c37-efa1-4b05-a237-f14eb78d26eb.mov

---------

Co-authored-by: Marco Antonio Ghiani <marcoantonio.ghiani@elastic.co>
Co-authored-by: Carlos Crespo <crespocarlos@users.noreply.github.com>
---
 .../containers/logs/log_stream/index.ts       | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/x-pack/plugins/infra/public/containers/logs/log_stream/index.ts b/x-pack/plugins/infra/public/containers/logs/log_stream/index.ts
index e1b425b112f8c..1e63c4f5204c7 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_stream/index.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_stream/index.ts
@@ -109,7 +109,7 @@ export function useLogStream({
             ...(resetOnSuccess ? INITIAL_STATE : prevState),
             entries: combined.entries,
             hasMoreAfter: combined.hasMoreAfter ?? prevState.hasMoreAfter,
-            hasMoreBefore: combined.hasMoreAfter ?? prevState.hasMoreAfter,
+            hasMoreBefore: combined.hasMoreBefore ?? prevState.hasMoreBefore,
             bottomCursor: combined.bottomCursor,
             topCursor: combined.topCursor,
             lastLoadedTime: new Date(),
@@ -151,9 +151,9 @@ export function useLogStream({
 
   const fetchPreviousEntries = useCallback<FetchPageCallback>(
     (params) => {
-      if (state.topCursor === null) {
+      if (state.topCursor === null && state.hasMoreBefore) {
         throw new Error(
-          'useLogStream: Cannot fetch previous entries. No cursor is set.\nEnsure you have called `fetchEntries` at least once.'
+          'useLogStream: Cannot fetch previous entries.\nIt seems there are more entries available, but no cursor is set.\nEnsure you have called `fetchEntries` at least once.'
         );
       }
 
@@ -161,10 +161,12 @@ export function useLogStream({
         return;
       }
 
-      fetchLogEntriesBefore(state.topCursor, {
-        size: LOG_ENTRIES_CHUNK_SIZE,
-        extendTo: params?.extendTo,
-      });
+      if (state.topCursor !== null) {
+        fetchLogEntriesBefore(state.topCursor, {
+          size: LOG_ENTRIES_CHUNK_SIZE,
+          extendTo: params?.extendTo,
+        });
+      }
     },
     [fetchLogEntriesBefore, state.topCursor, state.hasMoreBefore]
   );
@@ -198,7 +200,7 @@ export function useLogStream({
 
   const fetchNextEntries = useCallback<FetchPageCallback>(
     (params) => {
-      if (state.bottomCursor === null) {
+      if (state.bottomCursor === null && state.hasMoreAfter) {
         throw new Error(
           'useLogStream: Cannot fetch next entries. No cursor is set.\nEnsure you have called `fetchEntries` at least once.'
         );
@@ -208,10 +210,12 @@ export function useLogStream({
         return;
       }
 
-      fetchLogEntriesAfter(state.bottomCursor, {
-        size: LOG_ENTRIES_CHUNK_SIZE,
-        extendTo: params?.extendTo,
-      });
+      if (state.bottomCursor !== null) {
+        fetchLogEntriesAfter(state.bottomCursor, {
+          size: LOG_ENTRIES_CHUNK_SIZE,
+          extendTo: params?.extendTo,
+        });
+      }
     },
     [fetchLogEntriesAfter, state.bottomCursor, state.hasMoreAfter]
   );

From 8f4fc45a18b8b35b6eefac8ff3b54d2318b00b12 Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad31comp@gmail.com>
Date: Tue, 18 Apr 2023 12:13:26 +0200
Subject: [PATCH 009/100] [Exp View] Fix e2e test (#155123)

---
 .../e2e/journeys/step_duration.journey.ts     | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/x-pack/plugins/exploratory_view/e2e/journeys/step_duration.journey.ts b/x-pack/plugins/exploratory_view/e2e/journeys/step_duration.journey.ts
index 706de17fcc661..a109740d74496 100644
--- a/x-pack/plugins/exploratory_view/e2e/journeys/step_duration.journey.ts
+++ b/x-pack/plugins/exploratory_view/e2e/journeys/step_duration.journey.ts
@@ -5,23 +5,16 @@
  * 2.0.
  */
 
-import { journey, step, before, after } from '@elastic/synthetics';
+import { journey, step } from '@elastic/synthetics';
 import moment from 'moment';
 import { recordVideo } from '../record_video';
 import { createExploratoryViewUrl } from '../../public/components/shared/exploratory_view/configurations/exploratory_view_url';
-import { loginToKibana, TIMEOUT_60_SEC, waitForLoadingToFinish } from '../utils';
+import { byTestId, loginToKibana, TIMEOUT_60_SEC, waitForLoadingToFinish } from '../utils';
 
-journey('Exploratory view', async ({ page, params }) => {
+journey('Step Duration series', async ({ page, params }) => {
   recordVideo(page);
 
-  before(async () => {
-    await waitForLoadingToFinish({ page });
-  });
-
-  after(async () => {
-    // eslint-disable-next-line no-console
-    console.log(await page.video()?.path());
-  });
+  page.setDefaultTimeout(TIMEOUT_60_SEC.timeout);
 
   const expUrl = createExploratoryViewUrl({
     reportType: 'kpi-over-time',
@@ -54,16 +47,16 @@ journey('Exploratory view', async ({ page, params }) => {
     });
   });
 
-  step('Open exploratory view with monitor duration', async () => {
+  step('build series with monitor duration', async () => {
     await page.waitForNavigation(TIMEOUT_60_SEC);
 
     await waitForLoadingToFinish({ page });
-    await page.click('text=browser', TIMEOUT_60_SEC);
+    await page.click('text=browser');
     await page.click('text=http');
     await page.click('[aria-label="Remove report metric"]');
     await page.click('button:has-text("Select report metric")');
     await page.click('button:has-text("Step duration")');
-    await page.click('text=Select an option: Monitor type, is selectedMonitor type >> button');
+    await page.click(byTestId('seriesBreakdown'));
     await page.click('button[role="option"]:has-text("Step name")');
     await page.click('.euiComboBox__inputWrap');
     await page.click(
@@ -71,7 +64,9 @@ journey('Exploratory view', async ({ page, params }) => {
     );
     await page.click('button[role="option"]:has-text("test-monitor - inline")');
     await page.click('button:has-text("Apply changes")');
+  });
 
+  step('Verify that changes are applied', async () => {
     await waitForLoadingToFinish({ page });
 
     await page.click('[aria-label="series color: #54b399"]');

From 0ce4f2de8ac8585055a713f5d39e6f5b727ec9cf Mon Sep 17 00:00:00 2001
From: Marco Liberati <dej611@users.noreply.github.com>
Date: Tue, 18 Apr 2023 12:44:51 +0200
Subject: [PATCH 010/100] [Lens] Reenable reporting functional tests (#155118)

## Summary

Fixes #155047, #154958, #154957, #154956, #154955, #154954

Flaky runner with 50 runs:
https://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/2146

### 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)
---
 .../functional/apps/lens/group3/lens_reporting.ts    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/x-pack/test/functional/apps/lens/group3/lens_reporting.ts b/x-pack/test/functional/apps/lens/group3/lens_reporting.ts
index bd7a27a411e7c..dc241c7f3ac49 100644
--- a/x-pack/test/functional/apps/lens/group3/lens_reporting.ts
+++ b/x-pack/test/functional/apps/lens/group3/lens_reporting.ts
@@ -24,8 +24,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const security = getService('security');
   const browser = getService('browser');
 
-  // Failing: See https://github.com/elastic/kibana/issues/154958
-  describe.skip('lens reporting', () => {
+  describe('lens reporting', () => {
     before(async () => {
       await kibanaServer.importExport.load(
         'x-pack/test/functional/fixtures/kbn_archiver/lens/reporting'
@@ -60,6 +59,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await PageObjects.reporting.clickGenerateReportButton();
       const url = await PageObjects.reporting.getReportURL(60000);
       expect(url).to.be.ok();
+      if (await testSubjects.exists('toastCloseButton')) {
+        await testSubjects.click('toastCloseButton');
+      }
     });
 
     for (const type of ['PNG', 'PDF'] as const) {
@@ -101,6 +103,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           await PageObjects.reporting.clickGenerateReportButton();
           const url = await PageObjects.reporting.getReportURL(60000);
           expect(url).to.be.ok();
+          if (await testSubjects.exists('toastCloseButton')) {
+            await testSubjects.click('toastCloseButton');
+          }
         });
 
         it(`should show a warning message for curl reporting of unsaved visualizations`, async () => {
@@ -126,6 +131,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         it(`should produce a valid URL for reporting`, async () => {
           await PageObjects.reporting.clickGenerateReportButton();
           await PageObjects.reporting.getReportURL(60000);
+          if (await testSubjects.exists('toastCloseButton')) {
+            await testSubjects.click('toastCloseButton');
+          }
           // navigate to the reporting page
           await PageObjects.common.navigateToUrl('management', '/insightsAndAlerting');
           await testSubjects.click('reporting');

From 7de4733f7255c976bf6503669e31e939cb9f485f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?=
 <alejandro.haro@elastic.co>
Date: Tue, 18 Apr 2023 13:06:05 +0200
Subject: [PATCH 011/100] [FullStory] Update snippet (#153570)

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
---
 NOTICE.txt                                                 | 5 +++--
 packages/analytics/shippers/fullstory/src/load_snippet.ts  | 2 +-
 .../cloud_full_story/server/assets/fullstory_library.js    | 7 ++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/NOTICE.txt b/NOTICE.txt
index cd0ba2a9c1bd9..45af6e5231783 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -257,8 +257,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 ---
-This code is part of the Services provided by FullStory, Inc. For license information, please refer to https://www.fullstory.com/legal/terms-and-conditions/.
-Portions of this code are licensed separately and can be found in https://edge.fullstory.com/s/fs.js.LICENSE.txt
+This code is part of the Services provided by FullStory, Inc. For license information, please refer to https://www.fullstory.com/legal/terms-and-conditions/
+Portions of this code are licensed under the following license:
+  For license information please see fs.js.LICENSE.txt
 
 ---
 This product bundles bootstrap@3.3.6 which is available under a
diff --git a/packages/analytics/shippers/fullstory/src/load_snippet.ts b/packages/analytics/shippers/fullstory/src/load_snippet.ts
index 2c37eee6608e9..1cbcc96e201ef 100644
--- a/packages/analytics/shippers/fullstory/src/load_snippet.ts
+++ b/packages/analytics/shippers/fullstory/src/load_snippet.ts
@@ -36,7 +36,7 @@ export interface FullStorySnippetConfig {
 }
 
 export function loadSnippet({
-  scriptUrl = 'edge.fullstory.com/s/fs.js',
+  scriptUrl = 'https://edge.fullstory.com/s/fs.js',
   fullStoryOrgId,
   host = 'fullstory.com',
   namespace = 'FS',
diff --git a/x-pack/plugins/cloud_integrations/cloud_full_story/server/assets/fullstory_library.js b/x-pack/plugins/cloud_integrations/cloud_full_story/server/assets/fullstory_library.js
index dcc579b5e57b9..bfe2af8d44668 100644
--- a/x-pack/plugins/cloud_integrations/cloud_full_story/server/assets/fullstory_library.js
+++ b/x-pack/plugins/cloud_integrations/cloud_full_story/server/assets/fullstory_library.js
@@ -1,8 +1,9 @@
 /* @notice
- * This code is part of the Services provided by FullStory, Inc. For license information, please refer to https://www.fullstory.com/legal/terms-and-conditions/.
- * Portions of this code are licensed separately and can be found in https://edge.fullstory.com/s/fs.js.LICENSE.txt
+ * This code is part of the Services provided by FullStory, Inc. For license information, please refer to https://www.fullstory.com/legal/terms-and-conditions/
+ * Portions of this code are licensed under the following license:
+ *   For license information please see fs.js.LICENSE.txt
  */
 /* eslint-disable prettier/prettier,no-var,eqeqeq,new-cap,no-nested-ternary,no-use-before-define,no-sequences,block-scoped-var,one-var,
     dot-notation,no-script-url,no-restricted-globals,no-unused-vars,guard-for-in,no-proto,camelcase,no-empty,no-redeclare,no-caller,
     strict,no-extend-native,no-undef,no-loop-func */
-!function(e){var t={};function n(r){if(t[r])return t[r].exports;var i=t[r]={i:r,l:!1,exports:{}};return e[r].call(i.exports,i,i.exports,n),i.l=!0,i.exports}n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var i in e)n.d(r,i,function(t){return e[t]}.bind(null,i));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e["default"]}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="/s",n(n.s=4)}([function(e,t,n){"use strict";var r=this&&this.__assign||function(){return(r=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var i in t=arguments[n])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)},i=this&&this.__createBinding||(Object.create?function(e,t,n,r){void 0===r&&(r=n),Object.defineProperty(e,r,{enumerable:!0,get:function(){return t[n]}})}:function(e,t,n,r){void 0===r&&(r=n),e[r]=t[n]});t.__esModule=!0,t.omit=t.pick=t.assertExhaustive=t.isNonEmpty=void 0,i(t,n(6),"ExtendedObject","Object"),t.isNonEmpty=function(e){return e.length>0},t.assertExhaustive=function(e,t){throw void 0===t&&(t="Reached unexpected case in exhaustive switch"),new Error(t)},t.pick=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];var r={};return t.forEach(function(t){r[t]=e[t]}),r},t.omit=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];var i=r({},e);return Object.keys(i).forEach(function(e){var n=e;-1!==t.indexOf(n)&&delete i[n]}),i}},function(e,t){},function(e){e.exports={Any:{iframe:{src:"scrubUrl",srcdoc:"erase"},frame:{src:"scrubUrl",srcdoc:"erase"}},Exclude:{"*":{alt:"erase",checked:"erase",data:"erase",placeholder:"erase",src:"erase",srcset:"erase",href:"erase",title:"erase",value:"erase"}},Mask:{"*":{checked:"erase",data:"erase",alt:"maskText",placeholder:"maskText",title:"maskText",value:"maskText"},option:{label:"maskText"}}}},function(e){e.exports=[{Selector:"object:not([type^=\"image/\"])",Consent:!1,Type:1},{Selector:"embed:not([type^=\"image/\"])",Consent:!1,Type:1},{Selector:"canvas",Consent:!1,Type:1},{Selector:"noscript",Consent:!1,Type:1},{Selector:".fs-hide",Consent:!1,Type:1},{Selector:".fs-exclude",Consent:!1,Type:1},{Selector:".fs-exclude-without-consent",Consent:!0,Type:1},{Selector:".fs-mask",Consent:!1,Type:2},{Selector:".fs-mask-without-consent",Consent:!0,Type:2},{Selector:".fs-unmask",Consent:!1,Type:3},{Selector:".fs-unmask-with-consent",Consent:!0,Type:3},{Selector:".fs-block",Consent:!1,Type:1},{Selector:".fs-record-with-consent",Consent:!0,Type:1}]},function(e,t,n){e.exports=n(7)},function(e,t){},function(e,t,n){"use strict";t.__esModule=!0,t.ExtendedObject=void 0,t.ExtendedObject=Object},function(e,t,n){"use strict";n.r(t);n(5);var r=!1;function i(){return r}function o(e){i()&&window.console&&console.log(e)}n(1);var s=new(function(){function e(e){this.rebuildFromSnapshot(e)}return e.prototype.rebuildFromSnapshot=function(e){var t=this.snapshot;if(this.snapshot=e,!t||t.functions!==e.functions){var n=e.functions;this.jsonParse=n.jsonParse,this.jsonStringify=n.jsonStringify,this.arrayIsArray=n.arrayIsArray,this.objectKeys=n.objectKeys,this.objectValues=n.objectValues||null,this.dateNow=n.dateNow,this.objectHasOwnProp=u(n.objectHasOwnProp),this.dateGetTime=u(n.dateGetTime),this.matchMedia=c(n.matchMedia),this.setWindowTimeout=u(n.setWindowTimeout),this.setWindowInterval=u(n.setWindowInterval),this.clearWindowTimeout=u(n.clearWindowTimeout),this.clearWindowInterval=u(n.clearWindowInterval),this.requestWindowAnimationFrame=c(n.requestWindowAnimationFrame),this.requestWindowIdleCallback=c(n.requestWindowIdleCallback),this.mathAbs=n.mathAbs,this.mathFloor=n.mathFloor,this.mathMax=n.mathMax,this.mathMin=n.mathMin,this.mathPow=n.mathPow,this.mathRandom=n.mathRandom,this.mathRound=n.mathRound}},e}())(a(window));function a(e,t){void 0===t&&(t=0);var n=t,r=function(e){try{return e()}catch(e){return n=2,function(){throw new Error("Invoked failed snapshot")}}},i={jsonParse:r(function(){return e.JSON.parse}),jsonStringify:r(function(){return e.JSON.stringify}),arrayIsArray:r(function(){return e.Array.isArray}),objectKeys:r(function(){return e.Object.keys}),objectValues:r(function(){return e.Object.values}),dateNow:r(function(){return e.Date.now}),objectHasOwnProp:r(function(){return e.Object.prototype.hasOwnProperty}),dateGetTime:r(function(){return e.Date.prototype.getTime}),matchMedia:r(function(){return e.matchMedia}),setWindowTimeout:r(function(){return e.setTimeout}),setWindowInterval:r(function(){return e.setInterval}),clearWindowTimeout:r(function(){return e.clearTimeout}),clearWindowInterval:r(function(){return e.clearInterval}),requestWindowAnimationFrame:r(function(){return e.requestAnimationFrame}),requestWindowIdleCallback:r(function(){return e.requestIdleCallback}),mathAbs:r(function(){return e.Math.abs}),mathFloor:r(function(){return e.Math.floor}),mathMax:r(function(){return e.Math.max}),mathMin:r(function(){return e.Math.min}),mathPow:r(function(){return e.Math.pow}),mathRandom:r(function(){return e.Math.random}),mathRound:r(function(){return e.Math.round})},o={functionToString:r(function(){return e.Function.prototype.toString}),objectToString:r(function(){return e.Object.prototype.toString})};return{status:n,functions:i,helpers:o}}function u(e){return function(t){for(var n=[],r=1;r<arguments.length;r++)n[r-1]=arguments[r];return e.apply(t,n)}}function c(e){return e?u(e):null}var h,d="number"==typeof(h=s.dateNow())?{now:function(){return s.dateNow()},timeOrigin:h}:{now:function(){return s.dateGetTime(new Date)},timeOrigin:h=s.dateGetTime(new Date)};var l=function(){var e,t=window.performance;if(t&&t.now){var n=t.now();if("number"==typeof n&&isFinite(n)&&!(n<=0)){var r=t.timeOrigin;if("number"!=typeof r){var i=d.now()-t.now(),o=null===(e=t.timing)||void 0===e?void 0:e.navigationStart;r=o?Math.min(i,o):i}var s=Math.round(r);if("number"==typeof s&&isFinite(s)&&!(s<=0))return{now:function(){return Math.round(s+t.now())},timeOrigin:s}}}}();function p(){return l?l.now():d.now()}var f=["","0","1","-1","true","false","n/a","nan","undefined","null","nil","the_id_that_you_use_in_your_app_for_this_user"],v=["811c9dc5","350ca8af","340ca71c","14cd0a2b","4db211e5","0b069958","3613e041","2f8f13ba","9b61ad43","77074ba4","0da3f8ec","1c750511"],_=function(){return s.mathFloor(p()/1e3)},g=function(){return _()+31536e3};function m(e){if(!e)return null;var t=e.split("/"),n=t[0],r=t[1],i=parseInt(r),s=_(),a=g();if(isNaN(i)&&(i=a),i<=s)return null;i>a&&(i=a);var u=n.split(/[#,]/);if(u.length<3&&(u=n.split("`")).length<3)return null;var c=u[0],h=u[1],d=u[2],l=u[3],p="";void 0!==l&&(p=decodeURIComponent(l),(f.indexOf(p)>=0||v.indexOf(p)>=0)&&(o("Ignoring invalid app key \""+p+"\" from cookie."),p=""));var m=d.split(":");return{expirationAbsTimeSeconds:i,host:c,orgId:h,userId:m[0],sessionId:m[1]||"",appKeyHash:p}}function y(e){for(var t={},n=e.cookie.split(";"),r=0;r<n.length;r++){var i=n[r].replace(/^\s+|\s+$/g,"").split("=");t[i[0]]||(t[i[0]]=i[1])}return t}var w="_fs_loaded",b="_fs_namespace";var S,E="FS";function T(e){if(S)return S;var t=k(e);return t?(S=t,t):(t=e[b])?(S=t,t):S=E}function k(e){return e[w]}function I(e){return e[T(e)]}function C(e){return"localhost"==e||"127.0.0.1"==e}var R,A,x,O,M=/^([^.]+\.)*(fullstory|onfire).[^.]+(\/|$)/;function L(e){return!!e._fs_ext_debug||!!e._fs_debug}function F(e){return e._fs_rec_host||((t=D(e))&&M.test(t)?0===t.lastIndexOf("rs.",0)||0===t.lastIndexOf("rs-2.",0)?t:0==t.lastIndexOf("www.",0)?"rs."+t.slice(4):0==t.lastIndexOf("app.",0)?"rs."+t.slice(4):"rs."+t:t);var t}function P(e){return e._fs_ext_org||e._fs_org}function q(e){return!!e._fs_is_outer_script}function U(e){return e._fs_replay_flags}function N(e){return e._fs_transport}function W(e,t){var n=I(e);if(n){var r=n.q;r||(r=n.q=[]),r.push(t)}}function D(e){return e._fs_ext_host||e._fs_host}function B(e){return e?C(function(e){var t=e,n=t.indexOf(":");return n>=0&&(t=t.slice(0,n)),t}(e))?e:0==e.indexOf("www.")?"app."+e.slice(4):"app."+e:e}function H(e){return e?e+"/s/fs.js":void 0}!function(e){e.MUT_INSERT=2,e.MUT_REMOVE=3,e.MUT_ATTR=4,e.MUT_TEXT=6,e.MOUSEMOVE=8,e.MOUSEMOVE_CURVE=9,e.SCROLL_LAYOUT=10,e.SCROLL_LAYOUT_CURVE=11,e.MOUSEDOWN=12,e.MOUSEUP=13,e.KEYDOWN=14,e.KEYUP=15,e.CLICK=16,e.FOCUS=17,e.VALUECHANGE=18,e.RESIZE_LAYOUT=19,e.DOMLOADED=20,e.LOAD=21,e.PLACEHOLDER_SIZE=22,e.UNLOAD=23,e.BLUR=24,e.SET_FRAME_BASE=25,e.TOUCHSTART=32,e.TOUCHEND=33,e.TOUCHCANCEL=34,e.TOUCHMOVE=35,e.TOUCHMOVE_CURVE=36,e.NAVIGATE=37,e.PLAY=38,e.PAUSE=39,e.RESIZE_VISUAL=40,e.RESIZE_VISUAL_CURVE=41,e.RESIZE_DOCUMENT=42,e.LOG=48,e.ERROR=49,e.DBL_CLICK=50,e.FORM_SUBMIT=51,e.WINDOW_FOCUS=52,e.WINDOW_BLUR=53,e.HEARTBEAT=54,e.WATCHED_ELEM=56,e.PERF_ENTRY=57,e.REC_FEAT_SUPPORTED=58,e.SELECT=59,e.CSSRULE_INSERT=60,e.CSSRULE_DELETE=61,e.FAIL_THROTTLED=62,e.AJAX_REQUEST=63,e.SCROLL_VISUAL_OFFSET=64,e.SCROLL_VISUAL_OFFSET_CURVE=65,e.MEDIA_QUERY_CHANGE=66,e.RESOURCE_TIMING_BUFFER_FULL=67,e.MUT_SHADOW=68,e.DISABLE_STYLESHEET=69,e.FULLSCREEN=70,e.FULLSCREEN_ERROR=71,e.ADOPTED_STYLESHEETS=72,e.CUSTOM_ELEMENT_DEFINED=73,e.MODAL_OPEN=74,e.MODAL_CLOSE=75,e.SLOW_INTERACTION=76,e.LONG_FRAME=77,e.TIMING=78,e.STORAGE_WRITE_FAILURE=79,e.KEEP_ELEMENT=2e3,e.KEEP_URL=2001,e.KEEP_BOUNCE=2002,e.SYS_SETVAR=8193,e.SYS_RESOURCEHASH=8195,e.SYS_SETCONSENT=8196,e.SYS_CUSTOM=8197,e.SYS_REPORTCONSENT=8198}(R||(R={})),function(e){e.Unknown=0,e.Serialization=1}(A||(A={})),function(e){e.Unknown=0,e.DomSnapshot=1,e.NodeEncoding=2,e.LzEncoding=3}(x||(x={})),function(e){e.Internal=0,e.Public=1}(O||(O={}));var j,K,V,z,Y,G,Q,X,J,$,Z,ee,te,ne=["print","alert","confirm"];function re(e){switch(e){case R.MOUSEDOWN:case R.MOUSEMOVE:case R.MOUSEMOVE_CURVE:case R.MOUSEUP:case R.KEYDOWN:case R.KEYUP:case R.TOUCHSTART:case R.TOUCHEND:case R.TOUCHMOVE:case R.TOUCHMOVE_CURVE:case R.TOUCHCANCEL:case R.CLICK:case R.SCROLL_LAYOUT:case R.SCROLL_LAYOUT_CURVE:case R.SCROLL_VISUAL_OFFSET:case R.SCROLL_VISUAL_OFFSET_CURVE:case R.NAVIGATE:return!0;}return!1}!function(e){e.GrantConsent=!0,e.RevokeConsent=!1}(j||(j={})),function(e){e.Page=0,e.Document=1}(K||(K={})),function(e){e.Unknown=0,e.Api=1,e.FsShutdownFrame=2,e.Hibernation=3,e.Reidentify=4,e.SettingsBlocked=5,e.Size=6,e.Unload=7}(V||(V={})),function(e){e.Timing=0,e.Navigation=1,e.Resource=2,e.Paint=3,e.Mark=4,e.Measure=5,e.Memory=6}(z||(z={})),function(e){e.Performance=0,e.PerformanceEntries=1,e.PerformanceMemory=2,e.Console=3,e.Ajax=4,e.PerformanceObserver=5,e.AjaxFetch=6}(Y||(Y={})),function(e){e.Node=1,e.Sheet=2}(G||(G={})),function(e){e.StyleSheetHooks=0,e.SetPropertyHooks=1}(Q||(Q={})),function(e){e.User="user",e.Account="acct",e.Event="evt"}(X||(X={})),function(e){e.Elide=0,e.Record=1,e.Whitelist=2}(J||(J={})),function(e){e.ReasonNoSuchOrg=1,e.ReasonOrgDisabled=2,e.ReasonOrgOverQuota=3,e.ReasonBlockedDomain=4,e.ReasonBlockedIp=5,e.ReasonBlockedUserAgent=6,e.ReasonBlockedGeo=7,e.ReasonBlockedTrafficRamping=8,e.ReasonInvalidURL=9,e.ReasonUserOptOut=10,e.ReasonInvalidRecScript=11,e.ReasonDeletingUser=12,e.ReasonNativeHookFailure=13}($||($={})),function(e){e.Unset=0,e.Exclude=1,e.Mask=2,e.Unmask=3,e.Watch=4,e.Keep=5}(Z||(Z={})),function(e){e.Unset=0,e.Click=1}(ee||(ee={})),function(e){e.MaxLogsPerPage=1024,e.MutationProcessingInterval=250,e.CurveSamplingInterval=142,e.DefaultBundleUploadInterval=5e3,e.HeartbeatInitial=4e3,e.HeartbeatMax=256200,e.PageInactivityTimeout=18e5,e.BackoffMax=3e5,e.ScrollSampleInterval=e.MutationProcessingInterval/5,e.InactivityThreshold=4e3,e.MaxPayloadLength=16384}(te||(te={}));function ie(e,t){return function(){try{return e.apply(this,arguments)}catch(e){try{t&&t(e)}catch(e){}}}}var oe=function(){},se=navigator.userAgent,ae=se.indexOf("MSIE ")>-1||se.indexOf("Trident/")>-1,ue=(ae&&se.indexOf("Trident/5"),ae&&se.indexOf("Trident/6"),ae&&se.indexOf("rv:11")>-1),ce=se.indexOf("Edge/")>-1;se.indexOf("CriOS");var he=/^((?!chrome|android).)*safari/i.test(window.navigator.userAgent);function de(){var e=window.navigator.userAgent.match(/Version\/(\d+)/);return e?parseInt(e[1]):-1}function le(e){if(!he)return!1;var t=de();return t>=0&&t===e}function pe(e){if(!he)return!1;var t=de();return t>=0&&t<e}le(9),le(10),pe(8),pe(10),pe(12);function fe(e,t){for(var n=0===t.indexOf("on")?function(e){return"on"+e+t.slice(2)}:function(e){return""+e+t.charAt(0).toUpperCase()+t.slice(1)},r=0,i=[function(){return t},function(){return n("webkit")},function(){return n("moz")},function(){return n("ms")}];r<i.length;r++){var o=(0,i[r])();if(o in e)return o}return t}function ve(e){return"function"==typeof e}var _e=Array.isArray?Array.isArray:function(e){return"[object Array]"===Object.prototype.toString.call(e)},ge=0,me=function(e,t){Ce[ge]=e,Ce[ge+1]=t,2===(ge+=2)&&be()};var ye=window.MutationObserver||window.WebKitMutationObserver,we="undefined"!=typeof Uint8ClampedArray&&"undefined"!=typeof self&&void 0!==self.importScripts&&"undefined"!=typeof MessageChannel;var be,Se,Ee,Te,ke,Ie,Ce=new Array(1e3);function Re(){for(var e=0;e<ge;e+=2){(0,Ce[e])(Ce[e+1]),Ce[e]=void 0,Ce[e+1]=void 0}ge=0}function Ae(e,t){var n=arguments,r=this,i=new this.constructor(Me);void 0===i[Oe]&&Qe(i);var o,s=r._state;return s?(o=n[s-1],me(function(){return Ye(s,i,o,r._result)})):je(r,i,e,t),i}function xe(e){if(e&&"object"==typeof e&&e.constructor===this)return e;var t=new this(Me);return We(t,e),t}ye?(Te=0,ke=new ye(Re),Ie=document.createTextNode(""),ke.observe(Ie,{characterData:!0}),be=function(){var e=Te=++Te%2;Ie.data=e+""}):we?((Ee=new MessageChannel).port1.onmessage=Re,be=function(){return Ee.port2.postMessage(0)}):(Se=setTimeout,be=function(){return Se(Re,1)});var Oe=Math.random().toString(36).substring(16);function Me(){}var Le=void 0,Fe=1,Pe=2,qe=new Ve;function Ue(e){try{return e.then}catch(e){return qe.error=e,qe}}function Ne(e,t,n){t.constructor===e.constructor&&n===Ae&&t.constructor.resolve===xe?function(e,t){t._state===Fe?Be(e,t._result):t._state===Pe?He(e,t._result):je(t,void 0,function(t){return We(e,t)},function(t){return He(e,t)})}(e,t):n===qe?(He(e,qe.error),qe.error=null):void 0===n?Be(e,t):ve(n)?function(e,t,n){me(function(e){var r=!1,i=function(e,t,n,r,i){try{e.call(t,n,r)}catch(e){return e}}(n,t,function(n){r||(r=!0,t!==n?We(e,n):Be(e,n))},function(t){r||(r=!0,He(e,t))},e._label);!r&&i&&(r=!0,He(e,i))},e)}(e,t,n):Be(e,t)}function We(e,t){var n;e===t?He(e,new TypeError("You cannot resolve a promise with itself")):"function"==typeof(n=t)||"object"==typeof n&&null!==n?Ne(e,t,Ue(t)):Be(e,t)}function De(e){e._onerror&&e._onerror(e._result),Ke(e)}function Be(e,t){e._state===Le&&(e._result=t,e._state=Fe,0!==e._subscribers.length&&me(Ke,e))}function He(e,t){e._state===Le&&(e._state=Pe,e._result=t,me(De,e))}function je(e,t,n,r){var i=e._subscribers,o=i.length;e._onerror=null,i[o]=t,i[o+Fe]=n,i[o+Pe]=r,0===o&&e._state&&me(Ke,e)}function Ke(e){var t=e._subscribers,n=e._state;if(0!==t.length){for(var r,i,o=e._result,s=0;s<t.length;s+=3)r=t[s],i=t[s+n],r?Ye(n,r,i,o):i(o);e._subscribers.length=0}}function Ve(){this.error=null}var ze=new Ve;function Ye(e,t,n,r){var i,o,s,a,u=ve(n);if(u){if((i=function(e,t){try{return e(t)}catch(e){return ze.error=e,ze}}(n,r))===ze?(a=!0,o=i.error,i.error=null):s=!0,t===i)return void He(t,new TypeError("A promises callback cannot return that same promise."))}else i=r,s=!0;t._state!==Le||(u&&s?We(t,i):a?He(t,o):e===Fe?Be(t,i):e===Pe&&He(t,i))}var Ge=0;function Qe(e){e[Oe]=Ge++,e._state=void 0,e._result=void 0,e._subscribers=[]}function Xe(e,t){this._instanceConstructor=e,this.promise=new e(Me),this.promise[Oe]||Qe(this.promise),_e(t)?(this._input=t,this.length=t.length,this._remaining=t.length,this._result=new Array(this.length),0===this.length?Be(this.promise,this._result):(this.length=this.length||0,this._enumerate(),0===this._remaining&&Be(this.promise,this._result))):He(this.promise,new Error("Array Methods must be provided an Array"))}Xe.prototype._enumerate=function(){for(var e=this.length,t=this._input,n=0;this._state===Le&&n<e;n++)this._eachEntry(t[n],n)},Xe.prototype._eachEntry=function(e,t){var n=this._instanceConstructor,r=n.resolve;if(r===xe){var i=Ue(e);if(i===Ae&&e._state!==Le)this._settledAt(e._state,t,e._result);else if("function"!=typeof i)this._remaining--,this._result[t]=e;else if(n===Je){var o=new n(Me);Ne(o,e,i),this._willSettleAt(o,t)}else this._willSettleAt(new n(function(t){return t(e)}),t)}else this._willSettleAt(r(e),t)},Xe.prototype._settledAt=function(e,t,n){var r=this.promise;r._state===Le&&(this._remaining--,e===Pe?He(r,n):this._result[t]=n),0===this._remaining&&Be(r,this._result)},Xe.prototype._willSettleAt=function(e,t){var n=this;je(e,void 0,function(e){return n._settledAt(Fe,t,e)},function(e){return n._settledAt(Pe,t,e)})};var Je=function(e){this[Oe]=Ge++,this._result=this._state=void 0,this._subscribers=[],Me!==e&&("function"!=typeof e&&function(){throw new TypeError("You must pass a resolver function as the first argument to the promise constructor")}(),this instanceof Je?function(e,t){try{t(function(t){We(e,t)},function(t){He(e,t)})}catch(t){He(e,t)}}(this,e):function(){throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.")}())};Je.all=function(e){return new Xe(this,e).promise},Je.race=function(e){var t=this;return _e(e)?new t(function(n,r){for(var i=e.length,o=0;o<i;o++)t.resolve(e[o]).then(n,r)}):new t(function(e,t){return t(new TypeError("You must pass an array to race."))})},Je.resolve=xe,Je.reject=function(e){var t=new this(Me);return He(t,e),t},Je._setAsap=function(e){me=e},Je._asap=me,Je.prototype={constructor:Je,then:Ae,"catch":function(e){return this.then(null,e)}};var $e,Ze,et="function"==typeof window.Promise?window.Promise:Je,tt=function(){return(tt=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var i in t=arguments[n])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)};function nt(e){return s.arrayIsArray(e)}var rt,it,ot,st,at,ut;function ct(e,t){return 0==e.lastIndexOf(t,0)}function ht(e,t){for(var n in e)s.objectHasOwnProp(e,n)&&t(e[n],n,e)}function dt(e){for(var t in e)if(Object.prototype.hasOwnProperty.call(e,t))return e[t]}function lt(e,t){var n=0;for(var r in e)if(Object.prototype.hasOwnProperty.call(e,r)&&++n>t)return!1;return n==t}function pt(e,t){var n=0;for(var r in e)if(Object.prototype.hasOwnProperty.call(e,r)&&++n>t)return!0;return!1}Ze="function"==typeof s.objectKeys?function(e){return s.objectKeys(e)}:function(e){var t=[];for(var n in e)s.objectHasOwnProp(e,n)&&t.push(n);return t},st=(ot=function(e){return e.matches||e.msMatchesSelector||e.webkitMatchesSelector})(window.Element.prototype),!(at=window.document?window.document.documentElement:void 0)||st&&at instanceof window.Element||(st=ot(at)),it=($e=[st,function(e,t){return st.call(e,t)}])[0],rt=$e[1];var ft;ut=ae?function(e){var t=e.nextSibling;return t&&e.parentNode&&t===e.parentNode.firstChild?null:t}:function(e){return e.nextSibling};var vt;ft=ae?function(e,t){if(e){var n=e.parentNode?e.parentNode.firstChild:null;do{t(e),e=e.nextSibling}while(e&&e!=n)}}:function(e,t){for(;e;e=e.nextSibling)t(e)};vt=ae?function(e){var t=e.previousSibling;return t&&e.parentNode&&t===e.parentNode.lastChild?null:t}:function(e){return e.previousSibling};function _t(e,t){if(!e)return oe;var n=function(e){try{var t=window;return t.Zone&&t.Zone.root&&"function"==typeof t.Zone.root.wrap?t.Zone.root.wrap(e):e}catch(t){return e}}(e);return t&&(n=n.bind(t)),ie(n,function(e){o("Unexpected error: "+e)})}function gt(e){var t,n=Array.prototype.toJSON,r=String.prototype.toJSON;n&&(Array.prototype.toJSON=void 0),r&&(String.prototype.toJSON=void 0);try{t=s.jsonStringify(e)}catch(e){t=mt(e)}finally{n&&(Array.prototype.toJSON=n),r&&(String.prototype.toJSON=r)}return t}function mt(e){var t="Internal error: unable to determine what JSON error was";try{t=(t=""+e).replace(/[^a-zA-Z0-9\.\:\!\, ]/g,"_")}catch(e){}return"\""+t+"\""}function yt(e){var t=e.doctype;if(!t)return"";var n="<!DOCTYPE ";return n+=t.name,t.publicId&&(n+=" PUBLIC \""+t.publicId+"\""),t.systemId&&(n+=" \""+t.systemId+"\""),n+">"}function wt(e){return s.jsonParse(e)}function bt(e){var t=0,n=0;return null==e.screen?[t,n]:(t=parseInt(String(e.screen.width)),n=parseInt(String(e.screen.height)),[t=isNaN(t)?0:t,n=isNaN(n)?0:n])}var St=function(){function e(e,t){this.target=e,this.propertyName=t,this._before=oe,this._afterSync=oe,this._afterAsync=oe,this.on=!1}return e.prototype.before=function(e){return this._before=_t(e),this},e.prototype.afterSync=function(e){return this._afterSync=_t(e),this},e.prototype.afterAsync=function(e){return this._afterAsync=_t(function(t){s.setWindowTimeout(window,ie(function(){e(t)}),0)}),this},e.prototype.disable=function(){if(this.on=!1,this.shim){var e=this.shim,t=e.override,n=e["native"];this.target[this.propertyName]===t&&(this.target[this.propertyName]=n,this.shim=void 0)}},e.prototype.enable=function(){if(this.on=!0,this.shim)return!0;this.shim=this.makeShim();try{this.target[this.propertyName]=this.shim.override}catch(e){return!1}return!0},e.prototype.makeShim=function(){var e=this,t=this.target[this.propertyName];return{"native":t,override:function(){var n={that:this,args:arguments,result:null};e.on&&e._before(n);var r=t.apply(this,arguments);return e.on&&(n.result=r,e._afterSync(n),e._afterAsync(n)),r}}},e}(),Et={};function Tt(e,t){if(!e||"function"!=typeof e[t])return null;var n;Et[t]=Et[t]||[];for(var r=0;r<Et[t].length;r++)Et[t][r].obj==e&&(n=Et[t][r].hook);return n||(n=new St(e,t),Et[t].push({obj:e,hook:n})),n.enable()?n:null}function kt(e,t,n){if(!e)return function(){};var r=Object.getOwnPropertyDescriptor(e.prototype,t);if(!r||!r.set)return function(){};var i=r.set,o=_t(n),s=!0;function a(e){i.call(this,e),s&&o(this,e)}return Object.defineProperty(e.prototype,t,tt(tt({},r),{set:a})),function(){s=!1;var n=Object.getOwnPropertyDescriptor(e.prototype,t);n&&a===n.set&&Object.defineProperty(e.prototype,t,tt(tt({},n),{set:i}))}}var It=10,Ct="[anonymous]",Rt=/function\s*([\w\-$]+)?\s*\(/i;function At(e){return e.stack||e.backtrace||e.stacktrace}function xt(){var e,t;try{throw new Error("")}catch(n){e="<generated>\n",t=At(n)}if(!t){e="<generated-ie>\n";var n=[];try{for(var r=arguments.callee.caller.caller;r&&n.length<It;){var i=Rt.test(r.toString())&&RegExp.$1||Ct;n.push(i),r=r.caller}}catch(e){o(e)}t=n.join("\n")}return e+t}function Ot(){try{return window.self!==window.top}catch(e){return!0}}var Mt=function(){function e(){}return e.wrap=function(t,n){return void 0===n&&(n="error"),ie(t,function(t){return e.sendToBugsnag(t,n)})},e.errorLimit=15,e.sendToBugsnag=function(t,n,r){if(!(e.errorLimit<=0)){e.errorLimit--,"string"==typeof t&&(t=new Error(t));var i=y(document).fs_uid,o=i?m(i):void 0;o&&o.orgId!=P(window)&&(o=void 0);var s=new Date(1591209308e3).toISOString(),a={projectRoot:window.location.origin,deviceTime:p(),inIframe:Ot(),CompiledTimestamp:1591209308,CompiledTime:s,orgId:P(window),"userId:sessionId":o?o.userId+":"+o.sessionId:"NA",context:document.location&&document.location.pathname,message:t.message,name:"Recording Error",releaseStage:"production "+s,severity:n,language:navigator.language||navigator.userLanguage||"en-GB",stacktrace:At(t)||xt()};if(r)for(var u in r){var c=typeof r[u];a["aux_"+u]="string"===c||"number"===c?r[u]:gt(r[u])}var h=[];for(var u in a)h.push(encodeURIComponent(u)+"="+encodeURIComponent(a[u]));new Image().src="https://"+F(window)+"/rec/except?"+h.join("&")}},e}(),Lt={};function Ft(e,t,n){if(void 0===n&&(n=1),e)return!0;if(Lt[t]=Lt[t]||0,Lt[t]++,Lt[t]>n)return!1;var r=new Error("Assertion failed: "+t);return Mt.sendToBugsnag(r,"error"),e}function Pt(e,t,n,r){void 0!==n&&("function"==typeof e.addEventListener?e.addEventListener(t,n,r):"function"==typeof e.addListener?e.addListener(n):o("Target of "+t+" doesn't seem to support listeners"))}function qt(e,t,n,r){void 0!==n&&("function"==typeof e.removeEventListener?e.removeEventListener(t,n,r):"function"==typeof e.removeListener?e.removeListener(n):o("Target of "+t+" doesn't seem to support listeners"))}var Ut=function(){function e(){var e=this;this._listeners=[],this._children=[],this._yesCapture=!0,this._noCapture=!1;try{var t=Object.defineProperty({},"passive",{get:function(){e._yesCapture={capture:!0,passive:!0},e._noCapture={capture:!1,passive:!0}}});window.addEventListener("test",oe,t)}catch(e){}}return e.prototype.add=function(e,t,n,r,i){return void 0===i&&(i=!1),this.addCustom(e,t,n,r,i)},e.prototype.addCustom=function(e,t,n,r,i){void 0===i&&(i=!1);var o={target:e,type:t,fn:Mt.wrap(function(e){(i||!1!==e.isTrusted||"message"==t||e._fs_trust_event)&&r(e)}),options:n?this._yesCapture:this._noCapture,index:this._listeners.length};return this._listeners.push(o),Pt(e,t,o.fn,o.options),o},e.prototype.remove=function(e){e.target&&(qt(e.target,e.type,e.fn,e.options),e.target=null,e.fn=void 0)},e.prototype.clear=function(){for(var e=0;e<this._listeners.length;e++)this._listeners[e].target&&this.remove(this._listeners[e]);this._listeners=[]},e.prototype.createChild=function(){var t=new e;return this._children.push(t),t},e.prototype.refresh=function(){for(var e=0,t=this._listeners;e<t.length;e++){var n=t[e];n.target&&(qt(n.target,n.type,n.fn,n.options),Pt(n.target,n.type,n.fn,n.options))}for(var r=0,i=this._children;r<i.length;r++){i[r].refresh()}},e}();function Nt(e,t){return t&&e.pageLeft==t.pageLeft&&e.pageTop==t.pageTop}function Wt(e,t){return t&&e.width==t.width&&e.height==t.height}function Dt(e){return{pageLeft:e.pageLeft,pageTop:e.pageTop,width:e.width,height:e.height}}var Bt=[["@import\\s+\"","\""],["@import\\s+'","'"]].concat([["url\\(\\s*\"","\"\\s*\\)"],["url\\(\\s*'","'\\s*\\)"],["url\\(\\s*","\\s*\\)"]]),Ht=".*?"+/(?:[^\\](?:\\\\)*)/.source;new RegExp(Bt.map(function(e){var t=e[0],n=e[1];return"("+t+")("+Ht+")("+n+")"}).join("|"),"g");var jt=/url\(["']?(.+?)["']?\)/g,Kt=/^\s*\/\//;function Vt(e){return e&&e.body&&e.documentElement?"BackCompat"==e.compatMode?[e.body.clientWidth,e.body.clientHeight]:[e.documentElement.clientWidth,e.documentElement.clientHeight]:[0,0]}var zt=function(){function e(e,t){var n,r;this.hasKnownPosition=!1,this.pageLeft=0,this.pageTop=0,this.width=0,this.height=0,this.clientWidth=0,this.clientHeight=0;var i=e.document;if(i&&i.documentElement&&i.body){if("visualViewport"in e){var o=i.documentElement.getBoundingClientRect();this.hasKnownPosition=!0,this.pageLeft=0==o.left?0:-o.left,this.pageTop=0==o.top?0:-o.top}if(n=Vt(i),this.clientWidth=n[0],this.clientHeight=n[1],void 0!==t&&this.clientWidth==t.clientWidth&&this.clientHeight==t.clientHeight&&t.width>0&&t.height>0)return this.width=t.width,void(this.height=t.height);r=this.computeLayoutViewportSizeFromMediaQueries(e),this.width=r[0],this.height=r[1]}}return e.prototype.computeLayoutViewportSizeFromMediaQueries=function(e){var t=this.findMediaValue(e,"width",this.clientWidth,this.clientWidth+128);void 0===t&&(t=this.tryToGet(e,"innerWidth")),void 0===t&&(t=this.clientWidth);var n=this.findMediaValue(e,"height",this.clientHeight,this.clientHeight+128);return void 0===n&&(n=this.tryToGet(e,"innerHeight")),void 0===n&&(n=this.clientHeight),[t,n]},e.prototype.findMediaValue=function(e,t,n,r){if(s.matchMedia){var i=s.matchMedia(e,"(min-"+t+": "+n+"px)");if(null!=i){if(i.matches&&s.matchMedia(e,"(max-"+t+": "+n+"px)").matches)return n;for(;n<=r;){var o=s.mathFloor((n+r)/2);if(s.matchMedia(e,"(min-"+t+": "+o+"px)").matches){if(s.matchMedia(e,"(max-"+t+": "+o+"px)").matches)return o;n=o+1}else r=o-1}}}},e.prototype.tryToGet=function(e,t){try{return e[t]}catch(e){return}},e}();function Yt(e,t){return new zt(e,t)}var Gt=function(e,t){this.offsetLeft=0,this.offsetTop=0,this.pageLeft=0,this.pageTop=0,this.width=0,this.height=0,this.scale=0;var n=e.document;if(n.body){var r="BackCompat"==n.compatMode;"pageXOffset"in e?(this.pageLeft=e.pageXOffset,this.pageTop=e.pageYOffset):n.scrollingElement?(this.pageLeft=n.scrollingElement.scrollLeft,this.pageTop=n.scrollingElement.scrollTop):r?(this.pageLeft=n.body.scrollLeft,this.pageTop=n.body.scrollTop):n.documentElement&&(n.documentElement.scrollLeft>0||n.documentElement.scrollTop>0)?(this.pageLeft=n.documentElement.scrollLeft,this.pageTop=n.documentElement.scrollTop):(this.pageLeft=n.body.scrollLeft||0,this.pageTop=n.body.scrollTop||0),this.offsetLeft=this.pageLeft-t.pageLeft,this.offsetTop=this.pageTop-t.pageTop;try{var i=e.innerWidth,o=e.innerHeight}catch(e){return}if(0!=i&&0!=o){this.scale=t.width/i,this.scale<1&&(this.scale=1);var s=t.width-t.clientWidth,a=t.height-t.clientHeight;this.width=i-s/this.scale,this.height=o-a/this.scale}}};var Qt,Xt=(Qt=function(e,t){return(Qt=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])})(e,t)},function(e,t){function n(){this.constructor=e}Qt(e,t),e.prototype=null===t?Object.create(t):(n.prototype=t.prototype,new n)}),Jt=function(e,t,n,r){return new(n||(n=Promise))(function(i,o){function s(e){try{u(r.next(e))}catch(e){o(e)}}function a(e){try{u(r["throw"](e))}catch(e){o(e)}}function u(e){var t;e.done?i(e.value):(t=e.value,t instanceof n?t:new n(function(e){e(t)})).then(s,a)}u((r=r.apply(e,t||[])).next())})},$t=function(e,t){var n,r,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),"throw":a(1),"return":a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(n)throw new TypeError("Generator is already executing.");for(;s;)try{if(n=1,r&&(i=2&o[0]?r["return"]:o[0]?r["throw"]||((i=r["return"])&&i.call(r),0):r.next)&&!(i=i.call(r,o[1])).done)return i;switch(r=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,r=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(i=(i=s.trys).length>0&&i[i.length-1])&&(6===o[0]||2===o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue;}o=t.call(e,s)}catch(e){o=[6,e],r=0}finally{n=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}},Zt=function(){function e(){var t=this;this._wrappedTick=Mt.wrap(function(){t.unregister(),t._tick()}),this._due=0,this._id=e.nextId++}return e._rearm=function(){e.checkedAlready=!1,e.lastCheck=0},e.checkForBrokenSchedulers=function(){return Jt(this,void 0,et,function(){var t,n;return $t(this,function(r){switch(r.label){case 0:return!s.requestWindowAnimationFrame||e.checkedAlready?[2,void 0]:(t=p())-e.lastCheck<100?[2,void 0]:(e.lastCheck=t,e.checkedAlready=!0,[4,new et(function(e){return s.requestWindowAnimationFrame(window,e)})]);case 1:return r.sent(),n=[],ht(e.registry,function(e){var r=e.maybeForceTick(t);r&&n.push(r)}),[2,et.all(n).then(function(){s.requestWindowAnimationFrame(window,Mt.wrap(function(){e.checkedAlready=!1}))})];}})})},e.stopAll=function(){ht(this.registry,function(e){return e.stop()})},e.prototype.setTick=function(e){this._tick=e},e.prototype.stop=function(){this.cancel(),delete e.registry[this._id]},e.prototype.register=function(t){this._due=p()+100+1.5*t,e.registry[this._id]=this},e.prototype.unregister=function(){delete e.registry[this._id]},e.prototype.maybeForceTick=function(e){if(e>this._due)return et.resolve().then(this._wrappedTick)["catch"](function(){})},e.registry={},e.nextId=0,e.checkedAlready=!1,e.lastCheck=0,e}(),en=function(e){function t(t){var n=e.call(this)||this;return n._interval=t,n._handle=-1,n}return Xt(t,e),t.prototype.start=function(e){var t=this;-1==this._handle&&(this.setTick(function(){e(),t.register(t._interval)}),this._handle=s.setWindowInterval(window,this._wrappedTick,this._interval),this.register(this._interval))},t.prototype.cancel=function(){-1!=this._handle&&(s.clearWindowInterval(window,this._handle),this._handle=-1,this.setTick(function(){}))},t}(Zt),tn=function(e){function t(t,n,r){void 0===n&&(n=0);for(var i=[],o=3;o<arguments.length;o++)i[o-3]=arguments[o];var s=e.call(this)||this;return s.delay=n,s.timer=-1,s.setTick(function(){t.apply(void 0===r?window:r,i),s.stop()}),s}return Xt(t,e),t.prototype.start=function(e){return void 0===e&&(e=this.delay),this.delay=e,s.clearWindowTimeout(window,this.timer),this.timer=s.setWindowTimeout(window,this._wrappedTick,this.delay),this.register(e),this},t.prototype.cancel=function(){-1!=this.timer&&(s.clearWindowTimeout(window,this.timer),this.timer=-1)},t}(Zt);!function(){function e(e){this.deadlineTime=e,this.didTimeout=this.deadlineTime<=p()}e.prototype.timeRemaining=function(){return this.deadlineTime-p()}}();var nn=function(){function e(e,t,n){this.limit=e,this.breaker=n,this.remaining=0,this.ticker=new en(t),this.open()}return e.prototype.guard=function(e){var t=this;return function(){return 0==t.remaining?(t.breaker(),void t.remaining--):t.remaining<0?void 0:(t.remaining--,e.apply(this,arguments))}},e.prototype.close=function(){return this.ticker.stop(),this},e.prototype.open=function(){var e=this;return this.remaining=this.limit,this.ticker.start(function(){e.remaining=e.limit}),this},e}(),rn=function(){function e(){this._reported=0,this._skew=0,this._startTime=l?l.timeOrigin:d.timeOrigin}return e.prototype.wallTime=function(){return p()},e.prototype.now=function(){var e=this.wallTime()-this._startTime;return e<0&&this._reportTimeSkew("timekeeper now() is negative"),e},e.prototype.startTime=function(){return this._startTime},e.prototype.setStartTime=function(e){var t=this.wallTime();this._startTime=e,e>t&&(this._skew=e-t,this._reportTimeSkew("timekeeper set with future ts"))},e.prototype._reportTimeSkew=function(e){this._reported++<=2&&Mt.sendToBugsnag(e,"error",{skew:this._skew,startTime:this._startTime,wallTime:this.wallTime()})},e}();function on(e){var t=e;return t.tagName?"object"==typeof t.tagName?"form":t.tagName.toLowerCase():null}var sn,an,un=n(3),cn=n(0),hn=Object.defineProperty,dn=p()%1e9,ln=window.WeakMap||((sn=function(){this.name="__st"+(1e9*s.mathRandom()>>>0)+dn++ +"__"}).prototype={set:function(e,t){var n=e[this.name];n&&n[0]===e?n[1]=t:hn(e,this.name,{value:[e,t],writable:!0})},get:function(e){var t;return(t=e[this.name])&&t[0]===e?t[1]:void 0}},sn),pn=1,fn=4,vn=function(){for(var e=0,t=0,n=arguments.length;t<n;t++)e+=arguments[t].length;var r=Array(e),i=0;for(t=0;t<n;t++)for(var o=arguments[t],s=0,a=o.length;s<a;s++,i++)r[i]=o[s];return r};function _n(e){if(null==e)return 0;switch(e){case an.Exclude:return 5;case an.Mask:return 4;case an.Unmask:return 3;case an.Watch:return 2;case an.Keep:return 1;default:return Object(cn.assertExhaustive)(e,"Undefined watch kind: "+e);}}!function(e){e[e.Exclude=1]="Exclude",e[e.Mask=2]="Mask",e[e.Unmask=3]="Unmask",e[e.Watch=4]="Watch",e[e.Keep=5]="Keep"}(an||(an={}));var gn={1:"exclude",2:"mask",3:"unmask",4:"watch",5:"keep"},mn=[an.Exclude,an.Mask,an.Unmask,an.Watch,an.Keep],yn=function(){function e(e){void 0===e&&(e="matches"),this._watchStrategy=e,this._hasWatched=!1,this._rules=Sn(),this._consentRules=Sn()}return e.prototype.initialize=function(e){var t=e.blocks,n=e.keeps,r=e.watches,i=e.flags;this._watchStrategy=i.watchStrategy;var o=vn(un);if(i.whitelist&&o.push({Type:Z.Mask,Consent:j.RevokeConsent,Selector:"body"}),t)for(var s=0,a=t;s<a.length;s++){var u=a[s];o.push(u)}if(r)for(var c=0,h=r;c<h.length;c++){var d=h[c];o.push({Type:Z.Watch,Consent:j.RevokeConsent,Selector:d.Selector})}this._batchElementBlocks(o),n&&this._batchElementKeeps(n)},e.prototype.isWatched=function(e){var t=[an.Exclude,an.Mask,an.Unmask,an.Watch,an.Keep];return this._firstMatch(t,e)},e.prototype.matchesAnyKeepRule=function(e){var t=[an.Keep];return null!==this._firstMatch(t,e)},e.prototype.matchesAnyConsentRule=function(e){var t=[an.Exclude,an.Mask,an.Unmask,an.Keep];return null!==this._firstConsentMatch(t,e)},e.prototype._firstMatch=function(e,t){this._hasWatched=!0;for(var n=0,r=e;n<r.length;n++)for(var i=r[n],o=0,s=this._rules[i];o<s.length;o++){var a=s[o];if(rt(t,a))return i}return this._consent?null:this._firstConsentMatch(e,t)},e.prototype._firstConsentMatch=function(e,t){for(var n=0,r=e;n<r.length;n++)for(var i=r[n],o=0,s=this._consentRules[i];o<s.length;o++){var a=s[o];if(rt(t,a))return i}return null},e.prototype._batchElementBlocks=function(e){var t=this,n=Sn(),r=Sn();e.map(wn).filter(function(e){return bn(e.selector)}).forEach(function(e){e.consent?r[e.kind].push(e):n[e.kind].push(e)});for(var i=document.documentElement||document.createElement("div"),o=function(e,n){try{var r=e.map(function(e){return e.selector}).join(", ");rt(i,r),n.push(r)}catch(n){Mt.sendToBugsnag("Browser rejected optimistic merge rule","warning"),t._fallback(e)}},s=0,a=mn;s<a.length;s++){var u=a[s];n[u].length>0&&o(n[u],this._rules[u]),r[u].length>0&&o(r[u],this._consentRules[u])}},e.prototype._fallback=function(e){for(var t=0,n=e;t<n.length;t++){var r=n[t],i=r.kind,o=r.consent,s=r.selector;this.addRule(i,o,s)}},e.prototype.addElementBlock=function(e){var t=wn(e),n=t.kind,r=t.consent,i=t.selector;return this.addRule(n,r,i)},e.prototype._batchElementKeeps=function(e){for(var t=0,n=e;t<n.length;t++){var r=n[t];this.addElementKeep(r)}},e.prototype.addElementKeep=function(e){var t=an.Keep;switch(e.Type){case ee.Click:break;default:return!1;}return this.addRule(t,e.Consent,e.Selector)},e.prototype.addRule=function(e,t,n){if(this.tryToAddRule(e,t,n))return!0;switch(e){case an.Watch:case an.Unmask:case an.Keep:break;case an.Mask:case an.Exclude:default:this._rules[e]=["*"];}return!1},e.prototype.tryToAddRule=function(e,t,n){try{return!bn(n)||this.mergeRule(e,t,n)}catch(e){return Mt.sendToBugsnag("Error adding block rule","error",{selector:n,error:e.toString()}),!1}},e.prototype.getConsent=function(){return this._consent},e.prototype.initializeConsent=function(e){void 0===this._consent&&this.setConsent(e)},e.prototype.setConsent=function(e){this._consent!==e&&(this._consent=e,this._hasWatched&&this.onConsentChange&&this.onConsentChange())},e.prototype.mergeRule=function(e,t,n){var r=t?this._consentRules:this._rules,i=document.documentElement||document.createElement("div"),o=function(){try{return rt(i,n),!0}catch(t){return Mt.sendToBugsnag("Browser rejected rule","warning",{kind:gn[e],selector:n,error:t.toString()}),!1}};switch(e){case an.Exclude:case an.Mask:case an.Unmask:case an.Watch:case an.Keep:break;default:e=an.Exclude;}if(0==r[e].length)return!!o()&&(r[e].push(n),!0);var s=r[e].length-1,a=r[e][s].concat(", ",n);try{rt(i,a)}catch(t){return!!o()&&(r[e].push(n),Mt.sendToBugsnag("Browser rejected merged rule","warning",{kind:gn[e],selector:n,error:t.toString()}),!0)}return r[e][s]=a,!0},e.prototype.allConsentSensitiveElements=function(e){for(var t=[],n=0,r=[an.Exclude,an.Mask,an.Unmask,an.Keep];n<r.length;n++)for(var i=r[n],o=0,s=this._consentRules[i];o<s.length;o++)for(var a=s[o],u=e.querySelectorAll(a),c=0;c<u.length;c++)t.push(u[c]);return t},e.prototype.allWatchedElements=function(e){var t=this;if("matches"===this._watchStrategy)return null;this._hasWatched=!0;for(var n=new ln,r=function(e,r,i){var o=n.get(e)||{kind:null,matchesAnyKeepRule:!1,matchesAnyConsentRule:i};(!i||i&&!t._consent)&&(null==o.kind&&(o.kind=r),r===an.Keep&&(o.matchesAnyKeepRule=!0)),i&&(o.matchesAnyConsentRule=!0),n.set(e,o)},i=0,o=[[this._rules,!1],[this._consentRules,!0]];i<o.length;i++)for(var s=o[i],a=s[0],u=s[1],c=0,h=mn;c<h.length;c++)for(var d=h[c],l=0,p=a[d];l<p.length;l++){var f=p[l];En(e)&&rt(e,f)&&r(e,d,u);for(var v=e.querySelectorAll(f),_=0;_<v.length;_++)r(v[_],d,u)}return n},e.prototype.getWatchStrategy=function(){return this._watchStrategy},e}();function wn(e){var t=an.Exclude;switch(e.Type){case Z.Unset:case Z.Exclude:t=an.Exclude;break;case Z.Mask:t=an.Mask;break;case Z.Unmask:t=an.Unmask;break;case Z.Watch:t=an.Watch;break;case Z.Keep:t=an.Keep;}return{kind:t,consent:e.Consent,selector:e.Selector}}function bn(e){return!e.match(Kt)&&""!=e.trim()}function Sn(){for(var e=Object.create?Object.create(null):{},t=0,n=mn;t<n.length;t++){e[n[t]]=[]}return e}function En(e){return e.nodeType===pn}var Tn={},kn=1;function In(e){var t=xn(e);return!!t&&void 0!==t.watchKind}function Cn(e){var t=xn(e);return!!t&&t.watchKind==an.Exclude}function Rn(e){var t=xn(e);return!!t&&!!t.mask}function An(e){var t=xn(e);return t?t.watchKind:void 0}function xn(e){return e?Tn[e._fs]:null}function On(e){return Tn[e]}function Mn(e){try{return e&&e._fs||0}catch(e){return 0}}function Ln(e){return Cn(e)?0:Mn(e)}function Fn(e,t){e.parent&&(t.unobserveSubtree(e.node),e.parent.child==e&&(e.parent.child=e.next),e.parent.lastChild==e&&(e.parent.lastChild=e.prev),e.prev&&(e.prev.next=e.next),e.next&&(e.next.prev=e.prev),e.parent=e.prev=e.next=null,delete Tn[e.id],e.node._fs==e.id&&(e.node._fs=0),e.id=0,e.child&&Pn(e.child))}function Pn(e){for(var t=[e];t.length>0&&t.length<1e4;){var n=t.pop();delete Tn[n.id],n.node._fs==n.id&&(n.node._fs=0),n.id=0,n.next&&t.push(n.next),n.child&&t.push(n.child)}Ft(t.length<1e4,"clearIds is fast")}var qn,Un=function(){function e(e,t){this._onchange=e,this._checkElem=t,this._fallback=!1,this._elems={},this.values={},this.radios={},qn=this}return e.prototype.hookEvents=function(){(function(){var e=Object.getOwnPropertyDescriptor(HTMLInputElement.prototype,"value");if(!e||!e.set)return!1;Nn||(kt(HTMLInputElement,"value",jn),kt(HTMLInputElement,"checked",jn),kt(HTMLSelectElement,"value",jn),kt(HTMLTextAreaElement,"value",jn),kt(HTMLSelectElement,"selectedIndex",jn),kt(HTMLOptionElement,"selected",jn),Nn=!0);return!0})()||(this._fallback=!0)},e.prototype.addInput=function(e){var t=Mn(e);if(this._elems[t]=e,Vn(e)){var n=Hn(e);e.checked&&(this.radios[n]=t)}else this.values[t]=Kn(e);(function(e){switch(e.type){case"checkbox":case"radio":return e.checked!=e.hasAttribute("checked");default:return(e.value||"")!=function(e){if("select"!=on(e))return e.getAttribute("value")||"";var t=e,n=t.querySelector("option[selected]")||t.querySelector("option");if(!n)return"";return n.value||""}(e);}})(e)&&this._onchange(e)},e.prototype.diffValue=function(e,t){var n=Mn(e);if(Vn(e)){var r=Hn(e);return this.radios[r]==n!=("true"==t)}return this.values[n]!=t},e.prototype.onChange=function(e,t){void 0===t&&(t=Kn(e));var n=Mn(e);if((e=this._elems[n])&&this.diffValue(e,t))if(this._onchange(e),Vn(e)){var r=Hn(e);"false"==t&&this.radios[r]==n?delete this.radios[r]:this.radios[r]=n}else this.values[n]=t},e.prototype.tick=function(){for(var e in this._elems){var t=this._elems[e];if(this._checkElem(t)){if(this._fallback){var n=Kn(t);if(t&&this.diffValue(t,n))if(this._onchange(t),Vn(t)){var r=Hn(t);this.radios[r]=+e}else this.values[e]=n}}else delete this._elems[e],delete this.values[e],Vn(t)&&delete this.radios[Hn(t)]}},e.prototype.shutdown=function(){qn=null},e.prototype._usingFallback=function(){return this._fallback},e.prototype._trackingElem=function(e){return!!this._elems[e]},e}(),Nn=!1;var Wn,Dn={};function Bn(){try{if(qn)for(var e in Dn){var t=Dn[e],n=t[0],r=t[1];qn.onChange(n,r)}}finally{Wn=null,Dn={}}}function Hn(e){if(!e)return"";for(var t=e;t&&"form"!=on(t);)t=t.parentElement;return(t&&"form"==on(t)?Mn(t):0)+":"+e.name}function jn(e,t){var n=function e(t,n){if(void 0===n&&(n=2),n<=0)return t;var r=on(t);return"option"!=r&&"optgroup"!=r||!t.parentElement?t:e(t.parentElement,n-1)}(e),r=Mn(n);r&&qn&&qn.diffValue(n,""+t)&&(Dn[r]=[n,""+t],Wn||(Wn=new tn(Bn)).start())}function Kn(e){switch(e.type){case"checkbox":case"radio":return""+e.checked;default:var t=e.value;return t||(t=""),""+t;}}function Vn(e){return e&&"radio"==e.type}var zn={};var Yn="__default";function Gn(e){void 0===e&&(e=Yn);var t=zn[e];return t||(t=function(){var e=document.implementation.createHTMLDocument("");return e.head||e.documentElement.appendChild(e.createElement("head")),e.body||e.documentElement.appendChild(e.createElement("body")),e}(),e!==Yn&&(t.open(),t.write(e),t.close()),zn[e]=t),t}var Qn=new(function(){function e(){var e=Gn(),t=e.getElementById("urlresolver-base");t||((t=e.createElement("base")).id="urlresolver-base",e.head.appendChild(t));var n=e.getElementById("urlresolver-parser");n||((n=e.createElement("a")).id="urlresolver-parser",e.head.appendChild(n)),this.base=t,this.parser=n}return e.prototype.parseUrl=function(e,t){if("undefined"!=typeof URL)try{e||(e=document.baseURI);var n=e?new URL(t,e):new URL(t);if(n.href)return n}catch(e){}return this.parseUrlUsingBaseAndAnchor(e,t)},e.prototype.parseUrlUsingBaseAndAnchor=function(e,t){this.base.setAttribute("href",e),this.parser.setAttribute("href",t);var n=document.createElement("a");return n.href=this.parser.href,n},e.prototype.resolveUrl=function(e,t){return this.parseUrl(e,t).href},e.prototype.resolveToDocument=function(e,t){var n=Jn(e);return null==n?t:this.resolveUrl(n,t)},e}());function Xn(e,t){return Qn.parseUrl(e,t)}function Jn(e){var t=e.document,n=e.location.href;if("string"==typeof t.baseURI)n=t.baseURI;else{var r=t.getElementsByTagName("base")[0];r&&r.href&&(n=r.href)}return"about:blank"==n&&e.parent!=e?Jn(e.parent):n}var $n=new RegExp("[^\\s]"),Zn=new RegExp("[\\s]*$");String.prototype;function er(e){var t=$n.exec(e);if(!t)return e;for(var n=t.index,r=(t=Zn.exec(e))?e.length-t.index:0,i="\uFFFF",o=e.slice(n,e.length-r).split(/\r\n?|\n/g),s=0;s<o.length;s++)i+=""+o[s].length,s!=o.length-1&&(i+=":");return(n||r)&&(i+=" "+n+" "+r),i}var tr=["allowReorder","attributeName","attributeType","autoReverse","baseFrequency","baseProfile","calcMode","clipPathUnits","contentScriptType","contentStyleType","diffuseConstant","edgeMode","externalResourcesRequired","filterRes","filterUnits","glyphRef","gradientTransform","gradientUnits","kernelMatrix","kernelUnitLength","keyPoints","keySplines","keyTimes","lengthAdjust","limitingConeAngle","markerHeight","markerUnits","markerWidth","maskContentUnits","maskUnits","numOctaves","pathLength","patternContentUnits","patternTransform","patternUnits","pointsAtX","pointsAtY","pointsAtZ","preserveAlpha","preserveAspectRatio","primitiveUnits","refX","refY","referrerPolicy","repeatCount","repeatDur","requiredExtensions","requiredFeatures","specularConstant","specularExponent","spreadMethod","startOffset","stdDeviation","stitchTiles","surfaceScale","systemLanguage","tableValues","targetX","targetY","textLength","viewBox","viewTarget","xChannelSelector","yChannelSelector","zoomAndPan"].reduce(function(e,t){return e[t]=t,e[t.toUpperCase()]=t,e},{}),nr=n(2),rr="(redacted)",ir=16e6;function or(e,t){var n=e.textContent;if(!n)return"";if(!t&&!(t=xn(e)))return"";var r=n.length;return r>ir?(Mt.sendToBugsnag("Ignoring huge text node","warning",{length:r}),""):e.parentNode&&"style"==on(e.parentNode)?n:t.mask?er(n):n}function sr(e){return tr[e]||e.toLowerCase()}function ar(e,t,n,r){var i,o=on(t);if(null===o)return null;var s=function(e){var t,r,s;i=null!==(r=null===(t=nr[e][o])||void 0===t?void 0:t[n])&&void 0!==r?r:null===(s=nr[e]["*"])||void 0===s?void 0:s[n]};if(s("Any"),void 0===i){var a=xn(t);if(!a)return null;a.watchKind==an.Exclude?s("Exclude"):a.mask&&s("Mask")}if(void 0===i)return r;switch(i){case"erase":return null;case"scrubUrl":return ur(r,e,{source:"dom",type:o});case"maskText":return er(r);default:return Object(cn.assertExhaustive)(i);}}function ur(e,t,n){switch(n.source){case"dom":switch(r=n.type){case"frame":case"iframe":return hr(e,t);default:return cr(e,t);}case"event":switch(r=n.type){case R.AJAX_REQUEST:case R.NAVIGATE:return cr(e,t);case R.SET_FRAME_BASE:return hr(e,t);default:return Object(cn.assertExhaustive)(r);}case"log":return hr(e,t);case"page":var r;switch(r=n.type){case"base":return hr(e,t);case"referrer":case"url":return cr(e,t);default:return Object(cn.assertExhaustive)(r);}case"perfEntry":switch(n.type){case"frame":case"iframe":case"navigation":case"other":return hr(e,t);default:return cr(e,t);}default:return Object(cn.assertExhaustive)(n);}}function cr(e,t){return lr(e,t,function(e){if(!(e in pr)){var t=["password","token","^jwt$"];switch("4K3FQ"!==e&&"NQ829"!==e&&"KCF98"!==e&&t.push("^code$"),e){case"2FVM4":t.push("^e$","^eref$","^fn$");break;case"35500":t.push("share_token","password-reset-key");break;case"1HWDJ":t.push("email_id","invite","join");break;case"J82WF":t=[".*"];break;case"8MM83":t=["^creditCard"];break;case"PAN8Z":t.push("code","hash","ol","aeh");break;case"BKP05":t.push("api_key","session_id","encryption_key");break;case"QKM7G":t.push("postcode","encryptedQuoteId","registrationId","productNumber","customerName","agentId","qqQuoteId");break;case"FP60X":t.push("phrase");break;case"GDWG7":t=["^(?!productType|utmSource).*$"];break;case"RV68C":t.push("drivingLicense");break;case"S3VEC":t.push("data");break;case"Q8RZE":t.push("myLowesCardNumber");}pr[e]=new RegExp(t.join("|"),"i")}return pr[e]}(t))}function hr(e,t){return lr(e,t,fr)}function dr(e,t,n,r){var i=new RegExp("(\\/"+t+"\\/).*$","i");n==r&&e.pathname.indexOf(t)>=0&&(e.pathname=e.pathname.replace(i,"$1"+rr))}function lr(e,t,n){var r=Xn("",e);return r.hash&&r.hash.indexOf("access_token")>=0&&(r.hash="#"+rr),dr(r,"visitor",t,"QS8RG"),dr(r,"account",t,"QS8RG"),dr(r,"parentAccount",t,"QS8RG"),dr(r,"reset_password",t,"AGQFM"),dr(r,"reset-password",t,"95NJ7"),dr(r,"dl",t,"RV68C"),dr(r,"retailer",t,"FP60X"),dr(r,"ocadotech",t,"FP60X"),dr(r,"serviceAccounts",t,"FP60X"),dr(r,"signup",t,"7R98D"),r.search&&r.search.length>0&&(r.search=function(e,t){return e.split("?").map(function(e){return function(e,t){return e.replace("?","").split("&").map(function(e){return e.split("=")}).map(function(e){var n=e[0],r=e[1],i=e.slice(2);return t.test(n)&&void 0!==r?[n,rr].concat(i):[n,r].concat(i)}).map(function(e){var t=e[0],n=e[1],r=e.slice(2);return void 0===n?t:[t,n].concat(r).join("=")}).join("&")}(e,t)}).join("?")}(r.search,n)),r.href.substring(0,2048)}var pr={};var fr=new RegExp(".*","i");var vr=/([a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+)/gi,_r=/(?:(http)|(ftp)|(file))[s]?:\/\/(?:[a-zA-Z]|[0-9]|[$-_@.&+#]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+/gi;function gr(e){return"function"==typeof(t=e.constructor)&&Function.prototype.toString.call(t).indexOf("[native code]")>-1;var t}var mr=function(){function e(e,t,n){this._watcher=e,this._resizer=t,this._orgId=n,Tn={},kn=1}return e.prototype.tokenizeNode=function(e,t,n,r,i,o,s){var a=this,u=xn(t),c=xn(n),h=[];return function(e){var t=kn;try{return e(),!0}catch(e){return kn=t,!1}}(function(){a.tokeNode(e,u,c,r,h,i,o,s)})||(h=[]),h},e.prototype.tokeNode=function(e,t,n,r,i,o,s,a){for(var u=[{parentMirror:t,nextMirror:n,node:r}],c=function(){var t=u.pop();if(!t)return"continue";if("string"==typeof t)return i.push(t),"continue";var n=t.parentMirror,r=t.nextMirror,c=t.node,d=h._encodeTagAndAttributes(e,n,r,c,i,o,s);if(null==d||d.watchKind===an.Exclude)return"continue";var l=c.nodeType===pn?c.shadowRoot:null;return(l||c.firstChild)&&a(d)?(u.push("]"),function(e,t){if(!e)return;var n=[];ft(e,function(e){return n.push(e)});for(;n.length>0;){var r=n.pop();r&&t(r)}}(c.firstChild,function(e){u.push({parentMirror:d,nextMirror:null,node:e})}),l&&u.push({parentMirror:d,nextMirror:null,node:l}),void u.push("[")):"continue"},h=this;u.length;)c()},e.prototype._encodeTagAndAttributes=function(e,t,n,r,i,o,s){if("script"==on(r)||8==r.nodeType)return null;var a,u,c,h,d=function(e){return e.constructor===window.ShadowRoot}(r),l=function(e){var t={id:kn++,node:e};return Tn[t.id]=t,e._fs=t.id,t}(r);if((d||(null==t?void 0:t.isInShadowDOM))&&(l.isInShadowDOM=!0),t&&(d?t.shadow=l:(a=t,u=l,c=n,h=this._resizer,Fn(u,h),u.parent=a,u.next=c,c&&(u.prev=c.prev,c.prev=u),null==u.next?(u.prev=a.lastChild,a.lastChild=u):u.next.prev=u,null==u.prev?a.child=u:u.prev.next=u)),10==r.nodeType){var p=r;return i.push("<!DOCTYPE",":name",p.name,":publicId",p.publicId||"",":systemId",p.systemId||""),l}try{switch(r.nodeType){default:i.push("<"+r.nodeName),yr(r,o);break;case 11:case 9:var f;f=d?gr(r)?"#shadow":"#polyfillshadow":r.nodeName,i.push("<"+f),yr(r,o);break;case 3:void 0===l.mask&&(l.mask=!l.parent||l.parent.mask),l.mask&&this._resizer.observe(r.parentElement),yr(r,o),i.push("<"+r.nodeName,or(r,l));break;case pn:var v=r,_=v.nodeName;"http://www.w3.org/2000/svg"==v.namespaceURI&&(_="svg:"+_),i.push("<"+_);var g=this.getWatchState(v,!!l.isInShadowDOM,e),m=g.watchKind,y=g.matchesAnyKeepRule,w=g.matchesAnyConsentRule;if(l.matchesAnyKeepRule=y,l.matchesAnyConsentRule=w,null!=m)switch(l.watchKind=m,m){case an.Watch:this._resizer.observe(v);break;case an.Exclude:this._resizer.observe(v),i.push(":_fs_excluded","true");break;case an.Unmask:l.mask=!1;break;case an.Mask:l.mask=!0;}m!==an.Unmask&&m!==an.Mask&&l.parent&&(l.mask=l.parent.mask),l.mask&&i.push(":_fs_masked","true"),l.watchKind!=an.Exclude&&yr(r,o),function(e,t,n){if(ce&&"output"===on(t))return;var r=t;if(void 0!==r.hasAttributes&&!r.hasAttributes()||void 0===r.hasAttributes&&r.attributes&&r.attributes.length<=0)return;var i=function(r,i){null!==i&&(r=sr(r),null!==(i=ar(e,t,r,i))&&n(r,i))};if(void 0!==r.getAttributeNames)for(var o=0,s=r.getAttributeNames();o<s.length;o++){var a=s[o];i(a,r.getAttribute(a))}else for(var u=0;u<r.attributes.length;u++){var c=r.attributes[u];null!=c&&i(c.name,c.value)}}(this._orgId,v,function(e,t){i.push(":"+e),i.push(t);try{s(v,e,t)}catch(e){Mt.sendToBugsnag(e,"error")}});}}catch(e){Mt.sendToBugsnag(e,"error")}return l},e.prototype.getWatchState=function(e,t,n){var r=t||null==n?"matches":this._watcher.getWatchStrategy();switch(r){case"matches":return{watchKind:this._watcher.isWatched(e),matchesAnyKeepRule:this._watcher.matchesAnyKeepRule(e),matchesAnyConsentRule:this._watcher.matchesAnyConsentRule(e)};case"qsa":var i=n.get(e);return i?{watchKind:i.kind,matchesAnyKeepRule:i.matchesAnyKeepRule,matchesAnyConsentRule:i.matchesAnyConsentRule}:{watchKind:null,matchesAnyKeepRule:!1,matchesAnyConsentRule:!1};case"verify":var o=n.get(e),s={watchKind:this._watcher.isWatched(e),matchesAnyKeepRule:this._watcher.matchesAnyKeepRule(e),matchesAnyConsentRule:this._watcher.matchesAnyConsentRule(e)};return null!==s.watchKind&&void 0===o?Mt.sendToBugsnag("Watch strategy qsa digest doesn't contain el","error",{matchesDigest:s,qsaDigest:o}):null!==s.watchKind&&void 0!==o?s.watchKind===o.kind&&s.matchesAnyConsentRule===o.matchesAnyConsentRule&&s.matchesAnyKeepRule===o.matchesAnyKeepRule||Mt.sendToBugsnag("Watch strategy qsa digest inconsistency","error",{matchesDigest:s,qsaDigest:o}):null===s.watchKind&&void 0!==o&&null!==o.kind&&Mt.sendToBugsnag("Watch strategy qsa digest flagged an element matches didn't","error",{matchesDigest:s,qsaDigest:o}),s;default:return Object(cn.assertExhaustive)(r);}},e}();function yr(e,t){try{t(e)}catch(e){Mt.sendToBugsnag(e,"error")}}var wr=function(){function e(){this.dict={idx:-1,map:{}},this.nodeCount=1,this.startIdx=0}return e.prototype.encode=function(t){if(0==t.length)return[];var n,r,i=t[0],o=Object.prototype.hasOwnProperty.call(this.dict.map,i)?this.dict.map[i]:null,s=[],a=1;function u(){o?a>1?s.push([o.idx,a]):s.push(o.idx):s.push(i)}for(n=1;n<t.length;n++)if(r=t[n],o&&Object.prototype.hasOwnProperty.call(o.map,r))a++,i=r,o=o.map[r];else{u();var c=this.startIdx+n-a;null==o&&this.nodeCount<e.MAX_NODES&&(o={idx:c,map:{}},this.dict.map[i]=o,this.nodeCount++),o&&this.nodeCount<e.MAX_NODES&&(o.map[r]={idx:c,map:{}},this.nodeCount++),a=1,i=r,o=Object.prototype.hasOwnProperty.call(this.dict.map,r)?this.dict.map[r]:null}return u(),this.startIdx+=t.length,s},e.MAX_NODES=1e4,e}(),br=function(){var e=function(t,n){return(e=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])})(t,n)};return function(t,n){function r(){this.constructor=t}e(t,n),t.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}(),Sr=function(){return(Sr=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var i in t=arguments[n])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)},Er=function(){function e(e){this._ctx=e,this._recordedDims={},this._observedDims={}}return e.create=function(e){return Tr.isSupported(e.window)?new Tr(e):new kr(e)},e.prototype.collect=function(e){var t=[];for(var n in this._observedDims)this.addPlaceholderResize(e,t,Number(n));return this._observedDims={},t},e.prototype.addEntry=function(e){try{var t=Mn(e);if(!t)return;if(e.nodeType!=pn)return;var n=e;if(this._observedDims[t]=n.getBoundingClientRect(),!this._recordedDims[t]){var r=this.flushSizeEvent(t);if(!r)return;this._ctx.queue().enqueue(r)}}catch(e){}},e.prototype.addPlaceholderResize=function(e,t,n){var r=this.flushSizeEvent(n);r&&t.push(Sr(Sr({},r),{When:e}))},e.prototype.flushSizeEvent=function(e){var t=this._observedDims[e];if(!t)return null;var n=On(e);if(!n)return null;var r=n.watchKind,i=t.width,o=t.height,s=this._recordedDims[e];if(s&&s.w==i&&s.h==o)return null;if(this._recordedDims[e]={w:i,h:o},r==an.Watch){var a=0!=i&&0!=o;if((!!s&&0!=s.w&&0!=s.h)!=a)return{Kind:R.WATCHED_ELEM,Args:[e,a]}}return{Kind:R.PLACEHOLDER_SIZE,Args:[e,i,o]}},e}(),Tr=function(e){function t(t){var n=e.call(this,t)||this;return n._inlineGroups=new ln,n._observedInlines=new ln,n._obs=new t.window.ResizeObserver(function(e){for(var t=0,r=e;t<r.length;t++){var i=r[t].target;n.addEntry(i)}}),n._inlineGroupObs=new t.window.ResizeObserver(function(e){for(var t=0,r=e;t<r.length;t++){var i=r[t].target;n._addEntriesForInlineGroup(i)}}),n}return br(t,e),t.isSupported=function(e){return"ResizeObserver"in e},t.prototype.observe=function(e){var t=this;if(e&&e.nodeType==pn){var n=e;this._obs.unobserve(n),this._obs.observe(n),this._ctx.measurer.requestMeasureTask(function(){t._addToInlineGroupIfNeeded(n)})}},t.prototype.unobserveSubtree=function(e){},t.prototype.nodeChanged=function(e){var t=this,n=this._observedInlines.get(e);"number"==typeof n&&Mn(e)===n&&this._ctx.measurer.requestMeasureTask(function(){t.addEntry(e)})},t.prototype._addEntriesForInlineGroup=function(e){var t=this._inlineGroups.get(e);if(t)for(var n in t){var r=On(t[n]);r?this.addEntry(r.node):delete t[n]}},t.prototype._addToInlineGroupIfNeeded=function(e){var t=this,n=Mn(e);if(n){var r=this._nearestNonInlineElementAncestorOf(e);if(r&&r!==e){this._observedInlines.set(e,n),this.addEntry(e);var i=this._inlineGroups.get(r);i||(i=Object.create(null),this._inlineGroups.set(r,i)),i[n]=n,s.setWindowTimeout(this._ctx.window,ie(function(){t._inlineGroupObs.observe(r)}),0)}}},t.prototype._nearestNonInlineElementAncestorOf=function(e){for(var t=0,n=e;;){if(t++>1e3)return null;if(!n||n.nodeType!=pn)return null;var r=n;if(getComputedStyle(r).display.indexOf("inline")<0)return r;n=n.parentNode}},t}(Er),kr=function(e){function t(){return null!==e&&e.apply(this,arguments)||this}return br(t,e),t.prototype.observe=function(e){var t=this;if(e&&e.nodeType==pn){var n=e;this.growWatchedIndex(xn(e)),this._ctx.measurer.requestMeasureTask(function(){t.addEntry(n)})}},t.prototype.unobserveSubtree=function(e){var t=xn(e);t&&this.clearWatchedIndex(t)},t.prototype.nodeChanged=function(e){var t=this,n=this.relatedWatched(e);this._ctx.measurer.requestMeasureTask(function(){for(var e=0,r=n;e<r.length;e++){var i=r[e];t.addEntry(i)}})},t.prototype.watchedChildren=function(e){return e.watchedChildren},t.prototype.growWatchedIndex=function(e){if(e&&In(e.node))for(var t=e,n=e.parent;n;n=n.parent){if(this.watchedChildren(n)||(n.watchedChildren={}),this.watchedChildren(t))for(var r in this.watchedChildren(t))delete this.watchedChildren(n)[r];if(this.watchedChildren(n)[t.id]=t,lt(this.watchedChildren(n),2))t=n;else if(pt(this.watchedChildren(n),2))break}},t.prototype.relatedWatched=function(e){var t=[],n=xn(e);if(n)for(var r=[n],i=0;r.length&&++i<1e3;){var o=r.pop();In(o.node)&&t.push(o.node),this.watchedChildren(o)&&ht(this.watchedChildren(o),function(e){r.push(e)})}else{for(var s=e;s&&!Mn(s);)s=s.parentNode;s&&In(s)&&t.push(s)}return t},t.prototype.clearWatchedIndex=function(e){if(pt(this.watchedChildren(e),0)||In(e.node))for(var t=this.watchedChildren(e)&&pt(this.watchedChildren(e),1)||In(e.node)?e.id:function(e){for(var t in e)if(Object.prototype.hasOwnProperty.call(e,t))return t}(this.watchedChildren(e)),n=t?e.parent:null;n&&this.watchedChildren(n)&&this.watchedChildren(n)[t];){if(delete this.watchedChildren(n)[t],lt(this.watchedChildren(n),1)){var r=n.id,i=dt(this.watchedChildren(n));for(n=n.parent;n&&this.watchedChildren(n)&&this.watchedChildren(n)[r];)delete this.watchedChildren(n)[r],this.watchedChildren(n)[i.id]=i,n=n.parent;break}n=n.parent}},t}(Er),Ir=function(){return(Ir=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var i in t=arguments[n])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)},Cr={attributeName:null,attributeNamespace:null,addedNodes:[],removedNodes:[],nextSibling:null,previousSibling:null,oldValue:null};function Rr(e){return Ir(Ir(Ir({},Cr),e),{type:"childList"})}function Ar(e,t){return 0===t.length?Rr({target:e}):Rr({addedNodes:t,nextSibling:ut(t[t.length-1]),previousSibling:vt(t[0]),target:e})}var xr=ae&&!ue?Dr:window.MutationObserver||window.WebKitMutationObserver||Dr,Or=new ln,Mr=window.setImmediate||window.msSetImmediate;if(!Mr){var Lr=[],Fr=String(s.mathRandom());window.addEventListener("message",function(e){if(e.data===Fr){var t=Lr;Lr=[],t.forEach(function(e){e()})}}),Mr=function(e){for(var t=[],n=1;n<arguments.length;n++)t[n-1]=arguments[n];return Lr.push(e),window.postMessage(Fr,"*"),0}}var Pr=!1,qr=[];function Ur(){Pr=!1;var e=qr;qr=[],e.sort(function(e,t){return e.uid_-t.uid_});var t=!1;e.forEach(function(e){var n=e.takeRecords();!function(e){e.nodes_.forEach(function(t){var n=Or.get(t);n&&n.forEach(function(t){t.observer===e&&t.removeTransientObservers()})})}(e),n.length&&(e.callback_(n,e),t=!0)}),t&&Ur()}function Nr(e,t){for(var n=e;n;n=n.parentNode){var r=Or.get(n);if(r)for(var i=0;i<r.length;i++){var o=r[i],s=o.options;if(n===e||s.subtree){var a=t(s);a&&o.enqueue(a)}}}}var Wr=0;function Dr(e){this.callback_=e,this.nodes_=[],this.records_=[],this.uid_=++Wr}Dr.prototype={observe:function(e,t){if(e=function(e){return window.ShadowDOMPolyfill&&window.ShadowDOMPolyfill.wrapIfNeeded(e)||e}(e),!t.childList&&!t.attributes&&!t.characterData||t.attributeOldValue&&!t.attributes||t.attributeFilter&&t.attributeFilter.length&&!t.attributes||t.characterDataOldValue&&!t.characterData)throw new SyntaxError;var n,r=Or.get(e);r||Or.set(e,r=[]);for(var i=0;i<r.length;i++)if(r[i].observer===this){(n=r[i]).removeListeners(),n.options=t;break}n||(n=new Yr(this,e,t),r.push(n),this.nodes_.push(e)),n.addListeners()},disconnect:function(){this.nodes_.forEach(function(e){for(var t=Or.get(e),n=0;n<t.length;n++){var r=t[n];if(r.observer===this){r.removeListeners(),t.splice(n,1);break}}},this),this.records_=[]},takeRecords:function(){var e=this.records_;return this.records_=[],e}};var Br,Hr,jr=function(e,t){this.type=e,this.target=t,this.addedNodes=[],this.removedNodes=[],this.previousSibling=null,this.nextSibling=null,this.attributeName=null,this.attributeNamespace=null,this.oldValue=null};function Kr(e,t){return Br=new jr(e,t)}function Vr(e){return Hr||((n=new jr((t=Br).type,t.target)).addedNodes=t.addedNodes.slice(),n.removedNodes=t.removedNodes.slice(),n.previousSibling=t.previousSibling,n.nextSibling=t.nextSibling,n.attributeName=t.attributeName,n.attributeNamespace=t.attributeNamespace,n.oldValue=t.oldValue,(Hr=n).oldValue=e,Hr);var t,n}function zr(e,t){return e===t?e:Hr&&((n=e)===Hr||n===Br)?Hr:null;var n}function Yr(e,t,n){var r=this;this.observer=e,this.target=t,this.options=n,this.transientObservedNodes=[],this.handleEventBound=function(e){return r.handleEvent_(e)}}Yr.prototype={enqueue:function(e){var t=this.observer.records_,n=t.length;if(t.length>0){var r=zr(t[n-1],e);if(r)return void(t[n-1]=r)}else!function(e){qr.push(e),Pr||(Pr=!0,Mr(Ur))}(this.observer);t[n]=e},addListeners:function(){this.addListeners_(this.target)},addListeners_:function(e){var t=this.options;t.attributes&&e.addEventListener("DOMAttrModified",this.handleEventBound,!0),t.characterData&&e.addEventListener("DOMCharacterDataModified",this.handleEventBound,!0),t.childList&&e.addEventListener("DOMNodeInserted",this.handleEventBound,!0),(t.childList||t.subtree)&&e.addEventListener("DOMNodeRemoved",this.handleEventBound,!0)},removeListeners:function(){this.removeListeners_(this.target)},removeListeners_:function(e){var t=this.options;t.attributes&&e.removeEventListener("DOMAttrModified",this.handleEventBound,!0),t.characterData&&e.removeEventListener("DOMCharacterDataModified",this.handleEventBound,!0),t.childList&&e.removeEventListener("DOMNodeInserted",this.handleEventBound,!0),(t.childList||t.subtree)&&e.removeEventListener("DOMNodeRemoved",this.handleEventBound,!0)},addTransientObserver:function(e){if(e!==this.target){this.addListeners_(e),this.transientObservedNodes.push(e);var t=Or.get(e);t||Or.set(e,t=[]),t.push(this)}},removeTransientObservers:function(){var e=this.transientObservedNodes;this.transientObservedNodes=[],e.forEach(function(e){this.removeListeners_(e);for(var t=Or.get(e),n=0;n<t.length;n++)if(t[n]===this){t.splice(n,1);break}},this)},handleEvent_:function(e){switch(e.type){case"DOMAttrModified":var t=e.attrName,n=e.relatedNode.namespaceURI,r=Kr("attributes",a=e.target);r.attributeName=t,r.attributeNamespace=n;var i=e.attrChange===MutationEvent.ADDITION?null:e.prevValue;Nr(a,function(e){if(e.attributes&&(!e.attributeFilter||!e.attributeFilter.length||-1!==e.attributeFilter.indexOf(t)||-1!==e.attributeFilter.indexOf(n)))return e.attributeOldValue?Vr(i):r});break;case"DOMCharacterDataModified":var o=Kr("characterData",a=e.target),s=e.prevValue;Nr(a,function(e){if(e.characterData)return e.characterDataOldValue?Vr(s):o});break;case"DOMNodeRemoved":case"DOMNodeInserted":"DOMNodeRemoved"==e.type&&this.addTransientObserver(e.target);var a=e.relatedNode,u=e.target,c=void 0,h=void 0;"DOMNodeInserted"===e.type?(c=[u],h=[]):(c=[],h=[u]);var d=vt(u),l=ut(u),p=Kr("childList",a);p.addedNodes=c,p.removedNodes=h,p.previousSibling=d,p.nextSibling=l,Nr(a,function(e){if(e.childList)return p});}Br=Hr=void 0}};var Gr=function(){return(Gr=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var i in t=arguments[n])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)},Qr=function(){function e(e,t,n,r,i,o,s){var a=this;void 0===n&&(n=!0),void 0===r&&(r=function(){}),void 0===i&&(i=function(){}),void 0===o&&(o=function(){}),void 0===s&&(s=function(){return!0}),this._ctx=e,this._watcher=t,this._compress=n,this._nodeVisitor=r,this._beforeRemove=i,this._attrVisitor=o,this._visitChildren=s,this._sentDomSnapshot=!1,this._newShadowContainers=[],this._toRefresh=[],this._records=[],this._setPropertyWasThrottled=!1,this._wnd=e.window,this._resizer=Er.create(e),this._encoder=new mr(t,this._resizer,e.options.orgId),Ft(!this._watcher.onConsentChange,"This is the only consent change listener."),this._watcher.onConsentChange=function(){return a.updateConsent()}}return e.prototype.hookMutations=function(e){void 0===e&&(e=this._wnd.document),this._root=e,this._sentDomSnapshot=!1,this._compress&&(this._lz=new wr);var t=!0;if(ae)try{this.setUpIEWorkarounds()}catch(e){o("Error setting up IE workarounds for mutation watcher: "+e),t=!1}t&&(this._observer=new xr(this._addMutations.bind(this)))},e.prototype._observerOff=function(){this._observer&&this._observer.disconnect()},e.prototype._addMutations=function(e){for(var t=0,n=e;t<n.length;t++){var r=n[t];this._records.push(r)}},e.prototype.resizer=function(){return this._resizer},e.prototype.shutdown=function(){this._observer&&this._observer.disconnect();var e=xn(this._root);e&&Pn(e),this._records=[],ae&&this.tearDownIEWorkarounds(),this._watcher.onConsentChange=null,this._attachShadowHook&&(this._attachShadowHook.disable(),this._attachShadowHook=null)},e.prototype.processMutations=function(e){if(!this._root)return[];var t=[];if(this.maybeGetInitialSnapshot(e,t),this._setPropertyWasThrottled&&(t.push({Kind:R.FAIL_THROTTLED,When:e,Args:[Q.SetPropertyHooks]}),this._setPropertyWasThrottled=!1),this._records.length>0||this._toRefresh.length>0){var n={},r={};for(var i in this.processRecords(e,t,r,n),r){var o=i.split("\t");t.push({Kind:R.MUT_ATTR,When:e,Args:[parseInt(o[0]),o[1],r[i]]})}for(var i in n)t.push({Kind:R.MUT_TEXT,When:e,Args:[parseInt(i),n[i]]})}var s=this._newShadowContainers;this._newShadowContainers=[];for(var a=0;a<s.length;a++){var u=s[a].shadowRoot;u&&0!=Mn(s[a])&&0==Mn(u)&&(this.observe(u),this.genShadow(null,e,t,s[a],u))}return t.push.apply(t,this._resizer.collect(e)),this._records=[],t},e.prototype.recordingIsDetached=function(){return this._root&&this._root!=this._wnd.document},e.prototype.maybeGetInitialSnapshot=function(e,t){if(!this._sentDomSnapshot){var n=this._watcher.allWatchedElements(this._root);this.genInsert(n,e,t,null,this._root,null),this._resizer.nodeChanged(this._root),this._observer&&this.observe(this._root),this._sentDomSnapshot=!0,this.hookAttachShadow()}},e.prototype.hookAttachShadow=function(){var e=this;this._attachShadowHook=Tt(Element.prototype,"attachShadow"),this._attachShadowHook&&this._attachShadowHook.before(function(t){t.that.shadowRoot||e._newShadowContainers.push(t.that)})},e.prototype.observe=function(e){try{this._observer.observe(e,{childList:!0,attributes:!0,characterData:!0,subtree:!0,attributeOldValue:!0,characterDataOldValue:!0})}catch(e){}},e.prototype.processRecords=function(e,t,n,r){for(var i=this,o={},s={},a=function(n){if(xn(n)){i.genRemove(e,t,xn(n));var r=xn(n.parentNode);r&&(s[r.id]=r.node)}},u=0;u<this._records.length;++u)try{var c=this._records[u],h=Mn(c.target);if(!h)continue;switch(o[h]=c.target,c.type){case"childList":if(c.removedNodes.length>0)for(var d=0;d<c.removedNodes.length;++d){var l=xn(c.removedNodes[d]);l&&l.id&&this.genRemove(e,t,l)}if(c.addedNodes.length>0){s[h]=c.target;var p=Jr(c.target);p&&(s[p.id]=p.node)}break;case"characterData":Cn(c.target)||c.oldValue!=c.target.textContent&&(r[h]=or(c.target));break;case"attributes":var f=An(w=c.target);if(_n(this._watcher.isWatched(w))>_n(f)){a(w);break}var v=Xr(c.attributeNamespace)+(c.attributeName||""),_=sr(v);if(w.hasAttribute(v)){var g=c.target.getAttribute(v);c.oldValue!=g&&(g=ar(this._ctx.options.orgId,c.target,_,g||""),this._attrVisitor(c.target,_,g||""),null!==g&&(n[h+"\t"+_]=g))}else n[h+"\t"+_]=null;}}catch(e){}for(var m=0,y=this._toRefresh;m<y.length;m++){var w=y[m];try{a(w)}catch(e){Mt.sendToBugsnag(e,"error")}}for(var b in this._toRefresh=[],s){var S=xn(E=s[b]);S&&S.id&&this.diff(e,t,E,S.child,E.firstChild)}for(var b in o){var E=o[b];this._resizer.nodeChanged(E)}},e.prototype._checkForMissingInsertions=function(e){if(!this._sentDomSnapshot||!e)return[];return this.walkAddRecords(this._root),[]},e.prototype.walkAddRecords=function(e){var t=this;Mn(e)||null===e.parentNode?ft(e.firstChild,function(e){t.walkAddRecords(e)}):this._records.push(Ar(e.parentNode,[e]))},e.prototype.diff=function(e,t,n,r,i){for(var o=[],s=r,a=i;s&&a;){var u=xn(a);Mn(a)?u&&s.id==u.id?(s=s.next,a=ut(a)):(o.push({remove:s}),s=s.next):(o.push({insert:[n,a,s.node]}),a=ut(a))}for(;s;s=s.next)o.push({remove:s});ft(a,function(e){o.push({insert:[n,e,null]})});for(var c=!1,h=0;h<o.length;h++){var d=o[h];d.insert?this.genInsert(null,e,t,d.insert[0],d.insert[1],d.insert[2]):d.remove&&(c=!0,this.genRemove(e,t,d.remove))}Ft(!c,"All remove events should have been generated earlier, in MutationWatcher.processMutations")},e.prototype.genShadow=function(e,t,n,r,i){var o=Mn(r),s=this.genDocStream(e,r,i,null);s.length>0&&n.push({When:t,Kind:R.MUT_SHADOW,Args:[o,this._compress?this._lz.encode(s):s]})},e.prototype.genInsert=function(e,t,n,r,i,o){var s=Mn(r)||-1,a=Mn(o)||-1,u=-1===s&&-1===a,c=p(),h=this.genDocStream(e,r,i,o),d=p()-c;if(h.length>0){var l=p(),f=this._compress?this._lz.encode(h):h,v=p()-l;n.push({When:t,Kind:R.MUT_INSERT,Args:[s,a,f]},{When:t,Kind:R.TIMING,Args:[[O.Internal,A.Serialization,u?x.DomSnapshot:x.NodeEncoding,t,d,[x.LzEncoding,v]]]})}},e.prototype.genDocStream=function(e,t,n,r){var i=this;if(t&&Cn(t))return[];for(var o=[],s=this._encoder.tokenizeNode(e,t,r,n,function(e){if(e.nodeType==pn){var t=e;t.shadowRoot&&i.observe(t.shadowRoot)}i._nodeVisitor(e,o)},this._attrVisitor,this._visitChildren),a=0,u=o;a<u.length;a++){(0,u[a])()}return s},e.prototype.genRemove=function(e,t,n){var r=n.id;if(this._beforeRemove(n),Fn(n,this._resizer),t.length>0){var i=t[t.length-1];if(i.Kind==R.MUT_REMOVE)return void i.Args.push(r)}t.push({When:e,Kind:R.MUT_REMOVE,Args:[r]})},e.prototype.setUpIEWorkarounds=function(){var t=this;if(ue){var n=Object.getOwnPropertyDescriptor(Node.prototype,"textContent"),r=n&&n.set;if(!n||!r)throw new Error("Missing textContent setter -- not safe to record mutations.");Object.defineProperty(Element.prototype,"textContent",Gr(Gr({},n),{set:function(e){try{for(var t=void 0;t=this.firstChild;)this.removeChild(t);if(null===e||""==e)return;var n=(this.ownerDocument||document).createTextNode(e);this.appendChild(n)}catch(t){r&&r.call(this,e)}}}))}this._setPropertyThrottle=new nn(e.ThrottleMax,e.ThrottleInterval,function(){return new tn(function(){t._setPropertyWasThrottled=!0,t.tearDownIEWorkarounds()}).start()});var i=this._setPropertyThrottle.guard(function(e){e.cssText=e.cssText});this._setPropertyThrottle.open(),this._setPropertyHook=Tt(CSSStyleDeclaration.prototype,"setProperty"),this._setPropertyHook&&this._setPropertyHook.afterSync(function(e){i(e.that)}),this._removePropertyHook=Tt(CSSStyleDeclaration.prototype,"removeProperty"),this._removePropertyHook&&this._removePropertyHook.afterSync(function(e){i(e.that)})},e.prototype.tearDownIEWorkarounds=function(){this._setPropertyThrottle&&this._setPropertyThrottle.close(),this._setPropertyHook&&this._setPropertyHook.disable(),this._removePropertyHook&&this._removePropertyHook.disable()},e.prototype.updateConsent=function(){var e=this,t=xn(this._root);t&&function(e,t){for(var n=[e];n.length;){var r=n.pop();if(r){t(r);for(var i=r.child,o=r.shadow;i;)n.push(i),i=i.next;o&&n.push(o)}}}(t,function(t){var n=t.node;t.matchesAnyConsentRule&&e.refreshElement(n)})},e.prototype.refreshElement=function(e){Mn(e)&&this._toRefresh.push(e)},e.ThrottleMax=1024,e.ThrottleInterval=1e4,e}();function Xr(e){return void 0===e&&(e=""),null===e?"":{"http://www.w3.org/1999/xlink":"xlink:","http://www.w3.org/XML/1998/namespace":"xml:","http://www.w3.org/2000/xmlns/":"xmlns:"}[e]||""}function Jr(e){return!(null==e?void 0:e.shadowRoot)||gr(e.shadowRoot)?null:xn(e.shadowRoot)}var $r=["navigationStart","unloadEventStart","unloadEventEnd","redirectStart","redirectEnd","fetchStart","domainLookupStart","domainLookupEnd","connectStart","connectEnd","secureConnectionStart","requestStart","responseStart","responseEnd","domLoading","domInteractive","domContentLoadedEventStart","domContentLoadedEventEnd","domComplete","loadEventStart","loadEventEnd"],Zr=["name","startTime","duration","initiatorType","redirectStart","redirectEnd","fetchStart","domainLookupStart","domainLookupEnd","connectStart","connectEnd","secureConnectionStart","requestStart","responseStart","responseEnd","unloadEventStart","unloadEventEnd","domInteractive","domContentLoadedEventStart","domContentLoadedEventEnd","domComplete","loadEventStart","loadEventEnd","type","redirectCount","decodedBodySize","encodedBodySize","transferSize"],ei=["name","startTime","duration","initiatorType","redirectStart","redirectEnd","fetchStart","domainLookupStart","domainLookupEnd","connectStart","connectEnd","secureConnectionStart","requestStart","responseStart","responseEnd","decodedBodySize","encodedBodySize","transferSize"],ti=["name","startTime","duration"],ni=["jsHeapSizeLimit","totalJSHeapSize","usedJSHeapSize"],ri=function(){function e(e,t,n){this._ctx=e,this._queue=t,this._perfSupported=!1,this._timingSupported=!1,this._getEntriesSupported=!1,this._memorySupported=!1,this._lastUsedJSHeapSize=0,this._gotLoad=!1,this._observer=null,this._observedBatches=[];var r=window.performance;r&&(this._perfSupported=!0,r.timing&&(this._timingSupported=!0),r.memory&&(this._memorySupported=!0),"function"==typeof r.getEntries&&(this._getEntriesSupported=!0),this._listeners=n.createChild())}return e.prototype.start=function(e){var t=this;this._resourceUploader=e;var n=window.performance;n&&(this._ctx.recording.inFrame||this._queue.enqueue({Kind:R.REC_FEAT_SUPPORTED,Args:[Y.Performance,this._timingSupported,Y.PerformanceEntries,this._getEntriesSupported,Y.PerformanceMemory,this._memorySupported,Y.PerformanceObserver,!!window.PerformanceObserver]}),this.observe(),!this._observer&&n.addEventListener&&n.removeEventListener&&this._listeners.add(n,"resourcetimingbufferfull",!0,function(){t._queue.enqueue({Kind:R.RESOURCE_TIMING_BUFFER_FULL,Args:[]})}),this.checkMemory())},e.prototype.onLoad=function(){this._gotLoad||(this._gotLoad=!0,this._timingSupported&&(this.recordTiming(performance.timing),this.checkForNewEntries()))},e.prototype.tick=function(e){this.checkMemory(),e&&this.checkForNewEntries()},e.prototype.shutdown=function(){this._listeners&&this._listeners.clear(),this._resourceUploader=void 0;var e=[];this._observer?(this._observer.takeRecords&&(e=this._observer.takeRecords()),this._observer.disconnect()):window.performance&&window.performance.getEntries&&(e=window.performance.getEntries()),e.length>300&&(e=e.slice(0,300),this._queue.enqueue({Kind:R.RESOURCE_TIMING_BUFFER_FULL,Args:[]})),this._observedBatches.push(e),this.tick(!0)},e.prototype.observe=function(){var e=this;if(!this._observer&&this._getEntriesSupported&&window.PerformanceObserver){this._observedBatches.push(performance.getEntries()),this._observer=new window.PerformanceObserver(function(t){var n=t.getEntries();e._observedBatches.push(n)});var t=["navigation","resource","measure","mark"];window.PerformancePaintTiming&&t.push("paint"),this._observer.observe({entryTypes:t})}},e.prototype.checkMemory=function(){if(this._memorySupported&&!this._ctx.recording.inFrame){var e=performance.memory;if(e){var t=e.usedJSHeapSize-this._lastUsedJSHeapSize;(0==this._lastUsedJSHeapSize||s.mathAbs(t/this._lastUsedJSHeapSize)>.2)&&(this.addPerfEvent(z.Memory,e,ni),this._lastUsedJSHeapSize=e.usedJSHeapSize)}}},e.prototype.recordEntry=function(e){switch(e.entryType){case"navigation":this.recordNavigation(e);break;case"resource":this.recordResource(e);break;case"paint":this.recordPaint(e);break;case"measure":this.recordMeasure(e);break;case"mark":this.recordMark(e);}},e.prototype.checkForNewEntries=function(){if(this._perfSupported&&this._getEntriesSupported){var e=this._observedBatches;this._observedBatches=[];for(var t=0,n=e;t<n.length;t++)for(var r=0,i=n[t];r<i.length;r++){var o=i[r];this.recordEntry(o)}}},e.prototype.recordTiming=function(e){this.addPerfEvent(z.Timing,e,$r)},e.prototype.recordNavigation=function(e){this.addPerfEvent(z.Navigation,e,Zr,{name:"navigation"})},e.prototype.recordResource=function(e){var t=this._ctx.options.orgId;"3E938"!=t&&"GDWG7"!=t&&this.addPerfEvent(z.Resource,e,ei,{name:e.initiatorType})},e.prototype.recordPaint=function(e){this.addPerfEvent(z.Paint,e,ti)},e.prototype.recordMark=function(e){this.addPerfEvent(z.Mark,e,ti)},e.prototype.recordMeasure=function(e){this.addPerfEvent(z.Measure,e,ti)},e.prototype.addPerfEvent=function(e,t,n,r){void 0===r&&(r={});for(var i=[e],o=0,s=n;o<s.length;o++){var a=s[o],u=t[a];if(void 0===u&&(u=-1),a in r){var c=ur(u,this._ctx.options.orgId,{source:"perfEntry",type:r[a]});u===c&&this.maybeUploadResource(e,t,c),u=c}i.push(u)}this._queue.enqueue({Kind:R.PERF_ENTRY,Args:i})},e.prototype.maybeUploadResource=function(e,t,n){this._resourceUploader&&e===z.Resource&&"css"===t.initiatorType&&this._resourceUploader.uploadIfNeeded(this._ctx.window,n)},e}();function ii(e){var t=0,n={id:t++,edges:{}};return e.split("\n").forEach(function(e){if(""!=(e=e.trim())){if(0==e.indexOf("/")||e.lastIndexOf("/")==e.length-1)throw new Error("Leading and trailing slashes are not supported");var r=n,i=e.split("/");i.forEach(function(e,n){if(""===(e=e.trim()))throw new Error("Empty elements are not allowed");if("**"!=e&&"*"!=e&&-1!=e.indexOf("*"))throw new Error("Embedded wildcards are not supported");var o=null;"**"==e?(r.loop=!0,o=r):e in r.edges&&(o=r.edges[e]),o||(o={id:t++,edges:{}},r.edges[e]=o),n==i.length-1&&(o.term=!0),r=o})}}),n}var oi=ii("**"),si="__fs__redacted";function ai(e,t,n){var r;if(n){r=1==n?oi:n;try{var i=0,o=[1],a=[],u={};return u[r.id]=r,a.push(u),s.jsonStringify(e,function(e,n){var r=n&&"object"==typeof n;if(""==e&&1==o.length)return o[0]--,r&&o.push(s.objectKeys(n).length),n;var u={},c=a[a.length-1],h=!0,d=!1,l=function(e){u[e.id]=e,h=!1,e.term&&(d=!0)};for(var p in c){var f=c[p];e in f.edges&&l(f.edges[e]),"*"in f.edges&&l(f.edges["*"]),f.loop&&l(f)}for((h||!r&&!d)&&(n=si),i+=e.length+2,(i+=r?2:null===n?4:n.toString().length)>=t&&(n=void 0),o[o.length-1]--,n&&n!==si&&r&&(o.push(s.objectKeys(n).length),a.push(u));o[o.length-1]<=0;)o.pop(),a.pop();return n})}catch(e){}return"[error serializing "+e.constructor.name+"]"}}var ui=function(){function e(e){this._requestTracker=e}return e.prototype.disable=function(){this._hook&&(this._hook.disable(),this._hook=null)},e.prototype.enable=function(e){var t,n=this,r=I(e),i=null===(t=null==r?void 0:r._w)||void 0===t?void 0:t.fetch;(i||e.fetch)&&(this._hook=Tt(i?r._w:e,"fetch"),this._hook&&this._hook.afterSync(function(e){return n.recordFetch(e.that,e.result,e.args[0],e.args[1])}))},e.prototype.recordFetch=function(e,t,n,r){var i,o="GET",s="",a={};if("string"==typeof n?s=n:"url"in n?(s=n.url,o=n.method,i=n.body,n.headers&&n.headers.forEach(function(e,t){a[e]=t})):s=""+n,r){o=r.method||o;var u=r.headers;if(u)if(nt(u))for(var c=0,h=u;c<h.length;c++){var d=h[c],l=d[0],p=d[1];a[l]=p}else if("function"==typeof u.forEach)u.forEach(function(e,t,n){a[t]=e});else for(var l in u)a[l]=u[l];i=r.body||i}if(s){for(var l in s=this._requestTracker.addPendingReq(t,o,s),a)this._requestTracker.addHeader(t,l,a[l]);i&&this._requestTracker.addRequestBody(t,i)}this.instrumentResponse(t,s,!!this._requestTracker.getRspWhitelist(s))},e.prototype.instrumentResponse=function(e,t,n){var r=this;e.then(Mt.wrap(function(t){var i=(t.headers.get("content-type")||"default").split(";")[0],o=["default","text/plain","text/json","application/json"].indexOf(i)>-1;n&&o?t.clone().text().then(Mt.wrap(function(i){var o=mi(i,n),s=o[0],a=o[1];r.onComplete(e,t,s,a)}))["catch"](Mt.wrap(function(n){r.onComplete(e,t,-1,void 0)})):r.onComplete(e,t,-1,void 0)}))["catch"](Mt.wrap(function(t){r.onComplete(e,t,-1,void 0)}))},e.prototype.onComplete=function(e,t,n,r){var i=this,o=-1,s="";if("headers"in t){o=t.status;s=this.serializeFetchHeaders(t.headers,function(e){return i._requestTracker.isHeaderInResponseHeaderWhitelist(e[0])})}return this._requestTracker.onComplete(e,s,o,n,r)},e.prototype.serializeFetchHeaders=function(e,t){var n="";return e.forEach(function(e,r){r=r.toLowerCase();var i=t([r,e]);n+=r+(i?": "+e:"")+di}),n},e}(),ci=function(){function e(e){this._requestTracker=e}return e.prototype.disable=function(){this._xhrOpenHook&&(this._xhrOpenHook.disable(),this._xhrOpenHook=null),this._xhrSetHeaderHook&&(this._xhrSetHeaderHook.disable(),this._xhrSetHeaderHook=null)},e.prototype.enable=function(e){var t,n=this,r=I(e),i=(null===(t=null==r?void 0:r._w)||void 0===t?void 0:t.XMLHttpRequest)||e.XMLHttpRequest;if(i){var o=i.prototype;this._xhrOpenHook=Tt(o,"open"),this._xhrOpenHook&&this._xhrOpenHook.before(function(e){var t=e.args[0],r=e.args[1];n._requestTracker.addPendingReq(e.that,t,r),e.that.addEventListener("load",Mt.wrap(function(t){n.onComplete(e.that)})),e.that.addEventListener("error",Mt.wrap(function(t){n.onComplete(e.that)}))}),this._xhrSendHook=Tt(o,"send"),this._xhrSendHook&&this._xhrSendHook.before(function(e){var t=e.args[0];n._requestTracker.addRequestBody(e.that,t)}),this._xhrSetHeaderHook=Tt(o,"setRequestHeader"),this._xhrSetHeaderHook&&this._xhrSetHeaderHook.before(function(e){var t=e.args[0],r=e.args[1];n._requestTracker.addHeader(e.that,t,r)})}},e.prototype.onComplete=function(e){var t=this,n=this.responseBody(e),r=n[0],i=n[1],o=Ei(function(e){var t=[];return e.split(di).forEach(function(e){var n=e.indexOf(":");-1!=n?t.push([e.slice(0,n).trim(),e.slice(n+1,e.length).trim()]):t.push([e.trim(),null])}),t}(e.getAllResponseHeaders()),function(e){return t._requestTracker.isHeaderInResponseHeaderWhitelist(e[0])});return this._requestTracker.onComplete(e,o,e.status,r,i)},e.prototype.responseBody=function(e){var t=this._requestTracker.pendingReq(e);if(!t)return[-1,void 0];var n=this._requestTracker.getRspWhitelist(t.url);if(e.responseType){var r=e.response;switch(r||o("Maybe response type was different that expected."),e.responseType){case"text":return mi(e.responseText,n);case"json":return function(e,t){if(!e)return[-1,void 0];return[yi(e),ai(e,te.MaxPayloadLength,t)]}(r,n);case"arraybuffer":return function(e,t){return[e?e.byteLength:-1,t?"[ArrayBuffer]":void 0]}(r,n);case"blob":return function(e,t){return[e?e.size:-1,t?"[Blob]":void 0]}(r,n);case"document":return function(e,t){return[-1,t?"[Document]":void 0]}(0,n);}}return mi(e.responseText,n)},e}();var hi,di="\r\n",li=["a-im","accept","accept-charset","accept-encoding","accept-language","accept-datetime","access-control-request-method,","access-control-request-headers","cache-control","connection","content-length","content-md5","content-type","date","expect","forwarded","from","host","if-match","if-modified-since","if-none-match","if-range","if-unmodified-since","max-forwards","origin","pragma","range","referer","te","user-agent","upgrade","via","warning"],pi=["access-control-allow-origin","access-control-allow-credentials","access-control-expose-headers","access-control-max-age","access-control-allow-methods","access-control-allow-headers","accept-patch","accept-ranges","age","allow","alt-svc","cache-control","connection","content-disposition","content-encoding","content-language","content-length","content-location","content-md5","content-range","content-type","date","delta-base","etag","expires","im","last-modified","link","location","permanent","p3p","pragma","proxy-authenticate","public-key-pins","retry-after","permanent","server","status","strict-transport-security","trailer","transfer-encoding","tk","upgrade","vary","via","warning","www-authenticate","x-frame-options"],fi={BM7A6:["x-b3-traceid"],KD87S:["transactionid"],NHYJM:["x-att-conversationid"],GBNRN:["x-trace-id"],R16RC:["x-request-id"],DE9CX:["x-client","x-client-id","ot-baggage-original-client","x-req-id","x-datadog-trace-id","x-datadog-parent-id","x-datadog-sampling-priority"]},vi={"thefullstory.com":["x-cloud-trace-context"],TN1:["x-cloud-trace-context"],KD87S:["transactionid"],PPE96:["x-b3-traceid"],HWT6H:["x-b3-traceid"],PPEY7:["x-b3-traceid"],PPK3W:["x-b3-traceid"],NHYJM:["x-att-conversationid"],GBNRN:["x-trace-id"],NK5T9:["traceid","requestid"]},_i=function(){function e(e,t){this._ctx=e,this._queue=t,this._enabled=!1,this._tracker=new gi(e,t),this._xhr=new ci(this._tracker),this._fetch=new ui(this._tracker)}return e.prototype.isEnabled=function(){return this._enabled},e.prototype.enable=function(e){this._enabled||(this._enabled=!0,this._queue.enqueue({Kind:R.REC_FEAT_SUPPORTED,Args:[Y.Ajax,!0,Y.AjaxFetch,!!e]}),this._xhr.enable(this._ctx.window),e&&this._fetch.enable(this._ctx.window))},e.prototype.disable=function(){this._enabled&&(this._enabled=!1,this._xhr.disable(),this._fetch.disable())},e.prototype.tick=function(e){this._tracker.tick(e)},e.prototype.setWatches=function(e){this._tracker.setWatches(e)},e}(),gi=function(){function e(e,t){this._ctx=e,this._queue=t,this._reqHeaderWhitelist={},this._rspHeaderWhitelist={},this._pendingReqs={},this._events=[],this._curId=1,this.addHeaderWhitelist(li,pi),this.addHeaderWhitelist(fi[e.options.orgId],vi[e.options.orgId])}return e.prototype.getReqWhitelist=function(e){var t=this.findWhitelistIndexFor(e);return t>=0&&this._reqWhitelist[t]},e.prototype.getRspWhitelist=function(e){var t=this.findWhitelistIndexFor(e);return t>=0&&this._rspWhitelist[t]},e.prototype.isHeaderInRequestHeaderWhitelist=function(e){return e in this._reqHeaderWhitelist},e.prototype.isHeaderInResponseHeaderWhitelist=function(e){return e in this._rspHeaderWhitelist},e.prototype.pushEvent=function(e){this._events.push(e)},e.prototype.setWatches=function(e){var t=this,n=[];this._reqWhitelist=[],this._rspWhitelist=[],e.forEach(function(e){n.push(e.URLRegex),t._reqWhitelist.push(Si(e.RecordReq,e.ReqWhitelist)),t._rspWhitelist.push(Si(e.RecordRsp,e.RspWhitelist))}),this._reqBodyRegex=new RegExp("("+n.join(")|(")+")")},e.prototype.addHeaderWhitelist=function(e,t){var n=this;e&&e.forEach(function(e){return n._reqHeaderWhitelist[e]=!0}),t&&t.forEach(function(e){return n._rspHeaderWhitelist[e]=!0})},e.prototype.tick=function(e){if(e){for(var t=0;t<this._events.length;t++)this._queue.enqueue({Kind:R.AJAX_REQUEST,Args:this._events[t]});this._events=[]}},e.prototype.pendingReq=function(e){var t=wi(e);return t?this._pendingReqs[t]:(o("missing xhr req id"),null)},e.prototype.deletePending=function(e){var t=wi(e);t&&delete this._pendingReqs[t]},e.prototype.addPendingReq=function(e,t,n){this.deletePending(e);var r=this._curId++;return n=function(e,t){return Qn.resolveToDocument(e,t)}(this._ctx.window,n),this._pendingReqs[r]={id:r,xhr:e,method:t,url:n,startTime:p(),headers:[],reqSize:0,reqBody:void 0},function(e,t){e._fs=t}(e,r),n},e.prototype.addHeader=function(e,t,n){var r=this.pendingReq(e);r&&r.headers.push([t,n])},e.prototype.addRequestBody=function(e,t){var n,r=this.pendingReq(e);r&&(n=this.requestBody(r.url,t),r.reqSize=n[0],r.reqBody=n[1])},e.prototype.onComplete=function(e,t,n,r,i){var o=this,s=this.pendingReq(e);if(s){this.deletePending(e);var a=p()-s.startTime,u=Ei(s.headers,function(e){return o.isHeaderInRequestHeaderWhitelist(e[0])}),c=s.reqBody||null,h=[s.method,ur(s.url,this._ctx.options.orgId,{source:"event",type:R.AJAX_REQUEST}),a,n,u,t,s.startTime,s.reqSize,r,c,i||null];this.pushEvent(h)}},e.prototype.findWhitelistIndexFor=function(e){if(this._reqBodyRegex){var t=this._reqBodyRegex.exec(e);if(t)for(var n=1;n<t.length;n++)if(void 0!==t[n])return n-1}return-1},e.prototype.requestBody=function(e,t){if(null==t)return[0,void 0];var n=this.getReqWhitelist(e),r=typeof t;if("string"==r)return function(e,t){return[e.length,bi(e,t)]}(t,n);if("object"==r){var i=r.constructor;switch(i){case String:case Object:default:return function(e,t){var n=void 0;!1!==t&&(n=ai(e,te.MaxPayloadLength,t));return[yi(e),n]}(t,n);case Blob:return function(e,t){var n=e.size,r=void 0;t&&(r="[Blob]");return[n,r]}(t,n);case ArrayBuffer:return function(e,t){var n=e.byteLength,r=void 0;t&&(r="[ArrayBuffer]");return[n,r]}(t,n);case Document:case FormData:case URLSearchParams:case ReadableStream:return[-1,n?""+i.name:void 0];}}return[-1,n?"[unknown]":void 0]},e}();function mi(e,t){return e?[e.length,bi(e,t)]:[-1,void 0]}function yi(e){try{return s.jsonStringify(e).length}catch(e){}return 0}function wi(e){return e._fs}function bi(e,t){if(0!=t)try{return ai(s.jsonParse(e),te.MaxPayloadLength,t)}catch(n){return 1==t?e.slice(0,te.MaxPayloadLength):void 0}}function Si(e,t){switch(e){default:case J.Elide:return!1;case J.Record:return!0;case J.Whitelist:try{return ii(t)}catch(e){return o("error parsing field whitelist ("+t+": "+e),!1}}}function Ei(e,t){var n="";return e.forEach(function(e){e[0]=e[0].toLowerCase();var r=t(e);n+=e[0]+(r?": "+e[1]:"")+di}),n}function Ti(e){return e?e.sheet:void 0}function ki(e){try{return e?e.cssRules||e.rules:void 0}catch(e){return}}function Ii(e,t){var n=function(e,t){var n=e;if("function"==typeof n.getPropertyCSSValue){var r=n.getPropertyCSSValue(t);if(null!=r){var i;switch(r.cssValueType){case 1:i=r;break;case 2:if(1!==r.length)return;var o=r.item(0);if(null==o)return;if(1!==o.cssValueType)return;i=o;break;default:return;}if(19===i.primitiveType){var s=Gn();hi||(hi=s.createElement("div"));var a=i.cssText;try{hi.style.cssText=t+": \""+a+"\";";var u=hi.style.getPropertyCSSValue(t);if(null==u)return;if(a!==u.cssText)return}catch(e){return}finally{hi.style.cssText=""}return"\""+a+"\""}}}}(e,t);return void 0!==n?n:e.getPropertyValue(t)}var Ci,Ri="EventQueue not defined for 'withEventQueueFor', likely caused by holding ref to callback",Ai=function(e){var t=e.ownerDocument;return t&&t.defaultView},xi=function(){function e(t,n){var r=this;this.ctx=t,this.queue=n,this.hooks=[],this.removeShims=[],this.nextSheetId=1;var i=e;this.throttle=new nn(i.ThrottleMax,i.ThrottleInterval,function(){return setTimeout(function(){r.queue.enqueue({Kind:R.FAIL_THROTTLED,Args:[Q.StyleSheetHooks]}),r.stop()})}),this.addInsert=this.throttle.guard(this.addInsert),this.addDelete=this.throttle.guard(this.addDelete)}return e.prototype.start=function(){var e=this;this.throttle.open();var t=this.ctx.window;if(t.CSSStyleSheet&&t.StyleSheet){var n,r=t.CSSStyleSheet.prototype;(n=Tt(r,"insertRule"))&&(n.afterSync(function(t){e.addInsert(t.that,t.args[0],t.args[1])}),this.hooks.push(n)),(n=Tt(r,"deleteRule"))&&(n.afterSync(function(t){e.addDelete(t.that,t.args[0])}),this.hooks.push(n)),this.removeShims.push(kt(t.StyleSheet,"disabled",function(t,n){return e.onDisableSheet(t,n)}),kt(t.Document,"adoptedStyleSheets",function(t,n){return e.onSetAdoptedStyleSheets(t)}),kt(t.ShadowRoot,"adoptedStyleSheets",function(t,n){return e.onSetAdoptedStyleSheets(t)}))}},e.prototype.onSetAdoptedStyleSheets=function(e){if(Mn(e)){var t=e.adoptedStyleSheets;if(t){for(var n=[],r=0,i=t;r<i.length;r++){var o=i[r],s=this.snapshotConstructedStylesheet(o);n.push(s),!0===o.disabled&&this.onDisableSheet(o,!0)}this.queue.enqueue({Kind:R.ADOPTED_STYLESHEETS,Args:[Mn(e),n]})}}},e.prototype.snapshotEl=function(e,t){void 0===t&&(t=0);var n=Mn(e);if(n){var r=Ti(e);r&&this.snapshot([G.Node,n],r,t)}},e.prototype.snapshotConstructedStylesheet=function(e){var t=Pi(e);if(void 0!==t)return t;var n=this.nextSheetId++;return function(e,t){e._fs=t}(e,n),this.snapshot([G.Sheet,n],e),n},e.prototype.snapshot=function(e,t,n){void 0===n&&(n=0);var r=ki(t);if(r){for(var i=[],o=n;o<r.length;o++)try{i.push(Ci(r[o]))}catch(e){i.push("html {}")}this.queue.enqueue({Kind:R.CSSRULE_INSERT,Args:[e,i,n]})}},e.prototype.addInsert=function(t,n,r){var i=Fi(t,G.Node);i&&"string"==typeof n&&(n.length>e.MaxRuleBytes&&(o("CSSRule too large, inserting dummy instead: "+n.length),n="dummy {}"),this.withEventQueueForSheet(t,function(e){return e.enqueue({Kind:R.CSSRULE_INSERT,Args:"number"==typeof r?[i,[n],r]:[i,[n]]})}))},e.prototype.addDelete=function(e,t){var n=Fi(e,G.Node);n&&this.withEventQueueForSheet(e,function(e){return e.enqueue({Kind:R.CSSRULE_DELETE,Args:[n,t]})})},e.prototype.onDisableSheet=function(e,t){var n=Fi(e,G.Node);n&&this.withEventQueueForSheet(e,function(e){return e.enqueue({Kind:R.DISABLE_STYLESHEET,Args:[n,!!t]})})},e.prototype.withEventQueueForSheet=function(e,t){if(e.ownerNode)return n=this.ctx,r=e.ownerNode,i=t,void((o=I(Ai(r)||n.window))&&"function"==typeof o._withEventQueue&&o._withEventQueue(n.recording.pageSignature(),function(e){i({enqueue:function(t){Ft(null!=e,Ri)&&e.enqueue(t)},enqueueFirst:function(t){Ft(null!=e,Ri)&&e.enqueueFirst(t)}}),e=null}));var n,r,i,o;t(this.queue)},e.prototype.stop=function(){this.throttle.close();for(var e=0,t=this.hooks;e<t.length;e++){t[e].disable()}this.hooks=[];for(var n=0,r=this.removeShims;n<r.length;n++){(0,r[n])()}this.removeShims=[]},e.ThrottleMax=1e4,e.ThrottleInterval=1e4,e.MaxRuleBytes=16384,e}(),Oi=document.createElement("div");function Mi(e,t){if(void 0===t&&(t=0),!Ft(t<=20,"No deep recursion for CSS rules"))return"html { /* Depth limit exceeded! */ }";var n=function(e){switch(e.type){case CSSRule.PAGE_RULE:var t=e.selectorText||"";return t&&ct(t,"@page")?t:"@page "+t;case CSSRule.KEYFRAME_RULE:return e.keyText;case CSSRule.STYLE_RULE:return e.selectorText;case CSSRule.MEDIA_RULE:return"@media "+e.media.mediaText;case CSSRule.KEYFRAMES_RULE:return"@keyframes "+e.name;case CSSRule.SUPPORTS_RULE:return"@supports "+e.conditionText;default:return null;}}(e);if(null==n)return e.cssText;var r=function(e,t){var n=e,r=n.style;if(r){for(var i="",o=0;o<r.length;o++){var s=r[o],a=Ii(r,s);"initial"!==a&&("\""!==(u=a)[0]&&"'"!==u[0]||u[u.length-1]!==u[0])||(i+=s+": "+a,"important"===r.getPropertyPriority(s)&&(i+=" !important"),i+="; ")}return[r.cssText,i].filter(Boolean).join("\n")}var u;var c=n.cssRules;if(!c)return null;var h="";for(o=0;o<c.length;o++)h+=Mi(c[o],t+1);return h}(e,t);return null==r?e.cssText:n+" { "+r+"} "}Oi.style.width="initial",Ci=""!=Oi.style.cssText?function(e){return e.cssText}:Mi;var Li=/^\s*$/;function Fi(e,t){var n=function(e){var t=Pi(e);if(t)return[G.Sheet,t];var n=Mn(e.ownerNode);if(n)return[G.Node,n];return}(e);if(n){var r=n[0],i=n[1];return r===t?i:n}}function Pi(e){return e._fs}var qi=function(){function e(e,t,n){this._ctx=e,this._q=t,this._listeners=n.createChild()}return e.prototype.start=function(){var e=this,t=this._ctx.window.document;this._listeners.addCustom(t,this.getFullscreenChangeEvent(),!0,function(t){e.onFullscreenChange(t)}),this._listeners.addCustom(t,this.getFullscreenErrorEvent(),!0,function(t){e.onFullscreenError(t)})},e.prototype.stop=function(){this._listeners&&this._listeners.clear()},e.prototype.onFullscreenChange=function(e){var t=this.getFullscreenElement();if(t){var n=Mn(t);Ft(null==this._previousFullscreenFSID,"Error: Received fullscreen signal but we think we are already in fullscreen?"),this._q.enqueue({Kind:R.FULLSCREEN,Args:[n,!0]}),this._previousFullscreenFSID=n}else Ft(null!=this._previousFullscreenFSID,"Error: Received fullscreen exit signal but have no previous fullscreen event?"),this._q.enqueue({Kind:R.FULLSCREEN,Args:[this._previousFullscreenFSID,!1]}),this._previousFullscreenFSID=void 0},e.prototype.onFullscreenError=function(e){this._q.enqueue({Kind:R.FULLSCREEN_ERROR,Args:[]})},e.prototype.getFullscreenElement=function(){var e=this._ctx.window.document;return e[fe(e,"fullscreenElement")]},e.prototype.getFullscreenChangeEvent=function(){return fe(this._ctx.window.document,"onfullscreenchange").slice(2)},e.prototype.getFullscreenErrorEvent=function(){return fe(this._ctx.window.document,"onfullscreenerror").slice(2)},e}(),Ui=function(e,t,n,r){return new(n||(n=Promise))(function(i,o){function s(e){try{u(r.next(e))}catch(e){o(e)}}function a(e){try{u(r["throw"](e))}catch(e){o(e)}}function u(e){var t;e.done?i(e.value):(t=e.value,t instanceof n?t:new n(function(e){e(t)})).then(s,a)}u((r=r.apply(e,t||[])).next())})},Ni=function(e,t){var n,r,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),"throw":a(1),"return":a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(n)throw new TypeError("Generator is already executing.");for(;s;)try{if(n=1,r&&(i=2&o[0]?r["return"]:o[0]?r["throw"]||((i=r["return"])&&i.call(r),0):r.next)&&!(i=i.call(r,o[1])).done)return i;switch(r=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,r=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(i=(i=s.trys).length>0&&i[i.length-1])&&(6===o[0]||2===o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue;}o=t.call(e,s)}catch(e){o=[6,e],r=0}finally{n=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}},Wi=function(){function e(e,t){this._queue=t,this._registry=null,this._checkedNodeTags={};var n=e.window;this._registry=n.customElements&&n.customElements.get&&n.customElements.whenDefined&&n.customElements}return e.prototype.onCustomNodeVisited=function(e){return Ui(this,void 0,et,function(){var t,n;return Ni(this,function(r){switch(r.label){case 0:if(!this._registry)return[2];if(t=e.nodeName.toLowerCase(),this._checkedNodeTags.hasOwnProperty(t))return[2];r.label=1;case 1:return r.trys.push([1,3,,4]),n=!!this._registry.get(t),this._checkedNodeTags[t]=n,[4,this._registry.whenDefined(t)];case 2:return r.sent(),this._enqueue(t),[3,4];case 3:return r.sent(),[3,4];case 4:return[2];}})})},e.prototype._enqueue=function(e){this._queue.enqueue({Kind:R.CUSTOM_ELEMENT_DEFINED,Args:[e]})},e}(),Di=function(){function e(e,t,n,r,i,o,s,a){var u=this;this._ctx=e,this._queue=t,this._keep=n,this._onFrameCreated=o,this._beforeFrameRemoved=s,this._resourceUploader=a,this._curSelection=[],this._scrollTimeouts={},this._uploadResources=!1,this._modalHooks=[],this._initialized=!1,this._wnd=e.window,this._doc=this._wnd.document,this._loc=this._wnd.location,this._hst=this._wnd.history,this._listeners=i.createChild(),this._currentUrl=this._loc.href,this._inputWatcher=new Un(function(e){u.addChangeElem(e)},function(e){return!!Mn(e)}),this._ajaxWatcher=new _i(e,t),this._perfWatcher=new ri(e,t,this._listeners),this._styleSheetWatcher=new xi(e,t),this._fullscreenWatcher=new qi(e,t,this._listeners),this._customElementWatcher=new Wi(e,t),this._mutWatcher=new Qr(e,r,!0,function(e,t){return u.visitNode(e,t)},function(e){var t=e.node;if("iframe"==on(e.node))u._beforeFrameRemoved(e.node);else if("function"==typeof t.getElementsByTagName)for(var n=t.getElementsByTagName("iframe"),r=0;r<n.length;r++){var i=n[r];u._beforeFrameRemoved(i)}},function(e,t,n){if(!function(e){return Cn(e)||Rn(e)}(e)&&u._uploadResources)for(var r=0,i=function(e,t,n){var r,i=on(e);if(Hi[t]&&Hi[t][i])return[n];if("link"==i&&"href"==t&&(r=e.getAttribute("rel"))&&r.indexOf("stylesheet")>-1)return[n];if("srcset"==t&&("img"==i||"source"==i)){return null!=n.match(/^\s*$/)?[]:n.split(",").map(function(e){return e.trim().split(/\s+/)[0]})}var o=e;if("style"==t&&o.style){var s=o.style.backgroundImage;if(!s)return[];if(s.length>300)return[];var a=[],u=void 0;for(jt.lastIndex=0;u=jt.exec(s);){var c=u[1];c&&a.push(c.trim())}return a}return[]}(e,t,n);r<i.length;r++){var o=i[r];u._resourceUploader.uploadIfNeeded(u._wnd,o)}})}return e.prototype.watchEvents=function(){var e=this;this._mutWatcher.hookMutations(),this._inputWatcher.hookEvents(),this._styleSheetWatcher.start(),this._perfWatcher.start(this._resourceUploader),this._fullscreenWatcher.start(),this._listeners.add(this._wnd,"mousemove",!0,function(t){e.isSafePointerEvent(t)&&e.addMouseMove(t)}),this._listeners.add(this._wnd,"mousedown",!0,function(t){e.isSafePointerEvent(t)&&e.addMouseDown(t)}),this._listeners.add(this._wnd,"mouseup",!0,function(t){e.isSafePointerEvent(t)&&e.addMouseUp(t)}),this._listeners.add(this._wnd,"keydown",!0,function(){e.addKeyDown()}),this._listeners.add(this._wnd,"keyup",!0,function(){e.addKeyUp()}),this._listeners.add(this._wnd,"click",!0,function(t){e.isSafePointerEvent(t)&&e.addClick(t)}),this._listeners.add(this._wnd,"dblclick",!0,function(t){e.addDblClick(t)}),this._listeners.add(this._wnd,"focus",!0,function(t){e.addFocus(t)}),this._listeners.add(this._wnd,"blur",!0,function(t){e.addBlur(t)}),this._listeners.add(this._wnd,"change",!0,function(t){e.addChange(t)},!0),this._listeners.add(this._wnd,"touchstart",!0,function(t){e.isSafePointerEvent(t)&&(e.addTouchEvent(t,R.TOUCHSTART),e.addWindowScrollOrResize())}),this._listeners.add(this._wnd,"touchend",!0,function(t){e.isSafePointerEvent(t)&&(e.addTouchEvent(t,R.TOUCHEND),e.addWindowScrollOrResize())}),this._listeners.add(this._wnd,"touchmove",!0,function(t){e.isSafePointerEvent(t)&&(e.addTouchEvent(t,R.TOUCHMOVE),e.addWindowScrollOrResize())}),this._listeners.add(this._wnd,"touchcancel",!0,function(t){e.isSafePointerEvent(t)&&e.addTouchEvent(t,R.TOUCHCANCEL)}),this._listeners.add(this._wnd,"play",!0,function(t){e.addPlayEvent(t)}),this._listeners.add(this._wnd,"pause",!0,function(t){e.addPauseEvent(t)}),this._listeners.add(this._wnd,"scroll",!1,function(){e.addWindowScrollOrResize()}),this._listeners.add(this._wnd,"resize",!1,function(){e.addWindowScrollOrResize()}),this._listeners.add(this._wnd,"submit",!1,function(t){e.addFormSubmit(t)}),this._listeners.add(this._wnd,"focus",!1,function(){e.addWindowFocus()}),this._listeners.add(this._wnd,"blur",!1,function(){e.addWindowBlur()}),this._listeners.add(this._wnd,"popstate",!1,function(){e.addNavigate()}),this._listeners.add(this._wnd,"selectstart",!0,function(){e.addSelection()}),this._listeners.add(this._doc,"selectionchange",!0,function(){e.addSelection()});var t=this._wnd.visualViewport;t?(this._listeners.add(t,"scroll",!0,function(){return e.addWindowScrollOrResize()}),this._listeners.add(t,"resize",!0,function(){return e.addWindowScrollOrResize()})):this._listeners.add(this._wnd,"mousewheel",!0,function(){e.addWindowScrollOrResize()}),this._pushHook=Tt(this._hst,"pushState"),this._pushHook&&this._pushHook.afterSync(function(){return e.addNavigate()}),this._replaceHook=Tt(this._hst,"replaceState"),this._replaceHook&&this._replaceHook.afterSync(function(){return e.addNavigate()});for(var n=function(t){var n=Tt(r._wnd,t);if(!n)return"continue";r._modalHooks.push(n),n.before(function(){e._queue.enqueue({Kind:R.MODAL_OPEN,Args:[t]})}).afterSync(function(){e._queue.enqueue({Kind:R.MODAL_CLOSE,Args:[t]})})},r=this,i=0,o=ne;i<o.length;i++){n(o[i])}if("function"==typeof this._wnd.document.hasFocus&&this._queue.enqueue({Kind:this._wnd.document.hasFocus()?R.WINDOW_FOCUS:R.WINDOW_BLUR,Args:[]}),s.matchMedia)for(var a=function(t,n,r){var i=s.matchMedia(u._wnd,r);if(!i)return"continue";var o=function(){i.matches&&e._queue.enqueue({Kind:R.MEDIA_QUERY_CHANGE,Args:[t,n]})};u._listeners.add(i,"change",!0,o),o()},u=this,c=0,h=[["any-pointer","coarse","not screen and (any-pointer: fine)"],["any-pointer","fine","only screen and (any-pointer: fine)"],["any-hover","none","not screen and (any-hover: hover)"],["any-hover","hover","only screen and (any-hover: hover)"],["pointer","none","(pointer: none)"],["pointer","coarse","(pointer: coarse)"],["pointer","fine","(pointer: fine)"]];c<h.length;c++){var d=h[c];a(d[0],d[1],d[2])}this._initialized=!0},e.prototype.initResourceUploading=function(){this._resourceUploader.init(),this._uploadResources=!0},e.prototype.onDomLoad=function(){this.addDomLoaded(),this.addViewportChange(),this._mutWatcher._checkForMissingInsertions(ae)},e.prototype.onLoad=function(){var e=this,t=!1,n=Mt.wrap(function(){t||(t=!0,e._perfWatcher.onLoad(),e.addLoad(),e.addViewportChange())},"error");new tn(n,0).start(),s.requestWindowAnimationFrame&&s.requestWindowAnimationFrame(this._wnd,n)},e.prototype.ajaxWatcher=function(){return this._ajaxWatcher},e.prototype.bundleEvents=function(e){var t=this;return this._queue.enqueueSimultaneousEventsIn(function(n){return t._inputWatcher.tick(),t._perfWatcher.tick(e),t._ajaxWatcher.tick(e),t.addViewportChange(),t._mutWatcher.processMutations(n)})},e.prototype.shutdown=function(e){if(this._initialized){this._initialized=!1,this._listeners&&this._listeners.clear(),this._pushHook&&this._pushHook.disable(),this._replaceHook&&this._replaceHook.disable();for(var t=0,n=this._modalHooks;t<n.length;t++){n[t].disable()}this._modalHooks=[],this._perfWatcher.onLoad(),this._ctx.measurer.performMeasurementsNow(),this._queue.processEvents(),this._inputWatcher.shutdown(),this._mutWatcher.shutdown(),this._ajaxWatcher.disable(),this._perfWatcher.shutdown(),this._styleSheetWatcher.stop(),this._fullscreenWatcher.stop(),this._queue.shutdown(e)}},e.prototype.recordingIsDetached=function(){return this._mutWatcher.recordingIsDetached()},e.prototype.visitNode=function(e,t){var n=this;switch(e.nodeName){case"#document":case"#document-fragment":"#document-fragment"===e.nodeName&&this._listeners.add(e,"scroll",!0,function(e){return n.addScroll(Ki(e))});var r=e;try{if(!r.adoptedStyleSheets||0===r.adoptedStyleSheets.length)break}catch(e){break}t.push(function(){n._styleSheetWatcher.onSetAdoptedStyleSheets(e)});break;case"HTML":this._docElScrollListener&&this._listeners.remove(this._docElScrollListener),this._docElScrollListener=this._listeners.add(e,"scroll",!0,function(e){n.addScroll(Ki(e))});break;case"BODY":this.addViewportChange(),this.addSelection();break;case"INPUT":case"TEXTAREA":case"SELECT":this._inputWatcher.addInput(e);break;case"FRAME":case"IFRAME":this._onFrameCreated(e);break;case"VIDEO":case"AUDIO":e.paused||this._queue.enqueue({Kind:R.PLAY,Args:[Mn(e)]});break;case"LINK":if(!(i=e.sheet))break;!0===i.disabled&&this._styleSheetWatcher.onDisableSheet(i,!0);break;case"STYLE":var i,o=e;if(!(i=o.sheet))break;!0===i.disabled&&this._styleSheetWatcher.onDisableSheet(i,!0);var s=function(e){var t=e.textContent||"";if(!(t.length>5e5)){var n=ki(Ti(e));if(n){if(n.length>0&&Li.test(t))return 0;var r,i=Gn();ae?(r=i.createElement("style")).textContent=e.textContent:r=i.importNode(e,!0),i.head.appendChild(r);var o=ki(Ti(r));if(i.head.removeChild(r),o)return n.length>o.length?o.length:void 0}}}(o);void 0!==s&&t.push(function(){n._styleSheetWatcher.snapshotEl(o,s)});break;default:"#"!==e.nodeName[0]&&e.nodeName.indexOf("-")>-1&&this._customElementWatcher.onCustomNodeVisited(e);}if("scrollLeft"in e&&"scrollTop"in e){var a=e;this._ctx.measurer.requestMeasureTask(function(){0==a.scrollLeft&&0==a.scrollTop||n.addScroll(a)})}},e.prototype.isSafePointerEvent=function(e){var t=Ki(e);return!!Mn(t)&&!Cn(t)},e.prototype.addMouseMove=function(e){var t=Mn(Ki(e));this._queue.enqueue({Kind:R.MOUSEMOVE,Args:t?[e.clientX,e.clientY,t]:[e.clientX,e.clientY]})},e.prototype.addMouseDown=function(e){this._queue.enqueue({Kind:R.MOUSEDOWN,Args:[e.clientX,e.clientY]})},e.prototype.addMouseUp=function(e){this._queue.enqueue({Kind:R.MOUSEUP,Args:[e.clientX,e.clientY]})},e.prototype.addTouchEvent=function(e,t){if(void 0!==e.changedTouches)for(var n=0;n<e.changedTouches.length;++n){var r=e.changedTouches[n];isNaN(parseInt(r.identifier))&&(r.identifier=0);var i=[r.identifier,r.clientX,r.clientY];this._queue.enqueue({Kind:t,Args:i})}},e.prototype.addPlayEvent=function(e){var t=Mn(Ki(e));t&&this._queue.enqueue({Kind:R.PLAY,Args:[t]})},e.prototype.addPauseEvent=function(e){var t=Mn(Ki(e));t&&this._queue.enqueue({Kind:R.PAUSE,Args:[t]})},e.prototype.addWindowFocus=function(){this._queue.enqueue({Kind:R.WINDOW_FOCUS,Args:[]})},e.prototype.addWindowBlur=function(){this._queue.enqueue({Kind:R.WINDOW_BLUR,Args:[]})},e.prototype.maybeAddValueChange=function(){var e=ji(this._doc);e&&this._inputWatcher.onChange(e)},e.prototype.addKeyDown=function(){var e=ji(this._doc);e&&!Ln(e)||(this.maybeAddValueChange(),this._queue.enqueue({Kind:R.KEYDOWN,Args:[]}))},e.prototype.addKeyUp=function(){var e=ji(this._doc);e&&!Ln(e)||(this.maybeAddValueChange(),this._queue.enqueue({Kind:R.KEYUP,Args:[]}))},e.prototype.addViewportChange=function(){var e=this;this._ctx.measurer.requestMeasureTask(function(){return e._addViewportChangeImpl()})},e.prototype._addViewportChangeImpl=function(){var e=this.getWindowScrollingElement(),t=Mn(e);if(t){var n=function(e,t){var n=e.documentElement.getBoundingClientRect(),r=t.scrollWidth,i=t.scrollHeight;return{width:s.mathMax(n.width,r),height:s.mathMax(n.height,i)}}(this._wnd.document,e);Wt(n,this._curDocSize)||(this._curDocSize=n,this._queue.enqueue({Kind:R.RESIZE_DOCUMENT,Args:[n.width,n.height]}));var r,i,o,a,u=Yt(this._wnd,this._curLayoutViewport),c=function(e,t){return"visualViewport"in e?e.visualViewport:(void 0===t&&(t=Yt(e)),new Gt(e,t))}(this._wnd,u);u.hasKnownPosition?(Nt(u,this._curLayoutViewport)||this._queue.enqueue({Kind:R.SCROLL_LAYOUT,Args:[t,u.pageLeft,u.pageTop]}),r=c,(i=this._curVisualViewport)&&r.offsetLeft==i.offsetLeft&&r.offsetTop==i.offsetTop||this._queue.enqueue({Kind:R.SCROLL_VISUAL_OFFSET,Args:[t,c.offsetLeft,c.offsetTop]})):Nt(c,this._curVisualViewport)||this._queue.enqueue({Kind:R.SCROLL_LAYOUT,Args:[t,c.pageLeft,c.pageTop]}),function(e,t){return t&&e.width==t.width&&e.height==t.height&&e.clientWidth==t.clientWidth&&e.clientHeight==t.clientHeight}(u,this._curLayoutViewport)||(u.width==u.clientWidth&&u.height==u.clientHeight?this._queue.enqueue({Kind:R.RESIZE_LAYOUT,Args:[u.clientWidth,u.clientHeight]}):this._queue.enqueue({Kind:R.RESIZE_LAYOUT,Args:[u.clientWidth,u.clientHeight,u.width,u.height]})),Wt(c,this._curVisualViewport)||this._queue.enqueue({Kind:R.RESIZE_VISUAL,Args:[c.width,c.height]}),this._curLayoutViewport=((a=Dt(o=u)).clientWidth=o.clientWidth,a.clientHeight=o.clientHeight,a),this._curVisualViewport=function(e){var t=Dt(e);return t.offsetLeft=e.offsetLeft,t.offsetTop=e.offsetTop,t}(c)}},e.prototype.doWorkInScrollTimeout=function(e,t){var n=this;e in this._scrollTimeouts||(this._scrollTimeouts[e]=t,new tn(function(){n._ctx.measurer.requestMeasureTask(function(){if(e in n._scrollTimeouts){var t=n._scrollTimeouts[e];delete n._scrollTimeouts[e],t()}})},te.ScrollSampleInterval).start())},e.prototype._fireScrollTimeouts=function(){for(var e in this._scrollTimeouts)this._scrollTimeouts[e](),delete this._scrollTimeouts[e];this._scrollTimeouts=[]},e.prototype.getWindowScrollingElement=function(){return this._doc.scrollingElement||this._doc.body||this._doc.documentElement},e.prototype.addWindowScrollOrResize=function(){var e=this;this.doWorkInScrollTimeout(1,function(){return e.addViewportChange()})},e.prototype.addScroll=function(e){var t=this,n=Mn(e);n&&this.doWorkInScrollTimeout(n,function(){if(Mn(e)===n){var r=e;n&&"number"==typeof r.scrollLeft&&t._queue.enqueue({Kind:R.SCROLL_LAYOUT,Args:[n,r.scrollLeft,r.scrollTop]})}})},e.prototype.addDomLoaded=function(){this._queue.enqueue({Kind:R.DOMLOADED,Args:[]})},e.prototype.addLoad=function(){this._queue.enqueue({Kind:R.LOAD,Args:[]})},e.prototype.addNavigate=function(){var e=this._loc.href;this._currentUrl!=e&&(this._currentUrl=e,this._keep.onNavigate(e),this._queue.enqueue({Kind:R.NAVIGATE,Args:[ur(this._loc.href,this._ctx.options.orgId,{source:"event",type:R.NAVIGATE}),this._doc.title]}))},e.prototype.addClick=function(e){var t=Ki(e),n=Mn(t);if(n){var r=0,i=0,o=0,s=0;if(t&&t.getBoundingClientRect){var a=t.getBoundingClientRect();r=a.left,i=a.top,o=a.width,s=a.height}var u=xn(t);this._keep.onClick(u),this._queue.enqueue({Kind:R.CLICK,Args:[n,e.clientX,e.clientY,r,i,o,s]})}},e.prototype.addDblClick=function(e){var t=Mn(Ki(e));t&&this._queue.enqueue({Kind:R.DBL_CLICK,Args:[t]})},e.prototype.addFormSubmit=function(e){var t=Mn(Ki(e));t&&this._queue.enqueue({Kind:R.FORM_SUBMIT,Args:[t]})},e.prototype.addFocus=function(e){var t=Mn(Ki(e));t&&this._queue.enqueue({Kind:R.FOCUS,Args:[t]})},e.prototype.addBlur=function(e){var t=Mn(Ki(e));t&&this._queue.enqueue({Kind:R.BLUR,Args:[t]})},e.prototype.addChange=function(e){this._inputWatcher.onChange(Ki(e))},e.prototype.addChangeElem=function(e){var t=Ln(e);if(t){var n=Kn(e);Rn(e)&&(n=er(n)),this._queue.enqueue({Kind:R.VALUECHANGE,Args:[t,n]})}},e.prototype.addSelection=function(){var e=this;this._ctx.measurer.requestMeasureTask(function(){var t;try{t=e.selectionArgs()}catch(e){return}for(var n=!1,r=0;r<4;r++)if(e._curSelection[r]!==t[r]){n=!0;break}n&&(e._curSelection=t,e._queue.enqueue({Kind:R.SELECT,Args:t}))})},e.prototype.selectionArgs=function(){if(!this._wnd.getSelection)return[];var e=this._wnd.getSelection();if(!e)return[];if("None"==e.type)return[];if("Caret"==e.type){var t=Mn(e.anchorNode);return t?[t,e.anchorOffset]:[]}if(!e.anchorNode||!e.focusNode)return[];var n=Bi(e.anchorNode,e.anchorOffset),r=n[0],i=n[1],o=Bi(e.focusNode,e.focusOffset),s=o[0],a=o[1],u=Boolean(r.compareDocumentPosition(s)&Node.DOCUMENT_POSITION_FOLLOWING),c=u?[r,s]:[s,r],h=c[0],d=c[1],l=u?[i,a]:[a,i],p=l[0],f=l[1];for(Mn(h)||(p=0);h&&!Mn(h)&&h!=d;)h=ut(h)||h.parentNode;for(Mn(d)||(f=0);d&&!Mn(d)&&d!=h;)d=vt(d)||d.parentNode;if(h==d&&p==f)return[];var v=Mn(h),_=Mn(d);return h&&d&&v&&_?[v,p,_,f,u]:[]},e}();function Bi(e,t){if(!e.firstChild)return[e,t];e=e.firstChild;for(var n=0;n<t-1;n++){var r=ut(e);if(!r)return[e,0];e=r}return[e,0]}var Hi={src:{img:!0,embed:!0},href:{use:!0,image:!0},data:{object:!0}};function ji(e){for(var t=e.activeElement;t&&t.shadowRoot;){var n=t.shadowRoot.activeElement;if(!n)return t;t=n}return t}function Ki(e){if(e.composed&&e.target){var t=e.target;if(t.nodeType==pn&&t.shadowRoot){var n=e.composedPath();if(n.length>0)return n[0]}}return e.target}var Vi=/^\s*at .*(\S+\:\d+|native|(<anonymous>))/m,zi=/^(eval@)?(\[native code\])?$/;function Yi(e){if(!e||"string"!=typeof e.stack)return[];var t=e;return t.stack.match(Vi)?t.stack.split("\n").filter(function(e){return!!e.match(Vi)}).map(function(e){e.indexOf("(eval ")>-1&&(e=e.replace(/eval code/g,"eval").replace(/(\(eval at [^\()]*)|(\)\,.*$)/g,""));var t=e.replace(/^\s+/,"").replace(/\(eval code/g,"(").replace(/\(native code\)/,"").split(/\s+/).slice(1),n=Qi(t.pop());return Gi(t.join(" "),["eval","<anonymous>"].indexOf(n[0])>-1?"":n[0],n[1],n[2])}):function(e){return e.split("\n").filter(function(e){return!e.match(zi)}).map(function(e){if(e.indexOf(" > eval")>-1&&(e=e.replace(/ line (\d+)(?: > eval line \d+)* > eval\:\d+\:\d+/g,":$1")),-1===e.indexOf("@")&&-1===e.indexOf(":"))return[e,"",-1,-1];var t=e.split("@"),n=Qi(t.pop());return Gi(t.join("@"),n[0],n[1],n[2])})}(t.stack)}function Gi(e,t,n,r){return[e||"",t||"",parseInt(n||"-1"),parseInt(r||"-1")]}function Qi(e){if(!e||-1===e.indexOf(":"))return["","",""];var t=/(.+?)(?:\:(\d+))?(?:\:(\d+))?$/.exec(e.replace(/[\(\)]/g,""));return t?[t[1]||"",t[2]||"",t[3]||""]:["","",""]}var Xi=function(){for(var e=0,t=0,n=arguments.length;t<n;t++)e+=arguments[t].length;var r=Array(e),i=0;for(t=0;t<n;t++)for(var o=arguments[t],s=0,a=o.length;s<a;s++,i++)r[i]=o[s];return r},Ji=function(){function e(e,t,n){this._queue=t,this._enabled=!1,this._overflow=!1,this._total=0,this._hooks=[],this._wnd=e.window,this._listeners=n.createChild();var r=e.options.orgId;this.orgId=r,this.maxLogsPerPage="P2C"==r||"ESHFX"==r||"6HFXR"==r||"A0W9W"==r||"5V0ND"==r?3e3:"GF6RM"==r?1600:te.MaxLogsPerPage}return e.prototype._overflowMsg=function(){return"\"[received more than "+this.maxLogsPerPage+" messages]\""},e.prototype.enable=function(){var e=this;if(this._listeners.add(this._wnd,"error",!0,function(t){return e.addError(t)}),this._listeners.add(this._wnd,"unhandledrejection",!0,function(t){e.addLog("error",["Uncaught (in promise)",t.reason])},!0),!this._enabled)if(this._enabled=!0,this._queue.enqueue({Kind:R.REC_FEAT_SUPPORTED,Args:[Y.Console,!0]}),this._wnd.console)for(var t=function(t){var r=Tt(n._wnd.console,t);if(!r)return"continue";r.before(function(n){var r=n.args;return e.addLog(t,r)}),n._hooks.push(r)},n=this,r=0,i=["log","info","warn","error"];r<i.length;r++){t(i[r])}else this.addLog("log",["NOTE: Log messages cannot be captured on IE9"])},e.prototype.isEnabled=function(){return this._enabled},e.prototype.disable=function(){var e;if(this._listeners&&this._listeners.clear(),this._enabled)for(this._enabled=!1;e=this._hooks.pop();)e.disable()},e.prototype.logEvent=function(e,t){if(!this.checkOverflow())return null;var n;n=-1==["log","info","warn","error","debug","_fs_debug"].indexOf(e)?["log",$i(e,1e3,this.orgId)]:[e];for(var r=0;r<t.length;++r)n.push($i(t[r],1e3,this.orgId));return{Kind:R.LOG,Args:n}},e.prototype.addLog=function(e,t){var n=this.logEvent(e,t);n&&this._queue.enqueue(n)},e.prototype.addError=function(e){var t=e.message,n=e.filename,r=e.lineno;(t||n||r)&&this.checkOverflow()&&("object"==typeof t&&(t=$i(t,1e3,this.orgId)),"object"==typeof n&&(n=$i(n,100,this.orgId,!1)),"object"==typeof r&&(r=-1),this._queue.enqueue({Kind:R.ERROR,Args:Xi([t,n,r],Yi(e.error))}))},e.prototype.checkOverflow=function(){return!this._overflow&&(this._total==this.maxLogsPerPage?(this._queue.enqueue({Kind:R.LOG,Args:["warn",this._overflowMsg()]}),this._overflow=!0,!1):(this._total++,!0))},e}();function $i(e,t,n,r){void 0===r&&(r=!0);try{var i={tokens:[],opath:[],cyclic:Zi(e,t/4)};!function e(t,n,r,i){if(n<1)return 0;var o=t&&t.constructor==Date?eo(t):function(e){return"object"==typeof Node?e instanceof Node:e&&"object"==typeof e&&e.nodeType>0&&"string"==typeof e.nodeName}(t)?function(e){return e.toString()}(t):void 0===t?"undefined":"object"!=typeof t||null==t?t:t instanceof Error?t.stack||t.name+": "+t.message:void 0;if(void 0!==o)return void 0===(o=s.jsonStringify(o))?0:("\""==o[0]&&(o=to(o,n,"...\"")),o.length<=n?(i.tokens.push(o),o.length):0);if(i.cyclic){i.opath.splice(r);var a=i.opath.lastIndexOf(t);if(a>-1){var u="<Cycle to ancestor #"+(r-a-1)+">";return u="\""+to(u,n-2)+"\"",i.tokens.push(u),u.length}i.opath.push(t)}var c=n,h=function(e){return c>=e.length&&(c-=e.length,i.tokens.push(e),!0)},d=function(e){","==i.tokens[i.tokens.length-1]?i.tokens[i.tokens.length-1]=e:h(e)};if(c<2)return 0;if(nt(t)){h("[");for(var l=0;l<t.length&&c>0;l++){var p=e(t[l],c-1,r+1,i);if(c-=p,0==p&&!h("null"))break;h(",")}d("]")}else{h("{");var f=Ze(t);for(l=0;l<f.length&&c>0;l++){var v=f[l],_=t[v];if(!h("\""+v+"\":"))break;if(0==(p=e(_,c-1,r+1,i))){i.tokens.pop();break}c-=p,h(",")}d("}")}return n==1/0?1:n-c}(e,t,0,i);var o=i.tokens.join("");return r?function(e,t){var n=t.replace(vr,"<email>");return n=n.replace(_r,function(t){return ur(t,e,{source:"log",type:"debug"})})}(n,o):o}catch(e){return mt(e)}}function Zi(e,t){var n=0;try{s.jsonStringify(e,function(e,r){if(n++>t)throw"break";if("object"==typeof r)return r})}catch(e){return"break"!=e}return!1}var eo=function(e){return isNaN(e)?"Invalid Date":e.toUTCString()},to=function(e,t,n){return void 0===n&&(n="..."),e.length<=t?e:e.length<=n.length||t<=n.length?e.substring(0,t):e.substring(0,t-n.length)+n};var no=function(){for(var e=0,t=0,n=arguments.length;t<n;t++)e+=arguments[t].length;var r=Array(e),i=0;for(t=0;t<n;t++)for(var o=arguments[t],s=0,a=o.length;s<a;s++,i++)r[i]=o[s];return r},ro=function(){function e(e,t){this._q=e,this._valueIndices=t,this._evts=[],this._curveEndMs=0}return e.prototype.add=function(e){0==this._evts.length?(this._q.push(e),this._curveEndMs=e.When):e.When>this._curveEndMs&&(this._curveEndMs=e.When),this._evts.push(e)},e.prototype.finish=function(e,t){void 0===t&&(t=[]);var n=this._evts.length;if(n<=1)return!1;for(var r=no([this._curveEndMs],t),i=this._evts[0].When,o=this._evts[n-1].When,s=0;s<this._valueIndices.length;++s){var a=this._valueIndices[s],u=this._evts[0].Args[a],c=(this._evts[1].When-i)/(o-i),h=(this._evts[1].Args[a]-u)/c,d=this._evts[n-2].Args[a],l=(o-this._evts[n-2].When)/(o-i),p=this._evts[n-1].Args[a],f=(p-d)/l;r.push(u,p,h,f)}return this._evts[0].Kind=e,this._evts[0].Args=r,!0},e.prototype.evts=function(){return this._evts},e}();var io=function(){function e(e,t,n,r){void 0===n&&(n=function(){return[]}),void 0===r&&(r=en),this._ctx=e,this._transport=t,this._gatherExternalEvents=n,this._tickerFactory=r,this._recordingDisabled=!1,this._activeSimultaneousEventsTransactions=0,this._lastWhen=-1,this._gotUnload=!1,this._eventQueue=[],this._sampleCurvesTicker=new this._tickerFactory(te.CurveSamplingInterval),this._processMutationsTicker=new this._tickerFactory(te.MutationProcessingInterval)}return e.prototype.startPipeline=function(e){var t,n,r=this;this._recordingDisabled||this._pipelineStarted||(this._pipelineStarted=!0,this._frameId=null!==(t=e.frameId)&&void 0!==t?t:0,this._parentIds=null!==(n=e.parentIds)&&void 0!==n?n:[],this.processEvents(),this._processMutationsTicker.start(function(){r.processEvents()}),this._sampleCurvesTicker.start(function(){r.processEvents(!0)}),this._transport.startPipeline(e))},e.prototype.enqueueSimultaneousEventsIn=function(e){0===this._activeSimultaneousEventsTransactions&&(this._lastWhen=this._ctx.time.now());try{return this._activeSimultaneousEventsTransactions++,e(this._lastWhen)}finally{this._activeSimultaneousEventsTransactions--,this._activeSimultaneousEventsTransactions<0&&(this._activeSimultaneousEventsTransactions=0)}},e.prototype.enqueue=function(e){var t=this._activeSimultaneousEventsTransactions>0?this._lastWhen:this._ctx.time.now();this.enqueueAt(t,e),Zt.checkForBrokenSchedulers()},e.prototype.enqueueAt=function(e,t){if(!this._recordingDisabled){e<this._lastWhen&&(e=this._lastWhen),this._lastWhen=e;var n=t;n.When=e,this._eventQueue.push(n)}},e.prototype.enqueueFirst=function(e){if(this._eventQueue.length>0){var t=e;t.When=this._eventQueue[0].When,this._eventQueue.unshift(t)}else this.enqueue(e)},e.prototype.addUnload=function(e){this._gotUnload||(this._gotUnload=!0,this.enqueue({Kind:R.UNLOAD,Args:[e]}),this.singSwanSong())},e.prototype.shutdown=function(e){this._flush(),this.addUnload(e),this._flush(),this._recordingDisabled=!0,this.stopPipeline()},e.prototype._flush=function(){this.processEvents(),this._transport.flush()},e.prototype.singSwanSong=function(){this._recordingDisabled||(this.processEvents(),this._transport.singSwanSong())},e.prototype.rebaseIframe=function(e){for(var t=0,n=this._eventQueue.length;t<n;t++){var r=this._eventQueue[t],i=r.When+this._ctx.time.startTime()-e;i<0&&(i=0),r.When=i}},e.prototype.processEvents=function(e){if(this._pipelineStarted){var t=this._eventQueue;this._eventQueue=[];var n=function(e){if(0==e.length)return e;for(var t,n=[],r=new ro(n,[0,1]),i={},o={},s={},a=0,u=e;a<u.length;a++){var c=u[a];switch(c.Kind){case R.MOUSEMOVE:r.add(c);break;case R.TOUCHMOVE:(l=c.Args[0])in i||(i[l]=new ro(n,[1,2])),i[l].add(c);break;case R.SCROLL_LAYOUT:(l=c.Args[0])in o||(o[l]=new ro(n,[1,2])),o[l].add(c);break;case R.SCROLL_VISUAL_OFFSET:(l=c.Args[0])in s||(s[l]=new ro(n,[1,2])),s[l].add(c);break;case R.RESIZE_VISUAL:t||(t=new ro(n,[0,1])),t.add(c);break;default:n.push(c);}}if(r.finish(R.MOUSEMOVE_CURVE)){var h=r.evts();if(h.length>0){var d=h[h.length-1].Args[2];if(d)h[0].Args[9]=d}}for(var l in o){o[p=parseInt(l)].finish(R.SCROLL_LAYOUT_CURVE,[p])}for(var l in s){s[p=parseInt(l)].finish(R.SCROLL_VISUAL_OFFSET_CURVE,[p])}for(var l in i){var p;i[p=parseInt(l)].finish(R.TOUCHMOVE_CURVE,[p])}return t&&t.finish(R.RESIZE_VISUAL_CURVE),n}(t);e||(n=n.concat(this._gatherExternalEvents(0!=n.length))),this.ensureFrameIds(n),0!=n.length&&this._transport.enqueueEvents(this._ctx.recording.pageSignature(),n)}},e.prototype.ensureFrameIds=function(e){if(this._frameId)for(var t=this._parentIds,n=t&&t.length>0,r=0;r<e.length;++r){var i=e[r];i.FId||(i.FId=this._frameId),n&&!i.PIds&&(i.PIds=t)}},e.prototype.stopPipeline=function(){this._pipelineStarted&&(this._sampleCurvesTicker.stop(),this._processMutationsTicker.stop(),this._eventQueue=[],this._transport.stopPipeline())},e}();function oo(){var e,t;return{promise:new et(function(n,r){e=n,t=r}),resolve:e,reject:t}}function so(e){return new et(function(t){s.setWindowTimeout(window,ie(t),e)})}var ao=function(){function e(e){void 0===e&&(e=4),this.hashCount=e,this.idx=0,this.hashMask=e-1,this.reset()}return e.prototype.reset=function(){this.idx=0,this.hash=[];for(var e=0;e<this.hashCount;++e)this.hash.push(2166136261)},e.prototype.write=function(e){for(var t=this.hashMask,n=this.idx,r=0;r<e.length;r++)this.hash[n]=this.hash[n]^e[r],this.hash[n]+=(this.hash[n]<<1)+(this.hash[n]<<4)+(this.hash[n]<<7)+(this.hash[n]<<8)+(this.hash[n]<<24),n=n+1&t;this.idx=n},e.prototype.writeAscii=function(e){for(var t=this.hashMask,n=this.idx,r=0;r<e.length;r++)this.hash[n]=this.hash[n]^e.charCodeAt(r),this.hash[n]+=(this.hash[n]<<1)+(this.hash[n]<<4)+(this.hash[n]<<7)+(this.hash[n]<<8)+(this.hash[n]<<24),n=n+1&t;this.idx=n},e.prototype.sum=function(){var e,t=this.sumAsHex();return e=t.replace(/\r|\n/g,"").replace(/([\da-fA-F]{2}) ?/g,"0x$1 ").replace(/ +$/,"").split(" ").map(Number),lo(String.fromCharCode.apply(window,e))},e.prototype.sumAsHex=function(){for(var e="",t=0;t<this.hashCount;++t)e+=("00000000"+(this.hash[t]>>>0).toString(16)).slice(-8);return e},e}();function uo(e){var t=new ao(1);return t.writeAscii(e),t.sumAsHex()}function co(e){var t=new Uint8Array(e);return lo(String.fromCharCode.apply(null,t))}var ho="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";function lo(e){var t;return(null!==(t=window.btoa)&&void 0!==t?t:po)(e).replace(/\+/g,"-").replace(/\//g,"_")}function po(e){for(var t=String(e),n=[],r=0,i=0,o=0,s=ho;t.charAt(0|o)||(s="=",o%1);n.push(s.charAt(63&r>>8-o%1*8))){if((i=t.charCodeAt(o+=.75))>255)throw new Error("'btoa' failed: The string to be encoded contains characters outside of the Latin1 range.");r=r<<8|i}return n.join("")}var fo=function(e,t,n,r){return new(n||(n=Promise))(function(i,o){function s(e){try{u(r.next(e))}catch(e){o(e)}}function a(e){try{u(r["throw"](e))}catch(e){o(e)}}function u(e){var t;e.done?i(e.value):(t=e.value,t instanceof n?t:new n(function(e){e(t)})).then(s,a)}u((r=r.apply(e,t||[])).next())})},vo=function(e,t){var n,r,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),"throw":a(1),"return":a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(n)throw new TypeError("Generator is already executing.");for(;s;)try{if(n=1,r&&(i=2&o[0]?r["return"]:o[0]?r["throw"]||((i=r["return"])&&i.call(r),0):r.next)&&!(i=i.call(r,o[1])).done)return i;switch(r=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,r=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(i=(i=s.trys).length>0&&i[i.length-1])&&(6===o[0]||2===o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue;}o=t.call(e,s)}catch(e){o=[6,e],r=0}finally{n=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}},_o=1e4,go=25,mo=100;function yo(e,t,n,r){return void 0===r&&(r=new ao),fo(this,void 0,et,function(){var i,o,s,a;return vo(this,function(u){switch(u.label){case 0:i=e.now(),o=n.byteLength,s=0,u.label=1;case 1:return s<o?e.now()-i>go?[4,t(mo)]:[3,3]:[3,5];case 2:u.sent(),i=e.now(),u.label=3;case 3:a=new Uint8Array(n,s,Math.min(o-s,_o)),r.write(a),u.label=4;case 4:return s+=_o,[3,1];case 5:return[2,{hash:r.sum(),hasher:r}];}})})}var wo=function(e,t,n,r){return new(n||(n=Promise))(function(i,o){function s(e){try{u(r.next(e))}catch(e){o(e)}}function a(e){try{u(r["throw"](e))}catch(e){o(e)}}function u(e){var t;e.done?i(e.value):(t=e.value,t instanceof n?t:new n(function(e){e(t)})).then(s,a)}u((r=r.apply(e,t||[])).next())})},bo=function(e,t){var n,r,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),"throw":a(1),"return":a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(n)throw new TypeError("Generator is already executing.");for(;s;)try{if(n=1,r&&(i=2&o[0]?r["return"]:o[0]?r["throw"]||((i=r["return"])&&i.call(r),0):r.next)&&!(i=i.call(r,o[1])).done)return i;switch(r=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,r=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(i=(i=s.trys).length>0&&i[i.length-1])&&(6===o[0]||2===o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue;}o=t.call(e,s)}catch(e){o=[6,e],r=0}finally{n=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}},So=6e6,Eo=function(){function e(e,t,n,r,i){void 0===r&&(r=window.FormData),void 0===i&&(i=tn),this.ctx=e,this.queue=t,this.protocol=n,this.FormDataCtr=r,this.Timeout=i,this.started={},this.byUrl={},this.batchReady=!1,this.existsBatch=[],this._sentToBugsnag=!1}return e.prototype.init=function(){this.FormDataCtr&&this.main()["catch"](function(e){Mt.sendToBugsnag(e,"error")})},e.prototype.main=function(){return wo(this,void 0,et,function(){var e,t,n,r,i,s,a,u,c,h,d,l,p,f,v,_,g,m,y,w,b,S,E,T,k,I;return bo(this,function(C){switch(C.label){case 0:e=this.ctx.options.orgId,C.label=1;case 1:return[4,this.getBatch()];case 2:for(t=C.sent(),n={fsnv:[],sha1:[]},r=0,i=t;r<i.length;r++)s=i[r],a=s.hash,v=s.hashAlgorithm,n[v].push(a);for(u={},c=0,h=t;c<h.length;c++)d=h[c],u[d.hash]=d;l=void 0,C.label=3;case 3:return C.trys.push([3,5,,6]),[4,this.protocol.queryResources({OrgId:e,HashesByAlgorithm:n})];case 4:return l=C.sent(),[3,6];case 5:return o("/rec/queryResources failed with status "+C.sent()),[3,1];case 6:for(p=0,f=l;p<f.length;p++)if((m=f[p]).Found&&m.CanonicalHash){if(!(y=u[m.QueryHash])){this.sendOnceToBugsnag("No resource found for hash");continue}if(y.blob=y.stringData=null,"fsnv"!==(v=m.CanonicalHash.Algorithm)){this.sendOnceToBugsnag("Unrecognized canonical hash type",{hashAlgorithm:v});continue}this.queue.enqueue({Kind:R.SYS_RESOURCEHASH,Args:["url",y.url,m.CanonicalHash.Hash]})}else;_=0,g=l,C.label=7;case 7:if(!(_<g.length))return[3,12];if((m=g[_]).Found&&m.CanonicalHash)return[3,11];if(null==(y=u[m.QueryHash]))return this.sendOnceToBugsnag("Server told us to upload a hash we don't have"),[3,11];if(w=y.url,b=y.contentType,!(S=y.blob||y.stringData))return this.sendOnceToBugsnag("Missing resource contents"),[3,11];if(E=y.blob||new Blob([S],{type:b}),null==S)return this.sendOnceToBugsnag("Tried to re-upload a resource"),[3,11];if((T=new this.FormDataCtr).append("orgId",e),T.append("baseUrl",w),"fsnv"===m.QueryAlgorithm)T.append("fsnvHash",m.QueryHash);else{if("sha1"!==m.QueryAlgorithm)return this.sendOnceToBugsnag("Unrecognized hash type from resource query",{hashAlgorithm:m.QueryAlgorithm}),[3,11];T.append("sha1Hash",m.QueryHash)}T.append("contents",E,"blob"),y.blob=y.stringData=null,C.label=8;case 8:return C.trys.push([8,10,,11]),[4,this.protocol.uploadResource(T)];case 9:return k=C.sent(),"fsnv"!=(I=JSON.parse(k)).Algorithm&&this.sendOnceToBugsnag("Unexpected hash type from resource upload",{hashAlgorithm:I.Algorithm}),this.queue.enqueue({Kind:R.SYS_RESOURCEHASH,Args:["url",w,I.Hash]}),[3,11];case 10:return C.sent(),o("Server error uploading resource"),[3,11];case 11:return _++,[3,7];case 12:return[3,1];case 13:return[2];}})})},e.prototype.getBatch=function(){var e=this,t=oo(),n=t.resolve,r=t.promise,i=function(){e.popBatch=null,e.batchReady=!1;var t=e.existsBatch;e.existsBatch=[],n(t)};return this.batchReady?i():this.popBatch=i,r},e.prototype.uploadIfNeeded=function(e,t){return wo(this,void 0,et,function(){var n,r,i=this;return bo(this,function(o){switch(o.label){case 0:return this.FormDataCtr?this.started[t]?[2]:function(e,t){var n=Xn(Jn(e),t);switch(n.protocol){case"blob:":return!0;case"http:":case"https:":switch(n.hostname){case"localhost":case"127.0.0.1":case"[::1]":return e.location.protocol===n.protocol&&e.location.host===n.host;case"::1":var r=n.port?"[::1]:"+n.port:"[::1]";return e.location.protocol===n.protocol&&e.location.host===r;default:return!1;}default:return!1;}}(e,t)?(this.started[t]=!0,[4,this.processResource(t)]):[2]:[2];case 1:return(n=o.sent())?(r=0==this.existsBatch.length,this.existsBatch.push(n),r&&new this.Timeout(function(){i.batchReady=!0,i.popBatch&&i.popBatch()},50).start(),[2]):[2];}})})},e.prototype.processResource=function(e){return wo(this,void 0,et,function(){var t,n,r,i,o;return bo(this,function(s){switch(s.label){case 0:return this.byUrl[e]?[2,this.byUrl[e]]:[4,To(e,this.ctx.options.orgId)];case 1:return(t=s.sent())?[4,ko(this.ctx,t.buffer)]:[2,null];case 2:return n=s.sent(),r=n.hash,i=n.algorithm,o={hash:r,hashAlgorithm:i,url:e,blob:t.blob,contentType:t.contentType},this.byUrl[o.url]=o,[2,o];}})})},e.prototype.sendOnceToBugsnag=function(e,t){this._sentToBugsnag||(this._sentToBugsnag=!0,o(e),Mt.sendToBugsnag(e,"error",t))},e}();function To(e,t){var n=oo(),r=n.resolve,i=n.promise,s=new XMLHttpRequest;return"string"!=typeof s.responseType?(r(null),i):(s.open("GET",e),s.responseType="blob",s.onerror=function(){r(null)},s.onload=function(){if(200!=s.status)return o("Error loading blob resource "+ur(e,t,{source:"log",type:"debug"})),void r(null);var n=s.response;if((n.size||n.length)>So){var i=ur(e,t,{source:"log",type:"bugsnag"});return Mt.sendToBugsnag("Size of blob resource exceeds limit","warning",{url:i,MaxResourceSizeBytes:So}),void r(null)}(function(e){var t=oo(),n=t.resolve,r=t.promise,i=new FileReader;return i.readAsArrayBuffer(e),i.onload=function(){n(i.result)},i.onerror=function(e){Mt.sendToBugsnag(e,"error"),n(null)},r})(n).then(function(e){r(e?{buffer:e,blob:n,contentType:n.type}:null)})},s.send(),i)}function ko(e,t){var n,r;return wo(this,void 0,et,function(){var i;return bo(this,function(o){switch(o.label){case 0:return i=e.window,(null===(r=null===(n=i.crypto)||void 0===n?void 0:n.subtle)||void 0===r?void 0:r.digest)?[4,i.crypto.subtle.digest({name:"sha-1"},t)]:[3,2];case 1:return[2,{hash:co(o.sent()),algorithm:"sha1"}];case 2:return[4,yo(e.time,so,t)];case 3:return[2,{hash:o.sent().hash,algorithm:"fsnv"}];}})})}var Io=function(e,t,n,r){return new(n||(n=Promise))(function(i,o){function s(e){try{u(r.next(e))}catch(e){o(e)}}function a(e){try{u(r["throw"](e))}catch(e){o(e)}}function u(e){var t;e.done?i(e.value):(t=e.value,t instanceof n?t:new n(function(e){e(t)})).then(s,a)}u((r=r.apply(e,t||[])).next())})},Co=function(e,t){var n,r,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),"throw":a(1),"return":a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(n)throw new TypeError("Generator is already executing.");for(;s;)try{if(n=1,r&&(i=2&o[0]?r["return"]:o[0]?r["throw"]||((i=r["return"])&&i.call(r),0):r.next)&&!(i=i.call(r,o[1])).done)return i;switch(r=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,r=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(i=(i=s.trys).length>0&&i[i.length-1])&&(6===o[0]||2===o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue;}o=t.call(e,s)}catch(e){o=[6,e],r=0}finally{n=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}},Ro=function(){function e(e){this._byteCount=0,this._scheme=e.options.scheme,this._recHost=e.options.recHost}return e.prototype.page=function(e,t,n){this.post("/rec/page",gt(e),function(e){try{t(wt(e))}catch(e){n(0)}},function(e,t){if(t)try{return n(0,wt(t))}catch(e){}n(0)})},e.prototype.bundle=function(e){var t=gt(e.bundle);this._byteCount+=t.length,o("total bytes written: "+this._byteCount);var n=xo(e.bundle.Seq,e);return this.post(n,t,function(t){try{e.win(wt(t))}catch(n){Mt.sendToBugsnag("Failed to JSON parse /rec/bundle response","error",{rsp:t,error:n.toString()}),e.lose(0)}},e.lose),this._byteCount},e.prototype.bundleBeacon=function(e){return Mo(this._scheme,this._recHost,e)},e.prototype.exponentialBackoffMs=function(e,t){var n=s.mathMin(te.BackoffMax,5e3*s.mathPow(2,e));return t?n+.25*s.mathRandom()*n:n},e.prototype.post=function(e,t,n,r){Oo(this._scheme,this._recHost,e,t,n,r)},e}(),Ao=function(){function e(e){this._scheme=e.options.scheme,this._recHost=e.options.recHost}return e.prototype.uploadResource=function(e){var t=this;return new et(function(n,r){Oo(t._scheme,t._recHost,"/rec/uploadResource",e,n,r)})},e.prototype.queryResources=function(e){return Io(this,void 0,et,function(){var t,n,r=this;return Co(this,function(i){switch(i.label){case 0:return t=JSON.stringify(e),[4,new et(function(e,n){Oo(r._scheme,r._recHost,"/rec/queryResources",t,e,n)})];case 1:return n=i.sent(),[2,JSON.parse(n)];}})})},e}();function xo(e,t){var n="/rec/bundle?OrgId="+t.orgId+"&UserId="+t.userId+"&SessionId="+t.sessionId+"&PageId="+t.pageId+"&Seq="+e;return null!=t.serverPageStart&&(n+="&PageStart="+t.serverPageStart),null!=t.serverBundleTime&&(n+="&PrevBundleTime="+t.serverBundleTime),null!=t.lastUserActivity&&(n+="&LastActivity="+t.lastUserActivity),t.isNewSession&&(n+="&IsNewSession=true"),null!=t.deltaT&&(n+="&DeltaT="+t.deltaT),n}function Oo(e,t,n,r,i,o){var s="//"+t+n,a=!1,u=new XMLHttpRequest;if("withCredentials"in u)u.onreadystatechange=function(){if(u.readyState==fn){if(a)return;a=!0;try{200==u.status?i(u.responseText):o&&o(u.status,u.responseText)}catch(e){Mt.sendToBugsnag(e,"error")}}},u.open("POST",e+s,!0),u.withCredentials=!0,"function"!=typeof r.append&&u.setRequestHeader("Content-Type","text/plain"),u.send(r);else{var c=new XDomainRequest;c.onload=function(){i(c.responseText)},c.onerror=function(){o&&o("Not Found"==c.responseText?404:500,c.responseText)},c.onprogress=function(){},c.open("POST",s),c.send(r)}}function Mo(e,t,n){if("function"==typeof navigator.sendBeacon){var r=e+"//"+t+xo(n.bundle.Seq,n)+"&SkipResponseBody=true",i=gt(n.bundle);try{return navigator.sendBeacon(r,i)}catch(e){Mt.sendToBugsnag(e,"error",{url:r,data:i})}}return!1}var Lo=function(){function e(e,t,n){void 0===n&&(n=new Fo),this._ctx=e,this._q=t,this._matcher=n}return e.prototype.initialize=function(e){var t;if(e){this._setUrlKeeps(e);var n=null===(t=this._ctx.window.location)||void 0===t?void 0:t.href;this.onNavigate(n)}},e.prototype.onNavigate=function(e){return!!this._matcher.matches(e)&&(this._q.enqueue({Kind:R.KEEP_URL,Args:[this._scrubUrl(e)]}),!0)},e.prototype.onClick=function(e){return!(!e||!function(e){var t=xn(e);return!!t&&!0===t.matchesAnyKeepRule}(e.node))&&(this._q.enqueue({Kind:R.KEEP_ELEMENT,Args:[e.id]}),!0)},e.prototype.urlMatches=function(e){return this._matcher.matches(e)},e.prototype._setUrlKeeps=function(e){this._matcher.setRules(e)},e.prototype._scrubUrl=function(e){return ur(e,this._ctx.options.orgId,{source:"page",type:"base"})},e}(),Fo=function(){function e(){this._regexes=null}return e.prototype.setRules=function(e){var t=e.map(function(e){return e.Regex}).filter(this._isValidRegex);t.length>0&&(this._regexes=this._joinRegexes(t))},e.prototype.matches=function(e){return!!this._regexes&&this._regexes.test(e)},e.prototype._isValidRegex=function(e){try{return new RegExp(e),!0}catch(t){return Mt.sendToBugsnag("Browser rejected UrlKeep.Regex","error",{expr:e,error:t.toString()}),!1}},e.prototype._joinRegexes=function(e){try{return new RegExp("("+e.join(")|(")+")","i")}catch(t){return Mt.sendToBugsnag("Browser rejected joining UrlKeep.Regexs","error",{exprs:e,error:t.toString()}),null}},e}();function Po(e,t){var n=Mn(e)+" ";return e.id&&(n+="#"+e.id),n+="[src="+ur(e.src,t,{source:"log",type:"debug"})+"]"}var qo,Uo=function(e){var t=e.transport,n=e.frame,r=e.orgId,s=e.scheme,a=e.script,u=e.recHost,c=e.appHost,h=Po(n,r);o("Injecting into Frame "+h);try{if(function(e){return e.id==e.name&&No.test(e.id)}(n))return void o("Blacklisted iframe: "+h);if(function(e){if(!e.contentDocument||!e.contentWindow||!e.contentWindow.location)return!0;return function(e){return!!e.src&&"about:blank"!=e.src&&e.src.indexOf("javascript:")<0}(e)&&e.src!=e.contentWindow.location.href&&"loading"==e.contentDocument.readyState}(n))return void o("Frame not yet loaded: "+h);var d=n.contentWindow,l=n.contentDocument;if(!d||!l)return void o("Missing contentWindow or contentDocument: "+h);if(!l.head)return void o("Missing contentDocument.head: "+h);if(I(d))return void o("FS already defined in Frame contentWindow: "+h+". Ignoring.");d._fs_org=r,d._fs_script=a,d._fs_rec_host=u,d._fs_app_host=c,d._fs_debug=i(),d._fs_run_in_iframe=!0,t&&(d._fs_transport=t);var p=l.createElement("script");p.async=!0,p.crossOrigin="anonymous",p.src=s+"//"+a,"testdrive"==r&&(p.src+="?allowMoo=true"),l.head.appendChild(p)}catch(e){o("iFrame no injecty. Probably not same origin.")}},No=/^fb\d{18}$/;!function(e){e[e.NoInfoYet=1]="NoInfoYet",e[e.Enabled=2]="Enabled",e[e.Disabled=3]="Disabled"}(qo||(qo={}));var Wo=function(){function e(e,t,n,r){var i=this;this._ctx=e,this._transport=n,this._injector=r,this._bundleUploadInterval=te.DefaultBundleUploadInterval,this._iFrames=[],this._pendingChildFrameIdInits=[],this._listeners=new Ut,this._getCurrentSessionEnabled=qo.NoInfoYet,this._resourceUploadingEnabled=!1,this._tickerTasks=[],this._pendingIframes={},this._watcher=new yn,this._queue=new io(e,this._transport,function(e){for(var t=i._eventWatcher.bundleEvents(e),n=void 0;n=i._tickerTasks.pop();)n();return t},t),this._keep=new Lo(e,this._queue),this._eventWatcher=new Di(e,this._queue,this._keep,this._watcher,this._listeners,function(e){i.onFrameCreated(e)},function(e){i.beforeFrameRemoved(e)},new Eo(e,this._queue,new Ao(e))),this._consoleWatcher=new Ji(e,this._queue,this._listeners),this._scheme=e.options.scheme,this._script=e.options.script,this._recHost=e.options.recHost,this._appHost=e.options.appHost,this._orgId=e.options.orgId,this._wnd=e.window}return e.prototype.bundleUploadInterval=function(){return this._bundleUploadInterval},e.prototype.start=function(e,t){var n=this;this._onFullyStarted=t,"onpagehide"in this._wnd?this._listeners.add(this._wnd,"pagehide",!1,function(e){n.onUnload()}):this._listeners.add(this._wnd,"unload",!1,function(e){n.onUnload()}),this._listeners.add(this._wnd,"message",!1,function(e){if("string"==typeof e.data){var t=e.source;n.postMessageReceived(t,Bo(e.data))}});var r=this._wnd.Document?this._wnd.Document.prototype:this._wnd.document;this._docCloseHook=Tt(r,"close"),this._docCloseHook&&this._docCloseHook.afterAsync(function(){n._listeners.refresh()})},e.prototype.queue=function(){return this._queue},e.prototype.eventWatcher=function(){return this._eventWatcher},e.prototype.console=function(){return this._consoleWatcher},e.prototype.onDomLoad=function(){this._eventWatcher.onDomLoad()},e.prototype.onLoad=function(){this._eventWatcher.onLoad()},e.prototype.shutdown=function(e){this._eventWatcher.shutdown(e),this._consoleWatcher.disable(),this._listeners&&this._listeners.clear(),this._docCloseHook&&this._docCloseHook.disable(),this.tellAllFramesTo(["ShutdownFrame"])},e.prototype.tellAllFramesTo=function(e){for(var t=0;t<this._iFrames.length;t++){var n=this._iFrames[t];n.contentWindow&&Do(n.contentWindow,e)}},e.prototype.getCurrentSessionURL=function(e){var t=this._getCurrentSessionEnabled;if(t==qo.NoInfoYet)return null;if(t==qo.Disabled)return this._scheme+"//"+this._appHost+"/opt/upgrade";var n=this.getCurrentSession();return n?(e&&(n+=":"+this._ctx.time.wallTime()),this._scheme+"//"+this._appHost+"/ui/"+this._ctx.options.orgId+"/session/"+encodeURIComponent(n)):null},e.prototype.getCurrentSession=function(){var e=this._getCurrentSessionEnabled;return e==qo.NoInfoYet||e==qo.Disabled?null:this._userId?this._userId+":"+this._sessionId:null},e.prototype.setConsent=function(e){var t=this,n=function(){t._watcher.setConsent(e),t._queue.processEvents()},r=function(){t._queue.enqueue({Kind:R.SYS_SETCONSENT,Args:[e,K.Document]})};switch(e){case j.GrantConsent:r(),n();break;case j.RevokeConsent:n(),r();}this.tellAllFramesTo(["SetConsent",e])},e.prototype.pageSignature=function(){return this._userId+":"+this._sessionId+":"+this._pageId},e.prototype.fireFsReady=function(e){void 0===e&&(e=!1);var t=this._wnd._fs_ready;if(t)try{e?t(!0):t()}catch(e){o("exception in _fs_ready(): "+e)}},e.prototype.onUnload=function(){this._queue.addUnload(V.Unload),Zt.stopAll()},e.prototype.handleResponse=function(e){var t=e.Flags,n=t.AjaxFetch,r=t.AjaxWatcher,i=t.ConsoleWatcher,o=t.GetCurrentSession,s=t.WatchStrategy,a=t.ResourceUploading,u=t.WhitelistElements;this._pageRsp=e,this._userId=e.UserIntId,this._sessionId=e.SessionIntId,this._pageId=e.PageIntId,this._serverPageStart=e.PageStart,this._getCurrentSessionEnabled=o?qo.Enabled:qo.Disabled,"number"==typeof e.BundleUploadInterval&&(this._bundleUploadInterval=e.BundleUploadInterval),a&&this.enableResourceUploading(),r&&this.enableAjaxWatcher(!!n),i&&this.enableConsoleWatcher(),r&&e.AjaxWatches&&this._eventWatcher.ajaxWatcher().setWatches(e.AjaxWatches),this._watcher.initialize({blocks:e.ElementBlocks,keeps:e.ElementKeeps,watches:e.ElementWatches,flags:{whitelist:!!u,watchStrategy:null!=s?s:"matches"}}),this._keep.initialize(e.UrlKeeps),this._watcher.initializeConsent(!!e.Consented)},e.prototype.fullyStarted=function(){this._onFullyStarted()},e.prototype.enableResourceUploading=function(){this._resourceUploadingEnabled=!0,this._eventWatcher.initResourceUploading()},e.prototype.enableAjaxWatcher=function(e){this.eventWatcher().ajaxWatcher().enable(e)},e.prototype.enableConsoleWatcher=function(){this.console().enable()},e.prototype.flushPendingChildFrameInits=function(){if(this._pendingChildFrameIdInits.length>0){for(var e=0;e<this._pendingChildFrameIdInits.length;e++)this._pendingChildFrameIdInits[e]();this._pendingChildFrameIdInits=[]}},e.prototype.inject=function(e){var t=this;this._ctx.measurer.requestMeasureTask(function(){i()&&o("Injecting into a "+("none"!==getComputedStyle(e,null).display?"hidden":"visible")+" iframe: "+Po(e,t._orgId));var n={send:function(n,r,i){et.resolve().then(Mt.wrap(function(){t.postMessageReceived(e.contentWindow,[n,s.jsonParse(r),i])}))}};t._injector({frame:e,transport:n,orgId:t._orgId,scheme:t._scheme,script:t._script,recHost:t._recHost,appHost:t._appHost})})},e.prototype.onFrameCreated=function(e){var t=Mn(e);if(t){this._iFrames.push(e);var n=!1;if(e.contentWindow)try{n=!!I(e.contentWindow)}catch(e){n=!0}var r=function(e){var t=e.src,n=location.protocol+"//"+location.host;return!t||"about:blank"==t||ct(t,"javascript:")||ct(t,n)}(e),i=e.contentWindow&&e.contentWindow.postMessage;r&&!n||!i?r?this.initSameOriginIframe(e):o("Frame Doesn't need injecting. Probably cross domain "+Po(e,this._orgId)):this.initCrossOriginIframe(e,t)}else o("fsid missing or invalid for iFrame "+Po(e,this._orgId))},e.prototype.initCrossOriginIframe=function(e,t){var n=this;e.contentWindow&&e.contentWindow.postMessage?(o("Cross-origin iframe "+Po(e,this._orgId)),Do(e.contentWindow,["GreetFrame"]),i()&&(this._pendingIframes[t]=!0,setTimeout(function(){n._pendingIframes[t]&&o("iframe "+e.src+" is unresponsive")},5e3))):o("No content window on init of cross-origin iframe "+Po(e,this._orgId))},e.prototype.initSameOriginIframe=function(e){var t=this;o("Attempting to setup Frame "+Po(e,this._orgId)),this.inject(e),e.addEventListener("load",Mt.wrap(function(n){o("onload for frame "+Po(e,t._orgId)),t.inject(e)}))},e.prototype.beforeFrameRemoved=function(e){for(var t=0;t<this._iFrames.length;t++){if(e==this._iFrames[t])return void this._iFrames.splice(t,1)}},e.prototype.postMessageReceived=function(e,t){if(!e||e.parent==this._wnd)switch(t[0]){case"EvtBundle":var n=t[1],r=this.pageSignature(),i=t[2];if(r!=i)return Mt.sendToBugsnag("Page signature mismatch","warning",{pageSignature:r,messageSignature:i}),void(e&&Do(e,["ShutdownFrame"]));n.length>0&&this._transport.enqueueEvents(r,n);break;case"RequestFrameId":if(!e)return void o("No MessageEvent.source, iframe may have unloaded.");var s=this.iFrameWndToFsId(e);s?(o("Responding to FID request for frame "+s),this._pendingIframes[s]=!1,this.sendFrameIdToInnerFrame(e,s)):o("No FrameId found. Hoping to send one later.");}},e.prototype.sendFrameIdToInnerFrame=function(e,t){var n=this,r=function(){var r=[];0!=n._frameId&&(r=n._parentIds?n._parentIds.concat(n._frameId):[n._frameId]);var i=n._ctx.time.startTime();Do(e,["SetFrameId",t,r,i,n._scheme,n._script,n._appHost,n._orgId,n._pageRsp])};null==this._frameId?this._pendingChildFrameIdInits.push(r):r()},e.prototype.iFrameWndToFsId=function(e){for(var t=0;t<this._iFrames.length;t++)if(this._iFrames[t].contentWindow==e)return Mn(this._iFrames[t]);return o("Unable to locate frame for window"),NaN},e}();function Do(e,t){e&&e.postMessage&&e.postMessage(gt({__fs:t}),"*")}function Bo(e){try{var t=wt(e);if("__fs"in t)return t.__fs}catch(e){}return[]}function Ho(e){return e>=400&&502!==e||202==e||206==e}var jo=function(){return(jo=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var i in t=arguments[n])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)},Ko=function(){function e(e,t,n,r){void 0===r&&(r=tn),this._ctx=e,this._protocol=t,this._identity=n,this._timeoutFactory=r,this._recover()}return e.prototype.sing=function(e){o("Saving "+e.bundles.length+" bundles in swan-song.");var t=gt({OrgId:this._identity.orgId(),UserId:this._identity.userId(),SessionId:this._identity.sessionId(),PageId:e.pageId,Bundles:e.bundles,PageStartTime:this._ctx.time.startTime(),LastBundleTime:e.lastBundleTime,ServerPageStart:e.serverPageStart,ServerBundleTime:e.serverBundleTime,IsNewSession:e.isNewSession});if(!(t.length>2e6))try{localStorage._fs_swan_song=t}catch(e){}},e.prototype._recover=function(){try{if("_fs_swan_song"in localStorage){var e=localStorage._fs_swan_song||localStorage.singSwanSong;delete localStorage._fs_swan_song,delete localStorage.singSwanSong;var t=wt(e);if(!(t.Bundles&&t.UserId&&t.SessionId&&t.PageId))return void o("Malformed swan song found. Ignoring it.");t.OrgId||(t.OrgId=this._identity.orgId()),t.Bundles.length>0&&(o("Sending "+t.Bundles.length+" bundles as prior page swan song"),this.sendSwanSongBundles(t))}}catch(e){o("Error recovering swan-song: "+e)}},e.prototype.sendSwanSongBundles=function(e,t){var n=this;void 0===t&&(t=0);var r=null;if(nt(e.Bundles)&&0!==e.Bundles.length&&void 0!==e.Bundles[0]){1==e.Bundles.length&&(r=this._ctx.time.wallTime()-(e.LastBundleTime||0));this._protocol.bundle({bundle:e.Bundles[0],deltaT:r,orgId:e.OrgId,pageId:e.PageId,serverBundleTime:e.ServerBundleTime,serverPageStart:e.ServerPageStart,sessionId:e.SessionId,userId:e.UserId,isNewSession:e.IsNewSession,win:function(t){o("Sent "+e.Bundles[0].Evts.length+" trailing events from last session as Seq "+e.Bundles[0].Seq),e.Bundles.shift(),e.Bundles.length>0?n.sendSwanSongBundles(jo(jo({},e),{ServerBundleTime:t.BundleTime})):o("Done with prior page swan song")},lose:function(r){Ho(r)?o("Fatal error while sending events, giving up"):(o("Failed to send events from last session, will retry while on this page"),n._lastSwanSongRetryTimeout=new n._timeoutFactory(n.sendSwanSongBundles,n._protocol.exponentialBackoffMs(t,!0),n,e,t+1).start())}})}},e}(),Vo=function(){function e(e,t,n,r){var i=this;void 0===t&&(t=new Ro(e)),void 0===n&&(n=en),void 0===r&&(r=tn),this._ctx=e,this._protocol=t,this._tickerFactory=n,this._backoffRetries=0,this._backoffTime=0,this._bundleSeq=1,this._lastPostTime=0,this._serverBundleTime=0,this._isNewSession=!1,this._largePageSize=16e6,this._outgoingEventQueue=[],this._bundleQueue=[],this._hibernating=!1,this._heartbeatInterval=0,this._lastUserActivity=this._ctx.time.wallTime(),this._finished=!1,this._scheme=e.options.scheme,this._identity=e.recording.identity,this._lastBundleTime=e.time.wallTime(),this._swanSong=new Ko(e,this._protocol,this._identity,r),this._heartbeatTimeout=new r(function(){i.onHeartbeat()}),this._hibernationTimeout=new r(function(){i.onHibernate()},te.PageInactivityTimeout)}return e.prototype.onShutdown=function(e){this._onShutdown=e},e.prototype.scheme=function(){return this._scheme},e.prototype.enqueueEvents=function(e,t){if(this.maybeHibernate(),this._hibernating){if(this._finished)return;for(var n=0,r=t;n<r.length;n++){if(re((u=r[n]).Kind)){this._ctx.recording.splitPage(V.Hibernation),this._finished=!0;break}}}else{for(var i=0,o=t;i<o.length;i++){if(re((u=o[i]).Kind)){this._hibernationTimeout.start(),this._heartbeatInterval=te.HeartbeatInitial,this._heartbeatTimeout.start(this._heartbeatInterval),this._lastUserActivity=this._ctx.time.wallTime();break}}for(var s=0,a=t;s<a.length;s++){var u=a[s];this._outgoingEventQueue.push(u)}}},e.prototype.initUploadTicker=function(){this._uploadTicker=new this._tickerFactory(this._ctx.recording.bundleUploadInterval())},e.prototype.startPipeline=function(e){var t=this;this._pageId=e.pageId,this._serverPageStart=e.serverPageStart,this._isNewSession=e.isNewSession,this.enqueueAndSendBundle(),this._uploadTicker||this.initUploadTicker(),this._uploadTicker.start(function(){t.enqueueAndSendBundle()}),this._heartbeatInterval=te.HeartbeatInitial,this._heartbeatTimeout.start(this._heartbeatInterval),this._hibernationTimeout.start()},e.prototype.stopPipeline=function(){this._uploadTicker&&this._uploadTicker.stop(),this._outgoingEventQueue=[],this._bundleQueue=[],this._hibernationTimeout.stop(),this._heartbeatTimeout.stop()},e.prototype.flush=function(){this.maybeSendNextBundle()},e.prototype.singSwanSong=function(){if(!this._hibernating&&(this._outgoingEventQueue.length>0&&this.enqueueNextBundle(!0),this._bundleQueue.length>0||this._pendingBundle)){var e=this._bundleQueue.concat();this._pendingBundle&&e.unshift(this._pendingBundle),this._swanSong.sing({pageId:this._pageId,bundles:e,lastBundleTime:this._lastBundleTime,serverPageStart:this._serverPageStart,serverBundleTime:this._serverBundleTime,isNewSession:this._isNewSession})}},e.prototype.maybeHibernate=function(){this._hibernating||this.calcLastUserActivityDuration()>=te.PageInactivityTimeout+5e3&&this.onHibernate()},e.prototype.calcLastUserActivityDuration=function(){return s.mathFloor(this._ctx.time.wallTime()-this._lastUserActivity)},e.prototype.onHeartbeat=function(){var e=this.calcLastUserActivityDuration();this._outgoingEventQueue.push({When:this._ctx.time.now(),Kind:R.HEARTBEAT,Args:[e]}),this._heartbeatInterval*=2,this._heartbeatInterval>te.HeartbeatMax&&(this._heartbeatInterval=te.HeartbeatMax),this._heartbeatTimeout.start(this._heartbeatInterval)},e.prototype.onHibernate=function(){this._hibernating||(this.calcLastUserActivityDuration()<=2*te.PageInactivityTimeout&&(this._outgoingEventQueue.push({When:this._ctx.time.now(),Kind:R.UNLOAD,Args:[V.Hibernation]}),this.singSwanSong()),this.stopPipeline(),this._hibernating=!0)},e.prototype.enqueueAndSendBundle=function(){this._pendingBundle?this._pendingBundleFailed&&this._sendPendingBundle():0!=this._outgoingEventQueue.length?this.enqueueNextBundle():this.maybeSendNextBundle()},e.prototype.enqueueNextBundle=function(e){void 0===e&&(e=!1);var t={When:this._outgoingEventQueue[0].When,Seq:this._bundleSeq++,Evts:this._outgoingEventQueue};this._outgoingEventQueue=[],this._bundleQueue.push(t),e?this._protocol.bundleBeacon({bundle:t,deltaT:null,orgId:this._identity.orgId(),pageId:this._pageId,serverBundleTime:this._serverBundleTime,serverPageStart:this._serverPageStart,isNewSession:this._isNewSession,sessionId:this._identity.sessionId(),userId:this._identity.userId(),win:function(){},lose:function(){}}):this.maybeSendNextBundle()},e.prototype.maybeSendNextBundle=function(){this._pageId&&this._serverPageStart&&!this._pendingBundle&&0!=this._bundleQueue.length&&(this._pendingBundle=this._bundleQueue.shift(),this._sendPendingBundle())},e.prototype._sendPendingBundle=function(){var e=this,t=this._ctx.time.wallTime();if(!(t<this._backoffTime)){var n=this._pendingBundle;n&&(this._pendingBundleFailed=!1,this._lastPostTime=this._lastBundleTime=t,this.sendBundle(n,function(t){o("Sent bundle "+n.Seq+" with "+n.Evts.length+" events"),e._serverBundleTime=t.BundleTime,e._pendingBundle=null,e._backoffTime=0,e._backoffRetries=0,e._ctx.time.wallTime()-e._lastPostTime>e._ctx.recording.bundleUploadInterval()&&e.maybeSendNextBundle()},function(t){if(o("Failed to send events."),Ho(t))return 206==t?Mt.sendToBugsnag("Failed to send bundle, probably because of its large size","error"):t>=500&&Mt.sendToBugsnag("Failed to send bundle, recording outage likely","error"),void(e._onShutdown&&e._onShutdown());e._pendingBundleFailed=!0,e._backoffTime=e._lastPostTime+e._protocol.exponentialBackoffMs(e._backoffRetries++,!1)}))}},e.prototype.sendBundle=function(e,t,n){var r=s.mathFloor(this._ctx.time.wallTime()-this._lastUserActivity),i=this._protocol.bundle({bundle:e,deltaT:null,lastUserActivity:r,orgId:this._identity.orgId(),pageId:this._pageId,serverBundleTime:this._serverBundleTime,serverPageStart:this._serverPageStart,isNewSession:this._isNewSession,sessionId:this._identity.sessionId(),userId:this._identity.userId(),win:t,lose:n});i>this._largePageSize&&this._bundleSeq>16&&(o("splitting large page: "+i),this._ctx.recording.splitPage(V.Size))},e}(),zo=function(){var e=function(t,n){return(e=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])})(t,n)};return function(t,n){function r(){this.constructor=t}e(t,n),t.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}(),Yo=function(e){function t(t,n,r,i,o){void 0===r&&(r=new Vo(t,n)),void 0===i&&(i=en),void 0===o&&(o=Uo);var s,a,u=e.call(this,t,i,r,o)||this;return u._protocol=n,u._domLoaded=!1,u._recordingDisabled=!1,u._integrationScriptFetched=!1,r.onShutdown(function(){return u.shutdown(V.SettingsBlocked)}),u._doc=u._wnd.document,u._frameId=0,u._identity=t.recording.identity,u._getCurrentSessionEnabled=qo.NoInfoYet,s=u._wnd,a=function(e){if(u._eventWatcher.shutdown(V.Api),e){var t=u._doc.getElementById(e);t&&t.setAttribute("_fs_embed_token",u._embedToken)}},s._fs_shutdown=a,u}return zo(t,e),t.prototype.onDomLoad=function(){var t=this;e.prototype.onDomLoad.call(this),this._domLoaded=!0,this.injectIntegrationScript(function(){t.fireFsReady(t._recordingDisabled)})},t.prototype.getReplayFlags=function(){var e=U(this._wnd);if(/[?&]_fs_force_session=true(&|#|$)/.test(location.search)&&(e+=",forceSession",this._wnd.history)){var t=location.search.replace(/(^\?|&)_fs_force_session=true(&|$)/,function(e,t,n){return n?t:""});this._wnd.history.replaceState({},"",this._wnd.location.href.replace(location.search,t))}return e},t.prototype.start=function(t,n){var r,i,o,s=this;e.prototype.start.call(this,t,n);var a=this.getReplayFlags(),u=Vt(this._doc),c=u[0],h=u[1],d=bt(this._wnd),l=d[0],p=d[1],f="";t||(f=this._identity.userId());var v=null!==(o=null===(i=null===(r=this._ctx)||void 0===r?void 0:r.recording)||void 0===i?void 0:i.preroll)&&void 0!==o?o:-1,_=ur(Jn(this._wnd),this._orgId,{source:"page",type:"base"}),g=ur(this._doc.referrer,this._orgId,{source:"page",type:"referrer"}),m=ur(this._wnd.location.href,this._orgId,{source:"page",type:"url"}),y={OrgId:this._orgId,UserId:f,Url:m,Base:_,Width:c,Height:h,ScreenWidth:l,ScreenHeight:p,Referrer:g,Preroll:v,Doctype:yt(this._doc),CompiledTimestamp:1591209308,AppId:this._identity.appId()};a&&(y.ReplayFlags=a),this._protocol.page(y,function(e){s.handleResponse(e),s.handleIdentity(e.CookieDomain,e.UserIntId,e.SessionIntId,e.PageIntId,e.EmbedToken),s.handleIntegrationScript(e.IntegrationScript),e.PreviewMode&&s.maybeInjectPreviewScript();var t=s._wnd._fs_pagestart;t&&t();var n=!!e.Consented;s._queue.enqueueFirst({Kind:R.SYS_REPORTCONSENT,Args:[n,K.Document]}),s._queue.enqueueFirst({Kind:R.SET_FRAME_BASE,Args:[ur(Jn(s._wnd),s._orgId,{source:"event",type:R.SET_FRAME_BASE}),yt(s._doc)]}),s._queue.startPipeline({pageId:e.PageIntId,serverPageStart:e.PageStart,isNewSession:!!e.IsNewSession}),s.fullyStarted()},function(e,t){t&&t.user_id&&t.cookie_domain&&t.reason_code==$.ReasonBlockedTrafficRamping&&f!=t.user_id&&s.handleIdentity(t.cookie_domain,t.user_id,"","",""),s.disableBecauseRecPageSaidSo()})},t.prototype.handleIntegrationScript=function(e){var t=this;this._integrationScriptFetched=!0,this._integrationScript=e,this.injectIntegrationScript(function(){t.fireFsReady(t._recordingDisabled)})},t.prototype.handleIdentity=function(e,t,n,r,i){var s=this._identity;s.setIds(this._wnd,e,t,n),this._embedToken=i,o("/User,"+s.userId()+"/Session,"+s.sessionId()+"/Page,"+r)},t.prototype.injectIntegrationScript=function(e){if(this._domLoaded&&this._integrationScriptFetched)if(this._integrationScript){var t=this._doc.createElement("script");this._wnd._fs_csp?(t.addEventListener("load",e),t.addEventListener("error",e),t.async=!0,t.src=this._scheme+"//"+this._recHost+"/rec/integrations?OrgId="+this._orgId,this._doc.head.appendChild(t)):(t.text=this._integrationScript,this._doc.head.appendChild(t),e())}else e()},t.prototype.maybeInjectPreviewScript=function(){if(!this._doc.getElementById("FullStory-preview-script")){var e=this._doc.createElement("script");e.id="FullStory-preview-script",e.async=!0,e.src=this._scheme+"//"+this._appHost+"/s/fspreview.js",this._doc.head.appendChild(e)}},t.prototype.disableBecauseRecPageSaidSo=function(){this.shutdown(V.SettingsBlocked),o("Disabling FS."),this._recordingDisabled=!0,this.fireFsReady(this._recordingDisabled)},t}(Wo),Go=function(){function e(e,t){void 0===t&&(t=new Qo(e)),this._wnd=e,this._messagePoster=t}return e.prototype.enqueueEvents=function(e,t){this._messagePoster.postMessage(this._wnd.parent,"EvtBundle",t,e)},e.prototype.startPipeline=function(){},e.prototype.stopPipeline=function(){},e.prototype.flush=function(){},e.prototype.singSwanSong=function(){},e.prototype.onShutdown=function(e){},e}(),Qo=function(){function e(e){this.wnd=e}return e.prototype.postMessage=function(e,t,n,r){var i=N(this.wnd);if(i)try{i.send(t,gt(n),r)}catch(e){i.send(t,gt(n))}else e.postMessage(function(e,t,n){var r=[e,t];n&&r.push(n);return gt({__fs:r})}(t,n,r),"*")},e}();var Xo,Jo=function(){var e=function(t,n){return(e=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])})(t,n)};return function(t,n){function r(){this.constructor=t}e(t,n),t.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}(),$o=function(e){function t(t,n,r,i,o){void 0===n&&(n=new Qo(t.window)),void 0===r&&(r=new Go(t.window)),void 0===i&&(i=en),void 0===o&&(o=Uo);var s=e.call(this,t,i,r,o)||this;return s._messagePoster=n,s}return Jo(t,e),t.prototype.start=function(t,n){var r=this;e.prototype.start.call(this,t,n),this.sendRequestForFrameId(),this._listeners.add(this._wnd,"load",!1,function(){r._eventWatcher.recordingIsDetached()&&(o("Recording wrong document. Restarting recording in iframe."),r._ctx.recording.splitPage(V.FsShutdownFrame))})},t.prototype.postMessageReceived=function(t,n){if(e.prototype.postMessageReceived.call(this,t,n),t==this._wnd.parent||t==this._wnd)switch(n[0]){case"GreetFrame":this.sendRequestForFrameId();break;case"SetFrameId":try{var r=n[1],i=n[2],s=n[3],a=n[4],u=n[5],c=n[6],h=n[7],d=n[8];if(!r)return void o("Outer page gave us a bogus frame Id! Iframe: "+ur(location.href,h,{source:"log",type:"debug"}));this.setFrameIdFromOutside(r,i,s,a,u,c,h,d)}catch(e){o("Failed to parse frameId from message: "+gt(n))}break;case"SetConsent":var l=n[1];this.setConsent(l);break;case"InitFrameMobile":try{var p=JSON.parse(n[1]),f=p.StartTime;if(n.length>2){var v=n[2];if(v.hasOwnProperty("ProtocolVersion"))v.ProtocolVersion>=20180723&&v.hasOwnProperty("OuterStartTime")&&(f=v.OuterStartTime)}var _=p.Host;this.setFrameIdFromOutside(0,[],f,"https:",H(_),B(_),p.OrgId,p.PageResponse)}catch(e){o("Failed to initialize mobile web recording from message: "+gt(n))}}},t.prototype.sendRequestForFrameId=function(){this._frameId||(0!=this._frameId?this._wnd.parent?(o("Asking for a frame ID."),this._messagePoster.postMessage(this._wnd.parent,"RequestFrameId",[])):o("Orphaned window."):o("For some reason the outer window attempted to request a frameId"))},t.prototype.setFrameIdFromOutside=function(e,t,n,r,i,s,a,u){if(this._frameId)this._frameId!=e?(o("Updating frame id from "+this._frameId+" to "+e),this._ctx.recording.splitPage(V.FsShutdownFrame)):o("frame Id is already set to "+this._frameId);else{o("FrameId received within frame "+ur(location.href,a,{source:"log",type:"debug"})+": "+e),this._scheme=r,this._script=i,this._appHost=s,this._orgId=a,this._frameId=e,this._parentIds=t,this.handleResponse(u),this.fireFsReady();var c=!!u.Consented;this._queue.enqueueFirst({Kind:R.SYS_REPORTCONSENT,Args:[c,K.Document]}),this._queue.enqueueFirst({Kind:R.SET_FRAME_BASE,Args:[ur(Jn(this._wnd),a,{source:"event",type:R.SET_FRAME_BASE}),yt(this._wnd.document)]}),this._queue.rebaseIframe(n),this._ctx.time.setStartTime(n),this._queue.startPipeline({pageId:this._pageId,serverPageStart:u.PageStart,isNewSession:!!u.IsNewSession,frameId:e,parentIds:t}),this.flushPendingChildFrameInits(),this.fullyStarted()}},t}(Wo),Zo="fsidentity",es="newuid",ts=function(){function e(e,t){void 0===e&&(e=document),void 0===t&&(t=function(){}),this._doc=e,this._onWriteFailure=t,this._cookies={},this._appId=void 0}return e.prototype.initFromCookies=function(e,t){this._cookies=y(this._doc);var n=this._cookies.fs_uid;if(!n)try{n=localStorage._fs_uid}catch(e){}var r=m(n);r&&r.host.replace(/^www\./,"")==e.replace(/^www\./,"")&&r.orgId==t?this._cookie=r:this._cookie={expirationAbsTimeSeconds:g(),host:e,orgId:t,userId:"",sessionId:"",appKeyHash:""}},e.prototype.initFromParsedCookie=function(e){this._cookie=e},e.prototype.clear=function(){this._cookie.userId=this._cookie.sessionId=this._cookie.appKeyHash=this._appId="",this._cookie.expirationAbsTimeSeconds=g(),this._write()},e.prototype.host=function(){return this._cookie.host},e.prototype.orgId=function(){return this._cookie.orgId},e.prototype.userId=function(){return this._cookie.userId},e.prototype.sessionId=function(){return this._cookie.sessionId},e.prototype.appKeyHash=function(){return this._cookie.appKeyHash},e.prototype.cookieData=function(){return this._cookie},e.prototype.cookies=function(){return this._cookies},e.prototype.setCookie=function(e,t,n){void 0===n&&(n=new Date(p()+6048e5).toUTCString());var r=e+"="+t;this._domain?r+="; domain=."+encodeURIComponent(this._domain):r+="; domain=",r+="; Expires="+n+"; path=/; SameSite=Strict","https:"===location.protocol&&(r+="; Secure"),this._doc.cookie=r},e.prototype.setIds=function(e,t,n,r){(C(t)||t.match(/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/g))&&(t="");var i=function(e){return e._fs_cookie_domain}(e);"string"==typeof i&&(t=i),this._domain=t,this._cookie.userId=n,this._cookie.sessionId=r,this._write()},e.prototype.clearAppId=function(){return!!this._cookie.appKeyHash&&(this._appId="",this._cookie.appKeyHash="",this._write(),!0)},e.prototype.setAppId=function(e){this._appId=e,this._cookie.appKeyHash=uo(e),this._write()},e.prototype.appId=function(){return this._appId},e.prototype.encode=function(){var e=this._cookie.host+"#"+this._cookie.orgId+"#"+this._cookie.userId+":"+this._cookie.sessionId;return this._cookie.appKeyHash&&(e+="#"+encodeURIComponent(this._cookie.appKeyHash)+"#"),e+="/"+this._cookie.expirationAbsTimeSeconds},e.prototype._write=function(){if(null!=this._domain){var e=this.encode(),t=new Date(1e3*this._cookie.expirationAbsTimeSeconds).toUTCString();this.setCookie("fs_uid",e,t);var n=[];-1===this._doc.cookie.indexOf(e)&&n.push(["fs_uid","cookie"]);try{localStorage._fs_uid=e,localStorage._fs_uid!==e&&n.push(["fs_uid","localStorage"])}catch(e){n.push(["fs_uid","localStorage",String(e)])}n.length>0&&this._onWriteFailure(n)}},e}();!function(e){e.rec="rec",e.user="user",e.account="account",e.consent="consent",e.customEvent="event",e.log="log"}(Xo||(Xo={}));var ns={acctId:"str",displayName:"str",website:"str"},rs={uid:"str",displayName:"str",email:"str"},is={str:os,bool:ss,real:as,"int":us,date:cs,strs:hs(os),bools:hs(ss),reals:hs(as),ints:hs(us),dates:hs(cs),objs:hs(ds),obj:ds};function os(e){return"string"==typeof e}function ss(e){return"boolean"==typeof e}function as(e){return"number"==typeof e}function us(e){return"number"==typeof e&&e-s.mathFloor(e)==0}function cs(e){return!!e&&(e.constructor===Date?!isNaN(e):("number"==typeof e||"string"==typeof e)&&!isNaN(new Date(e)))}function hs(e){return function(t){if(!(t instanceof Array))return!1;for(var n=0;n<t.length;n++)if(!e(t[n]))return!1;return!0}}function ds(e){return!!e&&"object"==typeof e}var ls=/^[a-zA-Z][a-zA-Z0-9_]*$/,ps=function(){function e(e){this._identity=e}return e.prototype.identity=function(){return this._identity},e.prototype.api=function(e,t,n){var r=!1,i=[];try{switch(e){case Xo.account:i.push.apply(i,this.rawEventsFromApi(X.Account,ns,t,n));break;case Xo.user:if("object"!=typeof t)o("Expected argument of type 'object' instead got type: '"+typeof t+"', value: "+gt(t));else if("uid"in t){var a=t.uid;if(!1===a)this._identity.clearAppId()&&(r=!0),delete t.uid;else{var u=function(e,t){"number"==typeof e&&s.mathFloor(e)==e&&(o("Expected appId of type 'string' instead got value: "+e+" of type: "+typeof e),e=""+e);if("string"!=typeof e)return o("blocking FS.identify API call; uid value ("+e+") must be a string"),[void 0,Zo];var n=e.trim();if(f.indexOf(n.toLowerCase())>=0)return o("blocking FS.identify API call; uid value ("+n+") is illegal"),[void 0,Zo];var r=uo(n),i=void 0;t&&t._cookie.appKeyHash&&t._cookie.appKeyHash!==r&&t._cookie.appKeyHash!==n&&(o("user re-identified; existing uid hash ("+t._cookie.appKeyHash+") does not match provided uid ("+n+")"),i=es);return[n,i]}(a,this._identity),c=u[0],h=u[1];if(!c){switch(h){case Zo:case void 0:break;default:o("unexpected failReason returned from setAppId: "+h);}return{events:i}}t.uid=c,this._identity.setAppId(t.uid),h==es&&(r=!0)}}i.push.apply(i,this.rawEventsFromApi(X.User,rs,t,n));break;case Xo.customEvent:var d=t.n,l=t.p;i.push.apply(i,this.rawEventsFromApi(X.Event,{},l,n,d));break;default:o("invalid operation \""+e+"\"; only \"rec\", \"account\", and \"user\" are supported at present");}}catch(t){o("unexpected exception handling "+e+" API call: "+t.message)}return{events:i,reidentify:r}},e.prototype.rawEventsFromApi=function(e,t,n,r,i){var a=function e(t,n,r){var i={PayloadToSend:{},ValidationErrors:[]},a=function(r){var o=e(t,n,r);return i.ValidationErrors=i.ValidationErrors.concat(o.ValidationErrors),o.PayloadToSend};return ht(r,function(e,r){var u=function(e,t,n,r){var i=t,a=typeof n;if("undefined"===a)return o("Cannot infer type of "+a+" "+n),r.push({Type:"vartype",FieldName:t,ValueType:a+" (unsupported)"}),null;if(s.objectHasOwnProp(e,t))return{name:t,type:e[t]};var u=t.lastIndexOf("_");if(-1==u||!vs(t.substring(u+1))){var c=function(e){for(var t in is)if(is[t](e))return t;return null}(n);if(null==c)return o("Cannot infer type of "+a+" "+n),n?r.push({Type:"vartype",FieldName:t}):r.push({Type:"vartype",FieldName:t,ValueType:"null (unsupported)"}),null;u=t.length,o("Warning: Inferring user variable \""+t+"\" to be of type \""+c+"\""),t=t+"_"+c}var h=[t.substring(0,u),t.substring(u+1)],d=h[0],l=h[1];if("object"===a&&!n)return o("null is not a valid object type"),r.push({Type:"vartype",FieldName:i,ValueType:"null (unsupported)"}),null;if(!ls.test(d)){d=d.replace(/[^a-zA-Z0-9_]/g,"").replace(/^[0-9]+/,""),/[0-9]/.test(d[0])&&(d=d.substring(1)),r.push({Type:"varname",FieldName:i});var p=d+"_"+l;if(o("Warning: variable \""+i+"\" has invalid characters. It should match /"+ls.source+"/. Converted name to \""+p+"\"."),""==d)return null;t=p}if(!vs(l))return o("Variable \""+i+"\" has invalid type \""+l+"\""),r.push({Type:"varname",FieldName:i}),null;if(!function(e,t){return is[e](t)}(l,n))return o("illegal value "+gt(n)+" for type "+l),"number"===a?a=n%1==0?"integer":"real":"object"==a&&null!=n&&n.constructor==Date&&(a=isNaN(n)?"invalid date":"date"),r.push({Type:"vartype",FieldName:i,ValueType:a}),null;return{name:t,type:l}}(n,r,e,i.ValidationErrors);if(u){var c=u.name,h=u.type;if("obj"!=h){if("objs"!=h){var d,l;i.PayloadToSend[c]=fs(h,e)}else{t!=X.Event&&i.ValidationErrors.push({Type:"vartype",FieldName:c,ValueType:"Array<Object> (unsupported)"});for(var p=e,f=[],v=0;v<p.length;v++){(_=a(p[v]))&&f.push(_)}f.length>0&&(i.PayloadToSend[c]=f)}}else{var _=a(e),g=(l="_obj").length>(d=r).length||d.substring(d.length-l.length)!=l?c.substring(0,c.length-"_obj".length):c;i.PayloadToSend[g]=_}}else i.PayloadToSend[r]=fs("",e)}),i}(e,t,n),u=[],c=e==X.Event,h=gt(a.PayloadToSend),d=!!r&&"fs"!==r;return c?u.push({When:0,Kind:R.SYS_CUSTOM,Args:d?[i,h,r]:[i,h]}):u.push({When:0,Kind:R.SYS_SETVAR,Args:d?[e,h,r]:[e,h]}),u},e}();function fs(e,t){return"str"==e&&null!=t&&(t=t.trim()),null==t||"date"!=e&&t.constructor!=Date||(t=function(e){var t,n=e.constructor===Date?e:new Date(e);try{t=n.toISOString()}catch(e){t=null}return t}(t)),t}function vs(e){return!!is[e]}var _s=function(){return(_s=Object.assign||function(e){for(var t,n=1,r=arguments.length;n<r;n++)for(var i in t=arguments[n])Object.prototype.hasOwnProperty.call(t,i)&&(e[i]=t[i]);return e}).apply(this,arguments)},gs=function(e,t,n,r){return new(n||(n=Promise))(function(i,o){function s(e){try{u(r.next(e))}catch(e){o(e)}}function a(e){try{u(r["throw"](e))}catch(e){o(e)}}function u(e){var t;e.done?i(e.value):(t=e.value,t instanceof n?t:new n(function(e){e(t)})).then(s,a)}u((r=r.apply(e,t||[])).next())})},ms=function(e,t){var n,r,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),"throw":a(1),"return":a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(n)throw new TypeError("Generator is already executing.");for(;s;)try{if(n=1,r&&(i=2&o[0]?r["return"]:o[0]?r["throw"]||((i=r["return"])&&i.call(r),0):r.next)&&!(i=i.call(r,o[1])).done)return i;switch(r=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,r=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(i=(i=s.trys).length>0&&i[i.length-1])&&(6===o[0]||2===o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue;}o=t.call(e,s)}catch(e){o=[6,e],r=0}finally{n=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}};function ys(e,t){return gs(this,void 0,et,function(){var n,r,i,s,u;return ms(this,function(c){switch(c.label){case 0:if(c.trys.push([0,2,,3]),ae||ce)return[2,_s(_s({},t),{status:1})];if(!e.document||0!==t.status)return[2,t];if(1===(n=function(e,t){var n=t.functions,r={},i=_s({},t.helpers);if(i.functionToString=function(e,t){var n,r,i=null===(n=e["__core-js_shared__"])||void 0===n?void 0:n.inspectSource;if(bs(i,1))return function(){return i(this)};var o=null===(r=e["__core-js_shared__"])||void 0===r?void 0:r["native-function-to-string"];if(bs(o))return o;var s=t.__zone_symbol__OriginalDelegate;if(bs(s))return s;if(bs(t))return t;return}(e,i.functionToString),!i.functionToString)return t;var o=!1;for(var s in n)if(n[s]){if(r[s]=Ts(i.functionToString,n[s]),r[s]||(r[s]=ks(i.functionToString,i,s)),!r[s])return t;r[s]!==n[s]&&(o=!0)}else r[s]=void 0;return{status:1,functions:o?r:n,helpers:i}}(e,t)).status)return[2,n];o("The window is dirty; rebuilding Windex from a fresh global."),(r=e.document.createElement("iframe")).id="FullStory-iframe",r.className="fs-hide",r.style.display="none",i=e.document.body||e.document.head||e.document.documentElement||e.document;try{i.appendChild(r)}catch(e){return[2,_s(_s({},t),{status:1})]}return r.contentWindow?(s=a(r.contentWindow,1),r.parentNode&&r.parentNode.removeChild(r),2===s.status?[2,_s(_s({},t),{status:1})]:[4,ws(s,t)]):[2,_s(_s({},t),{status:1})];case 1:return[2,c.sent()];case 2:return u=c.sent(),Mt.sendToBugsnag(u,"error"),[2,_s(_s({},t),{status:1})];case 3:return[2];}})})}function ws(e,t){var n,r=new et(function(e){return n=e});return setTimeout(function(){try{e.functions.jsonParse("[]").push(0)}catch(e){n(_s(_s({},t),{status:1}))}n(e)}),r}function bs(e,t){var n;if(void 0===t&&(t=0),!e)return!1;var r=function(e){try{return void e.call(null)}catch(e){return(e.stack||"").replace(/__fs_nomangle_check_stack(.|\n)*$/,"")}},i=void 0;0!==t&&"number"==typeof Error.stackTraceLimit&&(i=Error.stackTraceLimit,Error.stackTraceLimit=Number.POSITIVE_INFINITY);var o=[function(){throw new Error("")},e],s=function __fs_nomangle_check_stack(){return o.map(r)}(),a=s[0],u=s[1];if(void 0!==i&&(Error.stackTraceLimit=i),!a||!u)return!1;for(var c="\n".charCodeAt(0),h=a.length>u.length?u.length:a.length,d=1,l=d;l<h;l++){var p=a.charCodeAt(a.length-l),f=u.charCodeAt(u.length-l);if(p!=f)break;f!=c&&l!=h-1||(d=l)}return(null!==(n=u.slice(0,u.length-d+1).match(/\.js:\d+([:)]|$)/gm))&&void 0!==n?n:[]).length<=t}function Ss(e,t){return e.call(t).indexOf("[native code]")>=0}var Es=["__zone_symbol__OriginalDelegate","nr@original"];function Ts(e,t){if(t){for(var n=0,r=Es;n<r.length;n++){var i=t[r[n]];if("function"==typeof i&&Ss(e,i))return i}return Ss(e,t)?t:void 0}}function ks(e,t,n){switch(n){case"arrayIsArray":var r=Ts(e,t.objectToString);if(!r)return;return t.objectToString=r,function(e){return"[object Array]"==r.call(e)};default:return;}}var Is=function(){function e(e,t){void 0===t&&(t=function(e){return new WebSocket(e)}),this._newSock=t,this._connecting=!1,this._connected=!1,this._queue={},this._seq=1,this._scheme=e.options.scheme,this._host=e.options.recHost}return e.isSupported=function(){return"WebSocket"in window},e.prototype.page=function(e,t,n){this.request({Cmd:1,Page:e},function(e){return t(e.Page)},n)},e.prototype.bundle=function(e){var t=e.deltaT,n=e.serverPageStart,r=e.serverBundleTime;return this.request({Cmd:2,Bundle:{OrgId:e.orgId,UserId:e.userId,SessionId:e.sessionId,PageId:e.pageId,Seq:e.bundle.Seq,DeltaT:null===t?void 0:t,PageStart:null==n?void 0:n,PrevBundleTime:null==r?void 0:r,Bundle:e.bundle}},function(t){return e.win(t.Bundle)},e.lose)},e.prototype.bundleBeacon=function(e){return Mo(this._scheme,this._host,e)},e.prototype.exponentialBackoffMs=function(e,t){var n=s.mathMin(te.BackoffMax,5e3*s.mathPow(2,e));return t?n+.25*s.mathRandom()*n:n},e.prototype.request=function(e,t,n){e.Seq=this._seq++;var r=gt(e);return this._queue[e.Seq]={payload:r,win:t,lose:n},this.maybeConnect(),r.length},e.prototype.handleMessage=function(e){var t;try{t=wt(e)}catch(e){return void o("socket: error parsing frame: "+e.toString())}var n=this._queue[t.Seq];delete this._queue[t.Seq],n?3==t.Cmd?(o(t.Fail.Error),n.lose(t.Fail.Status)):n.win(t):o("socket: mismatched request seq "+t.Seq+"; ignoring")},e.prototype.drainQueue=function(){if(this._connected)for(var e in this._queue){var t=this._queue[e];t.sent||(this._sock.send(t.payload),t.sent=!0)}else o("socket: attempt to drain queue when disconnected.")},e.prototype.failPending=function(){for(var e in this._queue){var t=this._queue[e];t.sent&&(delete this._queue[e],t.lose(0))}},e.prototype.maybeConnect=function(){var e=this;if(this._connected)this.drainQueue();else if(!this._connecting){this._connecting=!0;var t=("https:"==this._scheme?"wss:":"ws:")+"//"+this._host+"/rec/sock";this._sock=this._newSock(t),this._sock.onopen=function(t){e._connecting=!1,e._connected=!0,e.drainQueue()},this._sock.onmessage=function(t){e.handleMessage(t.data),e.drainQueue()},this._sock.onclose=function(t){o("socket: closed; reconnecting"),e._connecting=e._connected=!1,e.failPending()},this._sock.onerror=function(t){o("socket: error; reconnecting"),e._connecting=e._connected=!1,e.failPending()}}},e}(),Cs=function(){var e=function(t,n){return(e=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(e,t){e.__proto__=t}||function(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n])})(t,n)};return function(t,n){function r(){this.constructor=t}e(t,n),t.prototype=null===n?Object.create(n):(r.prototype=n.prototype,new r)}}(),Rs=function(){function e(){var e=this;this.measurementTasks=null,this.performingMeasurements=!1,this.recursionDepth=0,this.performMeasurements=Mt.wrap(function(){if(e.performingMeasurements)Mt.sendToBugsnag("performMeasurements() already in progress","error");else{e.performingMeasurements=!0;try{if(!e.measurementTasks)return;for(var t=0;t<e.measurementTasks.length;t++)e.measurementTasks[t]();e.measurementTasks=null}finally{e.performingMeasurements=!1}}})}return e.create=function(e){return e.ResizeObserver?new As(e,e.ResizeObserver):s.requestWindowAnimationFrame&&e.MessageChannel?new xs(e,s.requestWindowAnimationFrame,e.MessageChannel):new Os(e)},e.prototype.requestMeasureTask=function(e){var t=this;if(this.recursionDepth>16)Mt.sendToBugsnag("Too much synchronous recursion in requestMeasureTask","error");else{var n=this.performingMeasurements?this.recursionDepth:0,r=Mt.wrap(function(){var r=t.recursionDepth;t.recursionDepth=n+1;try{e()}finally{t.recursionDepth=r}});this.measurementTasks?this.measurementTasks.push(r):(this.measurementTasks=[r],this.schedule())}},e.prototype.performMeasurementsNow=function(){this.performMeasurements()},e}(),As=function(e){function t(t,n){var r=e.call(this)||this;return r.wnd=t,r.ResizeObserver=n,r}return Cs(t,e),t.prototype.schedule=function(){var e=this,t=this.ResizeObserver,n=this.wnd.document,r=n.body||n.documentElement||n.head,i=new t(function(){i.unobserve(r),e.performMeasurements()});i.observe(r)},t}(Rs),xs=function(e){function t(t,n,r){var i=e.call(this)||this;return i.wnd=t,i.requestWindowAnimationFrame=n,i.onRAF=Mt.wrap(function(){i.ch.port2.postMessage(void 0)}),i.ch=new r,i}return Cs(t,e),t.prototype.schedule=function(){this.ch.port1.onmessage=this.performMeasurements,this.requestWindowAnimationFrame(this.wnd,this.onRAF)},t}(Rs),Os=function(e){function t(t){var n=e.call(this)||this;return n.wnd=t,n}return Cs(t,e),t.prototype.schedule=function(){s.setWindowTimeout(this.wnd,this.performMeasurements,0)},t}(Rs),Ms=function(e,t,n,r){return new(n||(n=Promise))(function(i,o){function s(e){try{u(r.next(e))}catch(e){o(e)}}function a(e){try{u(r["throw"](e))}catch(e){o(e)}}function u(e){var t;e.done?i(e.value):(t=e.value,t instanceof n?t:new n(function(e){e(t)})).then(s,a)}u((r=r.apply(e,t||[])).next())})},Ls=function(e,t){var n,r,i,o,s={label:0,sent:function(){if(1&i[0])throw i[1];return i[1]},trys:[],ops:[]};return o={next:a(0),"throw":a(1),"return":a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(n)throw new TypeError("Generator is already executing.");for(;s;)try{if(n=1,r&&(i=2&o[0]?r["return"]:o[0]?r["throw"]||((i=r["return"])&&i.call(r),0):r.next)&&!(i=i.call(r,o[1])).done)return i;switch(r=0,i&&(o=[2&o[0],i.value]),o[0]){case 0:case 1:i=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,r=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(i=(i=s.trys).length>0&&i[i.length-1])&&(6===o[0]||2===o[0])){s=0;continue}if(3===o[0]&&(!i||o[1]>i[0]&&o[1]<i[3])){s.label=o[1];break}if(6===o[0]&&s.label<i[1]){s.label=i[1],i=o;break}if(i&&s.label<i[2]){s.label=i[2],s.ops.push(o);break}i[2]&&s.ops.pop(),s.trys.pop();continue;}o=t.call(e,s)}catch(e){o=[6,e],r=0}finally{n=i=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}},Fs=function(){function e(){}return e.prototype.createTopRecorder=function(e){var t=e.window._fs_use_socket&&Is.isSupported()?new Is(e):new Ro(e);return new Yo(e,t)},e.prototype.createInnerRecorder=function(e){return new $o(e)},e}(),Ps=function(){function e(e,t){void 0===e&&(e=window),void 0===t&&(t=new Fs),this.wnd=e,this.recMaker=t,this.scheme="https:",this.domDoneLoaded=!1,this.waitingOnStart=!1,this.reidentifyCount=0}return e.prototype.init=function(){var e,t;k(this.wnd)||(e=this.wnd,t=T(this.wnd),e[w]=t,t in e||(e[t]={}),function(e){gs(this,void 0,et,function(){var t;return ms(this,function(n){switch(n.label){case 0:return[4,ys(e,s.snapshot)];case 1:return t=n.sent(),s.rebuildFromSnapshot(t),[2];}})})}(this.wnd),this.initApi(),this.start())},e.prototype.getCurrentSessionURL=function(e){return this.recorder?this.recorder.getCurrentSessionURL(e):null},e.prototype.getCurrentSession=function(){return this.recorder?this.recorder.getCurrentSession():null},e.prototype.enableConsole=function(){this.recorder&&this.recorder.console().enable()},e.prototype.disableConsole=function(){this.recorder&&this.recorder.console().disable()},e.prototype.log=function(){for(var e=[],t=0;t<arguments.length;t++)e[t]=arguments[t];this._api(Xo.log,e)},e.prototype.shutdownApi=function(){this.shutdown(V.Api)},e.prototype.shutdown=function(e){this.recorder&&!this.deferredStart?(this.recorder.shutdown(e),this.recorder=null):o("Recording already shut down.")},e.prototype.restart=function(){if(this.deferredStart)return this.deferredStart(),void(this.deferredStart=null);this.recorder?o("Recording already started."):this.recorder=this.createRecorder(!0)},e.prototype.splitPage=function(e,t){return Ms(this,void 0,et,function(){return Ls(this,function(n){switch(n.label){case 0:return t&&null==this.identity?(o("Can't re-identify from an iframe"),[2]):this.waitingOnStart?(this.splitPending=[e,t],[2]):(this.shutdown(e),[4,so(0)]);case 1:return n.sent(),[4,so(0)];case 2:return n.sent(),t&&this.identity&&this.identity.clear(),this.restart(),[2];}})})},e.prototype.executeApiSequence=function(e,t,n){if(this.inFrame())return o("API calls may only be made from the top-most frame"),null;for(var r,i,s=[],a=!1,u=0;u<t.length;u++)try{var c=t[u],h=c[0],d=c[1];switch(h){case Xo.rec:r=!!d;break;case Xo.log:var l=d,p=l[0],f=l.slice(1),v=e.console().logEvent(p,f);v&&s.push(v);break;case Xo.consent:i=!!d;break;case Xo.account:case Xo.user:case Xo.customEvent:var _=this.vars.api(h,d,n),g=_.events;_.reidentify&&(s=[],i=void 0,a=!0),s.push.apply(s,g);break;default:o("Unrecognized api: "+h);}}catch(e){Mt.sendToBugsnag(e,"error")}return{reidentified:a,recordingShouldBeEnabled:r,applyApi:function(){void 0!==i&&e.setConsent(i);for(var t=e.queue(),n=0,r=s;n<r.length;n++){var o=r[n];t.enqueue(o)}}}},e.prototype._api=function(e,t,n){var r;if(this.recorder){var i=null!==(r=this.executeApiSequence(this.recorder,[[e,t]],n))&&void 0!==r?r:{reidentified:!1,applyApi:function(){}},s=i.reidentified,a=i.recordingShouldBeEnabled,u=i.applyApi;if(s){if(this.reidentifyCount>=8)return void o("reidentified too many times; giving up");this.reidentifyCount++,W(this.wnd,[e,t]),this.splitPage(V.Reidentify,!0)}else u();void 0!==a&&(a?this.restart():this.shutdown(V.Api))}else W(this.wnd,[e,t])},e.prototype._cookies=function(){return this.identity?this.identity.cookies():(o("Error in FS integration: Can't get cookies from inside an iframe"),null)},e.prototype._setCookie=function(e,t){this.identity?this.identity.setCookie(e,t):o("Error in FS integration: Can't set cookies from inside an iframe")},e.prototype._withEventQueue=function(e,t){if(this.recorder){var n=this.recorder.queue(),r=this.recorder.pageSignature();null!=n&&null!=r?e===r?t(n):Mt.sendToBugsnag("Error in _withEventQueue: Page Signature mismatch","error",{pageSignature:r,callerSignature:e}):o("Error getting event queue or page signature: Recorder not initialized")}else o("Error in FS integration: Recorder not initialized")},e.prototype.initApi=function(){var e=I(this.wnd);e?(e.getCurrentSessionURL=_t(this.getCurrentSessionURL,this),e.getCurrentSession=_t(this.getCurrentSession,this),e.enableConsole=_t(this.enableConsole,this),e.disableConsole=_t(this.disableConsole,this),e.log=_t(this.log,this),e.shutdown=_t(this.shutdownApi,this),e.restart=_t(this.restart,this),e._api=_t(this._api,this),e._cookies=_t(this._cookies,this),e._setCookie=_t(this._setCookie,this),e._withEventQueue=_t(this._withEventQueue,this)):o("Missing browser API namespace; couldn't initialize API.")},e.prototype.start=function(){var e,t=this;e=L(this.wnd),r=e,o("script version UNSET (compiled at 1591209308)");var n=P(this.wnd);if(n){this.orgId=n;var i,s=(i=this.wnd)._fs_script||H(D(i));if(s){this.script=s;var a=F(this.wnd);if(a){this.recHost=a;var u=function(e){return e._fs_app_host||B(D(e))}(this.wnd);u?(this.appHost=u,o("script: "+this.script),o("recording host: "+this.recHost),o("orgid: "+this.orgId),"localhost:8080"==this.recHost&&(this.scheme="http:"),this.inFrame()||(this.identity=new ts(this.wnd.document,function(e){for(var n,r=0,i=e;r<i.length;r++){var o=i[r];null===(n=t.recorder)||void 0===n||n.queue().enqueue({Kind:R.STORAGE_WRITE_FAILURE,Args:o})}}),this.vars=new ps(this.identity),this.identity.initFromCookies(this.recHost,this.orgId)),this.canRecord(this.orgId)?(this.recorder=this.createRecorder(),this.recorder.eventWatcher().watchEvents(),this.hookLoadEvents(),this.wnd.addEventListener("message",Mt.wrap(function(e){if("string"==typeof e.data&&(e.source==t.wnd.parent||e.source==t.wnd))switch(Bo(e.data)[0]){case"ShutdownFrame":t.shutdown(V.FsShutdownFrame);break;case"RestartFrame":t.restart();}}))):this.hailMary()):o("Missing global _fs_host or _fs_app_host. Recording disabled.")}else o("Missing global _fs_host or _fs_rec_host. Recording disabled.")}else o("Missing global _fs_host or _fs_rec_host. Recording disabled.")}else o("Missing global _fs_org. Recording disabled.")},e.prototype._context=function(e){var t,n=this,r=s.mathRound(null!==(t=ie(function(){var e;return null===(e=window.performance)||void 0===e?void 0:e.now()})())&&void 0!==t?t:-1);return{window:this.wnd,time:new rn,measurer:Rs.create(this.wnd),options:{orgId:this.orgId,scheme:this.scheme,script:this.script,recHost:this.recHost,appHost:this.appHost},recording:{bundleUploadInterval:function(){return e().bundleUploadInterval()},preroll:r,inFrame:this.inFrame(),vars:this.vars,identity:this.identity,splitPage:function(e,t){return n.splitPage(e,t)},pageSignature:function(){return e().pageSignature()}},queue:function(){return e().queue()}}},e.prototype.createRecorder=function(e){var t,n,r=this,i=this._context(function(){return n}),o=!1,s=!1;if(this.inFrame())n=this.recMaker.createInnerRecorder(i);else{n=this.recMaker.createTopRecorder(i);var a=null!==(t=this.executeApiSequence(n,function(e){var t=I(e);if(!t)return[];var n=t.q;return n?(delete t.q,n):[]}(this.wnd)))&&void 0!==t?t:{applyApi:function(){}},u=a.reidentified,c=a.recordingShouldBeEnabled,h=a.applyApi;void 0!==c&&(s=!c),o=!!u,h()}this.waitingOnStart=!0;var d=function(){n.start(o,function(){r.waitingOnStart=!1,e&&n.tellAllFramesTo(["RestartFrame"]),r.splitPending&&(r.splitPage(r.splitPending[0],r.splitPending[1]),r.splitPending=null)}),e&&n.eventWatcher().watchEvents()};return s?this.deferredStart=d:d(),n},e.prototype.inFrame=function(){if("boolean"==typeof this._inFrame)return this._inFrame;var e=N(this.wnd);return q(this.wnd)?this._inFrame=!1:this.wnd!=top?this._inFrame=!0:e?e.init&&e.init(this.orgId)&&(this._inFrame=!0):this._inFrame=!1,this._inFrame},e.prototype.canRecord=function(e){return(this.wnd.MutationObserver||this.wnd.MutationEvent)&&this.wnd.postMessage&&it&&2!==s.snapshot.status?!!function e(t){if(t==top||q(t)||function(e){return!!e._fs_run_in_iframe}(t)||N(t))return!0;try{return t.parent.document,e(t.parent)}catch(e){return!1}}(this.wnd)||(o("FullStory recording for this page is NOT allowed within an iFrame."),!1):(o("missing required browser features"),!1)},e.prototype.hailMary=function(){var e,t=this;if(this.identity){var n=U(this.wnd);o("Unable to record playback stream.");var r=document.createElement("script");this.wnd.__fs_startResponse=function(e){e&&t.identity.setIds(t.wnd,e.CookieDomain,e.UserIntId,e.SessionIntId),document.head&&document.head.removeChild(r)};var i=Vt(this.wnd.document),a=i[0],u=i[1],c=bt(this.wnd),h=c[0],d=c[1],l=ur(Jn(this.wnd),this.orgId,{source:"page",type:"base"}),p=ur(document.referrer,this.orgId,{source:"page",type:"referrer"}),f=ur(this.wnd.location.href,this.orgId,{source:"page",type:"url"}),v=s.mathRound(null!==(e=ie(function(){var e;return null===(e=window.performance)||void 0===e?void 0:e.now()})())&&void 0!==e?e:-1);r.src="//"+this.recHost+"/rec/page?OrgId="+this.orgId+"&UserId="+this.identity.userId()+"&Url="+encodeURIComponent(f)+"&Base="+encodeURIComponent(l)+"&Width="+a+"&Height="+u+"&ScreenWidth="+h+"&ScreenHeight="+d+"&Referrer="+encodeURIComponent(p)+"&Doctype="+encodeURIComponent(yt(document))+"&Preroll="+v+"&CompiledTimestamp=1591209308&Fallback=true"+(n?"&ReplayFlags="+n:""),document.head&&document.head.appendChild(r)}},e.prototype.hookLoadEvents=function(){var e=this,t=function(){e.domDoneLoaded||(e.domDoneLoaded=!0,e.recorder&&e.recorder.onDomLoad())},n=!1,r=function(){n||(n=!0,e.recorder&&e.recorder.onLoad())};switch(document.readyState){case"interactive":document.attachEvent||t();break;case"complete":t(),r();}this.domDoneLoaded||document.addEventListener("DOMContentLoaded",Mt.wrap(t)),n||this.wnd.addEventListener("load",Mt.wrap(function(e){t(),r()}))},e}();!function(){try{new Ps().init()}catch(e){Mt.sendToBugsnag(e,"error"),L(window)&&window.console&&console.log&&console.log("Failed to initialize FullStory.")}}()}]);
+!function(){"use strict";var t={248:function(t,n,i){var r,e=i(940);function s(t){}!function(t){t[t.Unknown=0]="Unknown",t[t.Clean=1]="Clean",t[t.UnrecoverableFailure=2]="UnrecoverableFailure"}(r||(r={}));var o=new(function(){function t(t){this.rebuildFromSnapshot(t)}return t.prototype.rebuildFromSnapshot=function(t){var n=this.snapshot;if(this.snapshot=t,!n||n.functions!==t.functions){var i=t.functions;this.arrayIsArray=i.arrayIsArray,this.clearWindowInterval=a(i.clearWindowInterval),this.clearWindowTimeout=a(i.clearWindowTimeout),this.dateGetTime=a(i.dateGetTime),this.dateNow=i.dateNow,this.docFragQuerySelectorAll=a(i.docFragQuerySelectorAll),this.docQuerySelectorAll=a(i.docQuerySelectorAll),this.elMatches=a(i.elMatches),this.elQuerySelectorAll=a(i.elQuerySelectorAll),this.jsonParse=i.jsonParse,this.jsonStringify=i.jsonStringify,this.matchMedia=c(i.matchMedia),this.mathAbs=i.mathAbs,this.mathFloor=i.mathFloor,this.mathMax=i.mathMax,this.mathMin=i.mathMin,this.mathPow=i.mathPow,this.mathRandom=i.mathRandom,this.mathRound=i.mathRound,this.objectHasOwnProp=a(i.objectHasOwnProp),this.objectKeys=i.objectKeys,this.objectValues=i.objectValues||null,this.requestWindowAnimationFrame=c(i.requestWindowAnimationFrame),this.requestWindowIdleCallback=c(i.requestWindowIdleCallback),this.setWindowInterval=a(i.setWindowInterval),this.setWindowTimeout=a(i.setWindowTimeout)}},t}())(u(window));function u(t,n){void 0===n&&(n=r.Unknown);var i=n,e=[],s=function(t){return i=r.UnrecoverableFailure,e.push("Snapshot failed: "+t),function(){throw new Error("Invoked failed snapshot")}},o=function(t){try{return t()}catch(t){return s(t.message)}},u=function(t){try{return t()||s("snapshot not found")}catch(t){return s(t.message)}},a={arrayIsArray:o(function(){return t.Array.isArray}),clearWindowInterval:o(function(){return t.clearInterval}),clearWindowTimeout:o(function(){return t.clearTimeout}),dateGetTime:o(function(){return t.Date.prototype.getTime}),dateNow:o(function(){return t.Date.now}),docFragQuerySelectorAll:u(function(){var n;return null===(n=t.DocumentFragment)||void 0===n?void 0:n.prototype.querySelectorAll}),docQuerySelectorAll:u(function(){var n;return null!==(n=t.Document.prototype.querySelectorAll)&&void 0!==n?n:t.document.querySelectorAll}),elMatches:u(function(){return v(t,h)}),elQuerySelectorAll:u(function(){return v(t,f)}),jsonParse:o(function(){return t.JSON.parse}),jsonStringify:o(function(){return t.JSON.stringify}),matchMedia:o(function(){return t.matchMedia}),mathAbs:o(function(){return t.Math.abs}),mathFloor:o(function(){return t.Math.floor}),mathMax:o(function(){return t.Math.max}),mathMin:o(function(){return t.Math.min}),mathPow:o(function(){return t.Math.pow}),mathRandom:o(function(){return t.Math.random}),mathRound:o(function(){return t.Math.round}),objectHasOwnProp:o(function(){return t.Object.prototype.hasOwnProperty}),objectKeys:o(function(){return t.Object.keys}),objectValues:o(function(){return t.Object.values}),requestWindowAnimationFrame:o(function(){return t.requestAnimationFrame}),requestWindowIdleCallback:o(function(){return t.requestIdleCallback}),setWindowInterval:o(function(){return t.setInterval}),setWindowTimeout:o(function(){return t.setTimeout})},c={functionToString:o(function(){return t.Function.prototype.toString}),objectToString:o(function(){return t.Object.prototype.toString})};return{status:i,functions:a,helpers:c,errors:e}}function a(t){return function(n){for(var i=[],r=1;r<arguments.length;r++)i[r-1]=arguments[r];return t.apply(n,i)}}function c(t){return t?a(t):null}function h(t){return t.matches||t.webkitMatchesSelector||t.msMatchesSelector||t.mozMatchesSelector}function f(t){return t.querySelectorAll}function v(t,n){var i,r,e=(null===(i=t.Element)||void 0===i?void 0:i.prototype)?n(null===(r=t.Element)||void 0===r?void 0:r.prototype):void 0,s=t.document?t.document.documentElement:void 0;if(!s||e&&s instanceof t.Element||(e=n(s)),!e)throw new Error("Unabled to find Element proto function");return e}function l(){var t=function(){return o.dateNow()};return"number"!=typeof t()&&(t=function(){return o.dateGetTime(new Date)}),t}var d=function(){var t,n=l(),i=null!==(t=function(){var t;if(function(){var t=window.performance;return!(!t||!t.now)}()){var n=window.performance,i=n.now();if("number"==typeof i&&isFinite(i)&&!(i<=0)){var r=n.timeOrigin;if("number"!=typeof r){var e=l()()-n.now(),s=null===(t=n.timing)||void 0===t?void 0:t.navigationStart;r=s?Math.min(e,s):e}var o=Math.round(r);if("number"==typeof o&&isFinite(o)&&!(o<=0))return o}}}())&&void 0!==t?t:n();return{now:n,timeOrigin:i,msSinceDocumentStart:function(){return n()-i}}}();function p(){return d.now()}function w(){return d.msSinceDocumentStart()}var g,m,y=["","0","1","-1","true","false","n/a","nan","undefined","null","nil","the_id_that_you_use_in_your_app_for_this_user"],b=["811c9dc5","350ca8af","340ca71c","14cd0a2b","4db211e5","0b069958","3613e041","2f8f13ba","9b61ad43","77074ba4","0da3f8ec","1c750511"],E=function(){return o.mathFloor(p()/1e3)},S=function(){return E()+31536e3};function x(t){if(!t)return null;var n,i=t.split("#");if(i.length<3)return null;for(var r=2;r<i.length;r++){var e=i[r];if(e.indexOf("/")>=0){var s=e.split("/"),o=s[0],u=s[1];i[r]=o,n=u;break}}var a=function(t){var n=parseInt(null!=t?t:"",10),i=E(),r=S();return isNaN(n)?r:n<=i?void 0:n>r?r:n}(n);if(!a)return null;i[0];var c=i[1],h=i[2],f=i[3],v="";f&&(v=decodeURIComponent(f),(y.indexOf(v)>=0||b.indexOf(v)>=0)&&(v=""));var l=(null!=h?h:"").split(":"),d=l[0],p=l[1],w=l[2];return l[3],{appKeyHash:v,expirationAbsTimeSeconds:a,userId:d,orgId:c,pageCount:_(l[4]),sessionId:null!=p?p:"",sessionStartTime:_(w)}}function k(t){var n={};try{for(var i=t.cookie.split(";"),r=0;r<i.length;r++){var e=i[r].replace(/^\s+|\s+$/g,"").split("=");n[e[0]]||(n[e[0]]=e[1])}}catch(t){}return n}function _(t){var n=parseInt(null!=t?t:"",10);return isNaN(n)?void 0:n}function A(t){if(g)return g;var n=I(t);return n||(n=t._fs_namespace)?(g=n,n):g="FS"}function I(t){return t._fs_loaded}function T(t){return t[A(t)]}function C(t){return"localhost"==t||"127.0.0.1"==t}!function(t){var n,i,r;(r=(n=t.V1||(t.V1={})).OperationName||(n.OperationName={})).Consent="consent",r.Log="log",r.Record="rec",(i=n.VarOperationName||(n.VarOperationName={})).Event="event",i.Page="page",i.Vars="setVars",i.User="user",function(t){var n;!function(t){t.TrackEvent="trackEvent",t.GetSession="getSession",t.Init="init",t.Log="log",t.Source="source",t.Observe="observe",t.Restart="restart",t.SetIdentity="setIdentity",t.SetConfig="setConfig",t.SetPage="setPage",t.SetProperties="setProperties",t.Shutdown="shutdown",t.Start="start",t.Stat="stat"}(t.OperationName||(t.OperationName={})),function(t){t.START="start",t.SHUTDOWN="shutdown",t.INTERNAL_BUNDLE="internal/bundle",t.INTERNAL_ERROR="internal/error",t.INTERNAL_FS_INIT="internal/fs-init"}(n=t.EventTypeName||(t.EventTypeName={})),t.EventTypes=[n.START,n.SHUTDOWN,n.INTERNAL_BUNDLE,n.INTERNAL_ERROR,n.INTERNAL_FS_INIT]}(t.V2||(t.V2={}))}(m||(m={}));var P=/^([^.]+\.)*(fullstory|onfire).[^.]+(\/|$)/;function j(t){return M(t,"edge")}var O=["rs","rs-2","edge","www","app"];function M(t){for(var n=[],i=1;i<arguments.length;i++)n[i-1]=arguments[i];if(!t)return t;if(!P.test(t))return t;if(n.some(function(n){return 0===t.lastIndexOf(n+".",0)}))return t;for(var r=n[0],e=0,s=O;e<s.length;e++){var o=s[e];if(0===t.lastIndexOf(o+".",0))return r+"."+t.slice((o+".").length)}return r+"."+t}function K(t){return P.test(t)}function R(t,n,i){void 0===i&&(i="string");var r=t[n];if(typeof r===i)return r}function H(t){return R(t,"_fs_script")||G(z(t))}function N(t){var n;return null!==(n=R(t,"_fs_rec_settings_host"))&&void 0!==n?n:j(z(t))}function L(t){return R(t,"_fs_rec_host")||M(z(t),"rs","rs-2")}function U(t){return R(t,"_fs_app_host")||$(z(t))}function F(t){return R(t,"_fs_ext_org")||R(t,"_fs_org")}function D(t){return!!R(t,"_fs_capture_on_start","boolean")}function B(t){return!!R(t,"_fs_is_outer_script","boolean")}function W(t){return t._fs_transport}function q(t){var n=T(t);if(!n)return[];var i=n.q;return i?(delete n.q,i):[]}function Q(t,n){var i=T(t);if(i){var r=i.q;r||(r=i.q=[]),r.push(n)}}function V(t){var n=T(t);return(null==n?void 0:n._v)||"unknown"}function z(t){var n=R(t,"_fs_ext_host")||R(t,"_fs_host");if(n){var i=function(t){var n,i,r=null!==(i=null===(n=F(t))||void 0===n?void 0:n.split("-"))&&void 0!==i?i:[];if(!(r.length<3)){var e=r[0],s=r[r.length-1];if(!("na1"===s||e.length>1))return s}}(t);if(!i||!K(n))return n;var r="";return 0===n.indexOf("www.")&&(n=n.slice(4),r="www."),0===n.indexOf(i+".")&&(n=n.slice((i+".").length)),""+r+i+"."+n}}function $(t){return t?C(function(t){var n=t,i=n.indexOf(":");return i>=0&&(n=n.slice(0,i)),n}(t))?t:0==t.indexOf("www.")?"app."+t.slice(4):"app."+t:t}function G(t){var n=j(t);if(n)return n+"/s/fs.js"}function X(t,n){return function(){for(var i=[],r=0;r<arguments.length;r++)i[r]=arguments[r];try{return t.apply(this,i)}catch(t){try{n&&n(t)}catch(t){}}}}var J=function(){},Z="_fs_weak_map_key",Y=function(){function t(t){this.t=new WeakMap(t)}return t.prototype.get=function(t){var n=this.t.get(t);return void 0===n?this.t.get(t[Z]||{}):n},t.prototype.set=function(t,n){try{this.t.set(t,n)}catch(i){t[Z]=t[Z]||{},this.t.set(t[Z],n)}return this},t.prototype["delete"]=function(t){return this.t["delete"](t)||this.t["delete"](t[Z]||{})},t.prototype.has=function(t){return this.t.has(t)||this.t.has(t[Z]||{})},t}();function tt(t){return o.arrayIsArray(t)}var nt="function"==typeof o.objectKeys?function(t){return o.objectKeys(t)}:function(t){var n=[];for(var i in t)o.objectHasOwnProp(t,i)&&n.push(i);return n};function it(t,n){return 0==t.lastIndexOf(n,0)}function rt(t,n){for(var i in t)o.objectHasOwnProp(t,i)&&n(t[i],i,t)}function et(t){for(var n in t)if(Object.prototype.hasOwnProperty.call(t,n))return t[n]}function st(t,n){var i=0;for(var r in t)if(Object.prototype.hasOwnProperty.call(t,r)&&++i>n)return!1;return i==n}function ot(t,n){var i=0;for(var r in t)if(Object.prototype.hasOwnProperty.call(t,r)&&++i>n)return!0;return!1}function ut(t){var n=t.nextSibling;return n&&t.parentNode&&n===t.parentNode.firstChild?null:n}function at(t){var n=t.previousSibling;return n&&t.parentNode&&n===t.parentNode.lastChild?null:n}function ct(t){return function(){for(var n=this,i=[],r=0;r<arguments.length;r++)i[r]=arguments[r];var e=window;return e.Zone&&e.Zone.root&&"function"==typeof e.Zone.root.run?e.Zone.root.run(function(){return t.apply(n,i)}):t.apply(this,i)}}function ht(t){try{var n=window;if(n.Zone&&n.Zone.root&&"function"==typeof n.Zone.root.wrap)return n.Zone.root.wrap(t)}catch(t){}return t}function ft(t,n,i){if(void 0===i&&(i=ht),!t)return J;var r=i(t);return X(n?r.bind(n):r,function(t){})}function vt(t){var n,i=Object.getOwnPropertyDescriptor(Array.prototype,"toJSON"),r=Object.getOwnPropertyDescriptor(String.prototype,"toJSON");try{i&&i.value&&i.configurable&&delete Array.prototype.toJSON,r&&r.value&&r.configurable&&delete String.prototype.toJSON,n=o.jsonStringify(t)}catch(t){n=lt(t)}finally{(null==i?void 0:i.value)&&X(function(){return Object.defineProperty(Array.prototype,"toJSON",i)})(),(null==r?void 0:r.value)&&X(function(){return Object.defineProperty(String.prototype,"toJSON",r)})()}return n}function lt(t){var n="Internal error: unable to determine what JSON error was";try{n=(n=""+t).replace(/[^a-zA-Z0-9.:!, ]/g,"_")}catch(t){}return"\""+n+"\""}function dt(t){var n=t.doctype;if(!n)return"";var i="<!DOCTYPE ";return i+=n.name,n.publicId&&(i+=" PUBLIC \""+n.publicId+"\""),n.systemId&&(i+=" \""+n.systemId+"\""),i+">"}function pt(t){return o.jsonParse(t)}var wt=function(){function t(t,n,i){void 0===i&&(i=!1),this.i=t,this.u=n,this.l=i,this.g=J,this.m=J,this.S=J,this.k=!1}return t.prototype.before=function(t){return this.g=ft(t),this},t.prototype.afterSync=function(t){return this.m=ft(t),this},t.prototype.afterAsync=function(t){return this.S=ft(function(n){o.setWindowTimeout(window,X(function(){t(n)}),0)}),this},t.prototype.disable=function(){if(this.k=!1,this._){var t=this._,n=t.override,i=t["native"];this.i[this.u]===n&&(this.i[this.u]=i,this._=void 0)}},t.prototype.enable=function(){if(this.k=!0,this._)return!0;this._=this.A();try{this.i[this.u]=this._.override}catch(t){return!1}return!0},t.prototype.getTarget=function(){return this.i},t.prototype.A=function(){var t=this,n=this,i=this.i[this.u],r=function(){for(var t=[],r=0;r<arguments.length;r++)t[r]=arguments[r];var e={that:this,args:t,result:null};n.k&&n.g(e);var s=i.apply(this,t);return e.result=s,n.k&&(n.m(e),n.S(e)),e.result};return this.l&&(r.toString=function(){var n;return"function "+(null!==(n=t.u)&&void 0!==n?n:"")+"() { [native code] }"}),{"native":i,override:r}},t}(),gt={};function mt(t,n,i){var r;if(void 0===i&&(i=!1),!t||"function"!=typeof t[n])return null;gt[n]=null!==(r=gt[n])&&void 0!==r?r:new Y;var e=gt[n].get(t);return e||(e=new wt(t,n,i),gt[n].set(t,e)),e.enable()?e:null}function yt(t,n,i){return bt(null==t?void 0:t.prototype,n,i)}function bt(t,n,i){if(!t)return function(){};var r=Object.getOwnPropertyDescriptor(t,n);if(!r||!r.set)return function(){};var s=r.set,o=ft(i),u=!0;function a(t){s.call(this,t),u&&o(this,t)}return Object.defineProperty(t,n,(0,e.__assign)((0,e.__assign)({},r),{set:a})),function(){u=!1;var i=Object.getOwnPropertyDescriptor(t,n);i&&a===i.set&&Object.defineProperty(t,n,(0,e.__assign)((0,e.__assign)({},i),{set:s}))}}function Et(t){var n=t.navigator.languages;return n&&tt(n)?n.join(","):t.navigator.userLanguage||t.navigator.language}function St(t){if(!t)return!1;var n=t.isConnected;return"boolean"==typeof n?n:function(t){for(var n=t,i=void 0;n;n=i)if(!(i=n.parentNode))return n;return t}(t).nodeType===Node.DOCUMENT_NODE}var xt="[anonymous]",kt=/function\s*([\w\-$]+)?\s*\(/i;function _t(t){return t.stack||t.backtrace||t.stacktrace}function At(){var t,n;try{throw new Error("")}catch(i){t="<generated>\n",n=_t(i)}if(!n){t="<generated-ie>\n";var i=[];try{for(var r=arguments.callee.caller.caller;r&&i.length<10;){var e=kt.test(r.toString())&&RegExp.$1||xt;i.push(e),r=r.caller}}catch(t){t.toString()}n=i.join("\n")}return t+n}function It(){try{return window.self!==window.top}catch(t){return!0}}var Tt=function(){function t(){}return t.wrap=function(n,i){return void 0===i&&(i="error"),X(n,function(n){return t.sendToBugsnag(n,i)})},t.I=15,t.sendToBugsnag=function(n,i,r){if(!(t.I<=0)){t.I--;var e=n;"string"==typeof e&&(e=new Error(e));var s=k(document).fs_uid,o=s?x(s):void 0;o&&o.orgId!=F(window)&&(o=void 0);var u=new Date(1678707725e3).toISOString(),a={projectRoot:window.location.origin,deviceTime:p(),inIframe:It(),CompiledVersion:"11aa377d19",CompiledTimestamp:1678707725,CompiledTime:u,orgId:F(window),"userId:sessionId":o?o.userId+":"+o.sessionId:"NA",context:document.location&&document.location.pathname,message:e.message,name:"Recording Error",releaseStage:"production "+u,severity:i,language:Et(window),stacktrace:_t(e)||At()},c=function(t,n,i){var r=encodeURIComponent(n)+"="+encodeURIComponent(i);t.push(r)},h=[];for(var f in a)c(h,f,a[f]||"");if(r)for(var f in r)c(h,"aux_"+f,Ct(r[f]));new Image().src="https://"+L(window)+"/rec/except?"+h.join("&")}},t}();function Ct(t){try{var n=typeof t+": "+vt(t);return"function"==typeof t.toString&&(n+=" (toString: "+t.toString()+")"),n}catch(t){return"failed to serialize \""+(null==t?void 0:t.message)+"\""}}var Pt={};function jt(t,n,i){if(void 0===i&&(i=1),t)return!0;if(Pt[n]=Pt[n]||0,Pt[n]++,Pt[n]>i)return!1;var r=new Error("Assertion failed: "+n);return Tt.sendToBugsnag(r,"error"),t}var Ot,Mt,Kt,Rt,Ht,Nt,Lt={};function Ut(t,n,i){var r;Lt[t]=null!==(r=Lt[t])&&void 0!==r?r:0,Lt[t]++,Lt[t]>1||Tt.sendToBugsnag(n,"error",i)}!function(t){t.MUT_INSERT=2,t.MUT_REMOVE=3,t.MUT_ATTR=4,t.MUT_TEXT=6,t.MOUSEMOVE=8,t.MOUSEMOVE_CURVE=9,t.SCROLL_LAYOUT=10,t.SCROLL_LAYOUT_CURVE=11,t.MOUSEDOWN=12,t.MOUSEUP=13,t.CLICK=16,t.FOCUS=17,t.VALUECHANGE=18,t.RESIZE_LAYOUT=19,t.DOMLOADED=20,t.LOAD=21,t.PLACEHOLDER_SIZE=22,t.UNLOAD=23,t.BLUR=24,t.SET_FRAME_BASE=25,t.TOUCHSTART=32,t.TOUCHEND=33,t.TOUCHCANCEL=34,t.TOUCHMOVE=35,t.TOUCHMOVE_CURVE=36,t.NAVIGATE=37,t.PLAY=38,t.PAUSE=39,t.RESIZE_VISUAL=40,t.RESIZE_VISUAL_CURVE=41,t.RESIZE_DOCUMENT_CONTENT=42,t.RESIZE_SCROLLABLE_ELEMENT_CONTENT=43,t.LOG=48,t.ERROR=49,t.DBL_CLICK=50,t.FORM_SUBMIT=51,t.WINDOW_FOCUS=52,t.WINDOW_BLUR=53,t.HEARTBEAT=54,t.WATCHED_ELEM=56,t.PERF_ENTRY=57,t.REC_FEAT_SUPPORTED=58,t.SELECT=59,t.CSSRULE_INSERT=60,t.CSSRULE_DELETE=61,t.FAIL_THROTTLED=62,t.AJAX_REQUEST=63,t.SCROLL_VISUAL_OFFSET=64,t.SCROLL_VISUAL_OFFSET_CURVE=65,t.MEDIA_QUERY_CHANGE=66,t.RESOURCE_TIMING_BUFFER_FULL=67,t.MUT_SHADOW=68,t.DISABLE_STYLESHEET=69,t.FULLSCREEN=70,t.FULLSCREEN_ERROR=71,t.ADOPTED_STYLESHEETS=72,t.CUSTOM_ELEMENT_DEFINED=73,t.MODAL_OPEN=74,t.MODAL_CLOSE=75,t.SLOW_INTERACTION=76,t.LONG_FRAME=77,t.TIMING=78,t.STORAGE_WRITE_FAILURE=79,t.DOCUMENT_PROPERTIES=80,t.ENTRY_NAVIGATE=81,t.STATS=82,t.VIEWPORT_INTERSECTION=83,t.COPY=84,t.PASTE=85,t.URL_SALT=86,t.URL_ID=87,t.FRAME_STATUS=88,t.SCRIPT_COMPILED_VERSION=89,t.RESET_CSS_SHEET=90,t.ANIMATION_CREATED=91,t.ANIMATION_METHOD_CALLED=92,t.ANIMATION_PROPERTY_SET=93,t.DOCUMENT_TIMELINE_CREATED=94,t.KEYFRAME_EFFECT_CREATED=95,t.KEYFRAME_EFFECT_METHOD_CALLED=96,t.KEYFRAME_EFFECT_PROPERTY_SET=97,t.CAPTURE_SOURCE=98,t.PAGE_DATA=99,t.VISIBILITY_STATE=100,t.DIALOG=101,t.CSSRULE_UPDATE=102,t.CANVAS=103,t.CANVAS_DETACHED_DIMENSION=104,t.INIT_API=105,t.DEFERRED_RESOLVED=106,t.KEEP_ELEMENT=2e3,t.KEEP_URL=2001,t.KEEP_BOUNCE=2002,t.SYS_SETVAR=8193,t.SYS_RESOURCEHASH=8195,t.SYS_SETCONSENT=8196,t.SYS_CUSTOM=8197,t.SYS_REPORTCONSENT=8198,t.SYS_LETHE_MOBILE_BUNDLE_SEQ=8199}(Ot||(Ot={})),function(t){t.Animation=0,t.CSSAnimation=1,t.CSSTransition=2}(Mt||(Mt={})),function(t){t.Unknown=0,t.Serialization=1}(Kt||(Kt={})),function(t){t.Unknown=0,t.Successful=1,t.BlocklistedFrame=2,t.PartiallyLoaded=3,t.MissingWindowOrDocument=4,t.MissingDocumentHead=5,t.MissingBodyOrChildren=6,t.AlreadyDefined=7,t.NoNonScriptElement=8,t.Exception=9}(Rt||(Rt={})),function(t){t.Unknown=0,t.DomSnapshot=1,t.NodeEncoding=2,t.LzEncoding=3}(Ht||(Ht={})),function(t){t.Internal=0,t.Public=1}(Nt||(Nt={}));var Ft,Dt,Bt,Wt,qt,Qt,Vt,zt,$t,Gt,Xt,Jt,Zt,Yt,tn,nn,rn,en,sn,on,un,an,cn,hn=["print","alert","confirm"];function fn(t){switch(t){case Ot.MOUSEDOWN:case Ot.MOUSEMOVE:case Ot.MOUSEMOVE_CURVE:case Ot.MOUSEUP:case Ot.TOUCHSTART:case Ot.TOUCHEND:case Ot.TOUCHMOVE:case Ot.TOUCHMOVE_CURVE:case Ot.TOUCHCANCEL:case Ot.CLICK:case Ot.SCROLL_LAYOUT:case Ot.SCROLL_LAYOUT_CURVE:case Ot.SCROLL_VISUAL_OFFSET:case Ot.SCROLL_VISUAL_OFFSET_CURVE:case Ot.NAVIGATE:return!0;}return!1}!function(t){t[t.Index=1]="Index",t[t.Cached=2]="Cached"}(Ft||(Ft={})),function(t){t.GrantConsent=!0,t.RevokeConsent=!1}(Dt||(Dt={})),function(t){t.Page=0,t.Document=1}(Bt||(Bt={})),function(t){t.Unknown=0,t.Api=1,t.FsShutdownFrame=2,t.Hibernation=3,t.Reidentify=4,t.SettingsBlocked=5,t.Size=6,t.Unload=7,t.Hidden=8}(Wt||(Wt={})),function(t){t.Unknown=0,t.NotEmpty=1,t.EmptyBody=2}(qt||(qt={})),function(t){t.Timing=0,t.Navigation=1,t.Resource=2,t.Paint=3,t.Mark=4,t.Measure=5,t.Memory=6,t.TimeOrigin=7,t.LayoutShift=8,t.FirstInput=9,t.LargestContentfulPaint=10,t.LongTask=11}(Qt||(Qt={})),function(t){t.Timing=["navigationStart","unloadEventStart","unloadEventEnd","redirectStart","redirectEnd","fetchStart","domainLookupStart","domainLookupEnd","connectStart","connectEnd","secureConnectionStart","requestStart","responseStart","responseEnd","domLoading","domInteractive","domContentLoadedEventStart","domContentLoadedEventEnd","domComplete","loadEventStart","loadEventEnd"],t.Navigation=["name","startTime","duration","initiatorType","redirectStart","redirectEnd","fetchStart","domainLookupStart","domainLookupEnd","connectStart","connectEnd","secureConnectionStart","requestStart","responseStart","responseEnd","unloadEventStart","unloadEventEnd","domInteractive","domContentLoadedEventStart","domContentLoadedEventEnd","domComplete","loadEventStart","loadEventEnd","type","redirectCount","decodedBodySize","encodedBodySize","transferSize"],t.Resource=["name","startTime","duration","initiatorType","redirectStart","redirectEnd","fetchStart","domainLookupStart","domainLookupEnd","connectStart","connectEnd","secureConnectionStart","requestStart","responseStart","responseEnd","decodedBodySize","encodedBodySize","transferSize"],t.Measure=["name","startTime","duration"],t.Memory=["jsHeapSizeLimit","totalJSHeapSize","usedJSHeapSize"],t.TimeOrigin=["timeOrigin"],t.LayoutShift=["startTime","value","hadRecentInput"],t.FirstInput=["name","startTime","duration","processingStart"],t.LargestContentfulPaint=["name","startTime","duration","renderTime","loadTime","size"]}(Vt||(Vt={})),function(t){t.Performance=0,t.PerformanceEntries=1,t.PerformanceMemory=2,t.Console=3,t.Ajax=4,t.PerformanceObserver=5,t.PerformanceTimeOrigin=7,t.WebAnimation=8,t.LayoutShift=9,t.FirstInput=10,t.LargestContentfulPaint=11,t.LongTask=12,t.HTMLDialogElement=13,t.CaptureOnStartEnabled=14,t.CanvasWatcherEnabled=15}(zt||(zt={})),function(t){t.Node=1,t.Sheet=2}($t||($t={})),function(t){t.StyleSheetHooks=0,t.SetPropertyHooks=1}(Gt||(Gt={})),function(t){t.Document="document",t.Event="evt",t.Page="page",t.User="user"}(Xt||(Xt={})),function(t){t.FsId="fsidentity",t.NewUid="newuid"}(Jt||(Jt={})),function(t){t.Elide=0,t.Record=1,t.Allowlist=2}(Zt||(Zt={})),function(t){t.Any=0,t.Exclude=1,t.Mask=2}(Yt||(Yt={})),function(t){t.Erase=0,t.MaskText=1,t.ScrubUrl=2,t.ScrubCss=3}(tn||(tn={})),function(t){t.Static=0,t.Prefix=1}(nn||(nn={})),function(t){t.SignalInvalid=0,t.SignalDeadClick=1,t.SignalRageClick=2}(rn||(rn={})),function(t){t.ReasonNoSuchOrg=1,t.ReasonOrgDisabled=2,t.ReasonOrgOverQuota=3,t.ReasonBlockedDomain=4,t.ReasonBlockedIp=5,t.ReasonBlockedUserAgent=6,t.ReasonBlockedGeo=7,t.ReasonBlockedTrafficRamping=8,t.ReasonInvalidURL=9,t.ReasonUserOptOut=10,t.ReasonInvalidRecScript=11,t.ReasonDeletingUser=12,t.ReasonNativeHookFailure=13}(en||(en={})),function(t){t.Unset=0,t.Exclude=1,t.Mask=2,t.Unmask=3,t.Watch=4,t.Keep=5,t.Defer=6}(sn||(sn={})),function(t){t.Unset=0,t.Click=1}(on||(on={})),function(t){t[t.Page=1]="Page",t[t.Bundle=2]="Bundle"}(un||(un={})),function(t){t[t.Error=3]="Error",t[t.Page=4]="Page",t[t.Bundle=5]="Bundle",t[t.Settings=6]="Settings"}(an||(an={})),function(t){t.MaxPerfMarksPerPage=16384,t.MaxLogsPerPage=1024,t.MaxUrlLength=2048,t.MutationProcessingInterval=250,t.CurveSamplingInterval=142,t.DefaultBundleUploadInterval=5e3,t.HeartbeatInitial=4e3,t.HeartbeatMax=256200,t.PageInactivityTimeout=18e5,t.BackoffMax=3e5,t.ScrollSampleInterval=t.MutationProcessingInterval/5,t.InactivityThreshold=4e3,t.MaxAjaxPayloadLength=16384,t.DefaultOrgSettings={MaxPerfMarksPerPage:t.MaxPerfMarksPerPage,MaxConsoleLogPerPage:t.MaxLogsPerPage,MaxAjaxPayloadLength:t.MaxAjaxPayloadLength,MaxUrlLength:t.MaxUrlLength,RecordPerformanceResourceImg:!0,RecordPerformanceResourceTiming:!0,HttpRequestHeadersAllowlist:[],HttpResponseHeadersAllowlist:[],UrlPrivacyConfig:[{Exclude:{Hash:[{Expression:"#.*"}],QueryParam:[{Expression:"(=)(.*)"}]}}],AttributeBlocklist:[{Target:Yt.Any,Tag:"*",Name:"",Type:nn.Prefix,Action:tn.Erase}]},t.DefaultStatsSettings={MaxPayloadLength:8192,MaxEventTypeLength:1024},t.BlockedFieldValue="__fs__redacted"}(cn||(cn={}));var vn,ln,dn,pn="_fs_uid",wn="_fs_cid",gn="_fs_lua";function mn(t,n,i,r){void 0!==i&&("function"==typeof t.addEventListener?t.addEventListener(n,i,r):"function"==typeof t.addListener&&t.addListener(i))}function yn(t,n,i,r){void 0!==i&&("function"==typeof t.removeEventListener?t.removeEventListener(n,i,r):"function"==typeof t.removeListener&&t.removeListener(i))}!function(t){t[t.Shutdown=1]="Shutdown",t[t.Starting=2]="Starting",t[t.Started=3]="Started"}(vn||(vn={})),function(t){t.Set=0,t.Function=1}(ln||(ln={})),function(t){t[t.Disabled=0]="Disabled",t[t.CaptureCanvasOps=1]="CaptureCanvasOps",t[t.ScreenshotCanvas=2]="ScreenshotCanvas"}(dn||(dn={}));var bn=function(){function t(){var t=this;this.T=[],this.C=[],this.P=!0,this.j=!1;try{var n=Object.defineProperty({},"passive",{get:function(){t.P={capture:!0,passive:!0},t.j={capture:!1,passive:!0}}});window.addEventListener("test",J,n)}catch(t){}}return t.prototype.add=function(t,n,i,r,e){return void 0===e&&(e=!1),this.addCustom(t,n,i,r,e)},t.prototype.addCustom=function(t,n,i,r,e){void 0===e&&(e=!1);var s={target:t,type:n,fn:Tt.wrap(function(t){(e||!1!==t.isTrusted||"message"==n||t._fs_trust_event)&&r(t)}),options:i?this.P:this.j,index:this.T.length};return this.T.push(s),mn(t,n,s.fn,s.options),s},t.prototype.remove=function(t){t.target&&(yn(t.target,t.type,t.fn,t.options),t.target=null,t.fn=void 0)},t.prototype.clear=function(){for(var t=0;t<this.T.length;t++)this.T[t].target&&this.remove(this.T[t]);this.T=[]},t.prototype.createChild=function(){var n=new t;return this.C.push(n),n},t.prototype.refresh=function(){for(var t=0,n=this.T;t<n.length;t++){var i=n[t];i.target&&(yn(i.target,i.type,i.fn,i.options),mn(i.target,i.type,i.fn,i.options))}for(var r=0,e=this.C;r<e.length;r++)e[r].refresh()},t}();function En(t){return"function"==typeof t}var Sn,xn,kn,_n,An,In=Array.isArray?Array.isArray:function(t){return"[object Array]"===Object.prototype.toString.call(t)},Tn=0,Cn=function(t,n){Pn[Tn]=t,Pn[Tn+1]=n,2===(Tn+=2)&&Sn()},Pn=new Array(1e3);function jn(){for(var t=0;t<Tn;t+=2)(0,Pn[t])(Pn[t+1]),Pn[t]=void 0,Pn[t+1]=void 0;Tn=0}function On(t,n){var i=arguments,r=this,e=new this.constructor(Rn);void 0===e[Kn]&&Xn(e);var s,o=r.O;return o?(s=i[o-1],Cn(function(){return $n(o,e,s,r.M)})):qn(r,e,t,n),e}function Mn(t){if(t&&"object"==typeof t&&t.constructor===this)return t;var n=new this(Rn);return Fn(n,t),n}window.MutationObserver?(kn=0,_n=new MutationObserver(jn),An=document.createTextNode(""),_n.observe(An,{characterData:!0}),Sn=function(){var t=kn=++kn%2;An.data=""+t}):(xn=setTimeout,Sn=function(){return xn(jn,1)});var Kn=Math.random().toString(36).substring(16);function Rn(){}var Hn=void 0,Nn=new Vn;function Ln(t){try{return t.then}catch(t){return Nn.error=t,Nn}}function Un(t,n,i){n.constructor===t.constructor&&i===On&&n.constructor.resolve===Mn?function(t,n){1===n.O?Bn(t,n.M):2===n.O?Wn(t,n.M):qn(n,void 0,function(n){return Fn(t,n)},function(n){return Wn(t,n)})}(t,n):i===Nn?(Wn(t,Nn.error),Nn.error=null):void 0===i?Bn(t,n):En(i)?function(t,n,i){Cn(function(t){var r=!1,e=function(i,e,s,o,u){try{i.call(e,function(i){r||(r=!0,n!==i?Fn(t,i):Bn(t,i))},function(n){r||(r=!0,Wn(t,n))})}catch(t){return t}}(i,n,0,0,t.K);!r&&e&&(r=!0,Wn(t,e))},t)}(t,n,i):Bn(t,n)}function Fn(t,n){var i;t===n?Wn(t,new TypeError("You cannot resolve a promise with itself")):"function"==typeof(i=n)||"object"==typeof i&&null!==i?Un(t,n,Ln(n)):Bn(t,n)}function Dn(t){t.R&&t.R(t.M),Qn(t)}function Bn(t,n){t.O===Hn&&(t.M=n,t.O=1,0!==t.H.length&&Cn(Qn,t))}function Wn(t,n){t.O===Hn&&(t.O=2,t.M=n,Cn(Dn,t))}function qn(t,n,i,r){var e=t.H,s=e.length;t.R=null,e[s]=n,e[s+1]=i,e[s+2]=r,0===s&&t.O&&Cn(Qn,t)}function Qn(t){var n=t.H,i=t.O;if(0!==n.length){for(var r,e,s=t.M,o=0;o<n.length;o+=3)r=n[o],e=n[o+i],r?$n(i,r,e,s):e(s);t.H.length=0}}function Vn(){this.error=null}var zn=new Vn;function $n(t,n,i,r){var e,s,o=En(i),u=!1,a=!1;if(o){if(e=function(t,n){try{return t(n)}catch(t){return zn.error=t,zn}}(i,r),e===zn?(a=!0,s=e.error,e.error=null):u=!0,n===e)return void Wn(n,new TypeError("A promises callback cannot return that same promise."))}else e=r,u=!0;n.O!==Hn||(o&&u?Fn(n,e):a?Wn(n,s):1===t?Bn(n,e):2===t&&Wn(n,e))}var Gn=0;function Xn(t){t[Kn]=Gn++,t.O=void 0,t.M=void 0,t.H=[]}function Jn(t,n){this.N=t,this.promise=new t(Rn),this.promise[Kn]||Xn(this.promise),In(n)?(this.L=n,this.length=n.length,this.U=n.length,this.M=new Array(this.length),0===this.length?Bn(this.promise,this.M):(this.length=this.length||0,this.F(),0===this.U&&Bn(this.promise,this.M))):Wn(this.promise,new Error("Array Methods must be provided an Array"))}Jn.prototype.F=function(){for(var t=this.length,n=this.L,i=0;this.O===Hn&&i<t;i++)this.D(n[i],i)},Jn.prototype.D=function(t,n){var i=this.N,r=i.resolve;if(r===Mn){var e=Ln(t);if(e===On&&t.O!==Hn)this.B(t.O,n,t.M);else if("function"!=typeof e)this.U--,this.M[n]=t;else if(i===Zn){var s=new i(Rn);Un(s,t,e),this.W(s,n)}else this.W(new i(function(n){return n(t)}),n)}else this.W(r(t),n)},Jn.prototype.B=function(t,n,i){var r=this.promise;r.O===Hn&&(this.U--,2===t?Wn(r,i):this.M[n]=i),0===this.U&&Bn(r,this.M)},Jn.prototype.W=function(t,n){var i=this;qn(t,void 0,function(t){return i.B(1,n,t)},function(t){return i.B(2,n,t)})};var Zn=function(t){this[Kn]=Gn++,this.M=this.O=void 0,this.H=[],Rn!==t&&("function"!=typeof t&&function(){throw new TypeError("You must pass a resolver function as the first argument to the promise constructor")}(),this instanceof Zn?function(t,n){try{n(function(n){Fn(t,n)},function(n){Wn(t,n)})}catch(n){Wn(t,n)}}(this,t):function(){throw new TypeError("Failed to construct 'Promise': Please use the 'new' operator, this object constructor cannot be called as a function.")}())};Zn.all=function(t){return new Jn(this,t).promise},Zn.race=function(t){var n=this;return In(t)?new n(function(i,r){for(var e=t.length,s=0;s<e;s++)n.resolve(t[s]).then(i,r)}):new n(function(t,n){return n(new TypeError("You must pass an array to race."))})},Zn.resolve=Mn,Zn.reject=function(t){var n=new this(Rn);return Wn(n,t),n},Zn.V=function(t){Cn=t},Zn.$=Cn,Zn.prototype={constructor:Zn,then:On,"catch":function(t){return this.then(null,t)}};var Yn="function"==typeof window.Promise?window.Promise:Zn;function ti(){var t,n;return{promise:new Yn(function(i,r){t=i,n=r}),resolve:t,reject:n}}function ni(t){return new Yn(function(n){o.setWindowTimeout(window,X(n),t)})}var ii,ri=function(){try{var t=new MessageChannel;return t.port1.start(),t}catch(t){return null}}(),ei=function(){return ri?new Yn(function(t){var n=ri.port1,i=ri.port2,r=function(){t(),n.removeEventListener("message",r)};n.addEventListener("message",r),i.postMessage(void 0)}):ni(0)};function si(t,n){return void 0===n&&(n=t),(0,e.__awaiter)(this,void 0,Yn,function(){var i,r;return(0,e.__generator)(this,function(e){switch(e.label){case 0:return[4,ni(t)];case 1:return e.sent(),(i=o.requestWindowIdleCallback)?[2,new Yn(function(t){i(window,t,{timeout:n})})]:(r=Date.now()+25,[2,{timeRemaining:function(){return Math.max(0,r-Date.now())},didTimeout:!1}]);}})})}!function(t){t.Essential="0",t.High="1",t.Medium="2",t.Low="3"}(ii||(ii={}));var oi=["0","1","2","3"],ui=function(){function t(t){var n=this;this.G=null,this.X=!1,this.J=0,this.Z=!0,this.performMeasurements=Tt.wrap(function(){if(n.X)Tt.sendToBugsnag("performMeasurements() already in progress","error");else{n.wnd;var t=p(),i=t+150;n.X=!0;try{if(!n.G)return;t:for(var r=0,e=oi;r<e.length;r++)for(var s=e[r],o=n.G[s],u=0;u<o.length;u++){o[u]();var a=p();if(a>i){n.Z||(n.Z=!0,Tt.sendToBugsnag("Out of time for remaining measurement tasks.","warning",{totalRunningTimeMs:a-t}));break t}}n.G=null}finally{n.X=!1,n.wnd}}}),this.wnd=t}return t.create=function(t){return t.ResizeObserver?new ai(t,t.ResizeObserver):new ci(t)},t.prototype.requestMeasureTask=function(t,n){var i,r=this;if(this.J>16)Tt.sendToBugsnag("Too much synchronous recursion in requestMeasureTask","error");else{var e=this.X?this.J:0,s=Tt.wrap(function(){var t=r.J;r.J=e+1;try{n()}finally{r.J=t}});this.G?this.G[t].push(s):(this.G=((i={})[ii.Essential]=[],i[ii.High]=[],i[ii.Medium]=[],i[ii.Low]=[],i[t]=[s],i),this.schedule())}},t.prototype.performMeasurementsNow=function(){this.performMeasurements()},t}(),ai=function(t){function n(n,i){var r=t.call(this,n)||this;return r.Y=i,r}return(0,e.__extends)(n,t),n.prototype.schedule=function(){var t=this,n=this.Y,i=this.wnd.document,r=i.documentElement||i.body||i.head,e=new n(function(){e.unobserve(r),t.performMeasurements()});e.observe(r)},n}(ui),ci=function(t){function n(n){return t.call(this,n)||this}return(0,e.__extends)(n,t),n.prototype.schedule=function(){(0,e.__awaiter)(void 0,void 0,Yn,function(){var t;return(0,e.__generator)(this,function(n){switch(n.label){case 0:return(t=o.requestWindowAnimationFrame)?[4,new Yn(function(n){return t(window,n)})]:[3,2];case 1:n.sent(),n.label=2;case 2:return[4,ei()];case 3:return n.sent(),[2];}})}).then(this.performMeasurements)},n}(ui);function hi(t,n){return n&&t.pageLeft==n.pageLeft&&t.pageTop==n.pageTop}function fi(t,n){return n&&t.width==n.width&&t.height==n.height}function vi(t){return{pageLeft:t.pageLeft,pageTop:t.pageTop,width:t.width,height:t.height}}var li=[["@import\\s+\"","\""],["@import\\s+'","'"]].concat([["url\\(\\s*\"","\"\\s*\\)"],["url\\(\\s*'","'\\s*\\)"],["url\\(\\s*","\\s*\\)"]]),di=".*?"+/(?:[^\\](?:\\\\)*)/.source,pi=new RegExp(li.map(function(t){var n=t[0],i=t[1];return"("+n+")("+di+")("+i+")"}).join("|"),"g"),wi=/url\(["']?(.+?)["']?\)/g,gi=/^\s*\/\//;function mi(t){return"BackCompat"==t.compatMode}function yi(t){return t&&t.body&&t.documentElement?mi(t)?[t.body.clientWidth,t.body.clientHeight]:[t.documentElement.clientWidth,t.documentElement.clientHeight]:[0,0]}var bi=function(){function t(t,n){var i,r,e,s;this.hasKnownPosition=!1,this.pageLeft=0,this.pageTop=0,this.width=0,this.height=0,this.clientWidth=0,this.clientHeight=0;var o=t.document;if(o&&o.documentElement&&o.body){i=yi(o),this.clientWidth=i[0],this.clientHeight=i[1];var u=t.visualViewport;if(u){this.hasKnownPosition=!0,this.pageTop=u.pageTop-u.offsetTop,this.pageLeft=u.pageLeft-u.offsetLeft,0==this.pageTop&&(this.pageTop=0),0==this.pageLeft&&(this.pageLeft=0);var a=null!==(e=xi(t,"innerWidth"))&&void 0!==e?e:0,c=null!==(s=xi(t,"innerHeight"))&&void 0!==s?s:0;if(a>0&&c>0)return this.width=a,void(this.height=c)}if(void 0!==n&&this.clientWidth==n.clientWidth&&this.clientHeight==n.clientHeight&&n.width>0&&n.height>0)return this.width=n.width,void(this.height=n.height);r=this.tt(t),this.width=r[0],this.height=r[1]}}return t.prototype.tt=function(t){var n=this.it(t,"width",this.clientWidth,this.clientWidth+128);void 0===n&&(n=xi(t,"innerWidth")),void 0===n&&(n=this.clientWidth);var i=this.it(t,"height",this.clientHeight,this.clientHeight+128);return void 0===i&&(i=xi(t,"innerHeight")),void 0===i&&(i=this.clientHeight),[n,i]},t.prototype.it=function(t,n,i,r){if(o.matchMedia){var e=i,s=r,u=o.matchMedia(t,"(min-"+n+": "+e+"px)");if(null!=u){if(u.matches&&o.matchMedia(t,"(max-"+n+": "+e+"px)").matches)return e;for(;e<=s;){var a=o.mathFloor((e+s)/2);if(o.matchMedia(t,"(min-"+n+": "+a+"px)").matches){if(o.matchMedia(t,"(max-"+n+": "+a+"px)").matches)return a;e=a+1}else s=a-1}}}},t}();function Ei(t,n){return new bi(t,n)}var Si=function(t,n){this.offsetLeft=0,this.offsetTop=0,this.pageLeft=0,this.pageTop=0,this.width=0,this.height=0,this.scale=0;var i=t.document;if(i.body){"pageXOffset"in t?(this.pageLeft=t.pageXOffset,this.pageTop=t.pageYOffset):i.scrollingElement?(this.pageLeft=i.scrollingElement.scrollLeft,this.pageTop=i.scrollingElement.scrollTop):mi(i)?(this.pageLeft=i.body.scrollLeft,this.pageTop=i.body.scrollTop):i.documentElement&&(i.documentElement.scrollLeft>0||i.documentElement.scrollTop>0)?(this.pageLeft=i.documentElement.scrollLeft,this.pageTop=i.documentElement.scrollTop):(this.pageLeft=i.body.scrollLeft||0,this.pageTop=i.body.scrollTop||0),this.offsetLeft=this.pageLeft-n.pageLeft,this.offsetTop=this.pageTop-n.pageTop;var r=0,e=0;try{r=t.innerWidth,e=t.innerHeight}catch(t){return}if(0!=r&&0!=e){this.scale=n.width/r,this.scale<1&&(this.scale=1);var s=n.width-n.clientWidth,o=n.height-n.clientHeight;this.width=r-s/this.scale,this.height=e-o/this.scale}}};function xi(t,n){try{return t[n]}catch(t){return}}function ki(t){var n=t;return n.tagName?"object"==typeof n.tagName?"form":n.tagName.toLowerCase():null}var _i,Ai,Ii=new RegExp("[^\\s]"),Ti=new RegExp("[\\s]*$");function Ci(t){var n=Ii.exec(t);if(!n)return t;for(var i=n.index,r=(n=Ti.exec(t))?t.length-n.index:0,e="\uFFFF",s=t.slice(i,t.length-r).split(/\r\n?|\n/g),o=0;o<s.length;o++)e+=""+s[o].length,o!=s.length-1&&(e+=":");return(i||r)&&(e+=" "+i+" "+r),e}String.prototype,function(t){t[t.Exclude=2]="Exclude",t[t.Mask=4]="Mask",t[t.Unmask=8]="Unmask",t[t.Watch=16]="Watch",t[t.Keep=32]="Keep",t[t.Defer=64]="Defer"}(_i||(_i={})),function(t){t[t.Immediate=1]="Immediate",t[t.Deferred=2]="Deferred"}(Ai||(Ai={}));var Pi=[_i.Exclude,_i.Mask,_i.Unmask],ji=[_i.Watch,_i.Keep,_i.Defer],Oi=Pi.concat(ji),Mi={},Ki=1;function Ri(t,n){var i,r;return void 0===n&&(n=Ui(t)),null!==(r=null===(i=null==n?void 0:n.watchKind)||void 0===i?void 0:i.hasKinds())&&void 0!==r&&r}function Hi(t,n){var i,r;return void 0===n&&(n=Ui(t)),null!==(r=null===(i=null==n?void 0:n.watchKind)||void 0===i?void 0:i.has(_i.Exclude))&&void 0!==r&&r}function Ni(t,n){return void 0===n&&(n=Ui(t)),!!n&&!!n.mask}function Li(t,n){return void 0===n&&(n=Ui(t)),null==n?void 0:n.watchKind}function Ui(t){var n=t?t._fs:null;return n?Mi[n]:null}function Fi(t){return Mi[t]}function Di(t){try{return t&&t._fs||0}catch(t){return 0}}function Bi(t){return t&&!Hi(t)?Di(t):0}function Wi(t,n){t.parent&&(n.unobserveSubtree(t.node),t.parent.child==t&&(t.parent.child=t.next),t.parent.lastChild==t&&(t.parent.lastChild=t.prev),t.prev&&(t.prev.next=t.next),t.next&&(t.next.prev=t.prev),t.parent=t.prev=t.next=null,delete Mi[t.id],t.node._fs==t.id&&(t.node._fs=0),t.id=0,t.child&&qi(t.child))}function qi(t){for(var n=[t];n.length>0&&n.length<1e4;){var i=n.pop();delete Mi[i.id],i.node._fs==i.id&&(i.node._fs=0),i.id=0,i.next&&n.push(i.next),i.child&&n.push(i.child)}jt(n.length<1e4,"clearIds is fast")}function Qi(t,n){void 0===n&&(n=1024);try{var i={tokens:[],opath:[],cyclic:Vi(t,n/4)};return $i(t,n,0,i),i.tokens.join("")}catch(t){return lt(t)}}function Vi(t,n){var i=0;try{o.jsonStringify(t,function(t,r){if(i++>n)throw"break";if("object"==typeof r)return r})}catch(t){return"break"!=t}return!1}var zi=function(t,n,i){return void 0===i&&(i="..."),t.length<=n?t:t.length<=i.length||n<=i.length?t.substring(0,n):t.substring(0,n-i.length)+i};function $i(t,n,i,r){if(n<1)return 0;var e=function(t){switch(!0){case function(t){return!(!t||t.constructor!=Date)}(t):return n=t,isNaN(n)?"Invalid Date":n.toUTCString();case function(t){return"object"==typeof Node?t instanceof Node:t&&"object"==typeof t&&t.nodeType>0&&"string"==typeof t.nodeName}(t):return function(t){return t.toString()}(t);case void 0===t:return"undefined";case"object"!=typeof t||null==t:return t;case t instanceof Error:return[t.toString(),t.stack].filter(Boolean).join(",");}var n}(t);if(void 0!==e){var s=function(t,n){var i=o.jsonStringify(t);return i&&"\""==i[0]?zi(i,n,"...\""):i}(e,n);return"string"==typeof s&&s.length<=n?(r.tokens.push(s),s.length):0}if(r.cyclic){r.opath.splice(i);var u=r.opath.lastIndexOf(t);if(u>-1){var a="<Cycle to ancestor #"+(i-u-1)+">";return a="\""+zi(a,n-2)+"\"",r.tokens.push(a),a.length}r.opath.push(t)}var c=n,h=function(t){return c>=t.length&&(c-=t.length,r.tokens.push(t),!0)},f=function(t){var n=r.tokens.length-1;","===r.tokens[n]?r.tokens[n]=t:h(t)};if(c<2)return 0;if(tt(t)){h("[");for(var v=0;v<t.length&&c>0;v++){var l=$i(t[v],c-1,i+1,r);if(c-=l,0==l&&!h("null"))break;h(",")}f("]")}else{h("{");var d=nt(t);for(v=0;v<d.length&&c>0;v++){var p=d[v],w=t[p];if(!h("\""+p+"\":"))break;if(0==(l=$i(w,c-1,i+1,r))){r.tokens.pop();break}c-=l,h(",")}f("}")}return n==1/0?1:n-c}var Gi,Xi,Ji=function(){function t(){var n=this;this.rt=Tt.wrap(function(){n.unregister(),n.et&&n.et()}),this.st=0,this.ot=t.ut++}return t.ct=function(){t.checkedAlready=!1,t.ht=0},t.checkForBrokenSchedulers=function(){return(0,e.__awaiter)(this,void 0,Yn,function(){var n,i;return(0,e.__generator)(this,function(r){switch(r.label){case 0:return!o.requestWindowAnimationFrame||t.checkedAlready||(n=p())-t.ht<100?[2,!1]:(t.ht=n,t.checkedAlready=!0,[4,new Yn(function(t){return o.requestWindowAnimationFrame(window,t)})]);case 1:return r.sent(),i=[],rt(t.ft,function(t){var r=t.vt(n);r&&i.push(r)}),[4,Yn.all(i)];case 2:return r.sent(),o.requestWindowAnimationFrame(window,Tt.wrap(function(){t.checkedAlready=!1})),[2,!0];}})})},t.stopAll=function(){rt(this.ft,function(t){return t.stop()})},t.prototype.setTick=function(t){this.et=t},t.prototype.stop=function(){this.cancel(),delete t.ft[this.ot]},t.prototype.register=function(n){this.st=p()+100+1.5*n,t.ft[this.ot]=this},t.prototype.timerIsRunning=function(){return null!=t.ft[this.ot]},t.prototype.unregister=function(){delete t.ft[this.ot]},t.prototype.vt=function(t){if(t>this.st)return Yn.resolve().then(this.rt)["catch"](function(){})},t.ft={},t.ut=0,t.checkedAlready=!1,t.ht=0,t}(),Zi=function(t){function n(n){var i=t.call(this)||this;return i.lt=n,i.dt=-1,i}return(0,e.__extends)(n,t),n.prototype.start=function(t){var n=this;-1==this.dt&&(this.setTick(function(){t(),n.register(n.lt)}),this.dt=o.setWindowInterval(window,this.rt,this.lt),this.register(this.lt))},n.prototype.cancel=function(){-1!=this.dt&&(o.clearWindowInterval(window,this.dt),this.dt=-1,this.setTick(function(){}))},n}(Ji),Yi=function(t){function n(n,i,r){void 0===i&&(i=0);for(var e=[],s=3;s<arguments.length;s++)e[s-3]=arguments[s];var o=t.call(this)||this;return o.wt=i,o.gt=-1,o.setTick(function(){o.stop(),n.apply(void 0===r?window:r,e)}),o}return(0,e.__extends)(n,t),n.prototype.start=function(t){return void 0===t&&(t=this.wt),this.wt=t,o.clearWindowTimeout(window,this.gt),this.gt=o.setWindowTimeout(window,this.rt,this.wt),this.register(t),this},n.prototype.isRunning=function(){return this.timerIsRunning()},n.prototype.cancel=function(){-1!=this.gt&&(o.clearWindowTimeout(window,this.gt),this.gt=-1)},n}(Ji),tr=function(){function t(t,n,i){this.yt=t,this.bt=i,this.U=0,this.Et=new Zi(n),this.open()}return t.prototype.guard=function(t){var n=this;return function(){for(var i=[],r=0;r<arguments.length;r++)i[r]=arguments[r];return 0==n.U?(n.bt(),void n.U--):n.U<0?void 0:(n.U--,t.apply(this,i))}},t.prototype.close=function(){return this.Et.stop(),this},t.prototype.open=function(){var t=this;return this.U=this.yt,this.Et.start(function(){t.U=t.yt}),this},t}(),nr=function(){function t(){this.St=0,this.xt=p()}return t.prototype.wallTime=function(){return p()},t.prototype.now=function(){var t=this.wallTime()-this.xt;return t<0&&this.kt("timekeeper now() is negative"),t},t.prototype.startTime=function(){return this.xt},t.prototype.setStartTime=function(t){var n=this.wallTime();this.xt=t,t>n&&(this.St=t-n,this.St>1e3&&this.kt("timekeeper set with future ts"))},t.prototype.kt=function(t){Qi({msg:t,skew:this.St,startTime:this.xt,wallTime:this.wallTime()},1024)},t}(),ir=function(){function t(t,n){this._t=t,this.At=n,this.It=!1,this.Tt={},this.Ct={},this.Pt={},this.jt=!1,this.Ot=!1,Gi=this,this.Mt=t.window.document}return t.prototype.start=function(){var t;(t=Object.getOwnPropertyDescriptor(HTMLInputElement.prototype,"value"))&&t.set&&(rr||(yt(HTMLInputElement,"value",ar),yt(HTMLInputElement,"checked",ar),yt(HTMLSelectElement,"value",ar),yt(HTMLTextAreaElement,"value",ar),yt(HTMLSelectElement,"selectedIndex",ar),yt(HTMLOptionElement,"selected",ar),rr=!0),1)||(this.It=!0)},t.prototype.hookInstance=function(t){if("input"===ki(t))switch(t.type){case"checkbox":case"radio":bt(t,"checked",ar);break;default:bt(t,"value",ar);}},t.prototype.addInput=function(t){if(t){var n=Bi(t);if(n){"input"===ki(t)&&this.Kt(t);var i=!1;if(function(t){switch(t.type){case"checkbox":case"radio":return t.checked!=t.hasAttribute("checked");default:return(t.value||"")!=function(t){if("select"!=ki(t))return t.getAttribute("value")||"";var n=t,i=n.querySelector("option[selected]")||n.querySelector("option");return i&&i.value||""}(t);}}(t)&&(this.Rt(t),i=!0),this.It&&(this.Tt[n]={elem:t}),!i)if(hr(t)){var r=or(t);t.checked&&(this.Pt[r]=n)}else this.Ct[n]=cr(t)}}},t.prototype.Kt=function(t){if(this.jt)this.Ot&&this.hookInstance(t);else{var n="checkbox"===t.type||"radio"===t.type?"checked":"value",i=Object.getOwnPropertyDescriptor(HTMLInputElement.prototype,n),r=Object.getOwnPropertyDescriptor(t,n);i&&r&&i!==r&&(this.Ot=!0,this.hookInstance(t)),this.jt=!0}},t.prototype.diffValue=function(t,n){void 0===n&&(n=cr(t));var i=Bi(t);if(!t||!i)return!1;if(hr(t)){var r=or(t);return this.Pt[r]===i!=("true"===n)}return this.Ct[i]!==n},t.prototype.onChange=function(t,n,i){void 0===i&&(i=cr(t));var r=Bi(t);t&&r&&(n||this.diffValue(t,i))&&this.Rt(t,n)},t.prototype.onKeyboardChange=function(t){var n,i=function(t){for(var n=t.activeElement;n&&n.shadowRoot;){var i=n.shadowRoot.activeElement;if(!i)return n;n=i}return n}(this.Mt);i&&("value"in(n=i)||"checked"in n)&&!Hi(i)&&this.diffValue(i)&&this.Rt(i,t)},t.prototype.tick=function(){for(var t in this.Tt){var n=this.Tt[t],i=n.elem;if(Bi(i))try{delete this.Tt[t];var r=cr(i);if(this.diffValue(i,r))this.Rt(i);else if(n.noFsIdInOption){var e=i;Array.prototype.slice.call(e.options).every(function(t){return Bi(t)})&&(n.noFsIdInOption=!1,this.Rt(i))}}finally{this.It&&(this.Tt[t]=n)}else delete this.Tt[t],delete this.Ct[t],hr(i)&&delete this.Pt[or(i)]}},t.prototype.stop=function(){Gi=void 0},t.prototype.Rt=function(t,n){var i=this;void 0===n&&(n=!1);var r=Bi(t);if(t&&r&&!this.Ht(r,t)){var e=cr(t);if(hr(t)){var s=or(t);"false"===e&&this.Pt[s]===r?delete this.Pt[s]:"true"===e&&(this.Pt[s]=r)}else this.Ct[r]=e;this._t.measurer.requestMeasureTask(ii.Medium,function(){var s=t.getBoundingClientRect(),o=s.width>0&&s.height>0,u=Ni(t)?Ci(e):e;i.At.enqueue({Kind:Ot.VALUECHANGE,Args:[r,u,n,o]})})}},t.prototype.Ht=function(t,n){if(this.Tt[t])return!0;if("select"!==ki(n))return!1;for(var i=n.options,r=0;r<i.length;r++)if(!Bi(i[r]))return this.Tt[t]={elem:n,noFsIdInOption:!0},!0;return!1},t}(),rr=!1,er={};function sr(){try{if(Gi)for(var t in er){var n=er[t],i=n[0],r=n[1];Gi.onChange(i,!1,r)}}finally{Xi=null,er={}}}function or(t){if(!t)return"";for(var n=t;n&&"form"!=ki(n);)n=n.parentElement;return(n&&"form"==ki(n)?Di(n):0)+":"+(t.name||"_fs_"+Di(t))}function ur(t,n){if(void 0===n&&(n=2),n<=0)return t;var i=ki(t);return"option"!=i&&"optgroup"!=i||!t.parentElement?t:ur(t.parentElement,n-1)}function ar(t,n){if(Gi){var i=ur(t),r=Bi(i);r&&Gi.diffValue(i,""+n)&&(er[r]=[i,""+n],Xi||(Xi=new Yi(sr)).start())}}function cr(t){if(!t)return"";switch(t.type){case"checkbox":case"radio":return""+t.checked;default:var n=t.value;return n||(n=""),""+n;}}function hr(t){return t&&"radio"==t.type}var fr=function(){function t(t,n,i){var r=this;this.Nt=new WeakMap,this.Lt=!1,this.Ut=!1,this.ut=1,this.Ft=[],this.Dt=[],this.Bt=Tt.wrap(function(t){var n=function(t,n){void 0===n&&(n=window);var i=n.KeyframeEffect,r=t.effect;return r&&(void 0===i||r instanceof i)?r:null}(t,r.Wt),i=function(t,n){void 0===n&&(n=window);var i=n.DocumentTimeline,r=t.timeline;return r&&(void 0===i||r instanceof i)?r:null}(t,r.Wt),s=pr(t);if((null==n?void 0:n.target)&&0!==Bi(null==n?void 0:n.target)&&i===r.Wt.document.timeline&&s===Mt.Animation){var o=Di(n.target);if(r.Nt.has(n)){var u=r.Nt.get(n)||[],a=(c=u[0],u.slice(1));-1===a.indexOf(o)&&(r.qt(n,o),r.Nt.set(n,(0,e.__spreadArray)((0,e.__spreadArray)([c],a),[o])))}else{var c=r.ut++;r.Nt.set(n,[c,o]),r.Qt.enqueue({Kind:Ot.KEYFRAME_EFFECT_CREATED,Args:[c,o,dr(n),lr(n)]})}if(!r.Nt.has(t)){var h=r.ut++,f=(c=r.Vt(n),r.Vt(i));switch(r.Nt.set(t,[h]),r.Qt.enqueue({Kind:Ot.ANIMATION_CREATED,Args:[h,pr(t),c,f]}),t.playState){case"finished":r.Qt.enqueue({Kind:Ot.ANIMATION_METHOD_CALLED,Args:[h,["finish",[]]]});break;case"paused":case"running":r.Qt.enqueue({Kind:Ot.ANIMATION_PROPERTY_SET,Args:[h,["currentTime",t.currentTime]]});var v="paused"===t.playState?"pause":"play";r.Qt.enqueue({Kind:Ot.ANIMATION_METHOD_CALLED,Args:[h,[v,[]]]});}r.T.add(t,"cancel",!0,function(){r.Qt.enqueue({Kind:Ot.ANIMATION_METHOD_CALLED,Args:[h,["cancel",[]]]})}),r.T.add(t,"finish",!0,function(){r.Qt.enqueue({Kind:Ot.ANIMATION_METHOD_CALLED,Args:[h,["finish",[]]]})})}}}),this.Qt=n,this.Wt=t.window,this.T=i.createChild(),this.Ut=function(t){void 0===t&&(t=window);var n=t.Animation,i=t.Document,r=t.Element;return void 0!==n&&"effect"in n.prototype&&"getAnimations"in i.prototype&&"animate"in r.prototype}(this.Wt)}return Object.defineProperty(t.prototype,"nextId",{get:function(){return this.ut},enumerable:!1,configurable:!0}),t.prototype.snapshot=function(t){var n,i=this,r=("getAnimations"in t);this.Lt&&this.Ut&&r&&(null!==(n=t.getAnimations())&&void 0!==n?n:[]).forEach(function(t){i.Bt(t)})},t.prototype.start=function(t){var n,i=this;if(t.CaptureAnimations){var r=this.Wt,e=r.document,s=r.Element;this.Qt.enqueue({Kind:Ot.REC_FEAT_SUPPORTED,Args:[zt.WebAnimation,this.Ut]}),this.Ut&&(this.Lt=!0,this.snapshot(e),this.zt(null===(n=mt(s.prototype,"animate"))||void 0===n?void 0:n.afterSync(function(t){i.Bt(t.result)})),this.$t("play"),this.$t("pause"),this.$t("cancel"),this.$t("finish"),this.Gt("updateTiming"),this.Gt("setKeyframes"),this.Ft.push(yt(KeyframeEffect,"target",function(t,n){i.qt(t,Di(n))})))}},t.prototype.stop=function(){this.T.clear(),this.Lt=!1,this.Dt.forEach(function(t){return t&&t.disable()}),this.Dt=[],this.Ft.forEach(function(t){return t()}),this.Ft=[]},t.prototype.qt=function(t,n){var i=this.Vt(t);i&&this.Qt.enqueue({Kind:Ot.KEYFRAME_EFFECT_PROPERTY_SET,Args:[i,["target",n]]})},t.prototype.Vt=function(t){return(this.Nt.get(t)||[])[0]},t.prototype.zt=function(t){t&&this.Dt.push(t)},t.prototype.$t=function(t){var n,i=this;this.zt(null===(n=mt(Animation.prototype,t))||void 0===n?void 0:n.afterSync(function(n){var r=i.Vt(n.that);r&&i.Qt.enqueue({Kind:Ot.ANIMATION_METHOD_CALLED,Args:[r,[t,[]]]})}))},t.prototype.Gt=function(t){var n,i=this;this.zt(null===(n=mt(KeyframeEffect.prototype,t))||void 0===n?void 0:n.afterSync(function(n){var r,e,s=i.Vt(n.that);if(s)switch(t){case"updateTiming":var u=n.args[0];i.Qt.enqueue({Kind:Ot.KEYFRAME_EFFECT_METHOD_CALLED,Args:[s,["updateTiming",[vr(u)]]]});break;case"setKeyframes":var a=n.args[0];i.Qt.enqueue({Kind:Ot.KEYFRAME_EFFECT_METHOD_CALLED,Args:[s,["setKeyframes",[(r=a,e=(o.arrayIsArray(r)?r:[r]).map(function(t){var n=[];return rt(t,function(t,i){n.push([i,t])}),[n,null,null,null]}),e)]]]});}}))},t}();function vr(t){return[t.delay,t.direction,t.duration,t.easing,t.endDelay,t.fill,t.iterationStart,""+t.iterations]}function lr(t){var n=t.getTiming(),i=t.composite,r=void 0===i?"replace":i,s=t.iterationComposite,o=void 0===s?"replace":s;return(0,e.__spreadArray)((0,e.__spreadArray)([],vr(n)),[r,o])}function dr(t){return t.getKeyframes().map(function(t){var n=t.composite,i=t.easing,r=t.offset,e=[];return rt(t,function(t,n){"composite"!==n&&"computedOffset"!==n&&"easing"!==n&&"offset"!==n&&e.push([n,t])}),[e,n,i,r]})}function pr(t){return"animationName"in t?Mt.CSSAnimation:"transitionProperty"in t?Mt.CSSTransition:Mt.Animation}var wr=navigator.userAgent,gr=wr.indexOf("MSIE ")>-1||wr.indexOf("Trident/")>-1,mr=(gr&&wr.indexOf("Trident/5"),gr&&wr.indexOf("Trident/6"),gr&&wr.indexOf("rv:11")>-1),yr=wr.indexOf("Edge/")>-1,br=(wr.indexOf("CriOS"),wr.indexOf("Snapchat")>-1),Er=/^((?!chrome|android).)*safari/i.test(window.navigator.userAgent);function Sr(){var t=window.navigator.userAgent.match(/Version\/(\d+)/);return t&&t[1]?parseInt(t[1],10):-1}function xr(t){if(!Er)return!1;var n=Sr();return n>=0&&n===t}function kr(t){if(!Er)return!1;var n=Sr();return n>=0&&n<t}xr(9),xr(10);var _r=kr(8);function Ar(t,n){for(var i=0===n.indexOf("on")?function(t){return"on"+t+n.slice(2)}:function(t){return""+t+n.charAt(0).toUpperCase()+n.slice(1)},r=0,e=[function(){return n},function(){return i("webkit")},function(){return i("moz")},function(){return i("ms")}];r<e.length;r++){var s=(0,e[r])();if(s in t)return s}return n}kr(10),kr(12);var Ir=i(220),Tr={},Cr="__default";function Pr(t){void 0===t&&(t=Cr);var n=Tr[t];return n||(n=function(){var t=document.implementation.createHTMLDocument("");return t.head||t.documentElement.appendChild(t.createElement("head")),t.body||t.documentElement.appendChild(t.createElement("body")),t}(),t!==Cr&&(n.open(),n.write(t),n.close()),Tr[t]=n),n}var jr=new(function(){function t(){var t=Pr(),n=t.getElementById("urlresolver-base");n||((n=t.createElement("base")).id="urlresolver-base",t.head.appendChild(n));var i=t.getElementById("urlresolver-parser");i||((i=t.createElement("a")).id="urlresolver-parser",t.head.appendChild(i)),this.base=n,this.parser=i}return t.prototype.parseUrl=function(t,n){var i=t;if("undefined"!=typeof URL)try{i||(i=document.baseURI);var r=i?new URL(n,i):new URL(n);if(r.href)return r}catch(t){}return this.parseUrlUsingBaseAndAnchor(i,n)},t.prototype.parseUrlUsingBaseAndAnchor=function(t,n){this.base.setAttribute("href",t),this.parser.setAttribute("href",n);var i=document.createElement("a");return i.href=this.parser.href,i},t.prototype.resolveUrl=function(t,n){return this.parseUrl(t,n).href},t.prototype.resolveToDocument=function(t,n){var i=Mr(t);return null==i?n:this.resolveUrl(i,n)},t}());function Or(t,n){return jr.parseUrl(t,n)}function Mr(t){var n=t.document,i=t.location.href;if("string"==typeof n.baseURI)i=n.baseURI;else{var r=n.getElementsByTagName("base")[0];r&&r.href&&(i=r.href)}return"about:blank"==i&&t.parent!=t?Mr(t.parent):i}var Kr=["allowReorder","attributeName","attributeType","autoReverse","baseFrequency","baseProfile","calcMode","clipPathUnits","contentScriptType","contentStyleType","diffuseConstant","edgeMode","externalResourcesRequired","filterRes","filterUnits","glyphRef","gradientTransform","gradientUnits","kernelMatrix","kernelUnitLength","keyPoints","keySplines","keyTimes","lengthAdjust","limitingConeAngle","markerHeight","markerUnits","markerWidth","maskContentUnits","maskUnits","numOctaves","pathLength","patternContentUnits","patternTransform","patternUnits","pointsAtX","pointsAtY","pointsAtZ","preserveAlpha","preserveAspectRatio","primitiveUnits","refX","refY","referrerPolicy","repeatCount","repeatDur","requiredExtensions","requiredFeatures","specularConstant","specularExponent","spreadMethod","startOffset","stdDeviation","stitchTiles","surfaceScale","systemLanguage","tableValues","targetX","targetY","textLength","viewBox","viewTarget","xChannelSelector","yChannelSelector","zoomAndPan"].reduce(function(t,n){return t[n]=n,t[n.toUpperCase()]=n,t},{}),Rr=function(t){for(var n=[],i=0,r=t;i<r.length;i++){var e=r[i],s={Exclude:Hr(e.Exclude)};if(e.If){s.If=[];for(var o=0,u=e.If;o<u.length;o++){var a=u[o];s.If.push(Hr(a,!0))}}n.push(s)}return n};function Hr(t,n){return void 0===n&&(n=!1),{Hash:Nr(t.Hash,n),Host:Nr(t.Host,n),Path:Nr(t.Path,n),QueryParam:Nr(t.QueryParam,n),Query:Nr(t.Query,n)}}function Nr(t,n){return t?n?[new RegExp(t.map(function(t){return t.Expression}).join("|"),"ig")]:t.map(function(t){return new RegExp(t.Expression,"ig")}):[]}var Lr="--blocked--",Ur=function(t,n,i){if(void 0===i&&(i=Lr),!n||0===t.length)return n;for(var r=[],e=0,s=t;e<s.length;e++)for(var o=s[e],u=0,a=Fr(o,n);u<a.length;u++){var c=a[u];r.push(c)}if(0===r.length)return n;for(var h="",f=0,v=0,l=r=Dr(r);v<l.length;v++){var d=l[v],p=d[0],w=d[1];h+=""+n.substring(f,p)+i,f=w}return h+n.slice(f)},Fr=function(t,n){var i,r=[];for(t.lastIndex=0;null!==(i=t.exec(n));)if(i){if(""===i[0])return".*"!==t.source&&Tt.sendToBugsnag("detected possible infinite loop when matching zero-length characters","error",{re:t.source}),[[0,n.length]];if(1!==i.length)for(var e=i.index,s=0,o=1;o<i.length;o++){var u=i[o];if(u&&0!==u.length)if(o%2!=1){var a=e+s,c=a+u.length;r.push([a,c]),s+=u.length}else s+=u.length}else r.push([i.index,t.lastIndex])}return r},Dr=function(t){if(t.length<=1)return t;t.sort(function(t,n){return t[0]-n[0]});for(var n=[],i=t[0],r=1;r<t.length;r++){var e=t[r];i[1]<=e[0]?(n.push(i),i=e):i[1]<e[1]&&(i[1]=e[1])}return n.push(i),n},Br=function(t,n){if(0===t.length||!n)return!0;for(var i=0,r=n.split("?");i<r.length;i++)for(var e=0,s=r[i].replace("?","").split("&");e<s.length;e++){var o=s[e];if(qr(t,o))return!0}return!1},Wr=function(t,n){if(!t)return!0;for(var i=Vr(n.pathname),r=0,e=t;r<e.length;r++){var s=e[r];if(qr(s.Hash,n.hash)&&qr(s.Host,n.host)&&qr(s.Path,i)&&Br(s.QueryParam,n.search)&&qr(s.Query,n.search))return!0}return!1},qr=function(t,n){return 0===t.length||!n||t.every(function(t){return t.lastIndex=0,t.test(n)})},Qr=function(t,n){var i,r,e,s,o;(i=t.Hash).push.apply(i,n.Hash),(r=t.Host).push.apply(r,n.Host),(e=t.Path).push.apply(e,n.Path),(s=t.QueryParam).push.apply(s,n.QueryParam),(o=t.Query).push.apply(o,n.Query)};function Vr(t){return"/"!==t.charAt(0)?"/"+t:t}var zr=/[-\\^$*+?.()|[\]{}]/g,$r=new RegExp(zr.source),Gr=JSON.parse("{\"W1MPQ\":[{\"Exclude\":{\"Path\":[{\"Expression\":\"(/auth/recover/)(.*)\"}]}}],\"K54HA\":[{\"Exclude\":{\"Path\":[{\"Expression\":\"(/verify-email/)(.*)\"}]}}],\"AGQFM\":[{\"Exclude\":{\"Path\":[{\"Expression\":\"(/reset-password/)(.*)\"}]}}],\"95NJ7\":[{\"Exclude\":{\"Path\":[{\"Expression\":\"(/reset-password/)(.*)\"}]}}],\"GBNRN\":[{\"Exclude\":{\"Path\":[{\"Expression\":\"(/reset-password/)(.*)\"}]}}],\"RV68C\":[{\"Exclude\":{\"Path\":[{\"Expression\":\"(/dl/)(.*)\"}]}}],\"QS8RG\":[{\"Exclude\":{\"Path\":[{\"Expression\":\"(/visitor/)(.*)\"},{\"Expression\":\"(/account/)(.*)\"},{\"Expression\":\"(/parentAccount/)(.*)\"}]}}],\"FP60X\":[{\"Exclude\":{\"Path\":[{\"Expression\":\"(/retailer/)(.*)\"},{\"Expression\":\"(/ocadotech/)(.*)\"},{\"Expression\":\"(/serviceAccounts/)(.*)\"}]}}],\"7R98D\":[{\"Exclude\":{\"Path\":[{\"Expression\":\"(/signup/)(.*)\"}]}}],\"WEN2C\":[{\"Exclude\":{\"Path\":[{\"Expression\":\"(/studies/)(.*)\"},{\"Expression\":\"(/EU/)(.*)\"},{\"Expression\":\"(/findings/)(.*)\"}]}}],\"WQF2B\":[{\"Exclude\":{\"Path\":[{\"Expression\":\"(/app/accounts/)(.*)\"},{\"Expression\":\"(/app/order/)(.*)\"},{\"Expression\":\"(/app/trade/)(.*)\"}]}}],\"QKM7G\":[{\"If\":[{\"Path\":[{\"Expression\":\"/hc/en-us/requests/new\"}]}],\"Exclude\":{\"QueryParam\":[{\"Expression\":\"(tf_)(.*)\"}]}}],\"14WAK8\":[{\"If\":[{\"Host\":[{\"Expression\":\"px.scs.splunk.com\"}]}],\"Exclude\":{\"Path\":[{\"Expression\":\"^/[^/]*\"}]}},{\"If\":[{\"Host\":[{\"Expression\":\"api.scs.splunk.com\"}]},{\"Host\":[{\"Expression\":\"api.playground.scs.splunk.com\"}]}],\"Exclude\":{\"Host\":[{\"Expression\":\".*\"}],\"Hash\":[{\"Expression\":\".*\"}],\"Path\":[{\"Expression\":\".*\"}],\"Query\":[{\"Expression\":\".*\"}]}}],\"141MBA\":[{\"If\":[{\"Host\":[{\"Expression\":\"px.scs.splunk.com\"}]}],\"Exclude\":{\"Path\":[{\"Expression\":\"^/[^/]*\"}]}},{\"If\":[{\"Host\":[{\"Expression\":\"api.scs.splunk.com\"}]},{\"Host\":[{\"Expression\":\"api.playground.scs.splunk.com\"}]}],\"Exclude\":{\"Host\":[{\"Expression\":\".*\"}],\"Hash\":[{\"Expression\":\".*\"}],\"Path\":[{\"Expression\":\".*\"}],\"Query\":[{\"Expression\":\".*\"}]}}],\"138HN0\":[{\"If\":[{\"Host\":[{\"Expression\":\"px.scs.splunk.com\"}]},{\"Host\":[{\"Expression\":\"px.playground.scs.splunk.com\"}]}],\"Exclude\":{\"Path\":[{\"Expression\":\"^/[^/]*\"}]}},{\"If\":[{\"Host\":[{\"Expression\":\"api.scs.splunk\"}]},{\"Host\":[{\"Expression\":\"api.playground.scs.splunk.com\"}]},{\"Host\":[{\"Expression\":\"api.staging.scs.splunk.com\"}]}],\"Exclude\":{\"Host\":[{\"Expression\":\".*\"}],\"Hash\":[{\"Expression\":\".*\"}],\"Path\":[{\"Expression\":\".*\"}],\"Query\":[{\"Expression\":\".*\"}]}}],\"18789V\":[{\"If\":[{\"Host\":[{\"Expression\":\"cae.scs.splunk.com\"}]},{\"Host\":[{\"Expression\":\"cae.playground.scs.splunk.com\"}]},{\"Host\":[{\"Expression\":\"cae.staging.scs.splunk.com\"}]}],\"Exclude\":{\"Path\":[{\"Expression\":\"^/[^/]*\"}]}},{\"If\":[{\"Host\":[{\"Expression\":\"api.playground.scs.splunk.com\"}]},{\"Host\":[{\"Expression\":\"api.scs.splunk.com\"}]},{\"Host\":[{\"Expression\":\"api.staging.scs.splunk.com\"}]}],\"Exclude\":{\"Host\":[{\"Expression\":\"()(.*).scs.splunk.com\"}],\"Path\":[{\"Expression\":\".*\"}],\"Query\":[{\"Expression\":\".*\"}],\"Hash\":[{\"Expression\":\".*\"}]}}],\"o-19X3N0-na1\":[{\"If\":[{\"Path\":[{\"Expression\":\"/account/recurringPayment/.*\"}]},{\"Path\":[{\"Expression\":\"/account/payNow/.*\"}]},{\"Path\":[{\"Expression\":\"/account/notifications/.*\"}]},{\"Path\":[{\"Expression\":\"/account/paymentMethod/.*\"}]},{\"Path\":[{\"Expression\":\"/account/trustAccount/.*\"}]},{\"Path\":[{\"Expression\":\"/testTransactions/.*\"}]},{\"Path\":[{\"Expression\":\"/api/.*\"}]}],\"Exclude\":{\"Path\":[{\"Expression\":\"(/(?:account/recurringPayment|account/payNow|api|account/notifications|account/paymentMethod|account/trustAccount|testTransactions)/)(.*)\"}],\"Query\":[{\"Expression\":\".*\"}],\"Hash\":[{\"Expression\":\".*\"}]}}],\"1878HN\":[{\"Exclude\":{\"Host\":[{\"Expression\":\".*\"}]}},{\"If\":[{\"Path\":[{\"Expression\":\"/app\"}]}],\"Exclude\":{\"Hash\":[{\"Expression\":\"(deployments/?)(.*)\"}]}},{\"If\":[{\"Path\":[{\"Expression\":\"/deployments\"}]},{\"Path\":[{\"Expression\":\"/authentication/users\"}]}],\"Exclude\":{\"Query\":[{\"Expression\":\".*\"}],\"Hash\":[{\"Expression\":\".*\"}]}}],\"ZHBMT\":[{\"Exclude\":{\"Query\":[{\"Expression\":\".*\"}]}}],\"12FMQA\":[{\"Exclude\":{\"Path\":[{\"Expression\":\"(/vehicles/)(.*)\"},{\"Expression\":\"(/orders/)(.*)\"},{\"Expression\":\"(/overview/)(.*)\"},{\"Expression\":\"(/services/)(.*)\"},{\"Expression\":\"(/timeslots/)(.*)\"},{\"Expression\":\"(/summary/)(.*)\"},{\"Expression\":\"(/confirmation/)(.*)\"}]}},{\"If\":[{\"Host\":[{\"Expression\":\"api.porsche.com\"}],\"Path\":[{\"Expression\":\"/vehicles/.*\"}]},{\"Host\":[{\"Expression\":\"api.porsche.com\"}],\"Path\":[{\"Expression\":\"/sloffermgm-datavolume/.*\"}]}],\"Exclude\":{\"Hash\":[{\"Expression\":\".*\"}],\"Path\":[{\"Expression\":\"(^/(?:vehicles|sloffermgm-datavolume)/)(.*)\"}],\"QueryParam\":[{\"Expression\":\".*\"}]}},{\"If\":[{\"Host\":[{\"Expression\":\"api.porsche.(?:com|cn)\"}]}],\"Exclude\":{\"Path\":[{\"Expression\":\"(^/(?:admin/api/v2/[^/]*/[^/]*/acquire|predictive-maintenance/information|vehicle-data/[^/]*/[^/]*/status|manuals/[^/]*|service-vehicle/vcs/capabilities|service-vehicle/vehicle-summary|service-vehicle/[^/]*/[^/]*/connected-navigation/points-of-interest|track-your-dream/[^/]*/orders)/)(.*)\"}],\"QueryParam\":[{\"Expression\":\"(gaClientId=)(.*)\"}]}},{\"If\":[{\"Host\":[{\"Expression\":\"my.porsche.(?:com|cn)\"}]}],\"Exclude\":{\"Path\":[{\"Expression\":\"(^/core/[^/]*/[^/]*/(?:home|track-your-dream)/)(.*)\"}]}},{\"If\":[{\"Host\":[{\"Expression\":\"signup.porsche.com\"}],\"Path\":[{\"Expression\":\".*confirm/\"}]}],\"Exclude\":{\"Path\":[{\"Expression\":\"(confirm/)(.*)\"}]}}],\"ZXFPS\":[{\"Exclude\":{\"Path\":[{\"Expression\":\"(/vehicles/)(.*)\"},{\"Expression\":\"(/overview/)(.*)\"},{\"Expression\":\"(/services/)(.*)\"},{\"Expression\":\"(/timeslots/)(.*)\"},{\"Expression\":\"(/summary/)(.*)\"},{\"Expression\":\"(/confirmation/)(.*)\"}]}},{\"If\":[{\"Host\":[{\"Expression\":\"api.porsche(?:-preview)?.(?:com|cn)\"}]}],\"Exclude\":{\"Path\":[{\"Expression\":\"(^/(?:admin/api/v2/[^/]*/[^/]*/acquire|predictive-maintenance/information|vehicle-data/[^/]*/[^/]*/status|manuals/[^/]*|service-vehicle/vcs/capabilities|service-vehicle/vehicle-summary|service-vehicle/[^/]*/[^/]*/connected-navigation/points-of-interest|track-your-dream/[^/]*/orders)/)(.*)\"}],\"QueryParam\":[{\"Expression\":\"(gaClientId=)(.*)\"}]}},{\"If\":[{\"Host\":[{\"Expression\":\"my.porsche(?:-preview)?.(?:com|cn)\"}]}],\"Exclude\":{\"Path\":[{\"Expression\":\"(^/core/[^/]*/[^/]*/(?:home|track-your-dream)/)(.*)\"}]}}],\"o-19WA8S-na1\":[{\"If\":[{\"Path\":[{\"Expression\":\"/app-mobile/.*\"}]}],\"Exclude\":{\"Path\":[{\"Expression\":\"(/app-mobile/)(.*)\"}]}}],\"o-1A7PWH-na1\":[{\"If\":[{\"Host\":[{\"Expression\":\"express.adobe.com\"}],\"Path\":[{\"Expression\":\"^/(post/|video/|page/).*\"}]}],\"Exclude\":{\"Path\":[{\"Expression\":\"(post/|video/|page/)(.*)\"}]}},{\"If\":[{\"Path\":[{\"Expression\":\"/sp/design/post/new\"}]}],\"Exclude\":{\"QueryParam\":[{\"Expression\":\"(.*=)(.*)\"}]}},{\"If\":[{\"Path\":[{\"Expression\":\"/(urn:aaid:sc:|urn%3Aaaid%3Asc%3A).*\"}]}],\"Exclude\":{\"Path\":[{\"Expression\":\"(urn:aaid:sc:|urn%3Aaaid%3Asc%3A)(.*)\"}]}}],\"o-1CJXPY-na1\":[{\"If\":[{\"Host\":[{\"Expression\":\"splunkcloud.com\"}]}],\"Exclude\":{\"Host\":[{\"Expression\":\"()([^.]+)(?:\\\\.[^.]+)?\\\\.splunkcloud\\\\.com\"}],\"Hash\":[{\"Expression\":\".*\"}],\"Path\":[{\"Expression\":\".*\"}],\"Query\":[{\"Expression\":\".*\"}]}}],\"o-19PMKB-na1\":[{\"If\":[{\"Host\":[{\"Expression\":\"splunkcloud.com\"}]}],\"Exclude\":{\"Host\":[{\"Expression\":\"()([^.]+)(?:\\\\.[^.]+)?\\\\.splunkcloud\\\\.com\"}],\"Hash\":[{\"Expression\":\".*\"}],\"Path\":[{\"Expression\":\".*\"}],\"Query\":[{\"Expression\":\".*\"}]}}],\"16GN0J\":[{\"Exclude\":{\"Path\":[{\"Expression\":\"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\"},{\"Expression\":\"(/book/confirmation/stays/|/book/stays/|/contact_host/|/guest/inbox/|/hosting/inbox/folder/all/thread/|/hosting/p/inbox/folder/all/thread/|/hosting/inbox/settings/quick-replies/edit/|/hosting/listings/|/hosting/reservations/details/|/hotels/|/luxury/listing/|/manage-your-space/|/multicalendar/|/performance/quality/overall/review/|/performance/quality/overall/reviews/review/|/progress/opportunities/basic/|/progress/reviews/details/|/progress/views/|/rooms/plus/|/rooms/|/split-stays/|/users/transaction_history/|/users/show/|/users/|/wishlists/v/|/wishlists/)([^/]*)\"},{\"Expression\":\"(/trips/v1/(?:[^/]*/)?ro/[^/]*/)([^/]*)\"}],\"QueryParam\":[{\"Expression\":\"(.*=)(.*[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}.*)\"},{\"Expression\":\"(tpiId=|tpiFormNameAndFullName=|productId=|_branch_referrer=|.*deeplink_path.*=|user_id=|_branch_match_id=|query=|confirmationCode=|federated_search_id=|lid%5B%5D=|lid\\\\[\\\\]=|modalItem=|other_listing=|cc=|refinement_paths%5B%5D=|refinement_paths\\\\[\\\\]=)(.*)\"}]}},{\"If\":[{\"Path\":[{\"Expression\":\"/account-settings/payments/payout-methods/redirect/paypal\"}]}],\"Exclude\":{\"Hash\":[{\"Expression\":\".*\"}],\"Query\":[{\"Expression\":\".*\"}]}},{\"Exclude\":{\"Path\":[{\"Expression\":\"(/multicalendar/)([^/]*)(/reservation/)([^/]*)\"}]}}],\"o-1EX0X1-na1\":[{\"If\":[{\"Path\":[{\"Expression\":\"/business/[^/]*/dashboard\"}]}],\"Exclude\":{\"Path\":[{\"Expression\":\"(/business/)([^/]*)\"}]}}],\"197Q72\":[{\"If\":[{\"Host\":[{\"Expression\":\"api.accuweather.com\"}],\"Path\":[{\"Expression\":\"/locations/v1/cities/geoposition/search.json\"}]}],\"Exclude\":{\"Query\":[{\"Expression\":\".*\"}]}},{\"If\":[{\"Path\":[{\"Expression\":\"/if9/jlr/users\"}]}],\"Exclude\":{\"Query\":[{\"Expression\":\".*\"}]}},{\"Exclude\":{\"Path\":[{\"Expression\":\"(/if9/jlr/vehicles/)(.*)\"}]}}],\"o-1CMWCC-na1\":[{\"If\":[{\"Host\":[{\"Expression\":\"harveynorman.com\"}]}],\"Exclude\":{\"Path\":[{\"Expression\":\"(email/)(.*)\"}]}}],\"13NHFR\":[{\"If\":[{\"Host\":[{\"Expression\":\"cm.com\"}]}],\"Exclude\":{\"Path\":[{\"Expression\":\"[0-9A-Fa-f]{8}(?:-[0-9A-Fa-f]{4}){3}-[0-9A-Fa-f]{12}\"}],\"QueryParam\":[{\"Expression\":\"(.*=)(.*[0-9A-Fa-f]{8}(?:-[0-9A-Fa-f]{4}){3}-[0-9A-Fa-f]{12}.*)\"}]}}]}"),Xr=[{Exclude:{Hash:[{Expression:"#.*"}],QueryParam:[{Expression:"(password.*=)(.*)"},{Expression:"(token.*=)(.*)"},{Expression:"^(jwt=)(.*)"},{Expression:"^(code=)(.*)"}]}}],Jr={};for(var Zr in Gr){var Yr=Gr[Zr];Jr[Zr]=Xr.concat(Yr)}var te=Jr,ne=16e6;function ie(t,n,i){void 0===i&&(i=!1);var r=t.textContent;if(!r)return"";var e=n;if(!e&&!(e=Ui(t)))return"";var s=r.length;return s>ne?(Tt.sendToBugsnag("Ignoring huge text node","warning",{length:s}),""):t.parentNode&&"style"==ki(t.parentNode)?r:e.mask?Ci(r):r}function re(t){return Kr[t]||t.toLowerCase()}var ee=/^\s*((prefetch|preload|prerender)\s*)+$/i,se=/^\s*.*((worklet|script|worker|font|fetch)\s*)+$/i;function oe(t,n,i,r,e){var s,u;if(void 0===r&&(r=ki(t)),void 0===e&&(e=Ui(t)),null===r||""===n)return null;if("link"===r&&ee.test(null!==(s=t.getAttribute("rel"))&&void 0!==s?s:"")&&!se.test(null!==(u=t.getAttribute("as"))&&void 0!==u?u:""))return null;var a,c="style"===n?ae(i):i,h=function(t,n,i){var r,e,s,u,a,c,h,f,v,l,d,p,w,g=void 0;(null===(r=null==n?void 0:n.watchKind)||void 0===r?void 0:r.has(_i.Exclude))?g=Yt.Exclude:(null==n?void 0:n.mask)&&(g=Yt.Mask);var m=[null===(u=null===(s=null===(e=Ee.blocklist[Yt.Any])||void 0===e?void 0:e[t])||void 0===s?void 0:s["static"])||void 0===u?void 0:u[i],null===(h=null===(c=null===(a=Ee.blocklist[Yt.Any])||void 0===a?void 0:a["*"])||void 0===c?void 0:c["static"])||void 0===h?void 0:h[i],g?null===(l=null===(v=null===(f=Ee.blocklist[g])||void 0===f?void 0:f[t])||void 0===v?void 0:v["static"])||void 0===l?void 0:l[i]:void 0,g?null===(w=null===(p=null===(d=Ee.blocklist[g])||void 0===d?void 0:d["*"])||void 0===p?void 0:p["static"])||void 0===w?void 0:w[i]:void 0];return Ee.hasPrefix&&m.push(ke(Yt.Any,t,i),ke(Yt.Any,"*",i),g?ke(g,t,i):void 0,g?ke(g,"*",i):void 0),function(t){var n=t.filter(function(t){return void 0!==t});if(0!==n.length)return o.mathMin.apply(o,n)}(m)}(r,e,n);if(void 0===h&&!e)return null;switch(h){case void 0:return c;case tn.Erase:return null;case tn.MaskText:return Ci(c);case tn.ScrubCss:return a=function(t,n,i){return""+t+Se+i},c.replace(pi,function(t){for(var n=[],i=1;i<arguments.length;i++)n[i-1]=arguments[i];var r=n[0]||n[3]||n[6]||n[9]||n[12],e=(n[1]||n[4]||n[7]||n[10]||n[13],n[2]||n[5]||n[8]||n[11]||n[14]);return n[15],a(r,0,e)});case tn.ScrubUrl:var f=he(c,{source:"dom",type:r});if("#"===c[0]){var v=f.indexOf("#");if(v>-1)return f.substring(v)}return f;default:return(0,Ir.nt)(h);}}var ue={},ae=function(t,n){void 0===n&&(n=window);try{var i=n.location,r=""+i.origin+i.pathname+i.search,e=ue[r];return e?e.lastIndex=0:(e=new RegExp((s=r,($r.test(s)?s.replace(zr,"\\$&"):s)+"/?(#)"),"g"),ue[r]=e),t.replace(e,"https://fs-currenturl.invalid$1")}catch(n){return Ut("cleanCSS",n),t}var s},ce=/^data:/i;function he(t,n){if(ce.test(t))return t;switch(n.source){case"dom":switch(i=n.type){case"frame":case"iframe":return we(t);default:return fe(t);}case"event":switch(i=n.type){case Ot.AJAX_REQUEST:case Ot.NAVIGATE:return fe(t);case Ot.SET_FRAME_BASE:return we(t);default:return(0,Ir.nt)(i);}case"log":return we(t);case"page":var i;switch(i=n.type){case"base":return we(t);case"referrer":case"url":return fe(t);default:return(0,Ir.nt)(i);}case"perfEntry":switch(n.type){case"frame":case"iframe":case"navigation":case"other":return we(t);default:return fe(t);}default:return(0,Ir.nt)(n);}}function fe(t){return ge(de,t)}var ve=cn.DefaultOrgSettings.MaxUrlLength,le=Rr(cn.DefaultOrgSettings.UrlPrivacyConfig),de=Rr(cn.DefaultOrgSettings.UrlPrivacyConfig);function pe(t,n){le=Rr(cn.DefaultOrgSettings.UrlPrivacyConfig.concat(t)),de=Rr(t),ve=n||cn.DefaultOrgSettings.MaxUrlLength}function we(t){return ge(le,t)}function ge(t,n){return function(t,n,i){void 0===i&&(i=Lr);for(var r={Hash:[],Host:[],Path:[],QueryParam:[],Query:[]},e=0,s=t;e<s.length;e++){var o=s[e];Wr(o.If,n)&&Qr(r,o.Exclude)}var u,a,c=Ur(r.Host,n.host,i);return n.host=c,n.port&&(u=c,a=n.port,u.substring(u.length-a.length)!==a)&&(n.port=""),n.pathname=Ur(r.Path,Vr(n.pathname),i),n.hash&&(n.hash=Ur(r.Hash,n.hash,i)),n.search&&(n.search=function(t,n,i){return void 0===i&&(i=Lr),n.split("?").map(function(n){return n.replace("?","").split("&").map(function(n){return Ur(t,n,i)}).join("&")}).join("?")}(r.QueryParam,n.search,i),n.search=Ur(r.Query,n.search,i)),n.href}(t,Or("",n)).substring(0,ve)}var me=/([a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+)/gi,ye=/(?:(http)|(ftp)|(ws)|(blob)|(file))[s]?:\/\/(?:[a-zA-Z]|[0-9]|[$-_@.&+#]|[!*(),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+/gi;function be(t){return t.replace(me,"<email>").replace(ye,function(t){return he(t,{source:"log",type:"debug"})})}var Ee,Se="https://fs-excluded.invalid";function xe(t){var n,i,r,e,s,o,u,a,c,h,f,v,l,d,p,w;try{for(var g=(Ee={blocklist:{},hasPrefix:!1}).blocklist,m=(null!==(r=null==t?void 0:t.length)&&void 0!==r?r:0)>0?t:cn.DefaultOrgSettings.AttributeBlocklist,y={},b=0,E=m;b<E.length;b++){var S=E[b],x=S.Action;switch(x){case tn.Erase:case tn.MaskText:case tn.ScrubCss:case tn.ScrubUrl:break;default:Tt.sendToBugsnag("Detected unexpected attribute block action "+x,"warning"),x=tn.Erase;}if(null!==(e=g[h=S.Target])&&void 0!==e||(g[h]={}),null!==(s=(f=g[S.Target])[v=S.Tag])&&void 0!==s||(f[v]={"static":{},regex:{}}),S.Type===nn.Prefix)null!==(o=y[l=S.Target])&&void 0!==o||(y[l]={}),null!==(u=(d=y[S.Target])[p=S.Tag])&&void 0!==u||(d[p]={}),null!==(a=(w=y[S.Target][S.Tag])[x])&&void 0!==a||(w[x]=[]),y[S.Target][S.Tag][x].push(null!==(c=S.Name)&&void 0!==c?c:"");else{if(!S.Name){Tt.sendToBugsnag("Detected an empty named static attribute "+JSON.stringify(S),"warning");continue}g[S.Target][S.Tag]["static"][S.Name]=x}}for(var k in y)for(var _ in y[k])for(var A in y[k][_]){var I=y[k][_][A];g[k][_].regex[A]=new RegExp("^(?:"+I.join("|")+")","i"),Ee.hasPrefix=!0}}catch(t){Tt.sendToBugsnag(t,"warning"),Ee={blocklist:(n={},n[Yt.Any]={"*":{"static":{},regex:(i={},i[tn.Erase]=/.*/,i)}},n),hasPrefix:!0}}}function ke(t,n,i){var r,e,s=null===(e=null===(r=Ee.blocklist[t])||void 0===r?void 0:r[n])||void 0===e?void 0:e.regex;if(s)for(var o in s)if(s[o].test(i))return Number(o)}xe();var _e={target:{any:Yt.Any,exclude:Yt.Exclude,mask:Yt.Mask},action:{erase:tn.Erase,maskText:tn.MaskText,scrubUrl:tn.ScrubUrl,scrubCss:tn.ScrubCss},type:{"static":nn.Static,prefix:nn.Prefix}};function Ae(t){var n;return{Tag:t.tag,Name:t.name,Target:_e.target[t.target],Action:_e.action[t.action],Type:_e.type[null!==(n=t.type)&&void 0!==n?n:"static"]}}function Ie(t){return"function"==typeof(n=t.constructor)&&Function.prototype.toString.call(n).indexOf("[native code]")>-1;var n}var Te="#polyfillshadow";function Ce(t){var n;return(null===(n=t.childNodes)||void 0===n?void 0:n.length)>0}function Pe(t,n){Oe(t.childNodes,n)}function je(t,n){Oe(t.childNodes,n,!0)}function Oe(t,n,i){void 0===i&&(i=!1);for(var r=i?t.length-1:0,e=i?-1:t.length;r!==e;){var s=t[r];s&&"frag"in s&&!St(s)&&Array.isArray(s.frag)?s.frag.length&&Oe(s.childNodes,n,i):n(s),i?--r:++r}}var Me={INPUT:!0,TEXTAREA:!0,NOSCRIPT:!0},Ke=function(){function t(t,n,i){this.Xt=t,this.Jt=n,this.Zt=i,Mi={},Ki=1}return t.prototype.tokenizeNode=function(t,n,i,r,e,s,o){var u=this,a=Ui(n),c=Ui(i),h=[];return function(n){var i=Ki;try{return u.Yt(t,a,c,r,h,e,s,o),!0}catch(t){return Ki=i,!1}}()||(h=[]),h},t.prototype.Yt=function(t,n,i,r,s,o,u,a){for(var c,h,f=[{parentMirror:n,nextMirror:i,node:r}],v=function(t,n){return function(i){i&&t.push({parentMirror:n,nextMirror:null,node:i})}};f.length;){var l=f.pop();if(l)if("string"!=typeof l){var d=l.node,p=ki(d),w=this.tn(t,p,l,s,o,u);if(null!=w&&!(null===(c=w.watchKind)||void 0===c?void 0:c.has(_i.Exclude))){var g=1===d.nodeType?d.shadowRoot:null,m=w.shadowRootType===Te&&window.HTMLSlotElement&&"slot"===p&&d.assignedNodes();if(g||m||Ce(d))if(null===(h=w.watchKind)||void 0===h?void 0:h.has(_i.Defer))a(w.node,Ai.Deferred);else{if(f.push("]"),je(d,v(f,w)),g)f.push({parentMirror:w,nextMirror:null,node:g});else if(m&&m.length>0){for(var y=[],b=!1,E=0,S=m;E<S.length;E++){var x=Di(S[E]);if(!x){b=!0;break}var k="<$"+x;y.unshift(k)}b?a(d,Ai.Immediate):f.push.apply(f,(0,e.__spreadArray)((0,e.__spreadArray)(["]"],y),["[","<#assigned-nodes"]))}f.push("[")}}}else"<"===l[0]&&++Ki,s.push(l)}},t.prototype.tn=function(t,n,i,r,e,s){var o,u,a,c=i.node,h=i.parentMirror,f=i.nextMirror;if(!this.nn(n,c,h))return null;var v,l,d,p=function(t){if(t.constructor===window.ShadowRoot)return Ie(t)?"#shadow":Te}(c),w=function(t){var n={id:Ki++,node:t};return Mi[n.id]=n,t._fs=n.id,n}(c);if(w.shadowRootType=p||(null==h?void 0:h.shadowRootType),h&&(p?(h.shadow=w,w.parent=h):(v=h,d=f,Wi(l=w,this.Jt),l.parent=v,l.next=d,d&&(l.prev=d.prev,d.prev=l),null==l.next?(l.prev=v.lastChild,v.lastChild=l):l.next.prev=l,null==l.prev?v.child=l:l.prev.next=l)),10==c.nodeType){var g=c;return r.push("<!DOCTYPE",":name",g.name,":publicId",g.publicId||"",":systemId",g.systemId||""),w}w.mask=null===(o=w.parent)||void 0===o?void 0:o.mask;try{switch(c.nodeType){default:r.push("<"+c.nodeName),Re(c,e);break;case 11:case 9:var m=void 0;m=p||c.nodeName,r.push("<"+m),Re(c,e);break;case 3:void 0===w.mask&&(w.mask=!w.parent||w.parent.mask),w.mask&&this.Jt.observe(c.parentElement),Re(c,e),r.push("<"+c.nodeName,ie(c,w,!0));break;case 1:var y=c;m=y.nodeName,"http://www.w3.org/2000/svg"==y.namespaceURI&&(m="svg:"+m),r.push("<"+m);var b=this.getWatchState(y,!!w.shadowRootType,t);if(null!=b){w.watchKind=b;var E=!1;b.has(_i.Watch)&&(E=!0,null===(u=this.Zt)||void 0===u||u.observe(y)),b.has(_i.Exclude)&&(E=!0,r.push(":_fs_excluded","true")),b.has(_i.Unmask)&&(w.mask=!1),b.has(_i.Mask)&&(w.mask=!0),b.has(_i.Defer)&&(E=!0,r.push(":_fs_deferred","true")),E&&this.Jt.observe(y)}w.mask&&r.push(":_fs_masked","true"),(null===(a=w.watchKind)||void 0===a?void 0:a.has(_i.Exclude))||Re(c,e);var S=!1,x={};if(function(t,n,i,r){var e;if(!yr||"output"!==n){var s=i;if(!(void 0!==s.hasAttributes&&!s.hasAttributes()||void 0===s.hasAttributes&&s.attributes&&s.attributes.length<=0))if(void 0!==s.getAttributeNames)for(var o=0,u=null!==(e=s.getAttributeNames())&&void 0!==e?e:[];o<u.length;o++){var a=u[o];He(t,n,i,r,a,s.getAttribute(a))}else for(var c=0;c<s.attributes.length;c++){var h=s.attributes[c];null!=h&&He(t,n,i,r,h.name,h.value)}}}(w,n,y,function(t,n){S=!0,r.push(":"+t),r.push(n),x[t]=n}),S)try{s(n,y,x)}catch(t){Tt.sendToBugsnag(t,"error")}}}catch(t){Tt.sendToBugsnag(t,"error")}return w},t.prototype.nn=function(t,n,i){return"script"!=t&&8!=n.nodeType},t.prototype.getWatchState=function(t,n,i){return n||null==i||Me[t.nodeName]?this.Xt.isWatched(t):i.get(t)},t}();function Re(t,n){try{n(t)}catch(t){Tt.sendToBugsnag(t,"error")}}function He(t,n,i,r,e,s){if(null!==s){if("open"===e&&"dialog"===n)return;var o=re(e),u=oe(i,o,s,n,t);null!==u&&r(o,u)}}var Ne=JSON.parse("[{\"Selector\":\"input[type=password]\",\"Consent\":false,\"Type\":1},{\"Selector\":\"input[type=hidden]\",\"Consent\":false,\"Type\":1},{\"Selector\":\"[autocomplete^=cc-]\",\"Consent\":false,\"Type\":1},{\"Selector\":\"object:not([type^=\\\"image/\\\"])\",\"Consent\":false,\"Type\":1},{\"Selector\":\"embed:not([type^=\\\"image/\\\"])\",\"Consent\":false,\"Type\":1},{\"Selector\":\"noscript\",\"Consent\":false,\"Type\":1},{\"Selector\":\".fs-hide\",\"Consent\":false,\"Type\":1},{\"Selector\":\".fs-exclude\",\"Consent\":false,\"Type\":1},{\"Selector\":\".fs-exclude-without-consent\",\"Consent\":true,\"Type\":1},{\"Selector\":\".fs-mask\",\"Consent\":false,\"Type\":2},{\"Selector\":\".fs-mask-without-consent\",\"Consent\":true,\"Type\":2},{\"Selector\":\".fs-unmask\",\"Consent\":false,\"Type\":3},{\"Selector\":\".fs-unmask-with-consent\",\"Consent\":true,\"Type\":3},{\"Selector\":\".fs-block\",\"Consent\":false,\"Type\":1},{\"Selector\":\".fs-record-with-consent\",\"Consent\":true,\"Type\":1}]"),Le=function(t,n){return t|n},Ue=ji.reduce(Le,0),Fe=Pi.reduce(Le,0),De=function(){function t(t){void 0===t&&(t=0),this.rn=t}return t.prototype.has=function(t){return!!(this.rn&t)},t.prototype.set=function(n){if(this.rn&Fe&&n&Fe){var i=this.rn|n,r=t.en(i);this.rn=t.sn(r,this.rn)}else this.rn|=n},t.prototype.hasKinds=function(){return 0!==this.rn},t.areEqual=function(t,n){return null==t&&null==n||null!=t&&null!=n&&t.equals(n)},t.prototype.getStrictestPrivacyKind=function(){return t.en(this.rn)},t.en=function(t){for(var n=0,i=Pi;n<i.length;n++){var r=i[n];if(t&r)return r}return null},t.needsToObserve=function(t,n){var i,r,e=null!==(i=null==t?void 0:t.rn)&&void 0!==i?i:0;return!!((null!==(r=null==n?void 0:n.rn)&&void 0!==r?r:0)&~e&Ue)},t.combineKindsPreservePrivacy=function(n,i){var r,e,s=t.sn(null!==(r=null==n?void 0:n.rn)&&void 0!==r?r:0,null!==(e=null==i?void 0:i.rn)&&void 0!==e?e:0);return new t(s)},t.sn=function(t,n){return t&Fe|n&Ue},t.prototype.equals=function(t){return!!t&&this.rn===t.rn},t}();function Be(t){var n=document.documentElement||document.createElement("div");try{return o.elMatches(n,t),!0}catch(n){return Tt.sendToBugsnag("Browser rejected rule","warning",{selector:t,error:n.toString()}),!1}}var We={1:"exclude",2:"mask",3:"unmask",4:"watch",5:"keep",6:"defer"},qe=function(){function t(){this.on=Qe(),this.un=Qe()}return t.prototype.forConsentState=function(t){return t?this.on:this.un},t.prototype.addElementBlockRules=function(t){var n=this,i=Qe(),r=Qe();t.map(ze).filter(function(t){return Ve(t.selector)}).forEach(function(t){if(t.consent)return t.kind===_i.Unmask?void i[t.kind].push(t):void r[t.kind].push(t);i[t.kind].push(t),r[t.kind].push(t)});for(var e=document.documentElement||document.createElement("div"),s=function(t,i){try{if(0===t.length)return;var r=t.map(function(t){return t.selector}).join(", ");o.elMatches(e,r),i.push(r)}catch(i){Tt.sendToBugsnag("Browser rejected optimistic merge rule","warning"),n.It(t)}},u=0,a=Oi;u<a.length;u++){var c=a[u];s(i[c],this.on[c]),s(r[c],this.un[c])}},t.prototype.addRule=function(t,n,i){if(this.an(t,n,i))return!0;switch(t){case _i.Watch:case _i.Unmask:case _i.Keep:case _i.Defer:break;case _i.Mask:case _i.Exclude:default:this.on[t]=["*"],this.un[t]=["*"];}return!1},t.prototype.an=function(t,n,i){try{if(Ve(i)){if(n){var r=this.cn(t);return this.hn(t,r,i)}return this.hn(t,this.un,i)&&this.hn(t,this.on,i)}return!0}catch(t){return Tt.sendToBugsnag("Error adding block rule","error",{selector:i,error:t.toString()}),!1}},t.prototype.hn=function(t,n,i){var r=document.documentElement||document.createElement("div"),e=t;switch(e){case _i.Exclude:case _i.Mask:case _i.Unmask:case _i.Watch:case _i.Keep:case _i.Defer:break;default:e=_i.Exclude;}if(0==n[e].length)return!!Be(i)&&(n[e].push(i),!0);var s=n[e].length-1,u=n[e][s].concat(", ",i);try{o.elMatches(r,u)}catch(t){return!!Be(i)&&(n[e].push(i),Tt.sendToBugsnag("Browser rejected merged rule","warning",{kind:We[e],selector:i,error:t.toString()}),!0)}return n[e][s]=u,!0},t.prototype.addElementBlock=function(t){var n=ze(t),i=n.kind,r=n.consent,e=n.selector;return this.addRule(i,r,e)},t.prototype.It=function(t){for(var n=0,i=t;n<i.length;n++){var r=i[n],e=r.kind,s=r.consent,o=r.selector;this.addRule(e,s,o)}},t.prototype.cn=function(t){var n=t===_i.Unmask;return this.forConsentState(n)},t}();function Qe(){for(var t=Object.create?Object.create(null):{},n=0,i=Oi;n<i.length;n++)t[i[n]]=[];return t}function Ve(t){return!t.match(gi)&&""!=t.trim()}function ze(t){var n=_i.Exclude;switch(t.Type){case sn.Unset:case sn.Exclude:n=_i.Exclude;break;case sn.Mask:n=_i.Mask;break;case sn.Unmask:n=_i.Unmask;break;case sn.Watch:n=_i.Watch;break;case sn.Keep:n=_i.Keep;break;case sn.Defer:n=_i.Defer;break;default:(0,Ir.nt)(t.Type,"Unexpected block type: "+t.Type);}return{kind:n,consent:t.Consent,selector:t.Selector}}function $e(t){if(!(null==t?void 0:t.hasKinds()))return 0;var n=t.getStrictestPrivacyKind();return null===n?0:Pi.length-Pi.indexOf(n)}var Ge=function(){function t(){this.vn=new qe,this.ln=!br}return t.prototype.initialize=function(t){var n=t.blocks,i=t.deferreds,r=t.keeps,s=t.watches,o=t.canvasWatcherMode,u=(0,e.__spreadArray)([],Ne);if(n)for(var a=0,c=n;a<c.length;a++){var h=c[a];u.push(h)}if((null!=o?o:dn.Disabled)===dn.Disabled&&u.push({Consent:!1,Selector:"canvas",Type:sn.Exclude}),s)for(var f=0,v=s;f<v.length;f++){var l=v[f];u.push({Type:sn.Watch,Consent:Dt.RevokeConsent,Selector:l.Selector})}if(i)for(var d=0,p=i;d<p.length;d++){var w=p[d];u.push({Type:sn.Defer,Consent:Dt.RevokeConsent,Selector:w.Selector})}if(this.vn.addElementBlockRules(u),r)for(var g=0,m=r;g<m.length;g++){var y=m[g];this.addElementKeep(y)}},t.prototype.isWatched=function(t){var n,i=new De,r=this.vn.forConsentState(null!==(n=this.dn)&&void 0!==n&&n),e=this.pn(t,Pi,r)|this.wn(t,ji,r);return i.set(e),i.hasKinds()?i:null},t.prototype.pn=function(t,n,i){return this.wn(t,n,i,!0)},t.prototype.wn=function(t,n,i,r){void 0===r&&(r=!1);for(var e=0,s=0,u=n;s<u.length;s++){for(var a=u[s],c=!1,h=0,f=i[a];h<f.length;h++){var v=f[h];if(o.elMatches(t,v)){e|=a,c=!0;break}}if(c&&r)break}return e},t.prototype.addElementBlock=function(t){return this.vn.addElementBlock(t)},t.prototype.addElementKeep=function(t){var n=_i.Keep;return t.Type===on.Click&&this.addRule(n,t.Consent,t.Selector)},t.prototype.addRule=function(t,n,i){return this.vn.addRule(t,n,i)},t.prototype.getConsent=function(){return this.dn},t.prototype.initializeConsent=function(t){void 0===this.dn&&this.gn(t,!1)},t.prototype.setConsent=function(t){this.gn(t,!0)},t.prototype.gn=function(t,n){void 0===n&&(n=!0),this.dn!==t&&(this.dn=t,n&&this.onConsentChange&&this.onConsentChange())},t.prototype.allWatchedElements=function(t){var n;if(!this.ln)return null;for(var i=new WeakMap,r=!1,e=function(t,n){var e,s=null!==(e=i.get(t))&&void 0!==e?e:new De;s.set(n),i.set(t,s),r=!0},s=this.vn.forConsentState(null!==(n=this.dn)&&void 0!==n&&n),u=0,a=Oi;u<a.length;u++)for(var c=a[u],h=0,f=s[c];h<f.length;h++){var v=f[h];Je(t)&&o.elMatches(t,v)&&e(t,c);for(var l=Xe(t,v),d=0;d<l.length;d++)e(l[d],c)}return r?i:null},t}();function Xe(t,n){return Je(t)?o.elQuerySelectorAll(t,n):function(t){return 9===t.nodeType}(t)?o.docQuerySelectorAll(t,n):function(t){return 11===t.nodeType}(t)?o.docFragQuerySelectorAll(t,n):t.querySelectorAll(n)}function Je(t){return 1===t.nodeType}var Ze=function(){function t(t){this._t=t,this.mn={},this.yn={}}return t.create=function(t){return Ye.isSupported(t.window)?new Ye(t):new ts(t)},t.prototype.collect=function(t){var n=[];for(var i in this.yn)this.addPlaceholderResize(t,n,parseInt(i,10));return this.yn={},n},t.prototype.isObserved=function(t){return!!this.mn[t]},t.prototype.bn=function(t,n){if(1!==(null==t?void 0:t.nodeType))return{width:0,height:0};if(!n||o.arrayIsArray(n)&&0===n.length)return t.getBoundingClientRect();var i=Array.isArray(n)?n[0]:n;switch(getComputedStyle(t).writingMode){case"horizontal-tb":return{width:i.inlineSize,height:i.blockSize};case"vertical-lr":case"vertical-rl":return{width:i.blockSize,height:i.inlineSize};default:return t.getBoundingClientRect();}},t.prototype.addEntry=function(t,n){try{var i=Di(t);if(!i)return;if(1!=t.nodeType)return;var r=t,e=this.bn(r,n);this.yn[i]=e;var s=this._t.queue();if(!this.mn[i]&&void 0!==s)for(var o=this.flushSizeEvents(i),u=0,a=o;u<a.length;u++){var c=a[u];s.enqueue(c)}}catch(t){}},t.prototype.addPlaceholderResize=function(t,n,i){for(var r=0,s=this.flushSizeEvents(i);r<s.length;r++){var o=s[r];n.push((0,e.__assign)((0,e.__assign)({},o),{When:t}))}},t.prototype.flushSizeEvents=function(t){var n=this.yn[t];if(!n)return[];var i=Fi(t);if(!i)return[];var r=i.watchKind,e=n.width,s=n.height,o=this.mn[t];if(o&&o.w==e&&o.h==s)return[];this.mn[t]={w:e,h:s};var u=[];if(null==r?void 0:r.has(_i.Watch)){var a=0!=e&&0!=s;(!!o&&0!=o.w&&0!=o.h)!=a&&u.push({Kind:Ot.WATCHED_ELEM,Args:[t,a]})}var c=i.node,h=("scrollLeft"in c);return((null==r?void 0:r.has(_i.Exclude))||(null==r?void 0:r.has(_i.Defer))||i.mask||h)&&(u.push({Kind:Ot.PLACEHOLDER_SIZE,Args:[t,e,s]}),h&&u.push({Kind:Ot.RESIZE_SCROLLABLE_ELEMENT_CONTENT,Args:[t,c.scrollWidth,c.scrollHeight]})),u},t}(),Ye=function(t){function n(n){var i=t.call(this,n)||this;return i.En=new WeakMap,i.Sn=new WeakMap,i.xn=new n.window.ResizeObserver(function(t){for(var n=0,r=t;n<r.length;n++){var e=r[n],s=e.target,o=e.borderBoxSize;i.addEntry(s,o)}}),i.kn=new n.window.ResizeObserver(function(t){for(var n=0,r=t;n<r.length;n++){var e=r[n].target;i._n(e)}}),i}return(0,e.__extends)(n,t),n.isSupported=function(t){return"function"==typeof t.ResizeObserver},n.prototype.observe=function(t){var n=this;if(t&&1==t.nodeType){var i=t;this.xn.unobserve(i),this.xn.observe(i),this._t.measurer.requestMeasureTask(ii.Medium,function(){n.An(i)})}},n.prototype.unobserveSubtree=function(t){},n.prototype.nodeChanged=function(t){var n=this,i=this.Sn.get(t);"number"==typeof i&&Di(t)===i&&this._t.measurer.requestMeasureTask(ii.Medium,function(){n.addEntry(t)})},n.prototype._n=function(t){var n=this.En.get(t);if(n)for(var i in n){var r=Fi(n[i]);r?this.addEntry(r.node):delete n[i]}},n.prototype.An=function(t){var n=this,i=Di(t);if(i){var r=this.In(t);if(r&&r!==t){this.Sn.set(t,i),this.addEntry(t);var e=this.En.get(r);e||(e=Object.create(null),this.En.set(r,e)),e[i]=i,o.setWindowTimeout(this._t.window,X(function(){n.kn.observe(r)}),0)}}},n.prototype.In=function(t){for(var n=0,i=t;;){if(n++>1e3)return null;if(!i||1!=i.nodeType)return null;var r=i;if(getComputedStyle(r).display.indexOf("inline")<0)return r;i=i.parentNode}},n}(Ze),ts=function(t){function n(){return null!==t&&t.apply(this,arguments)||this}return(0,e.__extends)(n,t),n.prototype.observe=function(t){var n=this;if(t&&1==t.nodeType){var i=t;this.Tn(Ui(t)),this._t.measurer.requestMeasureTask(ii.Medium,function(){n.addEntry(i)})}},n.prototype.unobserveSubtree=function(t){var n=Ui(t);n&&this.Cn(n)},n.prototype.nodeChanged=function(t){var n=this,i=this.Pn(t);this._t.measurer.requestMeasureTask(ii.Medium,function(){for(var t=0,r=i;t<r.length;t++){var e=r[t];n.addEntry(e)}})},n.prototype.watchedChildren=function(t){return t.watchedChildren},n.prototype.Tn=function(t){if(t&&Ri(t.node))for(var n=t,i=t.parent;i;i=i.parent){if(this.watchedChildren(i)||(i.watchedChildren={}),this.watchedChildren(n))for(var r in this.watchedChildren(n))delete this.watchedChildren(i)[r];if(this.watchedChildren(i)[n.id]=n,st(this.watchedChildren(i),2))n=i;else if(ot(this.watchedChildren(i),2))break}},n.prototype.Pn=function(t){var n=[],i=Ui(t);if(i)for(var r=[i],e=0;r.length&&++e<1e3;){var s=r.pop();Ri(s.node)&&n.push(s.node),this.watchedChildren(s)&&rt(this.watchedChildren(s),function(t){r.push(t)})}else{for(var o=t;o&&!Di(o);)o=o.parentNode;o&&Ri(o)&&n.push(o)}return n},n.prototype.Cn=function(t){if(ot(this.watchedChildren(t),0)||Ri(t.node))for(var n=this.watchedChildren(t)&&ot(this.watchedChildren(t),1)||Ri(t.node)?t.id:function(t){for(var n in t)if(Object.prototype.hasOwnProperty.call(t,n))return n}(this.watchedChildren(t)),i=n?t.parent:null;i&&this.watchedChildren(i)&&this.watchedChildren(i)[n];){if(delete this.watchedChildren(i)[n],st(this.watchedChildren(i),1)){var r=i.id,e=et(this.watchedChildren(i));for(i=i.parent;i&&this.watchedChildren(i)&&this.watchedChildren(i)[r];)delete this.watchedChildren(i)[r],this.watchedChildren(i)[e.id]=e,i=i.parent;break}i=i.parent}},n}(Ze),ns={attributeName:null,attributeNamespace:null,addedNodes:[],removedNodes:[],nextSibling:null,previousSibling:null,oldValue:null};function is(t){return(0,e.__assign)((0,e.__assign)((0,e.__assign)({},ns),t),{type:"childList"})}function rs(t,n){return 0===n.length?is({target:t}):is({addedNodes:n,nextSibling:ut(n[n.length-1]),previousSibling:at(n[0]),target:t})}function es(t){var n=[];return Pe(t,function(t){n.push(t)}),rs(t,n)}var ss=function(){function t(t,n,i,r,e,s){var o=this;void 0===i&&(i=function(){}),void 0===r&&(r=function(){}),void 0===e&&(e=function(){}),this.Xt=n,this.jn=i,this.On=r,this.Mn=e,this.Zt=s,this.Kn=!1,this.Rn=[],this.Hn=[],this.Nn=[],this.Ln=[],this.Un=[],this.Fn=!1,this.Dn=t.window,this.Jt=Ze.create(t),this.Bn=new Ke(n,this.Jt,this.Zt),jt(!this.Xt.onConsentChange,"This is the only consent change listener."),this.Xt.onConsentChange=function(){return o.updateConsent()}}return t.prototype.start=function(t){void 0===t&&(t=this.Dn.document),this.Wn=t,this.Kn=!1;var n=!0;if(gr)try{this.setUpIEWorkarounds()}catch(t){n=!1}n&&(this.qn=new MutationObserver(this.Qn.bind(this)))},t.prototype.Vn=function(){this.qn&&this.qn.disconnect()},t.prototype.Qn=function(t){for(var n=0,i=t;n<i.length;n++){var r=i[n];this.Un.push(r)}},t.prototype.resizer=function(){return this.Jt},t.prototype.stop=function(){this.qn&&this.qn.disconnect();var t=Ui(this.Wn);t&&qi(t),this.Un=[],gr&&this.tearDownIEWorkarounds(),this.Xt.onConsentChange=null,this.zn&&(this.zn.disable(),this.zn=null)},t.prototype.processMutations=function(t){var n;if(!this.Wn)return[];var i=[];if(this.$n(t,i),this.Fn&&(i.push({Kind:Ot.FAIL_THROTTLED,Args:[Gt.SetPropertyHooks],When:t}),this.Fn=!1),this.Un.length>0||this.Hn.length>0){var r={},s={};for(var o in this.Gn(t,i,s,r),s){var u=o.split("\t");i.push({Kind:Ot.MUT_ATTR,Args:[parseInt(u[0],10),u[1],s[o]],When:t})}for(var o in r)i.push({Kind:Ot.MUT_TEXT,Args:[parseInt(o,10),r[o]],When:t})}var a=this.Rn;this.Rn=[];for(var c=0;c<a.length;c++){var h=a[c].shadowRoot;h&&0!=Di(a[c])&&0==Di(h)&&(this.Xn(h),this.Jn(null,t,i,a[c],h))}if(i.push.apply(i,this.Jt.collect(t)),this.Un=[],this.Ln.length>0&&(i.push({Kind:Ot.DEFERRED_RESOLVED,Args:(0,e.__spreadArray)([],this.Ln),When:t}),this.Ln=[]),this.Nn.length>0){for(var f=0,v=this.Nn;f<v.length;f++){var l=v[f];this.Ln.push(Di(l)),(null===(n=l.childNodes)||void 0===n?void 0:n.length)>0&&this.Un.push(es(l))}this.Nn=[]}return i},t.prototype.recordingIsDetached=function(){return!!this.Wn&&this.Wn!=this.Dn.document},t.prototype.$n=function(t,n){if(!this.Kn&&this.Wn){window;var i=this.Xt.allWatchedElements(this.Wn);this.Zn(i,t,n,null,this.Wn,null),this.Jt.nodeChanged(this.Wn),this.qn&&this.Xn(this.Wn),this.Kn=!0,this.Yn(),window}},t.prototype.Yn=function(){var t=this;this.zn=mt(Element.prototype,"attachShadow",!0),this.zn&&this.zn.before(function(n){n.that.shadowRoot||t.Rn.push(n.that)})},t.prototype.Xn=function(t){var n;try{null===(n=this.qn)||void 0===n||n.observe(t,{childList:!0,attributes:!0,characterData:!0,subtree:!0,attributeOldValue:!0,characterDataOldValue:!0})}catch(t){}},t.prototype.Gn=function(t,n,i,r){for(var e,s,o,u,a=this,c={},h={},f=function(i){if(Ui(i)){a.ti(t,n,Ui(i));var r=Ui(i.parentNode);r&&(h[r.id]=r.node)}},v=0;v<this.Un.length;++v)try{var l=this.Un[v];if("childList"===l.type&&1===(null===(s=l.target)||void 0===s?void 0:s.nodeType)&&"SLOT"===l.target.tagName){var d=os(l.target);if(d){var p=d[0],w=d[1];h[p]=w}}var g=Di(l.target);if(!g)continue;switch(c[g]=l.target,l.type){case"childList":if(l.removedNodes.length>0)for(var m=0;m<l.removedNodes.length;++m)(E=Ui(l.removedNodes[m]))&&E.id&&this.ti(t,n,E);if(l.addedNodes.length>0){h[g]=l.target;var y=!(null==(T=l.target)?void 0:T.shadowRoot)||Ie(T.shadowRoot)?null:Ui(T.shadowRoot);y&&(h[y.id]=y.node)}break;case"characterData":Hi(l.target)||l.oldValue!=l.target.textContent&&(r[g]=ie(l.target));break;case"attributes":var b=ki(j=l.target);if("link"===b&&"rel"===l.attributeName&&ee.test(null!==(o=l.oldValue)&&void 0!==o?o:"")){f(j);break}var E,S=Li(j),x=this.Xt.isWatched(j);if($e(x)>$e(S)){f(j);break}De.needsToObserve(S,x)&&(this.Jt.observe(j),(null==x?void 0:x.has(_i.Watch))&&(null===(u=this.Zt)||void 0===u||u.observe(j)),(E=Ui(j))&&(E.watchKind=De.combineKindsPreservePrivacy(S,x)));var k=(void 0===(I=l.attributeNamespace)&&(I=""),(null===I?"":{"http://www.w3.org/1999/xlink":"xlink:","http://www.w3.org/XML/1998/namespace":"xml:","http://www.w3.org/2000/xmlns/":"xmlns:"}[I]||"")+(l.attributeName||"")),_=re(k);if("dialog"===b&&"open"===k)break;if(j.hasAttribute(k)){var A=l.target.getAttribute(k);l.oldValue!=A&&(A=oe(l.target,_,A||"",b),this.Mn(b,l.target,((e={})[_]=A||"",e)),null!==A&&(i[g+"\t"+_]=A))}else i[g+"\t"+_]=null;}}catch(t){}for(var I,T,C=0,P=this.Hn;C<P.length;C++){var j=P[C];try{f(j)}catch(t){Tt.sendToBugsnag(t,"error")}}for(var O in this.Hn=[],h){var M=Ui(K=h[O]);M&&M.id&&this.ni(t,n,K,M)}for(var O in c){var K=c[O];this.Jt.nodeChanged(K)}},t.prototype.ii=function(t){return this.Kn&&t&&this.Wn?(this.ri(this.Wn),[]):[]},t.prototype.ri=function(t){var n=this;Di(t)||null===t.parentNode?Pe(t,function(t){n.ri(t)}):this.Un.push(rs(t.parentNode,[t]))},t.prototype.ni=function(t,n,i,r){var e=[],s=r.child;for(Pe(i,function(t){if(s)for(var n=Ui(t);s;){if(!Di(t)){e.push({insert:[i,t,s.node]});break}if(n&&s.id==n.id){s=s.next;break}e.push({remove:s}),s=s.next}else e.push({insert:[i,t,null]})});s;s=s.next)e.push({remove:s});for(var o=!1,u=0;u<e.length;u++){var a=e[u];a.insert?this.Zn(null,t,n,a.insert[0],a.insert[1],a.insert[2]):a.remove&&(o=!0,this.ti(t,n,a.remove))}jt(!o,"All remove events should have been generated earlier, in MutationWatcher.processMutations")},t.prototype.Jn=function(t,n,i,r,e){var s=Di(r),o=p(),u=this.ei(t,r,e,null),a=p()-o;u.length>0&&i.push({Kind:Ot.MUT_SHADOW,Args:[s,u],When:n},{Kind:Ot.TIMING,Args:[[Nt.Internal,Kt.Serialization,Ht.NodeEncoding,n,a]],When:n})},t.prototype.Zn=function(t,n,i,r,e,s){var o=Di(r)||-1,u=Di(s)||-1,a=-1===o&&-1===u,c=p();window;var h=this.ei(t,r,e,s);window;var f=p()-c;h.length>0&&i.push({Kind:Ot.MUT_INSERT,Args:[o,u,h],When:n},{Kind:Ot.TIMING,Args:[[Nt.Internal,Kt.Serialization,a?Ht.DomSnapshot:Ht.NodeEncoding,n,f]],When:n})},t.prototype.ei=function(t,n,i,r){var e=this;if(n&&Hi(n))return[];for(var s=[],o=this.Bn.tokenizeNode(t,n,r,i,function(t){if(1==t.nodeType){var n=t;if(n.shadowRoot&&e.Xn(n.shadowRoot),"SLOT"===t.nodeName){var i=Ui(t);(null==i?void 0:i.shadowRootType)===Te&&t.addEventListener("slotchange",Tt.wrap(function(n){var i;e.Hn.push(null!==(i=n.target)&&void 0!==i?i:t)}))}}e.jn(t,s)},this.Mn,function(t,n){switch(n){case Ai.Immediate:e.refreshElement(t);break;case Ai.Deferred:e.Nn.push(t);}}),u=0,a=s;u<a.length;u++)(0,a[u])();return o},t.prototype.ti=function(t,n,i){var r=i.id;if(this.On(i),Wi(i,this.Jt),n.length>0){var e=n[n.length-1];if(e.Kind==Ot.MUT_REMOVE)return void e.Args.push(r)}n.push({Kind:Ot.MUT_REMOVE,Args:[r],When:t})},t.prototype.setUpIEWorkarounds=function(){var n=this;if(mr){var i=Object.getOwnPropertyDescriptor(Node.prototype,"textContent"),r=i&&i.set;if(!i||!r)throw new Error("Missing textContent setter -- not safe to record mutations.");Object.defineProperty(Element.prototype,"textContent",(0,e.__assign)((0,e.__assign)({},i),{set:function(t){try{for(var n=void 0;n=this.firstChild;)this.removeChild(n);if(null===t||""==t)return;var i=(this.ownerDocument||document).createTextNode(t);this.appendChild(i)}catch(n){r&&r.call(this,t)}}}))}this.si=new tr(t.ThrottleMax,t.ThrottleInterval,function(){return new Yi(function(){n.Fn=!0,n.tearDownIEWorkarounds()}).start()});var s=this.si.guard(function(t){var n=t.cssText;t.cssText=n});this.si.open(),this.oi=mt(CSSStyleDeclaration.prototype,"setProperty"),this.oi&&this.oi.afterSync(function(t){s(t.that)}),this.ui=mt(CSSStyleDeclaration.prototype,"removeProperty"),this.ui&&this.ui.afterSync(function(t){s(t.that)})},t.prototype.tearDownIEWorkarounds=function(){this.si&&this.si.close(),this.oi&&this.oi.disable(),this.ui&&this.ui.disable()},t.prototype.updateConsent=function(){var t=this;this.Wn&&Pe(this.Wn,function(n){return t.refreshElement(n)})},t.prototype.refreshElement=function(t){Di(t)&&this.Hn.push(t)},t.ThrottleMax=1024,t.ThrottleInterval=1e4,t}();function os(t){for(var n=new WeakMap,i=t;i;i=i.parentNode){if(n.has(i))return null;if(n.set(i,!0),11===i.nodeType)break}if(!i)return null;var r=Ui(i);return(null==r?void 0:r.shadowRootType)===Te&&(null==r?void 0:r.parent)?[r.parent.id,r.parent.node]:null}var us="navigation",as="resource",cs="paint",hs="measure",fs="mark",vs="layout-shift",ls="first-input",ds="largest-contentful-paint",ps="longtask",ws=function(){function t(t,n,i,r){var e=this;this._t=t,this.At=n,this.ai=r,this.ci=!1,this.hi=!1,this.fi=!1,this.vi=!1,this.li=!1,this.di=!1,this.pi=!1,this.wi=cn.DefaultOrgSettings.MaxPerfMarksPerPage,this.gi=0,this.mi=!1,this.yi=!1,this.bi=!1,this.Ei=!1,this.Si=0,this.xi=!1,this.qn=null,this.ki=[],this._i=new Yn(function(t){e.Ai=function(){t({timeRemaining:function(){return Number.POSITIVE_INFINITY},didTimeout:!1}),e.Ai=void 0}}),this.Ii=!1;var s=window.performance;s&&(this.fi=!0,s.timing&&(this.vi=!0),s.memory&&(this.di=!0),s.timeOrigin&&(this.pi=!0),"function"==typeof s.getEntries&&(this.li=!0),this.mi=gs(window,vs),this.yi=gs(window,ls),this.bi=gs(window,ds),this.Ei=gs(window,ps),this.T=i.createChild())}return t.prototype.initialize=function(t){var n=t.resourceUploader,i=t.recTimings,r=t.recImgs,e=t.maxPerfMarksPerPage;this.Ti=n,this.hi=i,this.ci=r,this.wi=e||cn.DefaultOrgSettings.MaxPerfMarksPerPage},t.prototype.start=function(){var t=this;this.gi=0;var n=window.performance;n&&(this._t.recording.inFrame||this.At.enqueue({Kind:Ot.REC_FEAT_SUPPORTED,Args:[zt.Performance,this.vi,zt.PerformanceEntries,this.li,zt.PerformanceMemory,this.di,zt.PerformanceObserver,!!window.PerformanceObserver,zt.PerformanceTimeOrigin,this.pi,zt.LayoutShift,this.mi,zt.FirstInput,this.yi,zt.LargestContentfulPaint,this.bi,zt.LongTask,this.Ei]}),this.Xn(),!this.qn&&n.addEventListener&&n.removeEventListener&&this.T&&this.T.add(n,"resourcetimingbufferfull",!0,function(){t.At.enqueue({Kind:Ot.RESOURCE_TIMING_BUFFER_FULL,Args:[]})}),this.Ci(),this.Pi())},t.prototype.ji=function(){return(0,e.__awaiter)(this,void 0,Yn,function(){return(0,e.__generator)(this,function(t){switch(t.label){case 0:if(!this.fi||!this.li||0==this.ki.length)return[2];if(this.Ii)return[2];this.Ii=!0,t.label=1;case 1:return t.trys.push([1,,3,4]),[4,this.Oi()];case 2:return t.sent(),[3,4];case 3:return this.Ii=!1,this.ki=[],[7];case 4:return[2];}})})},t.prototype.Mi=function(){return this.Ai?Yn.race([this._i,si(250,1e3)]):this._i},t.prototype.Oi=function(){return(0,e.__awaiter)(this,void 0,Yn,function(){var t,n,i,r,s,o,u,a;return(0,e.__generator)(this,function(e){switch(e.label){case 0:t=0,n=0,i=this.ki,e.label=1;case 1:if(!(n<i.length))return[3,7];r=i[n],s=0,o=r,e.label=2;case 2:return s<o.length?(u=o[s],p()>t?[4,this.Mi()]:[3,4]):[3,6];case 3:a=e.sent(),t=p()+Math.max(a.timeRemaining(),15),e.label=4;case 4:this.Ki(u),e.label=5;case 5:return s++,[3,2];case 6:return n++,[3,1];case 7:return[2];}})})},t.prototype.onLoad=function(){this.xi||(this.xi=!0,this.vi&&(this.Ri(performance.timing),this.ji()))},t.prototype.tick=function(){this.Ci()},t.prototype.stop=function(){var t;this.T&&this.T.clear(),this.Ti=void 0;var n=[];this.qn?(this.qn.takeRecords&&(n=this.qn.takeRecords()),this.qn.disconnect()):window.performance&&window.performance.getEntries&&(n=window.performance.getEntries()),n.length>300&&(n=n.slice(0,300),this.At.enqueue({Kind:Ot.RESOURCE_TIMING_BUFFER_FULL,Args:[]})),this.Ci(),null===(t=this.Ai)||void 0===t||t.call(this),this.ki.push(n),this.ji()},t.prototype.Xn=function(){var t=this;if(!this.qn&&this.li&&window.PerformanceObserver){this.ki.push(performance.getEntries()),this.ji(),this.qn=new window.PerformanceObserver(function(n){var i=n.getEntries();t.ki.push(i),t.ji()});var n=[us,as,hs,fs];window.PerformancePaintTiming&&n.push(cs),this.mi&&n.push(vs),this.yi&&n.push(ls),this.bi&&n.push(ds),this.Ei&&n.push(ps),this.qn.observe({entryTypes:n})}},t.prototype.Ci=function(){if(this.di&&!this._t.recording.inFrame){var t=performance.memory;if(t){var n=t.usedJSHeapSize-this.Si;(0==this.Si||o.mathAbs(n/this.Si)>.2)&&(this.Hi(Qt.Memory,t,Vt.Memory),this.Si=t.usedJSHeapSize)}}},t.prototype.Pi=function(){var t={timeOrigin:d.timeOrigin};this.Hi(Qt.TimeOrigin,t,Vt.TimeOrigin)},t.prototype.Ki=function(t){switch(t.entryType){case us:this.Ni(t);break;case as:this.Li(t);break;case cs:this.Ui(t);break;case hs:this.Fi(t);break;case fs:this.Di(t);break;case vs:this.Bi(t);break;case ls:this.Wi(t);break;case ds:this.qi(t);break;case ps:this.Qi(t);}},t.prototype.Ri=function(t){this.Hi(Qt.Timing,t,Vt.Timing)},t.prototype.Ni=function(t){this.Hi(Qt.Navigation,t,Vt.Navigation,{name:us})},t.prototype.Li=function(t){if(this.hi){var n=t.initiatorType;(this.ci||"img"!==n&&"image"!==n)&&this.Hi(Qt.Resource,t,Vt.Resource,{name:n})}},t.prototype.Ui=function(t){this.Hi(Qt.Paint,t,Vt.Measure)},t.prototype.Di=function(t){this.Hi(Qt.Mark,t,Vt.Measure)},t.prototype.Fi=function(t){this.Hi(Qt.Measure,t,Vt.Measure)},t.prototype.Bi=function(t){this.Hi(Qt.LayoutShift,t,Vt.LayoutShift)},t.prototype.Wi=function(t){this.Hi(Qt.FirstInput,t,Vt.FirstInput)},t.prototype.qi=function(t){this.Hi(Qt.LargestContentfulPaint,t,Vt.LargestContentfulPaint)},t.prototype.Qi=function(t){this.Hi(Qt.LongTask,t,Vt.Measure)},t.prototype.Hi=function(t,n,i,r){if(void 0===r&&(r={}),!this.atLimit(t)){for(var e=[t],s=0,o=i;s<o.length;s++){var u=o[s],a=n[u];if(void 0===a&&(a=-1),u in r){var c=he(a,{source:"perfEntry",type:r[u]}),h=a===c;a=this.Vi(t,n,c,h)}e.push(a)}this.At.enqueue({Kind:Ot.PERF_ENTRY,Args:e})}},t.prototype.Vi=function(t,n,i,r){if(t===Qt.Resource)switch(n.initiatorType){case"":case"xmlhttprequest":case"fetch":case"script":case"beacon":return i;case"css":if(this.Ti&&!r){var e=Or("",i);this.Ti.uploadIfNeeded(this._t.window,e)}return this.ai.obfuscateUrl(i,"css");default:return this.ai.obfuscateUrl(i);}},t.prototype.atLimit=function(t){switch(t){case Qt.Mark:case Qt.Measure:if(this.gi>=this.wi)return!0;this.gi++;}return!1},t}();function gs(t,n){var i,r;return(null!==(r=null===(i=t.PerformanceObserver)||void 0===i?void 0:i.supportedEntryTypes)&&void 0!==r?r:[]).indexOf(n)>-1}function ms(t){var n=0,i={id:n++,edges:{}};return t.split("\n").forEach(function(t){var r=t.trim();if(""!=r){if(0==r.indexOf("/")||r.lastIndexOf("/")==r.length-1)throw new Error("Leading and trailing slashes are not supported");var e=i,s=r.split("/");s.forEach(function(t,i){var r=t.trim();if(""===r)throw new Error("Empty elements are not allowed");if("**"!=r&&"*"!=r&&-1!=r.indexOf("*"))throw new Error("Embedded wildcards are not supported");var o=null;r in e.edges&&(o=e.edges[r]),o||(o={id:n++,edges:{}},e.edges[r]=o),i==s.length-1&&(o.term=!0),e=o})}}),i}var ys=ms("**");function bs(t,n,i){if(!js(i)){try{for(var r=[],e=0,s=i;e<s.length;e++){var u=s[e];if(!u)return;var a=new Es(!0===u?ys:u);r.push(a)}var c=function(t,n){for(var i={},r=function(n){i[n]=function(){for(var i=[],r=0;r<arguments.length;r++)i[r]=arguments[r];for(var e=0,s=t;e<s.length;e++){var o=s[e];o[n].apply(o,i)}}},e=0,s=["push","pop"];e<s.length;e++)r(s[e]);return i}(r),h=0,f=[1],v=!1;return o.jsonStringify(t,function(t,i){var e=i,s=e&&"object"==typeof e;if(""==t&&1==f.length)return f[0]--,s&&f.push(o.objectKeys(e).length),e;for(c.push(t),r.some(function(t){return t.isRedacted(!s)})&&(e=cn.BlockedFieldValue,s=!1),h+=t.length+2,(h+=s?2:null===e?4:e.toString().length)>=n&&(v?e=void 0:(e="_fs_trimmed_values",v=!0)),f[f.length-1]--,e&&e!==cn.BlockedFieldValue&&s?f.push(o.objectKeys(e).length):c.pop();f[f.length-1]<=0;)f.pop(),c.pop();for(var u=0,a=r;u<a.length;u++){var l=a[u].depth();if(void 0!==l&&f.length>0&&l!==f.length-1)throw new Error("Property matcher depth out of sync")}return e})}catch(t){Tt.sendToBugsnag(t,"error")}return"[error serializing "+t.constructor.name+"]"}}var Es=function(){function t(t){this.zi=1;var n=[t];t.edges["**"]&&n.push(t.edges["**"]),this.$i=[n]}return t.prototype.Gi=function(){if(this.$i.length<=0)return[];var t=this.$i.length-1,n=this.$i[t];return"number"==typeof n?this.$i[t-1]:n},t.prototype.depth=function(){return this.zi},t.prototype.isRedacted=function(t){var n=this.Gi();return 0===n.length||t&&!n.some(function(t){return t.term})},t.prototype.push=function(t){var n;this.zi++;var i=this.Gi(),r=[];function e(n){n.edges["**"]&&(r.push(n.edges["**"],Ss(n)),e(n.edges["**"])),n.edges["*"]&&r.push(n.edges["*"]),n.edges[t]&&r.push(n.edges[t])}for(var s=0,o=i;s<o.length;s++){var u=o[s];if(null===(n=u.edges["**"])||void 0===n?void 0:n.term){r=[Ss(u),u.edges["**"]];break}e(u)}var a=!1;if(r.length!==i.length)a=!0;else for(var c=0;c<r.length;c++)if(r[c].id!==i[c].id){a=!0;break}a?this.$i.push(r):("number"!=typeof this.$i[this.$i.length-1]&&this.$i.push(0),this.$i[this.$i.length-1]++)},t.prototype.pop=function(){this.zi>0&&this.zi--;var t=this.$i[this.$i.length-1];"number"==typeof t&&t>1?this.$i[this.$i.length-1]--:this.$i.pop()},t}();function Ss(t){var n=t.edges["**"];if(!n)throw new Error("Node must have double-wildcard edge.");return ot(t.edges,1)?{id:-n.id,edges:{"**":n}}:t}var xs,ks,_s,As=function(){function t(t){this.Xi=t,this.Ji=null}return t.prototype.disable=function(){this.Ji&&(this.Ji.disable(),this.Ji=null)},t.prototype.enable=function(t){var n,i=this,r=T(t),s=null===(n=null==r?void 0:r._w)||void 0===n?void 0:n.fetch;(s||t.fetch)&&(this.Ji=mt(s?r._w:t,"fetch"),this.Ji&&this.Ji.afterSync(function(t){var n=t.result;t.result=(0,e.__awaiter)(i,void 0,void 0,function(){return(0,e.__generator)(this,function(i){switch(i.label){case 0:return i.trys.push([0,2,,3]),[4,this.Zi(n,t.args[0],t.args[1])];case 1:case 2:return i.sent(),[3,3];case 3:return[2,n];}})})}))},t.prototype.Zi=function(t,n,i){return(0,e.__awaiter)(this,void 0,Yn,function(){var r,s,o,u,a,c;return(0,e.__generator)(this,function(e){switch(e.label){case 0:return r="GET",s="",a=!1,"string"==typeof n?s=n:"url"in n?(s=n.url,r=n.method,o=n.body,u=n.headers,a=!!n.signal):s=""+n,s?(i&&(r=i.method||r,u=Ds(i.headers),o=i.body||o,a=!!i.signal||a),c=this.Yi(t),a&&s.search(/\/(graphql|gql)/i)>-1?[4,Yn.race([c,ni(5e3)])]:[3,2]):[2];case 1:e.sent(),e.label=2;case 2:return this.Xi.startRequest(r,s,{body:function(){return o},headers:u},c),[2];}})})},t.prototype.Yi=function(t){return(0,e.__awaiter)(this,void 0,Yn,function(){var n,i,r,s;return(0,e.__generator)(this,function(e){switch(e.label){case 0:return[4,t];case 1:if(n=e.sent(),i=n.headers,r=(i.get("content-type")||"default").split(";")[0],!(["default","text/plain","text/json","application/json"].indexOf(r)>-1))return[2,{status:n.status,data:{headers:i,body:null}}];s=null,e.label=2;case 2:return e.trys.push([2,4,,5]),[4,n.clone().text()];case 3:return s=e.sent(),[3,5];case 4:return e.sent(),[3,5];case 5:return[2,{status:n.status,data:{headers:i,body:s}}];}})})},t}(),Is=function(){function t(t){this.Xi=t,this.tr=new WeakMap}return t.prototype.disable=function(){this.nr&&(this.nr.disable(),this.nr=null),this.ir&&(this.ir.disable(),this.ir=null),this.rr&&(this.rr.disable(),this.rr=null)},t.prototype.er=function(t){var n=this.tr.get(t);if(n)return n;var i={};return this.tr.set(t,i),i},t.prototype.enable=function(t){var n,i,r,s,o=this,u=T(t),a=(null===(n=null==u?void 0:u._w)||void 0===n?void 0:n.XMLHttpRequest)||t.XMLHttpRequest;if(a){var c=a.prototype;this.nr=null===(i=mt(c,"open"))||void 0===i?void 0:i.before(function(t){var n=o.er(t.that);n.method=t.args[0],n.url=t.args[1]}),this.rr=null===(r=mt(c,"setRequestHeader"))||void 0===r?void 0:r.before(function(t){var n=t.that,i=t.args[0],r=t.args[1],e=o.er(n);e.headers||(e.headers=[]),e.headers.push([i,r])}),this.ir=null===(s=mt(c,"send"))||void 0===s?void 0:s.before(function(t){var n=t.that,i=t.args[0],r=o.er(n),s=r.url,u=r.method,a=r.headers;void 0!==s&&void 0!==u&&(o.tr["delete"](n),o.Xi.startRequest(u,s,{headers:Ds(a),body:i},function(t){return(0,e.__awaiter)(this,void 0,Yn,function(){var n;return(0,e.__generator)(this,function(i){switch(i.label){case 0:return[4,new Yn(function(n){t.addEventListener("readystatechange",function(){t.readyState===XMLHttpRequest.DONE&&n()}),t.addEventListener("load",n),t.addEventListener("error",n)})];case 1:return i.sent(),n=function(t){if(t)return{forEach:function(n){for(var i,r=/([^:]*):\s+(.*)(?:\r\n|$)/g;i=r.exec(t);)n(i[2],i[1])}}}(t.getAllResponseHeaders()),[2,{status:t.status,data:{headers:n,body:function(){return"text"===t.responseType?t.responseText:t.response}}}];}})})}(n)))})}},t}(),Ts=/^data:/i,Cs=function(){function t(t,n){this._t=t,this.At=n,this.sr=!1,this.ur=new Ps(t,n),this.ar=new Is(this.ur),this.cr=new As(this.ur)}return t.prototype.isEnabled=function(){return this.sr},t.prototype.start=function(t){t.AjaxWatcher&&(this.sr||(this.sr=!0,this.At.enqueue({Kind:Ot.REC_FEAT_SUPPORTED,Args:[zt.Ajax,!0]}),this.ar.enable(this._t.window),this.cr.enable(this._t.window)))},t.prototype.stop=function(){this.sr&&(this.sr=!1,this.ar.disable(),this.cr.disable())},t.prototype.tick=function(){this.ur.tick()},t.prototype.setWatches=function(t){this.ur.setWatches(t)},t.prototype.initialize=function(t){this.ur.initialize(t)},t}(),Ps=function(){function t(t,n){this._t=t,this.At=n,this.hr=[],this.vr={},this.lr={},this.dr=[],this.pr=0;var i=cn.DefaultOrgSettings;this.initialize({requests:i.HttpRequestHeadersAllowlist,responses:i.HttpResponseHeadersAllowlist,maxAjaxPayloadLength:i.MaxAjaxPayloadLength})}return t.prototype.wr=function(t){for(var n=!1,i=!1,r=[],e=[],s=0,o=this.hr;s<o.length;s++){var u=o[s],a=u.urlPattern,c=u.reqFields,h=u.rspFields;if(n&&i)break;a.test(t)&&(!1===c&&(r=[!1],n=!0),n||r.push(c),!1===h&&(e=[!1],i=!0),i||e.push(h))}return[r,e]},t.prototype.gr=function(t){this.dr.push(t)},t.prototype.setWatches=function(t){this.hr=t.map(function(t){return{urlPattern:new RegExp(t.URLRegex),reqFields:Ls(t.RecordReq,t.ReqAllowlist),rspFields:Ls(t.RecordRsp,t.RspAllowlist)}})},t.prototype.initialize=function(t){var n=this,i=t.requests,r=t.responses,e=t.maxAjaxPayloadLength;this.vr={},this.lr={},null==i||i.forEach(function(t){return n.vr[t]=!0}),null==r||r.forEach(function(t){return n.lr[t]=!0}),this.pr=e||cn.DefaultOrgSettings.MaxAjaxPayloadLength},t.prototype.addHeaderAllowlist=function(t,n){var i=this;null==t||t.forEach(function(t){return i.vr[t]=!0}),null==n||n.forEach(function(t){return i.lr[t]=!0})},t.prototype.tick=function(){for(var t=0;t<this.dr.length;t++)this.At.enqueue({Kind:Ot.AJAX_REQUEST,Args:this.dr[t]});this.dr=[]},t.prototype.startRequest=function(t,n,i,r){var s,o;return(0,e.__awaiter)(this,void 0,Yn,function(){var u,a,c,h,f,v,l,d,w,g,m,y;return(0,e.__generator)(this,function(e){switch(e.label){case 0:return Ts.test(n)?[2]:(u=p(),a=function(t,n){return jr.resolveToDocument(t,n)}(this._t.window,n),c=this.wr(a),h=c[0],f=c[1],[4,this.mr(h,i)]);case 1:return v=e.sent(),[4,r["catch"](function(){return{status:0,data:{headers:{forEach:function(){}},body:void 0}}})];case 2:return l=e.sent(),d=l.status,w=l.data,g=p()-u,[4,this.yr(f,w)];case 3:return m=e.sent(),y=[t,he(a,{source:"event",type:Ot.AJAX_REQUEST}),g,d,v.headers,m.headers,u,v.size,m.size,null!==(s=v.text)&&void 0!==s?s:null,null!==(o=m.text)&&void 0!==o?o:null,v.legibility,m.legibility],this.gr(y),[2];}})})},t.prototype.mr=function(t,n){return Us(this.vr,t,this.pr,n)},t.prototype.yr=function(t,n){return Us(this.lr,t,this.pr,n)},t}();function js(t){return 0===t.length||t.indexOf(!1)>-1}function Os(t,n,i){return[t.length,Ns(t,n,i)]}function Ms(t,n,i){var r=void 0;return js(n)||(r=bs(t,i,n)),[Hs(t),r]}function Ks(t,n){var i=t.byteLength,r=void 0;return js(n)||(r="[ArrayBuffer]"),[i,r]}function Rs(t,n,i){return(0,e.__awaiter)(this,void 0,Yn,function(){var r,s,o,u,a;return(0,e.__generator)(this,function(e){switch(e.label){case 0:if(s=(r=t).size,js(n))return[2,[s,void 0]];switch(r.type){case"application/json":case"application/vnd.api+json":case"text/plain":return[3,1];}return[3,4];case 1:return e.trys.push([1,3,,4]),[4,r.text()["catch"](function(t){Tt.sendToBugsnag(t,"warning")})];case 2:return(o=e.sent())&&(u=Ns(o,n,i))?[2,[s,u]]:[3,4];case 3:return a=e.sent(),Tt.sendToBugsnag(a,"warning"),[3,4];case 4:return[2,[s,"[Blob]"]];}})})}function Hs(t){try{return o.jsonStringify(t).length}catch(t){}return 0}function Ns(t,n,i){if(!js(n))try{return bs(o.jsonParse(t),i,n)}catch(r){return n.length>0&&n.every(function(t){return!0===t})?t.slice(0,i):void 0}}function Ls(t,n){switch(t){default:case Zt.Elide:return!1;case Zt.Record:return!0;case Zt.Allowlist:try{return ms(n)}catch(t){return!1}}}function Us(t,n,i,r){var s;return(0,e.__awaiter)(this,void 0,Yn,function(){var o,u,a,c,h,f,v;return(0,e.__generator)(this,function(e){switch(e.label){case 0:return o="",null===(s=r.headers)||void 0===s||s.forEach(function(n,i){var r=i.toLowerCase(),e=t[r];o+=r+(e?": "+n:"")+"\r\n"}),"function"!=typeof(u=null==r?void 0:r.body)?[3,2]:[4,u()];case 1:return a=e.sent(),[3,3];case 2:a=u,e.label=3;case 3:return[4,Fs(n,a,i)];case 4:return c=e.sent(),h=c[0],f=c[1],v=0!==h||f?qt.NotEmpty:qt.Unknown,[2,{headers:o,text:f,size:h,legibility:v}];}})})}function Fs(t,n,i){return void 0===i&&(i=cn.DefaultOrgSettings.MaxAjaxPayloadLength),(0,e.__awaiter)(this,void 0,Yn,function(){var r;return(0,e.__generator)(this,function(e){if(null==n)return[2,[0,void 0]];switch(typeof n){default:return[2,[-1,js(t)?void 0:"[unknown]"]];case"string":return[2,Os(n,t,i)];case"object":switch(r=n.constructor){case Object:default:return[2,Ms(n,t,i)];case Blob:return[2,Rs(n,t,i)];case ArrayBuffer:return[2,Ks(n,t)];case Document:case FormData:case URLSearchParams:case ReadableStream:return[2,[-1,js(t)?void 0:""+r.name]];}}return[2]})})}function Ds(t){return t?tt(t)?{forEach:function(n){for(var i=0,r=t;i<r.length;i++){var e=r[i],s=e[0];n(e[1],s)}}}:"function"==typeof t.forEach?t:{forEach:function(n){for(var i in t)Object.prototype.hasOwnProperty.call(t,i)&&n(t[i],i)}}:t}function Bs(t){return t?t.sheet:void 0}function Ws(t){try{return t?t.cssRules||t.rules:void 0}catch(t){return}}!function(t){t[t.CSS_INHERIT=0]="CSS_INHERIT",t[t.CSS_PRIMITIVE_VALUE=1]="CSS_PRIMITIVE_VALUE",t[t.CSS_VALUE_LIST=2]="CSS_VALUE_LIST",t[t.CSS_CUSTOM=3]="CSS_CUSTOM"}(xs||(xs={})),function(t){t[t.CSS_UNKNOWN=0]="CSS_UNKNOWN",t[t.CSS_NUMBER=1]="CSS_NUMBER",t[t.CSS_PERCENTAGE=2]="CSS_PERCENTAGE",t[t.CSS_EMS=3]="CSS_EMS",t[t.CSS_EXS=4]="CSS_EXS",t[t.CSS_PX=5]="CSS_PX",t[t.CSS_CM=6]="CSS_CM",t[t.CSS_MM=7]="CSS_MM",t[t.CSS_IN=8]="CSS_IN",t[t.CSS_PT=9]="CSS_PT",t[t.CSS_PC=10]="CSS_PC",t[t.CSS_DEG=11]="CSS_DEG",t[t.CSS_RAD=12]="CSS_RAD",t[t.CSS_GRAD=13]="CSS_GRAD",t[t.CSS_MS=14]="CSS_MS",t[t.CSS_S=15]="CSS_S",t[t.CSS_HZ=16]="CSS_HZ",t[t.CSS_KHZ=17]="CSS_KHZ",t[t.CSS_DIMENSION=18]="CSS_DIMENSION",t[t.CSS_STRING=19]="CSS_STRING",t[t.CSS_URI=20]="CSS_URI",t[t.CSS_IDENT=21]="CSS_IDENT",t[t.CSS_ATTR=22]="CSS_ATTR",t[t.CSS_COUNTER=23]="CSS_COUNTER",t[t.CSS_RECT=24]="CSS_RECT",t[t.CSS_RGBCOLOR=25]="CSS_RGBCOLOR",t[t.CSS_VW=26]="CSS_VW",t[t.CSS_VH=27]="CSS_VH",t[t.CSS_VMIN=28]="CSS_VMIN",t[t.CSS_VMAX=29]="CSS_VMAX"}(ks||(ks={}));var qs="EventQueue not defined for 'withEventQueueFor', likely caused by holding ref to callback",Qs="_fs_stylesheet_hooked",Vs=["CSSMediaRule","CSSSupportsRule"],zs=function(){function t(n,i,r){var e=this;void 0===r&&(r=Yi),this._t=n,this.At=i,this.Dt=[],this.br=[],this.Er=1,this.Sr=!1,this.kr=new Map,this._r=new Y,this.Ar=new Y,this.Ir=0,this.Tr=new Y;var s=t;this.Cr=new tr(s.ThrottleMax,s.ThrottleInterval,function(){return setTimeout(function(){e.At.enqueue({Kind:Ot.FAIL_THROTTLED,Args:[Gt.StyleSheetHooks]}),e.stop()})}),this.addInsert=this.Cr.guard(this.addInsert),this.addDelete=this.Cr.guard(this.addDelete),this.Pr=new r(function(){e.jr()},t.FlushCSSInterval),this.Or=ft(function(t,n){var i,r;if(!(null===(i=t.parentRule)||void 0===i?void 0:i.parentStyleSheet)||!e.Sr)return!0;var s=t.parentRule;return e.kr.has(s)||e.kr.set(s,new Set),null===(r=e.kr.get(s))||void 0===r||r.add(n),e.Pr.isRunning()||e.Pr.start(),!0})}return t.prototype.start=function(){var t=this;this.Cr.open();var n=this._t.window;if(n.CSSStyleSheet&&n.StyleSheet){var i=n.CSSStyleSheet.prototype;this.Ji(i),this.Mr(n),this.Kr(n),this.br.push(yt(n.StyleSheet,"disabled",function(n,i){return t.onDisableSheet(n,i)}),yt(n.Document,"adoptedStyleSheets",function(n,i){return t.onSetAdoptedStyleSheets(n)}),yt(n.ShadowRoot,"adoptedStyleSheets",function(n,i){return t.onSetAdoptedStyleSheets(n)})),this.Sr=!0}},t.prototype.Mr=function(t){var n,i,r=this,e=function(t){var n=mt(t,"insertRule");n&&(n.afterSync(function(t){r.Rr(t.that,t.args[0],t.args[1])}),r.Dt.push(n)),(n=mt(t,"deleteRule"))&&(n.afterSync(function(t){r.Hr(t.that,t.args[0])}),r.Dt.push(n))};if("function"==typeof(null===(n=t.CSSGroupingRule)||void 0===n?void 0:n.prototype.insertRule))e(t.CSSGroupingRule.prototype);else for(var s=0,o=Vs;s<o.length;s++){var u=null===(i=t[o[s]])||void 0===i?void 0:i.prototype;u&&e(u)}},t.prototype.Kr=function(t){var n=this;if(!this.Sr){var i=mt(CSSStyleDeclaration.prototype,"setProperty");i&&(i.afterSync(function(t){n.Or(t.that,t.args[0])}),this.Dt.push(i));var r=CSSStyleRule.prototype,s=Object.getOwnPropertyDescriptor(r,"style");this.Nr||(this.Nr=null==s?void 0:s.get);var o=this;this.Lr=function(){var t,n=null===(t=null==s?void 0:s.get)||void 0===t?void 0:t.apply(this);return ft(function(){n=o.Ur(n)})(),n};try{Object.defineProperty(r,"style",(0,e.__assign)((0,e.__assign)({},s),{get:o.Lr}))}catch(t){}}},t.prototype.Ur=function(t){var n=this._r.get(t);if(n)return n;var i=function(t,n,i){if("function"!=typeof t.Proxy)return n;var r=new t.Proxy(n,{get:function(t,n){var i=t[n];return"function"!=typeof i?i:function(){for(var n=[],e=0;e<arguments.length;e++)n[e]=arguments[e];var s=this;return s===r&&(s=t),i.apply(s,n)}},set:function(t,n,r){var e=t[n];return t[n]=r,"function"==typeof e||"symbol"==typeof n||i(t,n),!0}});return r}(this._t.window,t,X(this.Or));return this._r.set(t,i),i},t.prototype.jr=function(){var t=this,n=this.kr;this.kr=new Map,n.forEach(function(n,i){var r=i.parentStyleSheet;if(r){var e=t.Fr(r,i);if(void 0!==e){var s={};n.forEach(function(t){s[t]=i.style[t]}),t.Dr(r,function(t){t.enqueue({Kind:Ot.CSSRULE_UPDATE,Args:[e,s]})})}}})},t.prototype.Rr=function(t,n,i){var r=this.Br(t);this.addInsert(t.parentStyleSheet,n,i,r)},t.prototype.Hr=function(t,n){var i=this.Br(t);this.addDelete(t.parentStyleSheet,n,i)},t.prototype.Br=function(t){for(var n=[],i=t;i.parentRule||i.parentStyleSheet;){var r;if(!(null==(r=i.parentRule?i.parentRule:i.parentStyleSheet)?void 0:r.cssRules))return Tt.sendToBugsnag("Could not find a path to target rule","warning"),n;var e=this.Wr(r.cssRules,i);if(e>-1){if(n.unshift(e),r instanceof CSSStyleSheet)break;i=r}else Tt.sendToBugsnag("Could not find intermediate rule in parent","warning")}return n},t.prototype.Wr=function(t,n){for(var i=0;i<t.length;i++)if(t[i]===n)return i;return-1},t.prototype.Ji=function(t){var n,i=this;(n=mt(t,"insertRule"))&&(n.afterSync(function(t){i.addInsert(t.that,t.args[0],t.args[1])}),this.Dt.push(n)),(n=mt(t,"deleteRule"))&&(n.afterSync(function(t){i.addDelete(t.that,t.args[0])}),this.Dt.push(n)),(n=mt(t,"replaceSync"))&&(n.afterSync(function(t){i.snapshotConstructedStylesheet(t.that,!0)}),this.Dt.push(n)),(n=mt(t,"replace"))&&(n.afterSync(function(t){return(0,e.__awaiter)(i,void 0,Yn,function(){return(0,e.__generator)(this,function(n){switch(n.label){case 0:return"object"!=typeof t.result||"function"!=typeof t.result.then?[2]:[4,t.result];case 1:return n.sent(),this.snapshotConstructedStylesheet(t.that,!0),[2];}})})}),this.Dt.push(n)),Object.defineProperty(t,Qs,{value:!0,configurable:!0})},t.prototype.onSetAdoptedStyleSheets=function(t){if(Di(t)){var n=t.adoptedStyleSheets;if(n){for(var i=[],r=0,e=n;r<e.length;r++){var s=e[r],o=this.snapshotConstructedStylesheet(s);i.push(o),!0===s.disabled&&this.onDisableSheet(s,!0)}this.At.enqueue({Kind:Ot.ADOPTED_STYLESHEETS,Args:[Di(t),i]})}}},t.prototype.snapshotEl=function(t,n){void 0===n&&(n=0);var i=Di(t);if(i){var r=Bs(t);r&&this.qr([$t.Node,i],r,n)}},t.prototype.snapshotConstructedStylesheet=function(t,n){void 0===n&&(n=!1);var i=Zs(this.Tr,t);return n||void 0===i?(void 0===i&&(i=this.Er++,function(t,n,i){t.set(n,i)}(this.Tr,t,i)),this.qr([$t.Sheet,i],t),i):i},t.prototype.qr=function(t,n,i){void 0===i&&(i=0),this.At.enqueue({Kind:Ot.RESET_CSS_SHEET,Args:[t]});var r=Ws(n);if(r){for(var e=[],s=i;s<r.length;s++)try{var o=Ys(Gs(r[s]));e.push(o)}catch(t){e.push("html {}")}this.At.enqueue({Kind:Ot.CSSRULE_INSERT,Args:[t,e,i]})}},t.prototype.addInsert=function(t,n,i,r){var e=Js(this.Tr,t,$t.Node);if(e&&"string"==typeof n){var s=[e,[Ys(n)]];void 0!==i&&(s[2]=i),void 0!==r&&(s[3]=r),this.Dr(t,function(t){return t.enqueue({Kind:Ot.CSSRULE_INSERT,Args:s})})}},t.prototype.addDelete=function(t,n,i){var r=Js(this.Tr,t,$t.Node);r&&this.Dr(t,function(t){return t.enqueue({Kind:Ot.CSSRULE_DELETE,Args:i?[r,n,i]:[r,n]})})},t.prototype.onDisableSheet=function(t,n){var i=Js(this.Tr,t,$t.Node);i&&this.Dr(t,function(t){return t.enqueue({Kind:Ot.DISABLE_STYLESHEET,Args:[i,!!n]})})},t.prototype.Dr=function(t,n){if(t.ownerNode)return i=this._t,r=t.ownerNode,e=n,void((s=T(function(t){var n=t.ownerDocument;return n&&n.defaultView}(r)||i.window))&&"function"==typeof s._withEventQueue&&s._withEventQueue(i.recording.pageSignature(),function(t){var n=t;e({enqueue:function(t){jt(null!=n,qs)&&n.enqueue(t)},enqueueFirst:function(t){jt(null!=n,qs)&&n.enqueueFirst(t)}}),n=null}));var i,r,e,s;n(this.At)},t.prototype.Fr=function(t,n){var i;if(this.Ar.has(n))return[Ft.Cached,this.Ar.get(n)];var r=Array.prototype.indexOf.call(null===(i=n.parentStyleSheet)||void 0===i?void 0:i.cssRules,n);if(-1!==r){var e=Js(this.Tr,t,$t.Node);if(e){var s=this.Ir++;return this.Ar.set(n,s),[Ft.Index,e,r]}}},t.prototype.stop=function(){this.Sr=!1,this.Cr.close();for(var t=0,n=this.Dt;t<n.length;t++){var i=n[t];i.disable(),Object.defineProperty(i.getTarget(),Qs,{value:!1,configurable:!0})}this.Dt=[];for(var r=0,s=this.br;r<s.length;r++)(0,s[r])();if(this.br=[],this.Nr){this.Pr.stop();try{var o=CSSStyleRule.prototype,u=Object.getOwnPropertyDescriptor(o,"style");if((null==u?void 0:u.get)!==this.Lr)return;Object.defineProperty(o,"style",(0,e.__assign)((0,e.__assign)({},u),{get:this.Nr}))}catch(t){}}},t.prototype.ensureHook=function(t){this.Qr(t)||t[Qs]||this.Ji(t)},t.prototype.removeHook=function(t){if(!this.Qr(t))for(var n=0;n<this.Dt.length;n++){var i=this.Dt[n],r=i.getTarget();if(t===r){i.disable(),this.Dt.splice(n,1),Object.defineProperty(r,Qs,{value:!1,configurable:!0});break}}},t.prototype.Qr=function(t){return Object.getPrototypeOf(t)===this._t.window.CSSStyleSheet},t.ThrottleMax=1e4,t.ThrottleInterval=1e4,t.FlushCSSInterval=50,t}(),$s=document.createElement("div");$s.style.width="initial";var Gs=""!=$s.style.cssText?function(t){return t.cssText}:function t(n,i){if(void 0===i&&(i=0),!jt(i<=20,"No deep recursion for CSS rules"))return"html { /* Depth limit exceeded! */ }";var r=function(t){switch(t.type){case CSSRule.PAGE_RULE:var n=t.selectorText||"";return n&&it(n,"@page")?n:"@page "+n;case CSSRule.KEYFRAME_RULE:return t.keyText;case CSSRule.STYLE_RULE:return t.selectorText;case CSSRule.MEDIA_RULE:return"@media "+t.media.mediaText;case CSSRule.KEYFRAMES_RULE:return"@keyframes "+t.name;case CSSRule.SUPPORTS_RULE:return"@supports "+t.conditionText;default:return null;}}(n);if(null==r)return n.cssText;var e=function(n,i){var r,e,s,o,u=n,a=u.style;if(a){for(var c="",h=0;h<a.length;h++){var f=a[h],v=void 0!==(o=function(t,n){var i=t;if("function"==typeof i.getPropertyCSSValue){var r=i.getPropertyCSSValue(n);if(null!=r){var e;switch(r.cssValueType){case xs.CSS_PRIMITIVE_VALUE:e=r;break;case xs.CSS_VALUE_LIST:if(1!==r.length)return;var s=r.item(0);if(null==s)return;if(s.cssValueType!==xs.CSS_PRIMITIVE_VALUE)return;e=s;break;default:return;}if(e.primitiveType===ks.CSS_STRING){var o=Pr();_s||(_s=o.createElement("div"));var u=e.cssText;try{_s.style.cssText=n+": \""+u+"\";";var a=_s.style.getPropertyCSSValue(n);if(null==a)return;if(u!==a.cssText)return}catch(t){return}finally{_s.style.cssText=""}return"\""+u+"\""}}}}(e=a,s=f))?o:e.getPropertyValue(s);("initial"===v||("\""===(r=v)[0]||"'"===r[0])&&r[r.length-1]===r[0])&&(c+=f+": "+v,"important"===a.getPropertyPriority(f)&&(c+=" !important"),c+="; ")}return[a.cssText,c].filter(Boolean).join("\n")}var l=u.cssRules;if(!l)return null;var d="";for(h=0;h<l.length;h++)d+=t(l[h],i+1);return d}(n,i);return null==e?n.cssText:r+" { "+e+"} "},Xs=/^\s*$/;function Js(t,n,i){var r=function(t,n){var i=Zs(t,n);if(i)return[$t.Sheet,i];var r=Di(n.ownerNode);return r?[$t.Node,r]:void 0}(t,n);if(r){var e=r[0],s=r[1];return e===i?s:r}}function Zs(t,n){return t.get(n)}function Ys(t){return t.length<=ne?t:(t.length,":root { --fs-dropped-large-rule: 0 }")}var to=function(){function t(t,n,i){this._t=t,this.Vr=n,this.T=i.createChild()}return t.prototype.start=function(){var t=this,n=this._t.window.document;this.T.addCustom(n,this.zr(),!0,function(n){t.onFullscreenChange(n)}),this.T.addCustom(n,this.$r(),!0,function(n){t.onFullscreenError(n)})},t.prototype.stop=function(){this.T&&this.T.clear()},t.prototype.onFullscreenChange=function(t){var n=this.Gr();if(n){var i=Di(n);this.Xr,this.Vr.enqueue({Kind:Ot.FULLSCREEN,Args:[i,!0]}),this.Xr=i}else this.Xr,this.Vr.enqueue({Kind:Ot.FULLSCREEN,Args:[this.Xr,!1]}),this.Xr=void 0},t.prototype.onFullscreenError=function(t){this.Vr.enqueue({Kind:Ot.FULLSCREEN_ERROR,Args:[]})},t.prototype.Gr=function(){var t=this._t.window.document;return t[Ar(t,"fullscreenElement")]},t.prototype.zr=function(){return Ar(this._t.window.document,"onfullscreenchange").slice(2)},t.prototype.$r=function(){return Ar(this._t.window.document,"onfullscreenerror").slice(2)},t}(),no=to,io=function(){function t(t,n){this.At=n,this.ft=null,this.Jr={};var i=t.window;"customElements"in i&&"get"in i.customElements&&"whenDefined"in i.customElements&&(this.ft=i.customElements)}return t.prototype.start=function(){},t.prototype.stop=function(){},t.prototype.onCustomNodeVisited=function(t){return(0,e.__awaiter)(this,void 0,Yn,function(){var n,i;return(0,e.__generator)(this,function(r){switch(r.label){case 0:if(!this.ft)return[2];if(n=t.nodeName.toLowerCase(),Object.prototype.hasOwnProperty.call(this.Jr,n))return[2];r.label=1;case 1:return r.trys.push([1,3,,4]),i=!!this.ft.get(n),this.Jr[n]=i,[4,this.ft.whenDefined(n)];case 2:return r.sent(),this.At.enqueue({Kind:Ot.CUSTOM_ELEMENT_DEFINED,Args:[n]}),[3,4];case 3:return r.sent(),[3,4];case 4:return[2];}})})},t}(),ro=function(){function t(t,n){var i;this.Dn=t,this.At=[],this.Zr=!1,this.lt=null!==(i=n.interval)&&void 0!==i?i:1e3,this.Yr=n.onFlush}return t.prototype.append=function(t){this.schedule(),this.At.push(t)},t.prototype.flush=function(){this.Zr=!1,this.Yr(this.At),this.At=[]},t.prototype.schedule=function(){this.Zr||(o.setWindowTimeout(this.Dn,X(this.flush.bind(this)),this.lt),this.Zr=!0)},t}(),eo=function(){function t(t){this.te=!1,this.Yr=t}return t.prototype.flush=function(){this.Yr(),this.te=!1},t.prototype.schedule=function(){var t=this;this.te||(this.te=!0,Yn.resolve().then(function(){t.flush()})["catch"](function(t){return Tt.sendToBugsnag(t,"error")}))},t}(),so=function(){function t(t,n){this.Ut=!1,this.Dt=[],this.Qt=n,this.Wt=t.window,this.Ut=oo(this.Wt)}return t.prototype.start=function(){this.Qt.enqueue({Kind:Ot.REC_FEAT_SUPPORTED,Args:[zt.HTMLDialogElement,this.Ut]}),this.Ut&&(this.zt("show"),this.zt("showModal"),this.zt("close"))},t.prototype.stop=function(){this.Dt.forEach(function(t){return t.disable()}),this.Dt=[]},t.prototype.zt=function(t){var n=this,i=mt(this.Wt.HTMLDialogElement.prototype,t);null==i||i.afterSync(function(i){var r=Di(i.that),e="close"!==t,s="showModal"===t;n.Qt.enqueue({Kind:Ot.DIALOG,Args:[r,e,s]})}),i&&this.Dt.push(i)},t}(),oo=function(t){return void 0!==t.HTMLDialogElement},uo=function(t){try{return o.elMatches(t,"dialog:modal")}catch(t){return!0}},ao=function(){function t(){}return t.prototype.now=function(){return Date.now()},t}(),co=new(function(){function t(t,n,i,r){void 0===i&&(i=n),void 0===r&&(r=new ao),this.ne=t,this.ie=n,this.ee=r,this.se=r.now(),this.oe=i}return t.prototype.hasCapacityFor=function(t){var n=this.ee.now(),i=(n-this.se)*this.ne;return this.oe=Math.min(this.ie,this.oe+i),this.se=n,this.oe>=t?(this.oe-=t,[!0,0]):[!1,(t-this.oe)/this.ne]},t}())(2,2e5),ho=new Set(["measureText","getImageData","getError","getTransform","isContextLost","isEnabled","isFramebuffer","isProgram","isRenderbuffer","isShader","isTexture"]),fo=new Set(["fillText"]),vo=function(){function t(t,n,i,r){this.At=n,this.Ti=i,this.ai=r,this.ue=dn.CaptureCanvasOps,this.ae=[],this.ce=[],this.he=new WeakMap,this.fe=new WeakMap,this.ve=new Set,this.le=0,this.de=new WeakMap,this.pe=!1,this.we=new WeakMap,this.ge=new Set,this.me=new WeakMap,this.ye=1,this.be=new WeakMap,this.Ee=1,this.Se=0,this.xe=!1}return t.prototype.start=function(t){var n,i=this;if(t.CanvasWatcherMode&&(this.At.enqueue({Kind:Ot.REC_FEAT_SUPPORTED,Args:[zt.CanvasWatcherEnabled,!0]}),this.pe=!0,this.ue=null!==(n=t.CanvasWatcherMode)&&void 0!==n?n:dn.CaptureCanvasOps,this.Ji("2d",CanvasRenderingContext2D),this.Ji("webgl",WebGLRenderingContext),this.ue===dn.ScreenshotCanvas)){if(!HTMLCanvasElement.prototype.toDataURL)return;this.le=setInterval(function(){return i.screenshotConnectedCanvases()},1e3)}},t.prototype.ke=function(t,n){return"object"!=typeof n?[void 0,0]:(this.be.has(n)||this.be.set(n,[t,this.Ee++]),this.be.get(n))},t.prototype.Ji=function(t,n){var i=this;if(n)for(var r=n.prototype,e=function(e){if(ho.has(e))return"continue";var o=Object.getOwnPropertyDescriptor(r,e);if("function"==typeof(null==o?void 0:o.value)){var u=mt(r,e);u&&(u.afterSync(function(n){return i._e(t,e,n.that,n.args,n.result)}),s.ae.push(u))}else"function"==typeof(null==o?void 0:o.set)&&s.ce.push(yt(n,e,s.Ae(t,e)))},s=this,o=0,u=Object.keys(r);o<u.length;o++)e(u[o])},t.prototype.Ie=function(t,n){var i;this.we.has(t)||this.we.set(t,[]),null===(i=this.we.get(t))||void 0===i||i.push.apply(i,n)},t.prototype.Te=function(t){var n=t instanceof HTMLCanvasElement?Di(t):0;if(n)return n;if(this.me.has(t))return{id:this.me.get(t)};var i={id:this.ye};return this.Ce(t,i),this.me.set(t,this.ye),++this.ye,i},t.prototype.Ce=function(t,n){this.At.enqueue({Kind:Ot.CANVAS_DETACHED_DIMENSION,Args:[n,t.width,t.height]})},t.prototype.flush=function(t,n){var i,r;if(this.pe){this.ue===dn.ScreenshotCanvas&&t instanceof HTMLCanvasElement&&(this.ve.add(t),this.fe.set(t,!0));var e=this.Te(t),s=null!==(i=this.we.get(t))&&void 0!==i?i:[];if(this.we["delete"](t),s.length>0){var o=n;if(!o){var u=t instanceof HTMLCanvasElement?Ui(t):void 0,a=t instanceof HTMLCanvasElement&&St(t);o=null!==(r=null==u?void 0:u.mask)&&void 0!==r?r:a}this.Pe(t,e,s,o)}return e}},t.prototype.je=function(t,n,i,r,e,s,o){var u;switch(typeof r){case"string":return e?Ci(r):r;case"number":case"boolean":case"bigint":return r;case"undefined":return{undef:!0};case"object":if(!r)return r;try{o.set(r,!0)}catch(t){}var a=null===(u=Object.getPrototypeOf(r))||void 0===u?void 0:u.constructor,c=(null==a?void 0:a.name)||function(t){var n;if(t){var i=t.toString(),r=po.exec(i);return r||(r=wo.exec(i)),null===(n=null==r?void 0:r[1])||void 0===n?void 0:n.trim()}}(a),h={ctor:c};if(r instanceof Node&&(l=Di(r)))return h.id=l,h;switch(c){case"Array":return this.Se+=r.length,this.Oe(t,n,i,r,e,s,o);case"CanvasGradient":return h;case"HTMLImageElement":var f=he(r.src,{source:"dom",type:"canvas"});return this.ai.record(f),h.src=f,h;case"HTMLCanvasElement":var v=r,l=this.flush(v,e);return h.srcId=l,h;}if(function(t){var n;return!!(null===(n=Object.prototype.toString.call(t))||void 0===n?void 0:n.match(lo))}(r))return this.be.has(r)?this.Me(r,h,e):(h.typedArray="["+r.toString()+"]",this.Se+=r.length,h);if("object"==typeof r&&this.be.has(r))return this.Me(r,h,e);if(r instanceof WebGLBuffer||r instanceof WebGLTexture){var d=void 0;switch(s){case"bindTexture":d=this.Ke(t,"createTexture",n,i,r);break;case"bindBuffer":d=this.Ke(t,"createBuffer",n,i,r);}if(void 0!==d)return this.Me(r,h,e)}var p=r;for(var w in h.obj={},p){try{switch(typeof p[w]){case"function":continue;case"object":if(p[w]&&o.has(p[w]))continue;}}catch(t){continue}++this.Se,h.obj[w]=this.je(t,n,i,p[w],e,s,o)}return h;default:return null;}},t.prototype.Me=function(t,n,i){var r=this.be.get(t),e=r[0],s=r[1];return this.flush(e,i),n.ref=s,delete n.ctor,n},t.prototype.Ke=function(t,n,i,r,e){var s=this.ke(i,e),o=(s[0],s[1]);return this.Re(r,[[t,ln.Function,n,[],o]]),o},t.prototype.Oe=function(t,n,i,r,e,s,o){var u=this;return void 0===o&&(o=new WeakMap),this.Se+=r.length+1,r.map(function(r){return u.je(t,n,i,r,e,s,o)})},t.prototype.Pe=function(t,n,i,r){var e=this;if(void 0===r&&(r=!1),!this.xe){var s=i.map(function(i){var s=i[0],o=i[1],u=i[2],a=i[3],c=i[4];return[s,o,u,e.Oe(s,t,n,a,r&&fo.has(u),u),c]});if(!this.he.has(t)&&(this.he.set(t,!0),i.some(function(t){return"2d"===t[0]}))){var o=this.He(t);if(o.length>0)return o.push.apply(o,s),void this.Re(n,o)}this.Re(n,s)}},t.prototype.Re=function(t,n){if(!this.xe){var i=co.hasCapacityFor(this.Se),r=i[0];i[1],this.Se=0,r?this.At.enqueue({Kind:Ot.CANVAS,Args:[t,n]}):this.xe=!0}},t.prototype.He=function(t){var n=t.getContext("2d");if(!n)return[];var i=[];if((n instanceof CanvasRenderingContext2D||n instanceof OffscreenCanvasRenderingContext2D)&&"function"==typeof n.getTransform){var r=n.getTransform();if(!r.isIdentity){var e=r.a,s=r.b,o=r.c,u=r.d,a=r.e,c=r.f;i.push(["2d",ln.Function,"transform",[e,s,o,u,a,c],-1])}}return i},t.prototype.Ne=function(t,n){t instanceof HTMLCanvasElement&&(this.ue===dn.ScreenshotCanvas?(this.fe.set(t,!0),this.ve.add(t)):(this.ge.add(t),this.Ie(t,n)))},t.prototype._e=function(t,n,i,r,e){for(var s=[],o=0;o<r.length;o++)s.push(r[o]);var u=this.ke(i.canvas,e),a=(u[0],u[1]);this.Ne(i.canvas,[[t,ln.Function,n,s,a]])},t.prototype.Ae=function(t,n){var i=this;return function(r,e){i.Ne(r.canvas,[[t,ln.Set,n,[e],0]])}},t.prototype.stop=function(){this.pe=!1,this.ae.forEach(function(t){return t.disable()}),this.ce.forEach(function(t){return t()}),this.ae=[],this.ce=[],this.le&&(clearInterval(this.le),this.le=0)},t.prototype.screenshotConnectedCanvases=function(){return(0,e.__awaiter)(this,void 0,Yn,function(){var t,n,i=this;return(0,e.__generator)(this,function(r){switch(r.label){case 0:return t=[],n=[],this.ve.forEach(function(r){var e=Di(r);St(r)&&e?i.fe.has(r)&&n.push(i.Le(r,e)):t.push(r)}),t.forEach(function(t){return i.ve["delete"](t)}),[4,Yn.all(n)];case 1:return r.sent(),[2];}})})},t.prototype.Le=function(t,n){return(0,e.__awaiter)(this,void 0,Yn,function(){var i,r,s,o;return(0,e.__generator)(this,function(e){switch(e.label){case 0:return i=t.toDataURL(),r=this.de.get(t),[4,this.Ti.uploadDataUrlIfNeeded(i,function(t){var n;return t.url!==r&&!!(null===(n=t.contentType)||void 0===n?void 0:n.match(/^image/i))})];case 1:return(s=e.sent())?(o=s.url,this.de.set(t,o),s.url===r||this.Re(n,[["2d",ln.Function,"drawImage",[{ctor:"HTMLImageElement",src:o},0,0],0]]),[2]):[2];}})})},t.prototype.Ue=function(){var t=this,n=[];this.ge.forEach(function(i){!Di(i)&&St(i)&&(t.we["delete"](i),n.push(i))});for(var i=0,r=n;i<r.length;i++){var e=r[i];this.ge["delete"](e)}},t.prototype.tick=function(){var t=this;this.pe&&(this.Ue(),this.ue!==dn.ScreenshotCanvas&&this.ge.forEach(function(n){var i=Di(n);if(i){var r=Ui(n),e=t.we.get(n);e&&0!==e.length&&(t.Pe(n,i,e,!!(null==r?void 0:r.mask)),t.we["delete"](n))}}))},t}(),lo=/\[object ((I|Ui)nt(8|16|32)|Float(32|64)|Uint8Clamped|Big(I|Ui)nt64)Array\]/,po=/^\[object ([^\]]+?)(?:Constructor)?\]/,wo=/^function ([^(]+)/,go=/^\s*at .*(\S+:\d+|native|(<anonymous>))/m,mo=/^(eval@)?(\[native code\])?$/;function yo(t){if(!t||"string"!=typeof t.stack)return[];var n=t;return n.stack.match(go)?n.stack.split("\n").filter(function(t){return!!t.match(go)}).map(function(t){var n=t;n.indexOf("(eval ")>-1&&(n=n.replace(/eval code/g,"eval").replace(/(\(eval at [^()]*)|(\),.*$)/g,""));var i=n.replace(/^\s+/,"").replace(/\(eval code/g,"(").replace(/\(native code\)/,"").split(/\s+/).slice(1),r=Eo(i.pop());return bo(i.join(" "),["eval","<anonymous>"].indexOf(r[0])>-1?"":r[0],r[1],r[2])}):n.stack.split("\n").filter(function(t){return!t.match(mo)}).map(function(t){var n=t;if(n.indexOf(" > eval")>-1&&(n=n.replace(/ line (\d+)(?: > eval line \d+)* > eval:\d+:\d+/g,":$1")),-1===n.indexOf("@")&&-1===n.indexOf(":"))return[n,"",-1,-1];var i=n.split("@"),r=Eo(i.pop());return bo(i.join("@"),r[0],r[1],r[2])})}function bo(t,n,i,r){return[t||"",n||"",parseInt(i||"-1",10),parseInt(r||"-1",10)]}function Eo(t){if(!t||-1===t.indexOf(":"))return["","",""];var n=/(.+?)(?::(\d+))?(?::(\d+))?$/.exec(t.replace(/[()]/g,""));return n?[n[1]||"",n[2]||"",n[3]||""]:["","",""]}var So,xo,ko=["log","info","warn","error","debug","_fs_debug","assert","trace"],_o=ko.filter(function(t){return!/debug/.test(t)}),Ao=function(t,n,i){void 0===i&&(i=!0);var r=Qi(t,n);return i?be(r):r},Io=function(){function t(t,n,i){this.At=n,this.sr=!1,this.Fe=!1,this.De=0,this.Dt=[],this.Be=cn.DefaultOrgSettings.MaxConsoleLogPerPage,this.Dn=t.window,this.T=i.createChild()}return t.prototype.initializeMaxLogsPerPage=function(t){this.Be=t||cn.DefaultOrgSettings.MaxConsoleLogPerPage},t.prototype.We=function(){return"\"[received more than "+this.Be+" messages]\""},t.prototype.start=function(t){var n=this;if(t.ConsoleWatcher&&(this.T.add(this.Dn,"error",!0,function(t){return n.addError(t)}),this.T.add(this.Dn,"unhandledrejection",!0,function(t){n.addError({error:t.reason,message:"Uncaught (in promise)",filename:"",lineno:0,colno:0})},!0),!this.sr))if(this.sr=!0,this.At.enqueue({Kind:Ot.REC_FEAT_SUPPORTED,Args:[zt.Console,!0]}),this.Dn.console)for(var i=function(t){var i=mt(r.Dn.console,t);if(!i)return"continue";"assert"===t?i.before(function(i){var r=i.args;r[0]||n.qe(t,Array.prototype.slice.apply(r,[1]))}):i.before(function(i){var r=i.args;return n.qe(t,r)}),r.Dt.push(i)},r=this,e=0,s=_o;e<s.length;e++)i(s[e]);else this.qe("log",["NOTE: Log messages cannot be captured on IE9"])},t.prototype.isEnabled=function(){return this.sr},t.prototype.stop=function(){var t;if(this.T&&this.T.clear(),this.sr)for(this.sr=!1;t=this.Dt.pop();)t.disable()},t.prototype.logEvent=function(t,n,i){if(void 0===i&&(i="console"),!this.Qe())return null;for(var r=-1===ko.indexOf(t)?[i,"log",Ao(t,1e3)]:[i,t],e=0;e<n.length;++e)r.push(Ao(n[e],1e3));return{Kind:Ot.LOG,Args:r}},t.prototype.qe=function(t,n){var i=this.logEvent(t,n);i&&this.At.enqueue(i)},t.prototype.addError=function(t){var n=t.lineno,i=t.filename;if(void 0!==t.error||void 0!==t.message||i||n){var r=t.error?t.message+" "+("object"==typeof t.error?Ao(t.error,1e3):t.error):t.message;this.Qe()&&("object"==typeof i&&(i=Ao(i,100,!1)),"object"==typeof n&&(n=-1),this.At.enqueue({Kind:Ot.ERROR,Args:(0,e.__spreadArray)([r,i,n],yo(t.error))}))}},t.prototype.Qe=function(){return!this.Fe&&(this.De==this.Be?(this.At.enqueue({Kind:Ot.LOG,Args:["console","warn",this.We()]}),this.Fe=!0,!1):(this.De++,!0))},t}();!function(t){t[t.Ajax=0]="Ajax",t[t.Animation=1]="Animation",t[t.Canvas=2]="Canvas",t[t.Console=3]="Console",t[t.CustomElement=4]="CustomElement",t[t.Dialog=5]="Dialog",t[t.Fullscreen=6]="Fullscreen",t[t.Input=7]="Input",t[t.Perf=8]="Perf",t[t.StyleSheet=9]="StyleSheet"}(So||(So={})),function(t){t[t.Scroll=1]="Scroll",t[t.Resize=2]="Resize"}(xo||(xo={}));var To=function(){function t(t,n,i,r,e,s,o,u,a){var c=this;this._t=t,this.At=n,this.Ve=i,this.ze=s,this.$e=o,this.Ti=u,this.ai=a,this.Ge=[],this.Xe={},this.Je=!1,this.Ze=[],this.Ye=!1,this.Dn=t.window,this.Mt=this.Dn.document,this.ts=this.Dn.location,this.ns=this.Dn.history,this.T=e.createChild(),this.rs=this.ts.href,this.es=function(t,n){void 0===n&&(n=.25);var i=t.window.IntersectionObserver;if(i)return new i(function(n){for(var i,r=0,e=n;r<e.length;r++){var s=e[r],o=s.target,u=s.intersectionRatio,a=Di(o);a&&(null===(i=t.queue())||void 0===i||i.enqueue({Kind:Ot.VIEWPORT_INTERSECTION,Args:[a,u]}))}},{threshold:[n,1]})}(t),this.ss=new ss(t,r,this.os.bind(this),this.On.bind(this),this.attributesVisitor.bind(this),this.es),this.us=[new Cs(t,n),new fr(t,n,this.T),new vo(t,n,u,this.ai),new Io(t,this.At,this.T),new io(t,n),new so(t,n),new no(t,n,this.T),new ir(t,n),new ws(t,n,this.T,this.ai),new zs(t,n)],this.cs=new ro(this.Dn,{interval:40,onFlush:function(t){return c.hs(t)}}),this.vs=new ro(this.Dn,{interval:40,onFlush:function(t){return c.hs(t,!0)}})}return t.prototype.getResourceUploader=function(){return this.Ti},t.prototype.start=function(t){this.ss.start();for(var n=0,i=this.us;n<i.length;n++)i[n].start(t);this.ls(t)},t.prototype.ls=function(t){var n=this;t.DisableCopyPasteListener||(this.T.add(this.Dn,"copy",!1,this.ds.bind(this)),this.T.add(this.Dn,"paste",!1,this.ps.bind(this))),this.T.add(this.Dn,"mousemove",!0,function(t){n.ws(t)&&n.gs(t)}),this.T.add(this.Dn,"mousedown",!0,function(t){n.ws(t)&&n.ys(t)}),this.T.add(this.Dn,"mouseup",!0,function(t){n.ws(t)&&n.bs(t)}),this.T.add(this.Dn,"keydown",!0,function(t){n.us[So.Input].onKeyboardChange(Mo(t))}),this.T.add(this.Dn,"keyup",!0,function(t){n.us[So.Input].onKeyboardChange(Mo(t))}),this.T.add(this.Dn,"click",!0,function(t){n.ws(t)&&n.Es(t)}),this.T.add(this.Dn,"dblclick",!0,function(t){n.Ss(t)}),this.T.add(this.Dn,"focus",!0,function(t){n.xs(t,Mo(t))},!0),this.T.add(this.Dn,"blur",!0,function(t){n.ks(t,Mo(t))},!0),this.T.add(this.Dn,"change",!0,function(t){n._s(t,Mo(t))},!0),this.T.add(this.Dn,"touchstart",!0,function(t){n.ws(t)&&(n.As(t,Ot.TOUCHSTART),n.Is())}),this.T.add(this.Dn,"touchend",!0,function(t){n.ws(t)&&(n.As(t,Ot.TOUCHEND),n.Is())}),this.T.add(this.Dn,"touchmove",!0,function(t){n.ws(t)&&(n.As(t,Ot.TOUCHMOVE),n.Is())}),this.T.add(this.Dn,"touchcancel",!0,function(t){n.ws(t)&&n.As(t,Ot.TOUCHCANCEL)}),this.T.add(this.Dn,"play",!0,function(t){n.Ts(t)}),this.T.add(this.Dn,"pause",!0,function(t){n.Cs(t)}),this.T.add(this.Dn,"scroll",!0,function(t){t.bubbles?n.Is():n.Ps(Oo(t))}),this.T.add(this.Dn,"resize",!1,function(){n.js()}),this.T.add(this.Dn,"submit",!1,function(t){n.Os(t)}),this.T.add(this.Dn,"focus",!1,function(){n.Ms()}),this.T.add(this.Dn,"blur",!1,function(){n.Ks()}),this.T.add(this.Dn,"popstate",!1,function(){n.Rs()}),this.T.add(this.Dn,"selectstart",!0,function(){n.Hs()}),this.T.add(this.Mt,"selectionchange",!0,function(){n.Hs()}),this.T.add(this.Dn,"visibilitychange",!1,function(t){n.addVisibilityChangeEvent()});var i=this.Dn.visualViewport;i?(this.T.add(i,"scroll",!0,function(){return n.Is()}),this.T.add(i,"resize",!0,function(){return n.js()})):this.T.add(this.Dn,"mousewheel",!0,function(){n.Is()}),this.Ns=mt(this.ns,"pushState",!0),this.Ns&&this.Ns.afterSync(function(){return n.Rs()}),this.Ls=mt(this.ns,"replaceState",!0),this.Ls&&this.Ls.afterSync(function(){return n.Rs()});for(var r=function(t){var i=mt(e.Dn,t);if(!i)return"continue";e.Ze.push(i),i.before(function(){n.At.enqueue({Kind:Ot.MODAL_OPEN,Args:[t]})}).afterSync(function(){n.At.enqueue({Kind:Ot.MODAL_CLOSE,Args:[t]})})},e=this,s=0,u=hn;s<u.length;s++)r(u[s]);if("function"==typeof this.Dn.document.hasFocus&&this.At.enqueue({Kind:this.Dn.document.hasFocus()?Ot.WINDOW_FOCUS:Ot.WINDOW_BLUR,Args:[]}),o.matchMedia)for(var a=function(t,i,r){var e=o.matchMedia(c.Dn,r);if(!e)return"continue";var s=function(){e.matches&&n.At.enqueue({Kind:Ot.MEDIA_QUERY_CHANGE,Args:[t,i]})};c.T.add(e,"change",!0,s),s()},c=this,h=0,f=[["any-pointer","coarse","not screen and (any-pointer: fine)"],["any-pointer","fine","only screen and (any-pointer: fine)"],["any-hover","none","not screen and (any-hover: hover)"],["any-hover","hover","only screen and (any-hover: hover)"],["pointer","none","(pointer: none)"],["pointer","coarse","(pointer: coarse)"],["pointer","fine","(pointer: fine)"],["prefers-color-scheme","no-preference","(prefers-color-scheme: no-preference)"],["prefers-color-scheme","light","(prefers-color-scheme: light)"],["prefers-color-scheme","dark","(prefers-color-scheme: dark)"]];h<f.length;h++){var v=f[h];a(v[0],v[1],v[2])}this.Ye=!0},t.prototype.initResourceUploading=function(){this.Ti.init(),this.Je=!0},t.prototype.onDomLoad=function(){this.Us(),this.Fs(!0),this.ss.ii(gr)},t.prototype.onLoad=function(){var t=this,n=!1,i=Tt.wrap(function(){n||(n=!0,t.us[So.Perf].onLoad(),t.Ds(),t.Fs())},"error");new Yi(i,0).start(),o.requestWindowAnimationFrame&&o.requestWindowAnimationFrame(this.Dn,i)},t.prototype.ajaxWatcher=function(){return this.us[So.Ajax]},t.prototype.consoleWatcher=function(){return this.us[So.Console]},t.prototype.perfWatcher=function(){return this.us[So.Perf]},t.prototype.bundleEvents=function(){var t=this;return this.At.enqueueSimultaneousEventsIn(function(n){for(var i,r=t.ss.processMutations(n),e=0,s=t.us;e<s.length;e++){var o=s[e];null===(i=o.tick)||void 0===i||i.call(o)}return t.Fs(),r})},t.prototype.stop=function(t){var n;if(this.Ye){this.Ye=!1,this.T&&this.T.clear(),this.Ns&&this.Ns.disable(),this.Ls&&this.Ls.disable();for(var i=0,r=this.Ze;i<r.length;i++)r[i].disable();this.Ze=[],this.us[So.Perf].onLoad(),this._t.measurer.performMeasurementsNow(),this.At.processEvents(),this.vs.flush(),this.cs.flush(),this.ai.flush(),this.ss.stop();for(var e=0,s=this.us;e<s.length;e++)s[e].stop(t);null===(n=this.es)||void 0===n||n.disconnect(),this.At.shutdown(t)}},t.prototype.recordingIsDetached=function(){return this.ss.recordingIsDetached()},t.prototype.os=function(t,n){var i=this;switch(t.nodeName){case"#document":case"#document-fragment":"#document-fragment"===t.nodeName&&this.T.add(t,"scroll",!0,function(t){return i.Ps(Oo(t))});var r=t;try{if(!r.adoptedStyleSheets||0===r.adoptedStyleSheets.length)break}catch(t){break}null==n||n.push(function(){i.us[So.StyleSheet].onSetAdoptedStyleSheets(t)});break;case"BODY":this.Fs(),this.Hs();break;case"INPUT":case"TEXTAREA":case"SELECT":this.us[So.Input].addInput(t);break;case"FRAME":case"IFRAME":this.ze(t);break;case"VIDEO":case"AUDIO":t.paused||this.At.enqueue({Kind:Ot.PLAY,Args:[Di(t)]});break;case"DIALOG":var e=t;e.open&&this.At.enqueue({Kind:Ot.DIALOG,Args:[Di(e),!0,uo(e)]});break;case"LINK":case"STYLE":var s=t,o=s.sheet;if(!o)break;var u=this.us[So.StyleSheet];u.ensureHook(o),!0===o.disabled&&u.onDisableSheet(o,!0),function(t){var n=t.textContent||"";if(n.length>5e5)return!1;var i=Ws(Bs(t));return!!i&&(!!("style"===ki(t)&&i.length>0&&Xs.test(n))||function(t){var n;try{if((null===(n=t.classList)||void 0===n?void 0:n.contains("fs-css-in-js"))||t.hasAttribute("data-fela-type")||t.hasAttribute("data-aphrodite"))return!0}catch(t){Tt.sendToBugsnag(t,"error")}return!1}(t))}(s)&&(null==n||n.push(function(){u.snapshotEl(s),"link"===ki(s)&&i.T.add(s,"load",!1,function(){u.snapshotEl(s)})}));break;case"CANVAS":this._t.measurer.requestMeasureTask(ii.Low,function(){return i.us[So.Canvas].flush(t)});break;default:t.nodeName&&"#"!==t.nodeName[0]&&t.nodeName.indexOf("-")>-1&&this.us[So.CustomElement].onCustomNodeVisited(t);}if("scrollLeft"in t&&"scrollTop"in t){var a=t;this._t.measurer.requestMeasureTask(ii.Low,function(){0==a.scrollLeft&&0==a.scrollTop||i.Ps(a)})}null==n||n.push(function(){i._t.measurer.requestMeasureTask(ii.Low,function(){i.us[So.Animation].snapshot(t)})})},t.prototype.On=function(t){var n,i=t.node,r=ki(t.node);if("iframe"===r)this.$e(t.node);else if("function"==typeof i.getElementsByTagName)for(var e=null!==(n=i.getElementsByTagName("iframe"))&&void 0!==n?n:[],s=0;s<e.length;s++){var o=e[s];this.$e(o)}else if("link"===r||"style"===r){var u=i.sheet;if(!u)return;this.us[So.StyleSheet].removeHook(u)}},t.prototype.attributesVisitor=function(t,n,i){if(!function(t,n){return void 0===n&&(n=Ui(t)),Hi(t,n)||Ni(t,n)}(n)){var r=function(t,n,i){for(var r,e,s=[],o=0,u=jo;o<u.length;o++){var a=u[o];i[a]&&Po[a][t]&&s.push(i[a])}if("link"===t&&i.href&&(r=i.rel)&&r.indexOf("stylesheet")>-1&&s.push(i.href),("img"===t||"source"===t)&&(e=i.srcset)&&null==e.match(/^\s*$/))for(var c=0,h=e.split(",");c<h.length;c++){var f=h[c];s.push(f.trim().split(/\s+/)[0])}var v=n;if(i.style&&v.style){var l=v.style.backgroundImage;if(l&&l.length<=300){var d=void 0;for(wi.lastIndex=0;d=wi.exec(l);){var p=d[1];p&&s.push(p.trim())}}}return s}(t,n,i);if(0===r.length)for(var e=0,s=jo;e<s.length;e++){var o=s[e];i[o]&&this.cs.append(i[o])}else for(var u=0,a=r;u<a.length;u++){var c=a[u];this.vs.append(c)}}},t.prototype.hs=function(t,n){void 0===n&&(n=!1),window;for(var i=Mr(this.Dn),r=0,e=t;r<e.length;r++){var s=Or(i,e[r]);this.Je&&n&&this.Ti.uploadIfNeeded(this.Dn,s),this.ai.record(s.href)}window},t.prototype.ws=function(t){var n=Oo(t);return!!Di(n)&&!Hi(n)},t.prototype.gs=function(t){var n=Di(Oo(t));this.At.enqueue({Kind:Ot.MOUSEMOVE,Args:n?[t.clientX,t.clientY,n]:[t.clientX,t.clientY]})},t.prototype.ys=function(t){this.At.enqueue({Kind:Ot.MOUSEDOWN,Args:[t.clientX,t.clientY]})},t.prototype.bs=function(t){this.At.enqueue({Kind:Ot.MOUSEUP,Args:[t.clientX,t.clientY]})},t.prototype.As=function(t,n){if(void 0!==t.changedTouches)for(var i=0;i<t.changedTouches.length;++i){var r=t.changedTouches[i];isNaN(parseInt(r.identifier,10))&&(r.identifier=0);var e=[r.identifier,r.clientX,r.clientY];this.At.enqueue({Kind:n,Args:e})}},t.prototype.Ts=function(t){var n=Di(Oo(t));n&&this.At.enqueue({Kind:Ot.PLAY,Args:[n]})},t.prototype.Cs=function(t){var n=Di(Oo(t));n&&this.At.enqueue({Kind:Ot.PAUSE,Args:[n]})},t.prototype.Ms=function(){this.At.enqueue({Kind:Ot.WINDOW_FOCUS,Args:[]})},t.prototype.Ks=function(){this.At.enqueue({Kind:Ot.WINDOW_BLUR,Args:[]})},t.prototype.Fs=function(t){var n=this;void 0===t&&(t=!1),this._t.measurer.requestMeasureTask(ii.High,function(){return n.Bs(t)})},t.prototype.Bs=function(t){var n,i=(n=this.Dn.document).scrollingElement||n.body||n.documentElement,r=Di(i);if(r){var e=function(t,n){var i,r=t.documentElement.getBoundingClientRect(),e=null!==(i=t.body)&&void 0!==i?i:{scrollHeight:0,scrollWidth:0};return{width:Math.max(r.width,n.scrollWidth,e.scrollWidth),height:Math.max(r.height,n.scrollHeight,e.scrollHeight)}}(this.Dn.document,i);fi(e,this.Ws)||(this.Ws=e,this.At.enqueue({Kind:Ot.RESIZE_DOCUMENT_CONTENT,Args:[e.width,e.height]}));var s,o,u,a,c=Ei(this.Dn,t?void 0:this.qs),h=function(t,n){var i=t.visualViewport;if(i)return i;var r=n;return void 0===r&&(r=Ei(t)),new Si(t,r)}(this.Dn,c);if(c.hasKnownPosition?(hi(c,this.qs)||this.At.enqueue({Kind:Ot.SCROLL_LAYOUT,Args:[r,c.pageLeft,c.pageTop]}),s=h,(o=this.Qs)&&s.offsetLeft==o.offsetLeft&&s.offsetTop==o.offsetTop||this.At.enqueue({Kind:Ot.SCROLL_VISUAL_OFFSET,Args:[r,h.offsetLeft,h.offsetTop]})):hi(h,this.Qs)||this.At.enqueue({Kind:Ot.SCROLL_LAYOUT,Args:[r,h.pageLeft,h.pageTop]}),!function(t,n){return n&&t.width==n.width&&t.height==n.height&&t.clientWidth==n.clientWidth&&t.clientHeight==n.clientHeight}(c,this.qs)){var f=[c.clientWidth,c.clientHeight];c.width===c.clientWidth&&c.height===c.clientHeight||f.push(c.width,c.height),this.At.enqueue({Kind:Ot.RESIZE_LAYOUT,Args:f})}fi(h,this.Qs)||this.At.enqueue({Kind:Ot.RESIZE_VISUAL,Args:[h.width,h.height]}),this.qs=((a=vi(u=c)).clientWidth=u.clientWidth,a.clientHeight=u.clientHeight,a),this.Qs=function(t){var n=vi(t);return n.offsetLeft=t.offsetLeft,n.offsetTop=t.offsetTop,n}(h)}},t.prototype.Vs=function(t,n){var i=this;t in this.Xe||(this.Xe[t]=n,new Yi(function(){i._t.measurer.requestMeasureTask(ii.High,function(){if(t in i.Xe){var n=i.Xe[t];delete i.Xe[t],n()}})},cn.ScrollSampleInterval).start())},t.prototype.zs=function(){for(var t in this.Xe)this.Xe[t](),delete this.Xe[t];this.Xe=[]},t.prototype.Is=function(){var t=this;this.Vs(xo.Scroll,function(){return t.Fs(!1)})},t.prototype.js=function(){var t=this;this.Vs(xo.Resize,function(){return t.Fs(!0)})},t.prototype.Ps=function(t){var n=this,i=Di(t);i&&this.Vs(i,function(){if(Di(t)===i){var r=t;i&&"number"==typeof r.scrollLeft&&(n.At.enqueue({Kind:Ot.RESIZE_SCROLLABLE_ELEMENT_CONTENT,Args:[i,r.scrollWidth,r.scrollHeight]}),n.At.enqueue({Kind:Ot.SCROLL_LAYOUT,Args:[i,r.scrollLeft,r.scrollTop]}),ei().then(function(){n.ss.resizer().isObserved(i)||n.ss.resizer().observe(t)}))}})},t.prototype.Us=function(){this.At.enqueue({Kind:Ot.DOMLOADED,Args:[]})},t.prototype.Ds=function(){this.At.enqueue({Kind:Ot.LOAD,Args:[]})},t.prototype.getNavigateEvent=function(t,n){void 0===n&&(n=Ot.NAVIGATE);var i={Kind:n,Args:[he(t,{source:"event",type:Ot.NAVIGATE})]};return n===Ot.ENTRY_NAVIGATE?(i.Args.push(this.$s()),i):i},t.prototype.Rs=function(){var t=this.ts.href;this.rs!=t&&(this.rs=t,this.Ve.onNavigate(t),this.At.enqueue(this.getNavigateEvent(t)))},t.prototype.$s=function(){try{var t=this.Dn.performance;if(!t||!t.navigation)return"unknown";switch(t.navigation.type){case PerformanceNavigation.TYPE_NAVIGATE:return"navigate";case PerformanceNavigation.TYPE_RELOAD:return"reload";case PerformanceNavigation.TYPE_BACK_FORWARD:return"back_forward";default:return"unknown";}}catch(t){return"unknown"}},t.prototype.Es=function(t){var n=Oo(t),i=Di(n);if(i){var r=0,e=0,s=0,o=0;if(n&&n.getBoundingClientRect){var u=n.getBoundingClientRect();r=u.left,e=u.top,s=u.width,o=u.height}var a=Ui(n);this.Ve.onClick(a),this.At.enqueue({Kind:Ot.CLICK,Args:[i,t.clientX,t.clientY,r,e,s,o]})}},t.prototype.Ss=function(t){var n=Di(Oo(t));n&&this.At.enqueue({Kind:Ot.DBL_CLICK,Args:[n]})},t.prototype.Os=function(t){var n=Di(Oo(t));n&&this.At.enqueue({Kind:Ot.FORM_SUBMIT,Args:[n]})},t.prototype.xs=function(t,n){var i=Di(Oo(t));i&&this.At.enqueue({Kind:Ot.FOCUS,Args:[i,n]})},t.prototype.ks=function(t,n){var i=Di(Oo(t));i&&this.At.enqueue({Kind:Ot.BLUR,Args:[i,n]})},t.prototype._s=function(t,n){this.us[So.Input].onChange(Oo(t),n)},t.prototype.Hs=function(){var t=this;this._t.measurer.requestMeasureTask(ii.High,function(){var n;try{n=t.selectionArgs()}catch(t){return}for(var i=!1,r=0;r<4;r++)if(t.Ge[r]!==n[r]){i=!0;break}i&&(t.Ge=n,t.At.enqueue({Kind:Ot.SELECT,Args:n}))})},t.prototype.selectionArgs=function(){if(!this.Dn.getSelection)return[];var t=this.Dn.getSelection();if(!t)return[];if("None"==t.type)return[];if("Caret"==t.type){var n=Di(t.anchorNode);return n?[n,t.anchorOffset]:[]}if(!t.anchorNode||!t.focusNode)return[];var i=Co(t.anchorNode,t.anchorOffset),r=i[0],e=i[1],s=Co(t.focusNode,t.focusOffset),o=s[0],u=s[1],a=Boolean(r.compareDocumentPosition(o)&Node.DOCUMENT_POSITION_FOLLOWING),c=a?[r,o]:[o,r],h=c[0],f=c[1],v=a?[e,u]:[u,e],l=v[0],d=v[1];for(Di(h)||(l=0);h&&!Di(h)&&h!=f;)h=ut(h)||h.parentNode;for(Di(f)||(d=0);f&&!Di(f)&&f!=h;)f=at(f)||f.parentNode;if(h==f&&l==d)return[];var p=Di(h),w=Di(f);return h&&f&&p&&w?[p,l,w,d,a]:[]},t.prototype.ds=function(){this.At.enqueue({Kind:Ot.COPY,Args:[]})},t.prototype.ps=function(){this.At.enqueue({Kind:Ot.PASTE,Args:[]})},t.prototype.addVisibilityChangeEvent=function(){this.At.enqueue({Kind:Ot.VISIBILITY_STATE,Args:[document.visibilityState]}),"hidden"===document.visibilityState&&this.At.singSwanSong(Wt.Hidden)},t}();function Co(t,n){var i=t;if(!i.firstChild)return[i,n];i=i.firstChild;for(var r=0;r<n-1;r++){var e=ut(i);if(!e)return[i,0];i=e}return[i,0]}var Po={src:{img:!0,embed:!0},href:{use:!0,image:!0},data:{object:!0}},jo=o.objectKeys(Po);function Oo(t){if(t.composed&&t.target){var n=t.target;if(1==n.nodeType&&n.shadowRoot){var i=t.composedPath();if(i.length>0)return i[0]}}return t.target}function Mo(t){var n;return!!(null!==(n=t._fs_trust_event)&&void 0!==n&&n||t.isTrusted)}var Ko,Ro=function(){function t(t,n){this.Vr=t,this.Gs=n,this.Xs=[],this.Js=0}return t.prototype.add=function(t){this.Xs.length>0&&this.Xs[this.Xs.length-1].When===t.When&&this.Xs.pop(),0===this.Xs.length?(this.Vr.push(t),this.Js=t.When):t.When>this.Js&&(this.Js=t.When),this.Xs.push(t)},t.prototype.finish=function(t,n){void 0===n&&(n=[]);var i=this.Xs.length;if(i<=1)return!1;for(var r=[],s=this.Xs[0].When,o=this.Xs[i-1].When,u=o-s!=0?o-s:1,a=0;a<this.Gs.length;++a){var c=this.Gs[a],h=this.Xs[0].Args[c],f=(this.Xs[1].When-s)/u,v=(this.Xs[1].Args[c]-h)/f,l=this.Xs[i-2].Args[c],d=(o-this.Xs[i-2].When)/u,p=this.Xs[i-1].Args[c],w=(p-l)/d;r.push(h,p,v,w)}return this.Xs[0].Kind=t,this.Xs[0].Args=(0,e.__spreadArray)((0,e.__spreadArray)([this.Js],n),r),!0},t.prototype.evts=function(){return this.Xs},t}(),Ho=function(){function t(){this.Zs=0,this.Wn={},this.Wn.next=this.Wn.prev=this.Wn}return t.prototype.first=function(){return this.Wn.next.value},t.prototype.last=function(){return this.Wn.prev.value},t.prototype.size=function(){return this.Zs},t.prototype.push=function(t){this.Zs++,No(this.Wn.prev,{value:t})},t.prototype.unshift=function(t){this.Zs++,No(this.Wn,{value:t})},t.prototype.pop=function(){return this.Zs>0&&this.Zs--,Lo(this.Wn.prev)},t.prototype.shift=function(){return this.Zs>0&&this.Zs--,Lo(this.Wn.next)},t}();function No(t,n){var i=t.next;n.next=i,n.prev=t,t.next=i.prev=n}function Lo(t){var n=t.prev,i=t.next;return n.next=i,i.prev=n,t.value}!function(t){t[t.rageWindowMillis=2e3]="rageWindowMillis",t[t.defaultRageThreshold=5]="defaultRageThreshold",t[t.rageThresholdIfPageChanges=8]="rageThresholdIfPageChanges",t[t.thresholdChangeQuiescenceMillis=2e3]="thresholdChangeQuiescenceMillis"}(Ko||(Ko={}));var Uo=function(){function t(t,n){var i,r;void 0===n&&(n=w),this._t=t,this.Ys=n,this.no=new Ho,this.io=Ko.defaultRageThreshold,this.ro=-1,this.eo=new WeakMap;var e=t.recording.pageResponse();if(!e)throw new Error("Attempt to construct EasyBake before rec/page response is set.");for(var s=[".fs-ignore-rage-clicks",".fs-ignore-rage-clicks *"],o=0,u=null!==(r=null===(i=e.BehaviorSignalSettings)||void 0===i?void 0:i.ElementBlocks)&&void 0!==r?r:[];o<u.length;o++){var a=u[o];a.Signals.indexOf(rn.SignalRageClick)>-1&&(s.push(a.Selector),s.push(a.Selector+" *"))}var c=s.join(", ");Be(c)?this.so=[c]:this.so=s}return t.prototype.oo=function(t){var n=this.eo.get(t);if(void 0!==n)return n;for(var i=0,r=this.so;i<r.length;i++){var e=r[i];if(o.elMatches(t,e))return this.eo.set(t,!0),!0}return this.eo.set(t,!1),!1},t.prototype.onEvent=function(t){var n;if(function(t){switch(t){case Ot.VALUECHANGE:case Ot.SCROLL_LAYOUT:case Ot.SCROLL_LAYOUT_CURVE:case Ot.SCROLL_VISUAL_OFFSET:case Ot.SCROLL_VISUAL_OFFSET_CURVE:case Ot.MUT_INSERT:case Ot.MUT_REMOVE:case Ot.MUT_ATTR:case Ot.MUT_SHADOW:case Ot.MUT_TEXT:case Ot.NAVIGATE:case Ot.LOAD:case Ot.FOCUS:case Ot.BLUR:case Ot.SELECT:case Ot.FORM_SUBMIT:case Ot.PLAY:case Ot.PAUSE:case Ot.MODAL_OPEN:case Ot.MODAL_CLOSE:return!0;}return!1}(t.Kind)&&this.io!==Ko.rageThresholdIfPageChanges)return this.io=Ko.rageThresholdIfPageChanges,void(this.ro=this.Ys());if(t.Kind===Ot.CLICK){var i=this.Ys(),r=null===(n=Fi(t.Args[0]))||void 0===n?void 0:n.node;if(r){var e=1===r.nodeType?r:r.parentElement;if(!this.oo(e)){var s=ki(r);if(!s||"textarea"!==s&&"select"!==s&&("input"!==s||"submit"===r.type)){this.no.push(i);for(var o=i-Ko.rageWindowMillis;;){var u=this.no.first();if(!(void 0!==u&&u<o))break;this.no.shift()}if(this.ro<i-Ko.thresholdChangeQuiescenceMillis&&(this.io=Ko.defaultRageThreshold),this.no.size()>=this.io){var a=this._t.recording.getCurrentSessionURL,c={eventStartTimeStamp:this.no.first(),eventEndTimeStamp:i,eventReplayUrlAtStart:a(),eventReplayUrlAtCurrentTime:a(!0)};this.dispatchRageClickEvent(r,c),this.io=Ko.defaultRageThreshold,this.no=new Ho}}}}}},t.prototype.dispatchRageClickEvent=function(t,n){var i,r="fullstory/rageclick";try{i=new CustomEvent(r,{detail:n,bubbles:!0,cancelable:!0})}catch(t){(i=document.createEvent("customevent")).initCustomEvent(r,!0,!0,n)}o.setWindowTimeout(window,Tt.wrap(function(){t.dispatchEvent(i)}),0)},t}(),Fo=function(){function t(t){this._t=t,this.uo=this._t.time.wallTime(),this.ao=!1}return t.prototype.getLastUserAcitivityTS=function(){return this.uo},t.prototype.getMsSinceLastUserAcivity=function(){return o.mathFloor(this._t.time.wallTime()-this.uo)},t.prototype.resetUserActivity=function(){this.uo=this._t.time.wallTime()},t.prototype.isHibernating=function(){return this.ao},t.prototype.setHibernating=function(){this.ao=!0},t}(),Do=function(){function t(t,n,i,r){void 0===r&&(r=Yi),this._t=t,this.co=n,this.At=i,this.ho=!1,this.fo=!1,this.vo=cn.HeartbeatInitial,this.lo=cn.PageInactivityTimeout,this.heartbeatTimeout=new r(this["do"].bind(this)),this.hibernationTimeout=new r(this.po.bind(this),this.lo)}return t.prototype.getUserActivityModel=function(){return this.co},t.prototype.manualHibernateCheck=function(){this.co.isHibernating()||this.co.getMsSinceLastUserAcivity()>=cn.PageInactivityTimeout+5e3&&this.po()},t.prototype.scanEvents=function(t){if(!this.ho){this.manualHibernateCheck();for(var n=!1,i=0,r=t;i<r.length;i++)if(fn(r[i].Kind)){n=!0;break}n&&(this.co.isHibernating()?this.wo():this.start())}},t.prototype.shutdown=function(){this.heartbeatTimeout.stop(),this.hibernationTimeout.stop()},t.prototype.start=function(){this.co.resetUserActivity(),this.vo=cn.HeartbeatInitial,this.lo=cn.PageInactivityTimeout,this.heartbeatTimeout.start(this.vo),this.hibernationTimeout.start(this.lo)},t.prototype["do"]=function(){var t=this.co.getMsSinceLastUserAcivity();t<=cn.PageInactivityTimeout&&this.At.enqueue({Kind:Ot.HEARTBEAT,Args:[t]}),this.vo*=2,this.vo>cn.HeartbeatMax&&(this.vo=cn.HeartbeatMax),this.heartbeatTimeout.start(this.vo)},t.prototype.po=function(){if(!this.co.isHibernating()){var t=!1;this.co.getMsSinceLastUserAcivity()<=2*cn.PageInactivityTimeout?this.At.enqueue({Kind:Ot.UNLOAD,Args:[Wt.Hibernation]}):t=!0;try{this.ho=!0,this.co.setHibernating(),this.shutdown(),this.At.onHibernate(t)}finally{this.ho=!1}}},t.prototype.wo=function(){this.fo||(this.fo=!0,this._t.recording.splitPage(Wt.Hibernation))},t}(),Bo=function(){function t(t,n,i,r,e,s){void 0===r&&(r=function(){return[]}),void 0===e&&(e=Zi),void 0===s&&(s=Yi),this._t=t,this.mo=n,this.yo=r,this.bo=e,this.Eo=0,this.So=[],this.xo=!1,this.ko=!1,this._o=0,this.Ao=-1,this.Io=!1,this.Qt=[],this.To=new this.bo(cn.CurveSamplingInterval),this.Co=new this.bo(cn.MutationProcessingInterval),i&&(this.Po=new Do(this._t,i,this,s))}return t.prototype.startPipeline=function(t){var n;return(0,e.__awaiter)(this,void 0,Yn,function(){var i,r=this;return(0,e.__generator)(this,function(e){switch(e.label){case 0:return this.ko||this.xo?[2]:(this.xo=!0,t.frameId&&(this.Eo=t.frameId),t.parentIds&&(this.So=t.parentIds),i=!0,[4,ei()]);case 1:return e.sent(),this.processEvents(),[4,ei()];case 2:return e.sent(),window,this.Co.start(function(){window,r.processEvents(),window}),this.To.start(function(){window,r.processEvents(i),window}),null===(n=this.Po)||void 0===n||n.start(),this.mo.startPipeline(t),window,[2];}})})},t.prototype.enableEasyBake=function(){this.jo=new Uo(this._t)},t.prototype.enqueueSimultaneousEventsIn=function(t){if(0===this._o){var n=this._t.time.now();this.Ao=n>this.Ao?n:this.Ao}try{return this._o++,t(this.Ao)}finally{this._o--,this._o<0&&(this._o=0)}},t.prototype.enqueue=function(t){var n=this._o>0?this.Ao:this._t.time.now();this.Oo(n,t),Ji.checkForBrokenSchedulers()},t.prototype.Oo=function(t,n){var i;if(!this.ko){var r=t;r<this.Ao&&(r=this.Ao),this.Ao=r;var e=n;e.When=r,this.Qt.push(e);try{null===(i=this.jo)||void 0===i||i.onEvent(e)}catch(t){Tt.sendToBugsnag(t,"error")}}},t.prototype.enqueueFirst=function(t){if(this.Qt.length>0){var n=t;n.When=this.Qt[0].When,this.Qt.unshift(n)}else this.enqueue(t)},t.prototype.addUnload=function(t){this.Io||(this.Io=!0,this.enqueue({Kind:Ot.UNLOAD,Args:[t]}),this.singSwanSong(t))},t.prototype.shutdown=function(t){this.addUnload(t),this.Mo(),this.ko=!0,this.Ko()},t.prototype.Mo=function(){this.processEvents(),this.mo.flush()},t.prototype.singSwanSong=function(t){this.ko||(window,this.Mo(),t===Wt.Hidden&&this.Io||this.mo.singSwanSong(),window)},t.prototype.rebaseIframe=function(t,n){for(var i=Math.max(0,n),r=this._t.time.startTime(),e=function(n){var e=r+n-t;return e>=i?e:i},s=0,o=this.Qt;s<o.length;s++){var u=o[s];u.When=e(u.When)}-1===this.Ao?this.Ao=i:this.Ao=e(this.Ao)},t.prototype.processEvents=function(t){if(this.xo){var n=this.Qt;this.Qt=[];var i=function(t){if(0==t.length)return t;for(var n,i=[],r=new Ro(i,[0,1]),e={},s={},o={},u=0,a=t;u<a.length;u++){var c=a[u];switch(c.Kind){case Ot.MOUSEMOVE:r.add(c);break;case Ot.TOUCHMOVE:(v=c.Args[0])in e||(e[v]=new Ro(i,[1,2])),e[v].add(c);break;case Ot.SCROLL_LAYOUT:(v=c.Args[0])in s||(s[v]=new Ro(i,[1,2])),s[v].add(c);break;case Ot.SCROLL_VISUAL_OFFSET:(v=c.Args[0])in o||(o[v]=new Ro(i,[1,2])),o[v].add(c);break;case Ot.RESIZE_VISUAL:n||(n=new Ro(i,[0,1])),n.add(c);break;default:i.push(c);}}if(r.finish(Ot.MOUSEMOVE_CURVE)){var h=r.evts();if(h.length>0){var f=h[h.length-1].Args[2];f&&(h[0].Args[9]=f)}}for(var v in s)s[l=parseInt(v,10)].finish(Ot.SCROLL_LAYOUT_CURVE,[l]);for(var v in o)o[l=parseInt(v,10)].finish(Ot.SCROLL_VISUAL_OFFSET_CURVE,[l]);for(var v in e){var l;e[l=parseInt(v,10)].finish(Ot.TOUCHMOVE_CURVE,[l])}return n&&n.finish(Ot.RESIZE_VISUAL_CURVE),i}(n);t||(i=i.concat(this.yo())),this.Ro(i),this.sendEvents(this._t.recording.pageSignature(),i)}},t.prototype.sendEvents=function(t,n){var i;0!=n.length&&(null===(i=this.Po)||void 0===i||i.scanEvents(n),this.mo.enqueueEvents(t,n))},t.prototype.onHibernate=function(t){t||this.Mo(),this.mo.singSwanSong(),this.mo.stopPipeline()},t.prototype.Ro=function(t){if(this.Eo)for(var n=this.So,i=n&&n.length>0,r=0;r<t.length;++r){var e=t[r];e.FId||(e.FId=this.Eo),i&&!e.PIds&&(e.PIds=n)}},t.prototype.Ko=function(){var t;this.xo&&(this.To.stop(),this.Co.stop(),this.Qt=[],null===(t=this.Po)||void 0===t||t.shutdown(),this.mo.stopPipeline())},t}(),Wo=function(){function t(t){void 0===t&&(t=4),this.hashCount=t,this.idx=0,this.hashMask=t-1,this.reset()}return t.prototype.reset=function(){this.idx=0,this.hash=[];for(var t=0;t<this.hashCount;++t)this.hash.push(2166136261)},t.prototype.write=function(t){for(var n=this.hashMask,i=this.idx,r=0;r<t.length;r++)this.hash[i]=this.hash[i]^t[r],this.hash[i]+=(this.hash[i]<<1)+(this.hash[i]<<4)+(this.hash[i]<<7)+(this.hash[i]<<8)+(this.hash[i]<<24),i=i+1&n;this.idx=i},t.prototype.writeAscii=function(t){for(var n=this.hashMask,i=this.idx,r=0;r<t.length;r++)this.hash[i]=this.hash[i]^t.charCodeAt(r),this.hash[i]+=(this.hash[i]<<1)+(this.hash[i]<<4)+(this.hash[i]<<7)+(this.hash[i]<<8)+(this.hash[i]<<24),i=i+1&n;this.idx=i},t.prototype.sum=function(){var t;return t=this.sumAsHex().replace(/\r|\n/g,"").replace(/([\da-fA-F]{2}) ?/g,"0x$1 ").replace(/ +$/,"").split(" ").map(Number),Vo(String.fromCharCode.apply(window,t))},t.prototype.sumAsHex=function(){for(var t="",n=0;n<this.hashCount;++n)t+=("00000000"+(this.hash[n]>>>0).toString(16)).slice(-8);return t},t}();function qo(t){var n=new Wo(1);return n.writeAscii(t),n.sumAsHex()}function Qo(t){var n=new Uint8Array(t);return Vo(String.fromCharCode.apply(null,n))}function Vo(t){var n;return(null!==(n=window.btoa)&&void 0!==n?n:zo)(t).replace(/\+/g,"-").replace(/\//g,"_")}function zo(t){for(var n=String(t),i=[],r=0,e=0,s=0,o="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";n.charAt(0|s)||(o="=",s%1);i.push(o.charAt(63&r>>8-s%1*8))){if((e=n.charCodeAt(s+=3/4))>255)throw new Error("'btoa' failed: The string to be encoded contains characters outside of the Latin1 range.");r=r<<8|e}return i.join("")}function $o(t,n,i,r){return void 0===r&&(r=new Wo),(0,e.__awaiter)(this,void 0,Yn,function(){var s,o,u,a;return(0,e.__generator)(this,function(e){switch(e.label){case 0:s=t.now(),o=i.byteLength,u=0,e.label=1;case 1:return u<o?t.now()-s>25?[4,n(100)]:[3,3]:[3,5];case 2:e.sent(),s=t.now(),e.label=3;case 3:a=new Uint8Array(i,u,Math.min(o-u,1e4)),r.write(a),e.label=4;case 4:return u+=1e4,[3,1];case 5:return[2,{hash:r.sum(),hasher:r}];}})})}var Go=6e6,Xo="resource-uploader",Jo=function(){function t(t,n,i,r,e){void 0===r&&(r=window.FormData),void 0===e&&(e=Yi),this._t=t,this.At=n,this.Ho=i,this.No=r,this.Lo=e,this.pe={},this.Uo={},this.Fo=!1,this.Do=[]}return t.prototype.init=function(){this.No&&this.Bo()["catch"](function(t){Tt.sendToBugsnag(t,"error")})},t.prototype.Bo=function(){return(0,e.__awaiter)(this,void 0,Yn,function(){var t,n,i,r,s,o,u,a,c,h,f,v,l,d,p,w,g,m,y,b,E,S,x,k,_;return(0,e.__generator)(this,function(e){switch(e.label){case 0:t=this._t.options.orgId,e.label=1;case 1:return[4,this.Wo()];case 2:for(n=e.sent(),i={fsnv:{},sha1:{}},r={},s=0,o=n;s<o.length;s++)m=o[s],i[m.hashAlgorithm][m.hash]=!0,(v=r[m.hash])?v.push(m):r[m.hash]=[m];u={fsnv:Object.keys(i.fsnv),sha1:Object.keys(i.sha1)},a=void 0,e.label=3;case 3:return e.trys.push([3,5,,6]),[4,this.Ho.queryResources({OrgId:t,HashesByAlgorithm:u})];case 4:return a=e.sent(),[3,6];case 5:return e.sent(),[3,1];case 6:c=0,h=a,e.label=7;case 7:if(!(c<h.length))return[3,15];if(f=h[c],!(null==(v=r[f.QueryHash])?void 0:v.length))return Ut(Xo,"No resource found for hash"),[3,14];if(!f.Found||!f.CanonicalHash)return[3,8];for(l=0,d=v;l<d.length;l++)(m=d[l]).blob=m.stringData=null,"fsnv"===(p=f.CanonicalHash.Algorithm)?this.At.enqueue({Kind:Ot.SYS_RESOURCEHASH,Args:["url",m.url,f.CanonicalHash.Hash]}):Ut(Xo,"Unrecognized canonical hash type",{hashAlgorithm:p});return[3,14];case 8:w=0,g=v,e.label=9;case 9:if(!(w<g.length))return[3,14];if(m=g[w],y=m.url,b=m.contentType,!(E=m.blob||m.stringData))return Ut(Xo,"Missing resource contents"),[3,13];if(S=m.blob||new Blob([E],{type:b}),(x=new this.No).append("orgId",t),x.append("baseUrl",y),"fsnv"===f.QueryAlgorithm)x.append("fsnvHash",f.QueryHash);else{if("sha1"!==f.QueryAlgorithm)return Ut(Xo,"Unrecognized hash type from resource query",{hashAlgorithm:f.QueryAlgorithm}),[3,13];x.append("sha1Hash",f.QueryHash)}x.append("contents",S,"blob"),m.blob=m.stringData=null,e.label=10;case 10:return e.trys.push([10,12,,13]),[4,this.Ho.uploadResource(x)];case 11:return k=e.sent(),"fsnv"!=(_=JSON.parse(k)).Algorithm&&Ut(Xo,"Unexpected hash type from resource upload",{hashAlgorithm:_.Algorithm}),this.At.enqueue({Kind:Ot.SYS_RESOURCEHASH,Args:["url",y,_.Hash]}),[3,13];case 12:return e.sent(),[3,13];case 13:return w++,[3,9];case 14:return c++,[3,7];case 15:return[3,1];case 16:return[2];}})})},t.prototype.Wo=function(){var t=this,n=ti(),i=n.resolve,r=n.promise,e=function(){t.qo=null,t.Fo=!1;var n=t.Do;t.Do=[],i(n)};return this.Fo?e():this.qo=e,r},t.prototype.uploadIfNeeded=function(t,n){return(0,e.__awaiter)(this,void 0,Yn,function(){var i,r;return(0,e.__generator)(this,function(e){switch(e.label){case 0:return this.No?(i=n.href,this.pe[i]?[2]:function(t,n){switch(n.protocol){case"blob:":return!0;case"http:":case"https:":switch(n.hostname){case"localhost":case"127.0.0.1":case"[::1]":return t.location.protocol===n.protocol&&t.location.host===n.host;case"::1":var i=n.port?"[::1]:"+n.port:"[::1]";return t.location.protocol===n.protocol&&t.location.host===i;default:return!1;}default:return!1;}}(t,n)?(this.pe[i]=!0,[4,this.processResource(i)]):[2]):[2];case 1:return(r=e.sent())?(this.Qo(r),[2]):[2];}})})},t.prototype.Qo=function(t){var n=this,i=0==this.Do.length;this.Do.push(t),i&&new this.Lo(function(){n.Fo=!0,n.qo&&n.qo()},50).start()},t.prototype.processResource=function(t){return(0,e.__awaiter)(this,void 0,Yn,function(){var n,i,r,s,o;return(0,e.__generator)(this,function(e){switch(e.label){case 0:return this.Uo[t]?[2,this.Uo[t]]:[4,Zo(t)];case 1:return(n=e.sent())?[4,Yo(this._t,n.buffer)]:[2,null];case 2:return i=e.sent(),r=i.hash,s=i.algorithm,o={hash:r,hashAlgorithm:s,url:t,blob:n.blob,contentType:n.contentType},this.Uo[o.url]=o,[2,o];}})})},t.prototype.uploadDataUrlIfNeeded=function(t,n){return void 0===n&&(n=function(){return!0}),(0,e.__awaiter)(this,void 0,Yn,function(){var i,r,s,o,u;return(0,e.__generator)(this,function(e){switch(e.label){case 0:return i=function(t){var n,i=t.indexOf(",");if(-1!==i)try{var r=t.substring(0,i).match(tu),e=void 0,s=void 0;r&&(e=r[1],s=null===(n=r[2])||void 0===n?void 0:n.substring(1));for(var o=atob(t.substring(i+1)),u=new ArrayBuffer(o.length),a=new Uint8Array(u),c=0;c<o.length;++c)a[c]=o.charCodeAt(c);return{blob:new Blob([u],{type:e}),buffer:u,contentType:e,charset:s}}catch(n){return void Tt.sendToBugsnag(nu,"warning",{input:t.substring(0,100),err:n})}else Tt.sendToBugsnag(nu,"warning",{input:t.substring(0,100)})}(t),i?[4,Yo(this._t,i.buffer)]:[2,void 0];case 1:return r=e.sent(),s=r.hash,o=r.algorithm,u={hash:s,hashAlgorithm:o,url:"https://data-url.fs.invalid/"+o+"/"+s,blob:i.blob,contentType:i.blob.type||"application/octet-stream"},n(u)?(this.Uo[u.url]=u,this.Qo(u),[2,u]):[2,u];}})})},t}();function Zo(t){var n=ti(),i=n.resolve,r=n.promise,e=new XMLHttpRequest;return"string"!=typeof e.responseType?(i(null),r):(e.open("GET",t,!0),e.responseType="blob",e.onerror=function(){i(null)},e.onload=function(){if(200!=e.status&&0!==e.status)return he(t,{source:"log",type:"debug"}),void i(null);var n=e.response;if((n.size||n.length)>Go){var r=he(t,{source:"log",type:"bugsnag"});return Tt.sendToBugsnag("Size of blob resource exceeds limit","warning",{url:r,MaxResourceSizeBytes:Go}),void i(null)}(function(t){var n=ti(),i=n.resolve,r=n.promise,e=new FileReader;return e.readAsArrayBuffer(t),e.onload=function(){i(e.result)},e.onerror=function(t){Tt.sendToBugsnag(t,"error"),i(null)},r})(n).then(function(t){i(t?{buffer:t,blob:n,contentType:n.type}:null)})},e.send(),r)}function Yo(t,n){var i,r;return(0,e.__awaiter)(this,void 0,Yn,function(){var s;return(0,e.__generator)(this,function(e){switch(e.label){case 0:return s=t.window,(null===(r=null===(i=s.crypto)||void 0===i?void 0:i.subtle)||void 0===r?void 0:r.digest)?[4,s.crypto.subtle.digest({name:"sha-1"},n)]:[3,2];case 1:return[2,{hash:Qo(e.sent()),algorithm:"sha1"}];case 2:return[4,$o(t.time,ni,n)];case 3:return[2,{hash:e.sent().hash,algorithm:"fsnv"}];}})})}var tu=/^data:([^;,]*)(;?charset=[^;]+)?(?:;base64)?$/i,nu="Could not parse data url",iu=function(t,n,i){this.name="ProtocolError",this.message=n,this.status=t,this.data=i};function ru(t){return t>=400&&502!==t||202==t||206==t}var eu=function(){function t(t){this.Vo=0,this.zo=t.options.scheme,this.$o=t.options.cdnHost,this._t=t}return t.prototype.page=function(t){return(0,e.__awaiter)(this,void 0,Yn,function(){return(0,e.__generator)(this,function(n){switch(n.label){case 0:return[4,uu(this.zo,vu(this._t),"/rec/page",vt(t))];case 1:return[2,pt(n.sent().text)];}})})},t.prototype.settings=function(t){return(0,e.__awaiter)(this,void 0,Yn,function(){var n;return(0,e.__generator)(this,function(i){return n=t.previewMode||t.fallback?vu(this._t):this.$o,[2,fu(this.zo,n,t)]})})},t.prototype.bundle=function(t){var n;return(0,e.__awaiter)(this,void 0,Yn,function(){var i,r,s,o;return(0,e.__generator)(this,function(e){switch(e.label){case 0:return[4,ei()];case 1:return e.sent(),window,i=vt(t.bundle),this.Vo+=i.length,this.Vo,window,i.length>2e6?[4,ei()]:[3,3];case 2:e.sent(),e.label=3;case 3:return window,r=ou(t.bundle.Seq,t),[4,uu(this.zo,null!==(n=t.recHost)&&void 0!==n?n:vu(this._t),r,i)];case 4:return s=e.sent().text,o=pt(s),window,[2,[this.Vo,o]];}})})},t.prototype.bundleBeacon=function(t){var n;return hu(this.zo,null!==(n=t.recHost)&&void 0!==n?n:vu(this._t),t)},t.prototype.exponentialBackoffMs=function(t,n){var i=o.mathMin(cn.BackoffMax,5e3*o.mathPow(2,t));return n?i+.25*o.mathRandom()*i:i},t}(),su=function(){function t(t){this.zo=t.options.scheme,this._t=t}return t.prototype.uploadResource=function(t){return(0,e.__awaiter)(this,void 0,Yn,function(){return(0,e.__generator)(this,function(n){switch(n.label){case 0:return[4,uu(this.zo,vu(this._t),"/rec/uploadResource",t)];case 1:return[2,n.sent().text];}})})},t.prototype.queryResources=function(t){return(0,e.__awaiter)(this,void 0,Yn,function(){return(0,e.__generator)(this,function(n){switch(n.label){case 0:return[4,uu(this.zo,vu(this._t),"/rec/queryResources",vt(t))];case 1:return[2,pt(n.sent().text)];}})})},t}();function ou(t,n){var i="/rec/bundle"+("v2"===n.version?"/v2":"")+"?OrgId="+n.orgId+"&UserId="+n.userId+"&SessionId="+n.sessionId+"&PageId="+n.pageId+"&Seq="+t;return null!=n.serverPageStart&&(i+="&PageStart="+n.serverPageStart),null!=n.serverBundleTime&&(i+="&PrevBundleTime="+n.serverBundleTime),null!=n.lastUserActivity&&(i+="&LastActivity="+n.lastUserActivity),n.isNewSession&&(i+="&IsNewSession=true"),null!=n.deltaT&&(i+="&DeltaT="+n.deltaT),i}function uu(t,n,i,r){return(0,e.__awaiter)(this,void 0,Yn,function(){return(0,e.__generator)(this,function(e){return[2,cu("POST",t,n,lu(i),!0,r)]})})}function au(t,n,i){return(0,e.__awaiter)(this,void 0,Yn,function(){return(0,e.__generator)(this,function(r){return[2,cu("GET",t,n,lu(i),!1)]})})}function cu(t,n,i,r,s,o){return(0,e.__awaiter)(this,void 0,Yn,function(){return(0,e.__generator)(this,function(e){return[2,new Yn(function(e,u){var a="//"+i+r,c=!1,h=new XMLHttpRequest,f=("withCredentials"in h);jt(f,"XHR missing CORS support"),f&&(h.onreadystatechange=function(){if(4==h.readyState){if(c)return;c=!0;try{var t={text:h.responseText};if(200==h.status)return void e(t);var n=void 0;try{n=pt(t.text)}catch(t){}u(new iu(h.status,t.text,n))}catch(t){Tt.sendToBugsnag(t,"error"),u(t)}}},h.open(t,n+a,!0),h.withCredentials=s,o&&"function"!=typeof o.append&&h.setRequestHeader("Content-Type","text/plain"),h.send(o))})]})})}function hu(t,n,i){if("function"==typeof navigator.sendBeacon){var r=t+"//"+n+ou(i.bundle.Seq,i)+"&SkipResponseBody=true",e=vt(i.bundle);try{return navigator.sendBeacon.bind(navigator)(r,e)}catch(t){}}return!1}function fu(t,n,i){var r;return(0,e.__awaiter)(this,void 0,Yn,function(){var s,o;return(0,e.__generator)(this,function(e){switch(e.label){case 0:return s=null!==(r=i.version)&&void 0!==r?r:"v1",o=i.previewMode?"?previewMode=true":"",[4,au(t,n,"/s/settings/"+i.orgId+"/"+s+"/web"+o)];case 1:return[2,pt(e.sent().text)];}})})}function vu(t){var n,i=null===(n=t.recording.pageResponse())||void 0===n?void 0:n.GCLBSubdomain,r=t.options.recHost;return i&&K(r)?r.replace(/^rs\./,i+"."):r}function lu(t){if(!window.Zone)return t;var n="?";return t.indexOf(n)>-1&&(n="&"),""+t+n+"ngsw-bypass=true"}var du,pu=function(){function t(t,n,i){void 0===i&&(i=new wu),this._t=t,this.Vr=n,this.Go=i}return t.prototype.initialize=function(t){var n;if(t){this.Xo(t);var i=null===(n=this._t.window.location)||void 0===n?void 0:n.href;this.onNavigate(i)}},t.prototype.onNavigate=function(t){return!!this.Go.matches(t)&&(this.Vr.enqueue({Kind:Ot.KEEP_URL,Args:[this.Jo(t)]}),!0)},t.prototype.onClick=function(t){var n;return!!(null===(n=null==t?void 0:t.watchKind)||void 0===n?void 0:n.has(_i.Keep))&&(this.Vr.enqueue({Kind:Ot.KEEP_ELEMENT,Args:[t.id]}),!0)},t.prototype.urlMatches=function(t){return this.Go.matches(t)},t.prototype.Xo=function(t){this.Go.setRules(t)},t.prototype.Jo=function(t){return he(t,{source:"page",type:"base"})},t}(),wu=function(){function t(){this.Zo=null}return t.prototype.setRules=function(t){var n=t.map(function(t){return t.Regex}).filter(this.Yo);n.length>0&&(this.Zo=this.tu(n))},t.prototype.matches=function(t){return!!this.Zo&&this.Zo.test(t)},t.prototype.Yo=function(t){try{return new RegExp(t),!0}catch(n){return Tt.sendToBugsnag("Browser rejected UrlKeep.Regex","error",{expr:t,error:n.toString()}),!1}},t.prototype.tu=function(t){try{return new RegExp("("+t.join(")|(")+")","i")}catch(n){return Tt.sendToBugsnag("Browser rejected joining UrlKeep.Regexs","error",{exprs:t,error:n.toString()}),null}},t}(),gu=function(t){var n=(void 0===t?{}:t).wnd,i=void 0===n?window:n;!function(t,n,i,r,e,s,o,u){var a,c;function h(t){var n,i=[];function r(){n&&(i.forEach(function(t){var i;try{i=t[n[0]]&&t[n[0]](n[1])}catch(n){return void(t[3]&&t[3](n))}i&&i.then?i.then(t[2],t[3]):t[2]&&t[2](i)}),i.length=0)}function e(t){return function(i){n||(n=[t,i],r())}}return t(e(0),e(1)),{then:function(t,n){return h(function(e,s){i.push([t,n,e,s]),r()})}}}(!(i in t)||(t.console&&t.console.log&&t.console.log("FullStory namespace conflict. Please set window[\"_fs_namespace\"]."),0))&&(u=t[i]=function(){var t=function(t,i,r){function e(e,s){n(t,i,r,e,s)}var s=/Async$/;return s.test(t)?(t=t.replace(s,""),"function"==typeof Promise?new Promise(e):h(e)):n(t,i,r)};function n(n,i,r,e,s){return t._api?t._api(n,i,r,e,s):(t.q&&t.q.push([n,i,r,e,s]),null)}return t.q=[],t}(),function(){function t(){}function n(t,n,i){u("setProperties",{type:t,properties:n},i)}function i(t,i){n("user",t,i)}function r(t,n,r){i({uid:t},r),n&&i(n,r)}u.identify=r,u.setUserVars=i,u.identifyAccount=t,u.clearUserCookie=t,u.setVars=n,u.event=function(t,n,i){u("trackEvent",{name:t,properties:n},i)},u.anonymize=function(){r(!1)},u.shutdown=function(){u("shutdown")},u.restart=function(){u("restart")},u.log=function(t,n){u("log",{level:t,msg:n})},u.consent=function(t){u("setIdentity",{consent:!arguments.length||t})}}(),a="fetch",c="XMLHttpRequest",u._w={},u._w[c]=t[c],u._w[a]=t[a],t[a]&&(t[a]=function(){return u._w[a].apply(this,arguments)}),u._v="2.0.0")}(i,i.document,i._fs_namespace,0,0,i._fs_script)};function mu(t,n){if(t&&t.postMessage)try{t.postMessage(function(t){var n;return vt(((n={}).__fs=t,n))}(n),"*")}catch(t){Ut("postMessage",t)}}function yu(t){try{var n=pt(t);if("__fs"in n)return n.__fs}catch(t){}return[du.Unknown]}function bu(t,n,i,r){var e=W(t);if(!e)return!1;try{e.send(n,i,r)}catch(t){e.send(n,i)}return!0}!function(t){t.EndPreviewMode="EndPreviewMode",t.EvtBundle="EvtBundle",t.GreetFrame="GreetFrame",t.InitFrameMobile="InitFrameMobile",t.RequestFrameId="RequestFrameId",t.RestartFrame="RestartFrame",t.SetConsent="SetConsent",t.SetFrameId="SetFrameId",t.ShutdownFrame="ShutdownFrame",t.Unknown="Unknown"}(du||(du={}));var Eu=new RegExp(/^\s+$/),Su=/^fb\d{18}$/,xu=function(t){var n=t.frame,i=t.orgId,r=t.scheme,e=t.script,s=t.recHost,u=t.cdnHost,a=t.appHost,c=t.namespace,h=(t.desc,t.snippetVersion);try{if(function(t){return t.id==t.name&&Su.test(t.id)}(n))return Rt.BlocklistedFrame;if(function(t){return!(t.contentDocument&&t.contentWindow&&t.contentWindow.location)||function(t){return!!t.src&&"about:blank"!=t.src&&t.src.indexOf("javascript:")<0}(t)&&t.src!=t.contentWindow.location.href&&"loading"==t.contentDocument.readyState}(n))return Rt.PartiallyLoaded;var f=n.contentWindow,v=n.contentDocument;if(!f||!v)return Rt.MissingWindowOrDocument;if(!v.head)return Rt.MissingDocumentHead;if(!v.body||0===v.body.childNodes.length)return Rt.MissingBodyOrChildren;for(var l=!1,d=v.body.childNodes,p=0;p<d.length;p++){switch(d[p].nodeType){case Node.ELEMENT_NODE:if("SCRIPT"===d[p].tagName)continue;break;case Node.TEXT_NODE:var w=d[p].textContent;if(null===w||Eu.test(w))continue;break;case Node.COMMENT_NODE:continue;}l=!0;break}if(!l)return Rt.NoNonScriptElement;if(T(f))return Rt.AlreadyDefined;var g=f;return g._fs_org=i,g._fs_script=e,g._fs_rec_host=s,g._fs_rec_settings_host=u,g._fs_app_host=a,g._fs_run_in_iframe=!0,g._fs_namespace=c,g._fs_transport=function(t){return{send:function(n,i,r){if(void 0!==t.parent){var e=T(t.parent);void 0!==e&&"function"==typeof e._withRecorder&&e._withRecorder(r,function(e){try{e.onMessageReceived(t,[n,o.jsonParse(i),r])}catch(t){t instanceof SyntaxError&&Tt.sendToBugsnag(t,"error",{msg:"Received invalid JSON"})}})}}}}(g),function(t,n,i,r,e,s){/^2\./.test(s)?gu({wnd:t}):function(t){var n,i,r,e,s,o=(void 0===t?{}:t).wnd,u=void 0===o?window:o;n=u,u.document,i=u._fs_namespace,r="user",i in n?n.console&&n.console.log&&n.console.log("FullStory namespace conflict. Please set window[\"_fs_namespace\"]."):((e=n[i]=function(t,n,i){e.q?e.q.push([t,n,i]):e._api(t,n,i)}).q=[],e.identify=function(t,n,i){e(r,{uid:t},i),n&&e(r,n,i)},e.setUserVars=function(t,n){e(r,t,n)},e.event=function(t,n,i){e("event",{n:t,p:n},i)},e.anonymize=function(){e.identify(!1)},e.shutdown=function(){e("rec",!1)},e.restart=function(){e("rec",!0)},e.log=function(t,n){e("log",[t,n])},e.consent=function(t){e("consent",!arguments.length||t)},e.identifyAccount=function(t,n){(n=n||{}).acctId=t,e("account",n)},e.clearUserCookie=function(){},e.setVars=function(t,n){e("setVars",[t,n])},e._w={},s="XMLHttpRequest",e._w[s]=n[s],s="fetch",e._w[s]=n[s],n[s]&&(n[s]=function(){return e._w[s].apply(this,arguments)}),e._v="1.3.0")}({wnd:t});var o=n.createElement("script");o.async=!0,o.crossOrigin="anonymous",o.src=i+"//"+r,"testdrive"==e&&(o.src+="?allowMoo=true"),n.head.appendChild(o)}(g,v,r,e,i,h),Rt.Successful}catch(t){return Rt.Exception}};function ku(t){var n=""+Di(t);return t.id&&(n+="#"+t.id),n+"[src="+he(t.src,{source:"log",type:"debug"})+"]"}var _u,Au="https://fs-obfuscated.invalid",Iu=function(){function t(t,n){var i=this;this.Dn=t,this.At=n,this.nu=0,this.iu={},this.ru=function(t){var n;try{if("function"==typeof(null===(n=t.crypto)||void 0===n?void 0:n.getRandomValues)){var i="",r=new Uint32Array(2);t.crypto.getRandomValues(r);for(var e=0;e<r.length;e++)i+=r[e].toString(16);return i}}catch(t){}return o.mathFloor(1e20*(o.mathRandom()+.1)).toString(16)}(this.Dn),this.At.enqueue({Kind:Ot.URL_SALT,Args:[this.ru]}),this.eu=new ro(this.Dn,{interval:500,onFlush:function(t){return i.Yr(t)}})}return t.prototype.flush=function(){this.eu.flush()},t.prototype.Yr=function(t){0!==t.length&&this.At.enqueue({Kind:Ot.URL_ID,Args:t})},t.prototype.record=function(t){if(/^(file|http)/i.test(t)){var n=this.su(t,!0),i=n[0];n[1]&&this.eu.append([t,i])}},t.prototype.seen=function(t){return this.su(t,!1)[0]},t.prototype.su=function(t,n){var i=t.substring(0,5e3);if(void 0===this.iu[i]){var r=this.nu++;return this.iu[i]={id:r,record:n},[r,n]}var e=!1;return n&&(e=!1===this.iu[i].record,this.iu[i].record=!0),[this.iu[i].id,e]},t.prototype.obfuscateUrl=function(t,n){return"css"===n?this.ou(t):this.uu(t)},t.prototype.ou=function(t){var n=qo(t.substring(0,5e3)+this.ru);return Au+"?hash="+n+"&algorithm=fnv32"},t.prototype.uu=function(t){var n=this.seen(t);return Au+"?url-id="+n},t}();!function(t){t[t.NoInfoYet=1]="NoInfoYet",t[t.Enabled=2]="Enabled",t[t.Disabled=3]="Disabled"}(_u||(_u={}));var Tu,Cu=function(){function t(t,n,i,r,e){var s=this;this._t=t,this.au=e,this.cu=cn.DefaultOrgSettings,this.hu=!1,this.Eo=null,this.So=[],this.fu=cn.DefaultBundleUploadInterval,this.vu=[],this.lu=new WeakMap,this.du=[],this.T=new bn,this.pu=_u.NoInfoYet,this.wu=!1,this.gu=!1,this.mu={},this.At=new Bo(t,r,i,function(){return s.yu.bundleEvents()},n);var o=new Jo(t,this.At,new su(t)),u=new Iu(t.window,this.At);this.Xt=new Ge,this.Ve=new pu(t,this.At),this.yu=new To(t,this.At,this.Ve,this.Xt,this.T,function(t){return s.ze(t)},function(t){return s.$e(t)},o,u),this.zo=t.options.scheme,this.bu=t.options.script,this.Eu=t.options.recHost,this.$o=t.options.cdnHost,this.Su=t.options.appHost,this.xu=t.options.orgId,this.Dn=t.window}return t.prototype.getPageResponse=function(){return this.ku},t.prototype.bundleUploadInterval=function(){return this.fu},t.prototype.orgSettings=function(){return this.cu},t.prototype.setInitConfig=function(t){this._u=t},t.prototype.start=function(t,n,i){var r=this;this.Au=n,this.Iu=i,"onpagehide"in this.Dn?this.T.add(this.Dn,"pagehide",!1,function(t){(null==t?void 0:t.persisted)?r.At.singSwanSong(Wt.Unload):r.Tu()}):this.T.add(this.Dn,"unload",!1,function(t){r.Tu()}),this.T.add(this.Dn,"message",!1,function(t){var n=t.data;if("string"==typeof n){var i=t.source;r.onMessageReceived(i,yu(n))}});var e=this.Dn.Document?this.Dn.Document.prototype:this.Dn.document;this.Cu=mt(e,"close"),this.Cu&&this.Cu.afterAsync(function(){r.T.refresh()})},t.prototype.tellAllFramesTo=function(t){for(var n=0,i=this.vu;n<i.length;n++){var r=i[n];r.contentWindow&&mu(r.contentWindow,t)}},t.prototype.queue=function(){return this.At},t.prototype.eventWatcher=function(){return this.yu},t.prototype.console=function(){return this.yu.consoleWatcher()},t.prototype.onDomLoad=function(){this.yu.onDomLoad()},t.prototype.onLoad=function(){this.yu.onLoad()},t.prototype.shutdown=function(t){this.gu=!0,this.yu.stop(t),this.T&&this.T.clear(),this.Cu&&this.Cu.disable(),this.tellAllFramesTo([du.ShutdownFrame])},t.prototype.getCurrentSessionURL=function(t){var n=this.pu;if(n==_u.NoInfoYet)return null;if(n==_u.Disabled)return this.zo+"//"+this.Su+"/opt/upgrade";var i=this.getCurrentSession();return i?(t&&(i+=":"+this._t.time.wallTime()),this.zo+"//"+this.Su+"/ui/"+this._t.options.orgId+"/"+(this.hu?"client-":"")+"session/"+encodeURIComponent(i)):null},t.prototype.getCurrentSession=function(){var t=this.pu;return t==_u.NoInfoYet||t==_u.Disabled?null:this.Pu&&this.ju?this.Pu+":"+this.ju:null},t.prototype.setConsent=function(t){var n,i=this;null===(n=this._t.recording.identity)||void 0===n||n.getConsentStore().setConsentState(t);var r=function(){i.Xt.setConsent(t),i.At.processEvents()},e=function(){i.At.enqueue({Kind:Ot.SYS_SETCONSENT,Args:[t,Bt.Document]})};switch(t){case Dt.GrantConsent:e(),r();break;case Dt.RevokeConsent:r(),e();}this.tellAllFramesTo([du.SetConsent,t])},t.prototype.pageSignature=function(){return this.Pu+":"+this.ju+":"+this.Ou},t.prototype.getBundleApiVersion=function(){return this.hu?"v2":"v1"},t.prototype.fireFsReady=function(t){var n,i;void 0===t&&(t=!1),null===(n=this._t.recording.observer)||void 0===n||n.onStart(null!==(i=this.getCurrentSessionURL())&&void 0!==i?i:"",this.cu);var r=R(this.Dn,"_fs_ready","function");if(r)try{t?r(!0):r()}catch(t){}},t.prototype.Tu=function(){this.At.addUnload(Wt.Unload),Ji.stopAll()},t.prototype.isSafeResponse=function(t){var n,i,r,e,s,o,u,a,c=(null!==(i=null===(n=t.ElementBlocks)||void 0===n?void 0:n.length)&&void 0!==i?i:0)>0&&(null!==(s=null===(e=null===(r=t.OrgSettings)||void 0===r?void 0:r.UrlPrivacyConfig)||void 0===e?void 0:e.length)&&void 0!==s?s:0)>0&&(null!==(a=null===(u=null===(o=t.OrgSettings)||void 0===o?void 0:o.AttributeBlocklist)||void 0===u?void 0:u.length)&&void 0!==a?a:0)>0;return c||Tt.sendToBugsnag("Invalid page response","error",{rsp:t}),c},t.prototype.handleResponse=function(t,n){var i,r,e,s,o=t.Flags,u=o.AjaxWatcher,a=o.ClientSideRageClick,c=o.GetCurrentSession,h=o.ResourceUploading,f=o.UseClientSideId;this.ku=t,this.Pu=t.UserIntId,this.ju=t.SessionIntId,this.Ou=t.PageIntId,this.Mu=t.PageStart,this.pu=c?_u.Enabled:_u.Disabled,this.cu=t.OrgSettings,pe(null!==(i=this.cu.UrlPrivacyConfig)&&void 0!==i?i:cn.DefaultOrgSettings.UrlPrivacyConfig,this.cu.MaxUrlLength);var v=null!==(r=this.cu.AttributeBlocklist)&&void 0!==r?r:[];(null===(s=null===(e=this._u)||void 0===e?void 0:e.privacy)||void 0===s?void 0:s.attributeBlocklist)&&(this._u.privacy.attributeBlocklist.length,v.push.apply(v,this._u.privacy.attributeBlocklist.map(Ae))),xe(v),this.yu.consoleWatcher().initializeMaxLogsPerPage(this.cu.MaxConsoleLogPerPage),this.yu.ajaxWatcher().initialize({requests:this.cu.HttpRequestHeadersAllowlist,responses:this.cu.HttpResponseHeadersAllowlist,maxAjaxPayloadLength:this.cu.MaxAjaxPayloadLength}),this.yu.perfWatcher().initialize({resourceUploader:this.yu.getResourceUploader(),recTimings:!!this.cu.RecordPerformanceResourceTiming,recImgs:!!this.cu.RecordPerformanceResourceImg,maxPerfMarksPerPage:this.cu.MaxPerfMarksPerPage}),this.Xt.initialize({canvasWatcherMode:t.Flags.CanvasWatcherMode,blocks:t.ElementBlocks,deferreds:t.ElementDeferreds,keeps:t.ElementKeeps,watches:t.ElementWatches}),this.Ve.initialize(t.UrlKeeps),this.Xt.initializeConsent(null!=n?n:!!t.Consented),"number"==typeof t.BundleUploadInterval&&(this.fu=t.BundleUploadInterval),h&&this.enableResourceUploading(),u&&t.AjaxWatches&&this.yu.ajaxWatcher().setWatches(t.AjaxWatches),a&&this.At.enableEasyBake(),f&&(this.hu=!0),this.yu.start(t.Flags)},t.prototype.fullyStarted=function(){this.Au&&this.Au()},t.prototype.enableResourceUploading=function(){this.wu=!0,this.yu.initResourceUploading()},t.prototype.flushPendingChildFrameInits=function(){if(this.du.length>0){for(var t=0;t<this.du.length;t++)this.du[t]();this.du=[]}},t.prototype.Ku=function(t){var n=this;this._t.measurer.requestMeasureTask(ii.Essential,function(){var i=ku(t),r=n.au({frame:t,orgId:n.xu,scheme:n.zo,script:n.bu,recHost:n.Eu,cdnHost:n.$o,appHost:n.Su,namespace:A(n.Dn),desc:i,snippetVersion:V(n.Dn)});r!==Rt.MissingDocumentHead&&r!==Rt.MissingBodyOrChildren&&r!==Rt.NoNonScriptElement||!t.contentDocument||new MutationObserver(function(i,r){n.Ku(t),r.disconnect()}).observe(t.contentDocument,{childList:!0,subtree:!0}),n.At.enqueue({Kind:Ot.FRAME_STATUS,Args:[Di(t),i,r]})})},t.prototype.addInitEvent=function(){var t,n;(null===(t=this._u)||void 0===t?void 0:t.privacy)&&this.At.enqueue({Kind:Ot.INIT_API,Args:["privacy",["attributeBlocklist",(null!==(n=this._u.privacy.attributeBlocklist)&&void 0!==n?n:[]).map(function(t){return[t.target,t.tag,t.name,t.action,t.type]})]]})},t.prototype.ze=function(t){var n=Di(t);if(n){this.vu.push(t);var i=!1;if(t.contentWindow)try{i=!!T(t.contentWindow)}catch(t){i=!0}var r=function(t){var n=t.src,i=location.protocol+"//"+location.host;return!n||"about:blank"==n||it(n,"javascript:")||it(n,i)}(t),e=t.contentWindow&&t.contentWindow.postMessage;r&&!i||!e?r?this.Ru(t):ku(t):this.Hu(t,n)}else ku(t)},t.prototype.Hu=function(t,n){t.contentWindow&&t.contentWindow.postMessage?(ku(t),mu(t.contentWindow,[du.GreetFrame,n])):ku(t)},t.prototype.Ru=function(t){var n=this;ku(t),this.Ku(t);var i=this.T.add(t,"load",!1,Tt.wrap(function(){ku(t),n.Ku(t)}));this.lu.set(t,i)},t.prototype.$e=function(t){if(Di(t)){var n=this.lu.get(t);void 0!==n&&(this.T.remove(n),this.lu["delete"](t)),this.vu=this.vu.filter(function(n){return n!==t})}},t.prototype.onMessageReceived=function(t,n){if(!t||t.parent==this.Dn)switch(n[0]){case du.EvtBundle:var i=n[1],r=n[2],e=this.pageSignature();if(e!==r)return Qi({msg:"Page signature mismatch",pageSignature:e,messageSignature:r},1024),void(t&&mu(t,[du.ShutdownFrame]));i.length>0&&this.At.sendEvents(e,i);break;case du.RequestFrameId:if(!t)return;var s=this.Nu(t);void 0===s||(this.mu[s]=!1,this.Lu(t,s));case du.Unknown:}},t.prototype.Nu=function(t){for(var n=0,i=this.vu;n<i.length;n++){var r=i[n];if(r.contentWindow===t)return Di(r)}},t.prototype.Lu=function(t,n){var i=this,r=function(){var r=[];0!=i.Eo&&null!==i.Eo&&(r=i.So?i.So.concat(i.Eo):[i.Eo]);var e=i._t.time.startTime();mu(t,[du.SetFrameId,n,r,e,i.zo,i.bu,i.Su,i.xu,i._u,i.ku,i.Xt.getConsent(),i._t.time.now()])};null==this.Eo?this.du.push(r):r()},t.prototype.enqueueDocumentProperties=function(t){var n=this;this._t.measurer.requestMeasureTask(ii.Essential,function(){n.At.enqueue({Kind:Ot.DOCUMENT_PROPERTIES,Args:[Di(t.scrollingElement),t.compatMode]})})},t}(),Pu=function(){function t(t,n,i,r){void 0===r&&(r=Yi),this._t=t,this.Ho=n,this.Uu=i,this.Fu=r,this.sing()}return t.prototype.store=function(t){var n;t.bundles.length;var i=vt({Bundles:t.bundles,IsNewSession:t.isNewSession,LastBundleTime:t.lastBundleTime,OrgId:this.Uu.getOrgId(),PageId:t.pageId,PageStartTime:this._t.time.startTime(),RecHost:vu(this._t),ServerBundleTime:t.serverBundleTime,ServerPageStart:t.serverPageStart,SessionId:null!==(n=this.Uu.getSessionId())&&void 0!==n?n:"",UserId:this.Uu.getUserId(),Version:t.version});if(!(i.length>2e6))try{localStorage._fs_swan_song=i}catch(t){}},t.prototype.sing=function(){try{var t=this.purge();if(void 0===t)return;if(!(t.Bundles&&t.UserId&&t.SessionId&&t.PageId))return;t.OrgId||(t.OrgId=this.Uu.getOrgId()),t.Bundles.length>0&&(t.Bundles.length,this.Du(t))}catch(t){}},t.prototype.purge=function(){try{if("_fs_swan_song"in localStorage){var t=localStorage._fs_swan_song;return delete localStorage._fs_swan_song,pt(t)}}catch(t){}},t.prototype.Du=function(t,n){return void 0===n&&(n=0),(0,e.__awaiter)(this,void 0,Yn,function(){var i,r,s,o;return(0,e.__generator)(this,function(u){switch(u.label){case 0:if(i=null,!tt(t.Bundles)||0===t.Bundles.length||void 0===t.Bundles[0])return[2];1==t.Bundles.length&&(i=this._t.time.wallTime()-(t.LastBundleTime||0)),u.label=1;case 1:return u.trys.push([1,3,,4]),[4,this.Ho.bundle({bundle:t.Bundles[0],deltaT:i,isNewSession:t.IsNewSession,orgId:t.OrgId,pageId:t.PageId,recHost:t.RecHost,serverBundleTime:t.ServerBundleTime,serverPageStart:t.ServerPageStart,sessionId:t.SessionId,userId:t.UserId,version:t.Version})];case 2:return r=u.sent(),s=r[1],t.Bundles[0].Evts.length,t.Bundles[0].Seq,t.Bundles.shift(),t.Bundles.length>0&&this.Du((0,e.__assign)((0,e.__assign)({},t),{ServerBundleTime:s.BundleTime})),[3,4];case 3:return(o=u.sent())instanceof iu&&ru(o.status)?[2]:(this.Bu=new this.Fu(this.Du,this.Ho.exponentialBackoffMs(n,!0),this,t,n+1).start(),[3,4]);case 4:return[2];}})})},t}(),ju=function(){function t(){}return t.prototype.encode=function(t){return t},t}(),Ou=function(){function t(){this.dict={idx:-1,map:{}},this.nodeCount=1,this.startIdx=0}return t.prototype.encode=function(n){if(0==n.length)return[];var i,r,e=n[0],s=Object.prototype.hasOwnProperty.call(this.dict.map,e)?this.dict.map[e]:void 0,o=[],u=1;function a(){s?u>1?o.push([s.idx,u]):o.push(s.idx):o.push(e)}for(i=1;i<n.length;i++)if(r=n[i],s&&Object.prototype.hasOwnProperty.call(s.map,r))u++,e=r,s=s.map[r];else{a();var c=this.startIdx+i-u;null==s&&this.nodeCount<t.MAX_NODES&&(s={idx:c,map:{}},this.dict.map[e]=s,this.nodeCount++),s&&this.nodeCount<t.MAX_NODES&&(s.map[r]={idx:c,map:{}},this.nodeCount++),u=1,e=r,s=Object.prototype.hasOwnProperty.call(this.dict.map,r)?this.dict.map[r]:void 0}return a(),this.startIdx+=n.length,o},t.MAX_NODES=1e4,t}(),Mu=((Tu={})[Ot.PERF_ENTRY]=!0,Tu[Ot.AJAX_REQUEST]=!0,Tu),Ku=function(){function t(t,n,i,r,e,s){void 0===r&&(r=!0),void 0===e&&(e=Zi),void 0===s&&(s=Yi),this._t=t,this.Ho=n,this.co=i,this.Wu=r,this.bo=e,this.qu=!1,this.Qu=0,this.Vu=0,this.zu=1,this.$u=0,this.Gu=!1,this.Xu={},this.Ju=16e6,this.Zu=0,this.Yu=new Ru(1),this.ta=[],this.Uu=t.recording.identity,this.zo=t.options.scheme,this.na=t.time.wallTime(),this.ia=new Pu(t,this.Ho,this.Uu,s)}return t.prototype.setPageData=function(t){this.ra=t},t.prototype.onShutdown=function(t){this.ea=t},t.prototype.scheme=function(){return this.zo},t.prototype.enqueueEvents=function(t,n){for(var i=0,r=n;i<r.length;i++){var e=r[i];this.Yu.pushEvent(e)}},t.prototype.initUploadTicker=function(){this.sa=new this.bo(this._t.recording.bundleUploadInterval())},t.prototype.startPipeline=function(t){var n,i=this;this.Ou=t.pageId,this.Mu=t.serverPageStart,this.Gu=t.isNewSession,this.oa(),this.sa||this.initUploadTicker(),null===(n=this.sa)||void 0===n||n.start(function(){i.oa()})},t.prototype.stopPipeline=function(){this.sa&&this.sa.stop(),this.Yu=new Ru(this.Yu.bundle.Seq),this.ta=[],this.Xu={},this.Ou=void 0,this.Mu=void 0,this.Gu=!1},t.prototype.flush=function(){return(0,e.__awaiter)(this,void 0,Yn,function(){return(0,e.__generator)(this,function(t){switch(t.label){case 0:return this.ua(),[4,this.aa()];case 1:return t.sent(),[2];}})})},t.prototype.singSwanSong=function(){var t;if(this.Ou){this.ua();var n=[];this.ca&&n.push(this.ca);for(var i=0,r=this.ta;i<r.length;i++){var e=r[i];n.push(e)}if(0!==n.length){void 0!==this.Mu&&this.ia.store({pageId:this.Ou,bundles:n,lastBundleTime:this.na,serverPageStart:this.Mu,serverBundleTime:this.Zu,isNewSession:this.Gu,version:this._t.recording.bundleApiVersion()});for(var s=0,o=n;s<o.length&&(e=o[s],this.Ho.bundleBeacon({bundle:e,deltaT:null,orgId:this.Uu.getOrgId(),pageId:this.Ou,serverBundleTime:this.Zu,serverPageStart:this.Mu,isNewSession:this.Gu,sessionId:null!==(t=this.Uu.getSessionId())&&void 0!==t?t:"",userId:this.Uu.getUserId(),version:this._t.recording.bundleApiVersion()}));s++);}}},t.prototype.oa=function(){return(0,e.__awaiter)(this,void 0,Yn,function(){return(0,e.__generator)(this,function(t){switch(t.label){case 0:return this.ca?(this.qu&&this.ha(),[2]):(this.Yu.hasActiveEvents()&&this.ua(),[4,this.aa()]);case 1:return t.sent(),[2];}})})},t.prototype.ua=function(){if(this.Yu.hasAnyEvents()){var t=this.fa(this.Yu.bundle);return this.Yu=this.Yu.createNext(),this.ta.push(t),t}},t.prototype.aa=function(){return(0,e.__awaiter)(this,void 0,Yn,function(){return(0,e.__generator)(this,function(t){switch(t.label){case 0:return this.Ou&&this.Mu&&!this.ca&&0!=this.ta.length?(this.ca=this.ta.shift(),[4,this.ha()]):[2];case 1:return t.sent(),[2];}})})},t.prototype.ha=function(){return(0,e.__awaiter)(this,void 0,Yn,function(){var t,n,i,r;return(0,e.__generator)(this,function(e){switch(e.label){case 0:if((t=this._t.time.wallTime())<this.Vu)return[2];if(!(n=this.ca))return[2];this.qu=!1,this.$u=this.na=t,e.label=1;case 1:return e.trys.push([1,5,,6]),[4,this.va(n)];case 2:return(i=e.sent())?(n.Seq,n.Evts.length,this.Zu=i.BundleTime,this.ca=void 0,this.Vu=0,this.Qu=0,this._t.time.wallTime()-this.$u>this._t.recording.bundleUploadInterval()?[4,this.aa()]:[3,4]):[2];case 3:e.sent(),e.label=4;case 4:return[3,6];case 5:if((r=e.sent())instanceof iu){if(ru(r.status))return 206==r.status?Tt.sendToBugsnag("Failed to send bundle, probably because of its large size","error"):r.status>=500&&Tt.sendToBugsnag("Failed to send bundle, recording outage likely","error"),this.ea&&this.ea(),[2]}else Tt.sendToBugsnag("Failed to send bundle, unknown err","error",{err:r});return this.qu=!0,this.Vu=this.$u+this.Ho.exponentialBackoffMs(this.Qu++,!1),[3,6];case 6:return[2];}})})},t.prototype.va=function(t){var n,i;return(0,e.__awaiter)(this,void 0,Yn,function(){var r,s,o,u;return(0,e.__generator)(this,function(e){switch(e.label){case 0:return this.Ou?(window,r=this.co.getMsSinceLastUserAcivity(),[4,this.Ho.bundle({bundle:t,deltaT:null,lastUserActivity:r,orgId:this.Uu.getOrgId(),pageId:this.Ou,serverBundleTime:this.Zu,serverPageStart:this.Mu,isNewSession:this.Gu,sessionId:null!==(n=this.Uu.getSessionId())&&void 0!==n?n:"",userId:this.Uu.getUserId(),version:this._t.recording.bundleApiVersion()})]):[2];case 1:return s=e.sent(),o=s[0],u=s[1],null===(i=this._t.recording.observer)||void 0===i||i.onBundleSent(o),o>this.Ju&&this.zu>16&&this._t.recording.splitPage(Wt.Size),window,[2,u];}})})},t.prototype.fa=function(t){if(0===t.Evts.length)return t;for(var n=[],i=0,r=t.Evts;i<r.length;i++){var s=r[i];switch(s.Kind){case Ot.SET_FRAME_BASE:var o=Hu(s.PIds,s.FId);delete this.Xu[o];break;case Ot.MUT_INSERT:var u=p();s.Args[2]=this.la(s.PIds,s.FId,s.Args[2]),n.push(p()-u);break;case Ot.MUT_SHADOW:u=p(),s.Args[1]=this.la(s.PIds,s.FId,s.Args[1]),n.push(p()-u);}}var a=t.Evts[t.Evts.length-1];if(this.ra&&t.Evts.push((0,e.__assign)((0,e.__assign)({},a),this.ra)),0===n.length)return t;var c=n[0],h=n.slice(1);return t.Evts.push((0,e.__assign)((0,e.__assign)({},a),{Kind:Ot.TIMING,Args:[(0,e.__spreadArray)([Nt.Internal,Kt.Serialization,Ht.LzEncoding,a.When,c],h.map(function(t){return[Ht.LzEncoding,t]}))]})),t},t.prototype.la=function(t,n,i){void 0===t&&(t=[]),void 0===n&&(n=0);var r=Hu(t,n);return this.Xu[r]||(this.Xu[r]=this.Wu?new Ou:new ju),this.Xu[r].encode(i)},t}(),Ru=function(){function t(t){this.da=!1,this.pa={Seq:t,When:-1,Evts:[]}}return Object.defineProperty(t.prototype,"bundle",{get:function(){return this.pa},enumerable:!1,configurable:!0}),t.prototype.createNext=function(){return new t(this.pa.Seq+1)},t.prototype.hasAnyEvents=function(){return this.pa.Evts.length>0},t.prototype.hasActiveEvents=function(){return this.da},t.prototype.pushEvent=function(t){Mu[t.Kind]||(this.da=!0),this.pa.When<0&&(this.pa.When=t.When),this.pa.Evts.push(t)},t}();function Hu(t,n){void 0===t&&(t=[]),void 0===n&&(n=0);for(var i="",r=0,e=t;r<e.length;r++)i+="/"+e[r];return i+"/"+n}var Nu=new RegExp("(^\\?|&)_fs_preview=(?:true|false)(&|$)"),Lu=function(){function t(t,n,i){this.Dn=n,this.wa=i,this.ga="fs_preview_"+t}return t.prototype.isPreviewMode=function(){return this.ma()||this.ya()},t.prototype.clear=function(){this.wa.setValue(this.ga,"",new Date(1970,1,1).toUTCString())},t.prototype.write=function(){var t=this.ma(),n=this.ba();(t||n)&&(t?this.wa.setValue(this.ga,"true",new Date(p()+432e5).toUTCString()):this.clear(),this.Ea())},t.prototype.Ea=function(){if(this.Dn.history){var t=location.search.replace(Nu,function(t,n,i){return i?n:""});this.Dn.history.replaceState({},"",this.Dn.location.href.replace(location.search,t))}},t.prototype.ma=function(){return this.Dn.document.location.search.indexOf("_fs_preview=true")>-1},t.prototype.ba=function(){return this.Dn.document.location.search.indexOf("_fs_preview=false")>-1},t.prototype.ya=function(){return!!this.wa.getValue(this.ga)},t}();function Uu(t){var n,i,r;return{Kind:Ot.CAPTURE_SOURCE,Args:[t.type,t.entrypoint,"dom",null===(i=null===(n=t.source)||void 0===n?void 0:n.integration)||void 0===i?void 0:i.slice(0,1024),!!(null===(r=t.source)||void 0===r?void 0:r.userInitiated)]}}function Fu(t){return(0,e.__awaiter)(this,void 0,Yn,function(){var n,i,r,s;return(0,e.__generator)(this,function(e){if(n=function(t){return"msCrypto"in t?t.msCrypto:t.crypto}(t),"function"==typeof(null==n?void 0:n.randomUUID))return[2,n.randomUUID()];for(i=new Uint8Array(16),n.getRandomValues(i),i[6]=15&i[6]|64,i[8]=63&i[8]|128,r=[],s=0;s<i.length;s++)r.push(function(t,n,i){for(var r=t;r.length<2;)r="0"+r;return r}(i[s].toString(16)));return[2,[""+r[0]+r[1]+r[2]+r[3],""+r[4]+r[5],""+r[6]+r[7],""+r[8]+r[9],""+r[10]+r[11]+r[12]+r[13]+r[14]+r[15]].join("-")]})})}var Du=/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;function Bu(t){return 36===t.length&&Du.test(t)}var Wu=void 0,qu=18e5,Qu=function(){function t(t,n,i,r){void 0===r&&(r=Yi),this._t=t,this.co=n,this.Sa=i,this.lastUserActivityTS=0,this.lastUserActivityTimeout=new r(this.xa.bind(this))}return t.prototype.createUserSessionPage=function(){var t;return(0,e.__awaiter)(this,void 0,Yn,function(){var n,i,r,s,o,u;return(0,e.__generator)(this,function(e){switch(e.label){case 0:return n=this.getExistingSession(),i=n===Wu,r=this._t.time.wallTime(),i?[4,this.ka()]:[3,3];case 1:return s=e.sent(),[4,Fu(this._t.window)];case 2:return o=e.sent(),this.Sa.create({userId:s,sessionId:o,sessionStartTime:r,lastUserActivityTime:r,pageCount:1}),[3,4];case 3:this.Sa.setLastUserActivityTimeMS(r),this.Sa.setPageCount((null!==(t=this.Sa.getPageCount())&&void 0!==t?t:0)+1),e.label=4;case 4:return[4,Fu(this._t.window)];case 5:return u=e.sent(),[2,{userId:this.Sa.getUserId(),sessionId:this.Sa.getSessionId(),pageId:u,isNewSession:i}];}})})},t.prototype.getExistingSession=function(){var t,n,i,r=this.Sa.getUserId();if(!r||!Bu(r))return Wu;var e=this.Sa.getSessionId();if(!e||!Bu(e))return Wu;var s=this._t.time.wallTime(),u=null!==(t=this.Sa.getSessionStartTimeMS())&&void 0!==t?t:0,a=o.mathAbs(s-u);if(0===u||a>=864e5)return Wu;var c=null!==(n=this.Sa.getLastUserActivityTimeMS())&&void 0!==n?n:u;return o.mathAbs(s-c)>=qu||(null!==(i=this.Sa.getPageCount())&&void 0!==i?i:0)>=250?Wu:e},t.prototype.start=function(){this.lastUserActivityTimeout.start(3e5)},t.prototype.stop=function(){this.lastUserActivityTimeout.stop()},t.prototype.ka=function(){return(0,e.__awaiter)(this,void 0,Yn,function(){var t;return(0,e.__generator)(this,function(n){return(t=this.Sa.getUserId())&&Bu(t)?[2,t]:[2,Fu(this._t.window)]})})},t.prototype.xa=function(){var t=this.co.getLastUserAcitivityTS();t!==this.lastUserActivityTS&&(this.lastUserActivityTS=t,this.Sa.setLastUserActivityTimeMS(t),this.start())},t}(),Vu=function(t){function n(n,i,r,e,s,o,u){void 0===r&&(r=!0),void 0===e&&(e=new Fo(n)),void 0===s&&(s=new Ku(n,i,e,r)),void 0===o&&(o=Zi),void 0===u&&(u=xu);var a,c=t.call(this,n,o,e,s,u)||this;return c.Ho=i,c.mo=s,c._a=!1,c.ko=!1,c.Aa=!1,s.onShutdown(function(){return c.shutdown(Wt.SettingsBlocked)}),c.Mt=c.Dn.document,c.Eo=0,c.Uu=n.recording.identity,c.Ia=new Lu(c.xu,c.Dn,c.Uu.getClientStore()),c.pu=_u.NoInfoYet,c.Ta=new Qu(n,e,c.Uu),a=function(t){if(c.yu.stop(Wt.Api),t){var n=c.Mt.getElementById(t);n&&c.Ca&&n.setAttribute("_fs_embed_token",c.Ca)}},c.Dn._fs_shutdown=a,c}return(0,e.__extends)(n,t),n.prototype.onDomLoad=function(){var n=this;t.prototype.onDomLoad.call(this),this._a=!0,this.Pa(function(){n.fireFsReady(n.ko)})},n.prototype.ja=function(){var t=R(this.Dn,"_fs_replay_flags");if(/[?&]_fs_force_session=true(&|#|$)/.test(location.search)&&(t+=",forceSession",this.Dn.history)){var n=location.search.replace(/(^\?|&)_fs_force_session=true(&|$)/,function(t,n,i){return i?n:""});this.Dn.history.replaceState({},"",this.Dn.location.href.replace(location.search,n))}return t},n.prototype.start=function(n,i,r){var s,o,u;return(0,e.__awaiter)(this,void 0,Yn,function(){var a,c,h,f,v,l,d,p,w,g,m,y,b,E,S,x,k,_,A,I,T,C,P,j=this;return(0,e.__generator)(this,function(e){switch(e.label){case 0:t.prototype.start.call(this,n,i,r),a=this.ja(),c=yi(this.Mt),h=c[0],f=c[1],O=this.Dn,M=0,K=0,v=null==O.screen?[M,K]:(M=parseInt(String(O.screen.width),10),K=parseInt(String(O.screen.height),10),[M=isNaN(M)?0:M,K=isNaN(K)?0:K]),l=v[0],d=v[1],p="",n||(p=this.Uu.getUserId()),w=null!==(u=null===(o=null===(s=this._t)||void 0===s?void 0:s.recording)||void 0===o?void 0:o.preroll)&&void 0!==u?u:-1,g=function(){return he(Mr(j.Dn),{source:"page",type:"base"})},m=function(){return he(j.Dn.location.href,{source:"page",type:"url"})},y=function(){return""===j.Mt.referrer?"":he(j.Mt.referrer,{source:"page",type:"referrer"})},b=function(t){var n,i="_fs_tab_id";try{var r=t.sessionStorage.getItem(i);if(r)return r;var e=Math.floor(1e17*Math.random()).toString(16);return t.sessionStorage.setItem(i,e),null!==(n=t.sessionStorage.getItem(i))&&void 0!==n?n:void 0}catch(t){return}}(this.Dn),E={OrgId:this.xu,UserId:p,Url:m(),Base:g(),Width:h,Height:f,ScreenWidth:l,ScreenHeight:d,SnippetVersion:V(this.Dn),Referrer:y(),Preroll:w,Doctype:dt(this.Mt),CompiledVersion:"11aa377d19",CompiledTimestamp:1678707725,AppId:this.Uu.getAppId(),TabId:b,PreviewMode:this.Ia.isPreviewMode()||void 0},a&&(E.ReplayFlags=a),e.label=1;case 1:return e.trys.push([1,5,,6]),S=this.Oa,[4,this.Ho.page(E)];case 2:return[4,S.apply(this,[e.sent()])];case 3:return P=e.sent(),this.isSafeResponse(P)?this.gu?[2]:(window,this.handleResponse(P),window,this.Ma(P.CookieDomain,P.UserIntId,P.SessionIntId,P.PageIntId,P.EmbedToken),P.Flags.UseStatelessConsent||this.Uu.getConsentStore().setConsentState(!!P.Consented),this.Ka(),P.PreviewMode&&this.Ra(),x=function(t){return R(t,"_fs_pagestart","function")}(this.Dn),x&&x(),this.At.enqueueFirst(this.yu.getNavigateEvent(this.Dn.location.href,Ot.ENTRY_NAVIGATE)),k=!!P.Consented,this.At.enqueueFirst({Kind:Ot.SYS_REPORTCONSENT,Args:[k,Bt.Document]}),_=dt(this.Mt),A=m(),I=y(),T=g(),this.At.enqueueFirst({Kind:Ot.SET_FRAME_BASE,Args:[he(Mr(this.Dn),{source:"event",type:Ot.SET_FRAME_BASE}),_,A,I]}),this.mo.setPageData({Kind:Ot.PAGE_DATA,Args:[A,T,h,f,l,d,V(this.Dn),I,_,w,p,P.PageStart,Et(this.Dn),this.Dn.navigator.userAgent,b,!!P.IsNewSession]}),this.At.enqueue({Kind:Ot.SCRIPT_COMPILED_VERSION,Args:["11aa377d19"]}),this.At.enqueue(Uu({type:"default"})),this.yu.addVisibilityChangeEvent(),this.addInitEvent(),[4,this.At.startPipeline({pageId:P.PageIntId,serverPageStart:P.PageStart,isNewSession:!!P.IsNewSession})]):[2,this.Ha()];case 4:return e.sent(),this.enqueueDocumentProperties(this.Mt),this.fullyStarted(),[3,6];case 5:return(C=e.sent())instanceof iu&&(P=C.data)&&P.user_id&&P.cookie_domain&&P.reason_code===en.ReasonBlockedTrafficRamping&&p!==P.user_id&&this.Ma(P.cookie_domain,P.user_id,"","",""),this.Ha(),[3,6];case 6:return[2];}var O,M,K})})},n.prototype.Ka=function(){var t=this;this.Aa=!0,this.Pa(function(){t.fireFsReady(t.ko)})},n.prototype.Ma=function(t,n,i,r,e){var s=this.Uu;s.setIds(this.Dn,t,n,i),this.Ca=e,this.Ia.write(),s.getUserId(),s.getSessionId()},n.prototype.Pa=function(t){var n,i;if(this._a&&this.Aa)if(null===(i=null===(n=this.ku)||void 0===n?void 0:n.Flags)||void 0===i?void 0:i.FetchIntegrations){var r=this.Mt.createElement("script");r.addEventListener("load",t),r.addEventListener("error",t),r.async=!0,r.src=this.zo+"//"+this.Eu+"/rec/integrations?OrgId="+this.xu,this.Mt.head.appendChild(r)}else t()},n.prototype.Ra=function(){var t="FullStory-preview-script";if(!this.Mt.getElementById(t)){var n=this.Mt.createElement("script");n.id=t,n.async=!0,n.src=this.zo+"//"+this.Su+"/s/fspreview.js",this.Mt.head.appendChild(n)}},n.prototype.Ha=function(){this.Iu&&this.Iu(),this.shutdown(Wt.SettingsBlocked),this.ko=!0,this.fireFsReady(this.ko)},n.prototype.Oa=function(t){var n;return(0,e.__awaiter)(this,void 0,Yn,function(){var i,r,s,o,u;return(0,e.__generator)(this,function(a){switch(a.label){case 0:return(i=(0,e.__assign)({},t)).Flags.UseStaticSettings?(r=this.Ia.isPreviewMode(),[4,this.Ho.settings({orgId:this.xu,previewMode:r,fallback:!1})["catch"](function(t){Tt.sendToBugsnag("Edge Rec settings error","error",{err:t})})]):[3,4];case 1:return(s=a.sent())?[3,3]:[4,this.Ho.settings({orgId:this.xu,previewMode:r,fallback:!0})["catch"](function(t){Tt.sendToBugsnag("Rs Rec settings error","error",{err:t})})];case 2:s=a.sent(),a.label=3;case 3:s&&(i=(0,e.__assign)((0,e.__assign)({},i),s)),a.label=4;case 4:return i.Flags.UseClientSideId?(this.Uu.setCookieDomain(this.Dn,i.CookieDomain),Bu(o=null!==(n=t.UserUUID)&&void 0!==n?n:"")&&this.Uu.setUserId(o),[4,this.Ta.createUserSessionPage()]):[3,6];case 5:u=a.sent(),this.Ta.start(),i=(0,e.__assign)((0,e.__assign)({},i),{UserIntId:u.userId,SessionIntId:u.sessionId,PageIntId:u.pageId,IsNewSession:u.isNewSession,PageStart:p()}),a.label=6;case 6:return i.Flags.UseStatelessConsent&&(i=(0,e.__assign)((0,e.__assign)({},i),{Consented:this.Uu.getConsentStore().getConsentState()})),[2,i];}})})},n.prototype.onMessageReceived=function(n,i){t.prototype.onMessageReceived.call(this,n,i),(null==n?void 0:n.parent)==this.Dn&&i[0]===du.EndPreviewMode&&this.Ia.clear()},n}(Cu),zu=function(){function t(t,n){void 0===n&&(n=new $u(t)),this.Dn=t,this.Na=n}return t.prototype.enqueueEvents=function(t,n){var i=null!=t?t:void 0;this.Na.postMessage(this.Dn.parent,[du.EvtBundle,n,i],i)},t.prototype.startPipeline=function(){},t.prototype.stopPipeline=function(){},t.prototype.flush=function(){return(0,e.__awaiter)(this,void 0,Yn,function(){return(0,e.__generator)(this,function(t){return[2]})})},t.prototype.singSwanSong=function(){},t.prototype.onShutdown=function(t){},t.prototype.setPageData=function(t){},t}(),$u=function(){function t(t){this.Dn=t}return t.prototype.postMessage=function(t,n,i){switch(n[0]){case du.EvtBundle:bu(this.Dn,n[0],vt(n[1]),i)||mu(t,n);break;case du.RequestFrameId:bu(this.Dn,n[0],"[]",i)||mu(t,n);break;default:n[0];}},t}(),Gu=function(t){function n(n,i,r,e,s){void 0===i&&(i=new $u(n.window)),void 0===r&&(r=new zu(n.window,i)),void 0===e&&(e=Zi),void 0===s&&(s=xu);var o=t.call(this,n,e,void 0,r,s)||this;return o.Na=i,o}return(0,e.__extends)(n,t),n.prototype.start=function(n,i,r){var e=this;t.prototype.start.call(this,n,i,r),this.La(),this.T.add(this.Dn,"load",!1,function(){e.yu.recordingIsDetached()&&e._t.recording.splitPage(Wt.FsShutdownFrame)}),this.yu.addVisibilityChangeEvent()},n.prototype.onMessageReceived=function(n,i){if(t.prototype.onMessageReceived.call(this,n,i),n===this.Dn.parent||n===this.Dn)switch(i[0]){case du.GreetFrame:this.La(i[1]);break;case du.SetFrameId:try{var r=i[1];if(!r)return void he(location.href,{source:"log",type:"debug"});this.Ua({frameId:r,parentIds:i[2],outerStartTime:i[3],scheme:i[4],script:i[5],appHost:i[6],orgId:i[7],initConfig:i[8],pageRsp:i[9],consentOverride:i[10],minimumWhen:i[11]})}catch(t){vt(i)}break;case du.SetConsent:this.setConsent(i[1]);break;case du.InitFrameMobile:try{var e=JSON.parse(i[1]),s=e.StartTime;if(i.length>2&&i[2]){var o=i[2];Object.prototype.hasOwnProperty.call(o,"ProtocolVersion")&&o.ProtocolVersion>=20180723&&Object.prototype.hasOwnProperty.call(o,"OuterStartTime")&&(s=o.OuterStartTime)}var u=e.Host;this.Ua({frameId:0,parentIds:[],outerStartTime:s,scheme:"https:",script:G(u),appHost:$(u),orgId:e.OrgId,initConfig:void 0,pageRsp:e.PageResponse,consentOverride:this.Xt.getConsent()})}catch(t){vt(i)}}},n.prototype.La=function(t){this.Eo&&this.Eo===t||0!=this.Eo&&this.Dn.parent&&this.Na.postMessage(this.Dn.parent,[du.RequestFrameId])},n.prototype.Ua=function(t){var n,i,r=this;if(this.Eo)this.Eo!==t.frameId?(this.Eo,t.frameId,this._t.recording.splitPage(Wt.FsShutdownFrame)):this.Eo;else if(he(location.href,{source:"log",type:"debug"}),t.frameId,this.zo=t.scheme,this.bu=t.script,this.Su=t.appHost,this.xu=t.orgId,this._u=t.initConfig,this.Eo=t.frameId,this.So=t.parentIds,t.pageRsp&&this.isSafeResponse(t.pageRsp)){if(!this.gu){var e=null!==(n=t.consentOverride)&&void 0!==n?n:!!t.pageRsp.Consented;this.handleResponse(t.pageRsp,e),this.fireFsReady(),this.At.enqueueFirst({Kind:Ot.SYS_REPORTCONSENT,Args:[e,Bt.Document]}),this.At.enqueueFirst({Kind:Ot.SET_FRAME_BASE,Args:[he(Mr(this.Dn),{source:"event",type:Ot.SET_FRAME_BASE}),dt(this.Dn.document)]}),this.At.enqueue({Kind:Ot.SCRIPT_COMPILED_VERSION,Args:["11aa377d19"]}),this.At.enqueue(Uu({type:"default"})),this.addInitEvent(),this.At.rebaseIframe(t.outerStartTime,null!==(i=t.minimumWhen)&&void 0!==i?i:0),this._t.time.setStartTime(t.outerStartTime),this.Ou&&this.At.startPipeline({pageId:this.Ou,serverPageStart:t.pageRsp.PageStart,isNewSession:!!t.pageRsp.IsNewSession,frameId:t.frameId,parentIds:t.parentIds}).then(function(){r.flushPendingChildFrameInits(),r.enqueueDocumentProperties(r.Dn.document),r.fullyStarted()})}}else this.shutdown(Wt.FsShutdownFrame)},n}(Cu),Xu=function(){function t(t,n,i){void 0===n&&(n=function(){}),void 0===i&&(i=!1),this.Mt=t,this.Fa=n,this.Da=i,this._cookies={},this._cookies=k(this.Mt)}return t.prototype.setDomain=function(t){this.Ba=t},t.prototype.getValue=function(t,n){var i=this._cookies[t];if(!i)try{i=localStorage[null!=n?n:t]}catch(t){}return i},t.prototype.setValue=function(t,n,i,r){if(null!=this.Ba&&!this.Da){var e=[];this._setCookie(t,n,i,e),this.Wa(null!=r?r:t,n,e,t),e.length>0&&this.Fa(e)}},t.prototype.setCookie=function(t,n,i){this._setCookie(t,n,i,[])},Object.defineProperty(t.prototype,"cookies",{get:function(){return this._cookies},enumerable:!1,configurable:!0}),t.prototype.clearCookie=function(t,n){if(this._cookies[t]&&(this.Mt.cookie=Ju(this.Ba,t,"","Thu, 01 Jan 1970 00:00:01 GMT"),delete this._cookies[t]),n)try{delete localStorage[n]}catch(t){}},t.prototype._setCookie=function(t,n,i,r){try{this.Mt.cookie=Ju(this.Ba,t,n,i),-1===this.Mt.cookie.indexOf(n)&&r.push([t,"cookie"])}finally{this._cookies=k(this.Mt)}},t.prototype.Wa=function(t,n,i,r){try{localStorage[t]=n,localStorage[t]!==n&&i.push([null!=r?r:t,"localStorage"])}catch(n){i.push([null!=r?r:t,"localStorage",String(n)])}},t}();function Ju(t,n,i,r){var e=n+"="+i;return e+="; domain="+function(t){return t?"."+encodeURIComponent(t):""}(t),e+="; Expires="+r+"; path=/; SameSite=Strict","https:"===location.protocol&&(e+="; Secure"),e}var Zu,Yu="fs_cid",ta=function(){function t(t){this.Sa=t,this.qa=1;var n=this.Sa.getValue(Yu,wn);this.Qa=function(t){var n={consent:Dt.RevokeConsent};if(!t)return n;var i=t.split(".");return i.length<1?n:(i[0],"1"===i[1]?{consent:Dt.GrantConsent}:n)}(n)}return t.prototype.getConsentState=function(){return this.Qa.consent},t.prototype.setConsentState=function(t){if(this.Qa.consent=t,t!==Dt.RevokeConsent){var n=this.Va(),i=this.za();this.Sa.setValue(Yu,n,i,wn)}else this.Sa.clearCookie(Yu,wn)},t.prototype.Va=function(){return[this.qa,this.Qa.consent===Dt.GrantConsent?1:0].join(".")},t.prototype.za=function(){return new Date(1e3*S()).toUTCString()},t}(),na="fs_lua",ia=function(){function t(t){this.qa=1,this.Sa=t;var n=this.Sa.getValue(na,gn);this.Qa=function(t){var n={lastUserActivityTime:void 0};if(!t)return n;var i=t.split(".");return i.length<1?n:(i[0],{lastUserActivityTime:_(i[1])})}(n)}return t.prototype.getLastUserActivityTimeMS=function(){return this.Qa.lastUserActivityTime},t.prototype.setLastUserActivityTimeMS=function(t){this.Qa.lastUserActivityTime=t;var n=this.Va(),i=this.za();this.Sa.setValue(na,n,i,gn)},t.prototype.Va=function(){var t;return[this.qa,null!==(t=this.Qa.lastUserActivityTime)&&void 0!==t?t:""].join(".")},t.prototype.za=function(){return new Date(p()+qu).toUTCString()},t}(),ra="fs_uid",ea=function(){function t(t,n,i,r){void 0===n&&(n=document),void 0===i&&(i=function(){}),void 0===r&&(r=!1),this.$a=void 0,this.wa=new Xu(n,i,r),this.Ga=new ta(this.wa),this.Xa=new ia(this.wa),this.Qa=this.Ja(t)}return t.prototype.Ja=function(t){var n=x(this.wa.getValue(ra,pn));return n&&n.orgId==t?n:{expirationAbsTimeSeconds:S(),orgId:t,userId:"",sessionId:"",appKeyHash:""}},t.prototype.getConsentStore=function(){return this.Ga},t.prototype.clear=function(){this.Xa.setLastUserActivityTimeMS(void 0),this.Qa.sessionStartTime=this.Qa.pageCount=void 0,this.Qa.userId=this.Qa.sessionId=this.Qa.appKeyHash=this.$a="",this.Qa.expirationAbsTimeSeconds=S(),this.Za()},t.prototype.create=function(t){this.Xa.setLastUserActivityTimeMS(t.lastUserActivityTime),this.Qa=(0,e.__assign)((0,e.__assign)({},this.Qa),t),this.Za()},t.prototype.getOrgId=function(){return this.Qa.orgId},t.prototype.getUserId=function(){return this.Qa.userId},t.prototype.setUserId=function(t){this.Qa.userId=t,this.Za()},t.prototype.getSessionId=function(){return this.Qa.sessionId},t.prototype.getAppKeyHash=function(){return this.Qa.appKeyHash},t.prototype.getCookies=function(){return this.wa.cookies},t.prototype.setAppId=function(t){this.$a=t,this.Qa.appKeyHash=qo(t),this.Za()},t.prototype.getAppId=function(){return this.$a},t.prototype.setSessionStartTimeMS=function(t){this.Qa.sessionStartTime=t,this.Za()},t.prototype.getSessionStartTimeMS=function(){return this.Qa.sessionStartTime},t.prototype.setLastUserActivityTimeMS=function(t){this.Xa.setLastUserActivityTimeMS(t)},t.prototype.getLastUserActivityTimeMS=function(){return this.Xa.getLastUserActivityTimeMS()},t.prototype.setPageCount=function(t){this.Qa.pageCount=t,this.Za()},t.prototype.getPageCount=function(){return this.Qa.pageCount},t.prototype.getClientStore=function(){return this.wa},t.prototype.setCookie=function(t,n,i){void 0===i&&(i=new Date(p()+6048e5).toUTCString()),this.wa.setCookie(t,n,i)},t.prototype.setCookieDomain=function(t,n){var i=n;(C(i)||i.match(/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/g))&&(i="");var r=function(t){return R(t,"_fs_cookie_domain")}(t);"string"==typeof r&&(i=r),this.wa.setDomain(i)},t.prototype.setIds=function(t,n,i,r){this.setCookieDomain(t,n),this.Qa.userId=i,this.Qa.sessionId=r,this.Za()},t.prototype.clearAppId=function(){return!!this.Qa.appKeyHash&&(this.$a="",this.Qa.appKeyHash="",this.Za(),!0)},t.prototype.encode=function(){var t,n,i,r=[this.Qa.userId,null!==(t=this.Qa.sessionId)&&void 0!==t?t:"",""+(null!==(n=this.Qa.sessionStartTime)&&void 0!==n?n:""),"",""+(null!==(i=this.Qa.pageCount)&&void 0!==i?i:"")].join(":"),e=["",this.Qa.orgId,r];return this.Qa.appKeyHash&&e.push(encodeURIComponent(this.Qa.appKeyHash)),e.push("/"+this.Qa.expirationAbsTimeSeconds),e.join("#")},t.prototype.Za=function(){var t=this.encode(),n=new Date(1e3*this.Qa.expirationAbsTimeSeconds).toUTCString();this.wa.setValue(ra,t,n,pn)},t}(),sa=((Zu={})[Xt.Document]={assetMapId:"str",releaseDatetime:"date",releaseVersion:"str"},Zu[Xt.Event]={},Zu[Xt.Page]={pageName:"str",releaseVersion:"str",releaseDatetime:"str"},Zu[Xt.User]={uid:"str",displayName:"str",email:"str"},Zu),oa={str:ua,bool:aa,real:ca,"int":ha,date:fa,strs:va(ua),bools:va(aa),reals:va(ca),ints:va(ha),dates:va(fa),objs:va(la),obj:la};function ua(t){return"string"==typeof t}function aa(t){return"boolean"==typeof t}function ca(t){return"number"==typeof t}function ha(t){return"number"==typeof t&&t-o.mathFloor(t)==0}function fa(t){return!(!t||(t.constructor===Date?isNaN(t):"number"!=typeof t&&"string"!=typeof t||isNaN(new Date(t))))}function va(t){return function(n){if(!(n instanceof Array))return!1;for(var i=0;i<n.length;i++)if(!t(n[i]))return!1;return!0}}function la(t){return!!t&&"object"==typeof t}var da=/^[a-zA-Z][a-zA-Z0-9_]*$/,pa=function(){function t(t){this.Uu=t,this.Ya={}}return t.prototype.setIdentity=function(t){this.Uu=t},t.prototype.unloadCrossPageVars=function(t){switch(t){case Wt.Hibernation:case Wt.Size:break;default:this.tc=void 0;}},t.prototype.getCrossPageVars=function(){return this.tc},t.prototype.getDocumentVars=function(){var t,n={},i=void 0;for(var r in this.Ya){var e=this.Ya[r],s=e.value;if(void 0===(h=e.apiSource)){var o=null!=i?i:{};o[r]=s,i=o}else{var u=null!==(t=n[h])&&void 0!==t?t:{};u[r]=s,n[h]=u}}var a=[],c=function(t){t&&a.push(t)};for(var h in i&&c(this.nc(Xt.Document,{PayloadToSend:i,ValidationErrors:[]})),n)c(this.nc(Xt.Document,{PayloadToSend:n[h],ValidationErrors:[]},h));return a},t.prototype.api=function(t){var n,i=!1,r=[],e=function(t){t&&r.push(t)};try{var s=function(t){switch(t.operation){case m.V2.OperationName.TrackEvent:return Xt.Event;case m.V2.OperationName.SetPage:return Xt.Page;case m.V2.OperationName.SetProperties:var n=t.option.type;switch(n){case Xt.Document:case Xt.Page:case Xt.User:return n;case Xt.Event:throw new Error("Invalid scope: Event");default:return(0,Ir.nt)(n,"Invalid scope: "+n);}default:(0,Ir.nt)(t,"Unsupported");}}(t),u=null===(n=t.source)||void 0===n?void 0:n.integration;switch(s){case Xt.Document:var a=t.option;if(!(h=this.ic(wa(s,a.properties),u)))break;e(this.nc(s,h,u));break;case Xt.Event:var c=(a=t.option).name;if("string"!=typeof c)break;Ea(t.source,"event",e),e(this.nc(s,wa(s,a.properties),u,c));break;case Xt.Page:var h=(a=t.option).properties||a;this.tc=this.nc(s,wa(s,h),u),e(this.tc);break;case Xt.User:if("object"!=typeof(a=t.option).properties)a.properties,vt(a.properties);else if("uid"in a.properties){var f=a.properties.uid;if(!1===f)this.Uu.clearAppId()&&(i=!0),delete a.properties.uid;else{var v=function(t,n){var i=t;if("number"==typeof i&&o.mathFloor(i)==i&&(i=""+i),"string"!=typeof i)return[void 0,Jt.FsId];var r=i.trim();if(y.indexOf(r.toLowerCase())>=0)return[void 0,Jt.FsId];var e=qo(r),s=void 0;return n&&n.Qa.appKeyHash&&n.Qa.appKeyHash!==e&&n.Qa.appKeyHash!==r&&(n.Qa.appKeyHash,s=Jt.NewUid),[r,s]}(f,this.Uu),l=v[0],d=v[1];if(!l)return Jt.FsId,{events:r};a.properties.uid=l,this.Uu.setAppId(l),d===Jt.NewUid&&(i=!0)}}Ea(t.source,"setVars",e),e(this.nc(s,wa(s,a.properties),u));break;default:(0,Ir.nt)(s,"Unsupported");}}catch(n){t.operation,n.message}return{events:r,reidentify:i}},t.prototype.nc=function(t,n,i,r){var e=vt(n.PayloadToSend),s=!!i&&"fs"!==i;switch(t){case Xt.Event:return{When:0,Kind:Ot.SYS_CUSTOM,Args:s?[r,e,i]:[r,e]};case Xt.Document:case Xt.Page:case Xt.User:return{When:0,Kind:Ot.SYS_SETVAR,Args:s?[t,e,i]:[t,e]};default:(0,Ir.nt)(t,"Unsupported");}},t.prototype.ic=function(t,n){var i=t.PayloadToSend;if(i&&"object"==typeof i){var r=0,e={};for(var s in i)if(!(s in this.Ya)){var o=i[s];this.Ya[s]={value:o,apiSource:n},e[s]=o,r++}if(0!==r)return{PayloadToSend:e,ValidationErrors:t.ValidationErrors}}},t}();function wa(t,n){var i=1500;return ga(function(){return--i},t,n)}var ga=function(t,n,i){var r,e,s={PayloadToSend:{},ValidationErrors:[]},u=function(i){var r=ga(t,n,i);return s.ValidationErrors=s.ValidationErrors.concat(r.ValidationErrors),r.PayloadToSend};for(var a in i)if(o.objectHasOwnProp(i,a)){if(t()<=0)break;var c=i[a],h=ya(n,a,c,s.ValidationErrors);if(h){var f=h.name;if("obj"!==h.type){if("objs"!==h.type)s.PayloadToSend[f]=ma(h.type,h.value);else{n!=Xt.Event&&s.ValidationErrors.push({Type:"vartype",FieldName:f,ValueType:"Array<Object> (unsupported)"});for(var v=[],l=0;l<h.value.length;l++)(d=u(h.value[l]))&&v.push(d);v.length>0&&(s.PayloadToSend[f]=v)}}else{var d=u(h.value),p=(e="_obj").length>(r=a).length||r.substring(r.length-e.length)!=e?f.substring(0,f.length-"_obj".length):f;s.PayloadToSend[p]=d}}else s.PayloadToSend[a]=ma("str",c)}return s};function ma(t,n){var i=n;return"str"==t&&"string"==typeof i&&(i=i.trim()),null==i||"date"!=t&&i.constructor!=Date||(i=function(t){var n=t.constructor===Date?t:new Date(t);try{return n.toISOString()}catch(t){return null}}(i)),i}function ya(t,n,i,r){var e=n,s=e,u=typeof i;if("undefined"===u)return r.push({Type:"vartype",FieldName:e,ValueType:u+" (unsupported)"}),null;var a=sa[t];if(o.objectHasOwnProp(a,e))return{name:e,type:a[e],value:i};var c=e.lastIndexOf("_");if(-1==c||!ba(e.substring(c+1))){var h=function(t){for(var n in oa)if(oa[n](t))return n;return null}(i);if(null==h)return i?r.push({Type:"vartype",FieldName:e}):r.push({Type:"vartype",FieldName:e,ValueType:"null (unsupported)"}),null;c=e.length,e=e+"_"+h}var f=e.substring(0,c),v=e.substring(c+1);if("object"===u&&!i)return r.push({Type:"vartype",FieldName:s,ValueType:"null (unsupported)"}),null;if(!da.test(f)){f=f.replace(/[^a-zA-Z0-9_]/g,"").replace(/^[0-9]+/,""),/[0-9]/.test(f[0])&&(f=f.substring(1)),r.push({Type:"varname",FieldName:s});var l=f+"_"+v;if(da.source,""==f)return null;e=l}return ba(v)?function(t,n){return oa[t](n)}(v,i)?{name:e,type:v,value:i}:(vt(i),"number"===u?u=i%1==0?"integer":"real":"object"==u&&null!=i&&i.constructor==Date&&(u=isNaN(i)?"invalid date":"date"),r.push({Type:"vartype",FieldName:s,ValueType:u}),null):(r.push({Type:"varname",FieldName:s}),null)}function ba(t){return!!oa[t]}function Ea(t,n,i){var r=Uu({source:t,type:"api",entrypoint:n});r&&i({When:0,Kind:r.Kind,Args:r.Args})}function Sa(t,n){return(0,e.__awaiter)(this,void 0,Yn,function(){var i,s,o,a,c;return(0,e.__generator)(this,function(h){switch(h.label){case 0:if(h.trys.push([0,2,,3]),gr||yr||function(t){return!!R(t,"_fs_use_polyfilled_apis","boolean")}(t))return[2,(0,e.__assign)((0,e.__assign)({},n),{status:r.Clean})];if(!t.document||n.status!==r.Unknown)return[2,n];if(i=function(t,n){var i=n.functions,s={},o=(0,e.__assign)({},n.helpers);if(o.functionToString=function(t,n){var i,r,e=null===(i=t["__core-js_shared__"])||void 0===i?void 0:i.inspectSource;if(e){var s=function(){return e(this)};if(ka(s,2))return s}var o=null===(r=t["__core-js_shared__"])||void 0===r?void 0:r["native-function-to-string"];if(ka(o))return o;var u=n.__zone_symbol__OriginalDelegate;return ka(u)?u:ka(n)?n:void 0}(t,o.functionToString),!o.functionToString)return n;var u=!1;for(var a in i)if(i[a]){if(s[a]=Ia(o.functionToString,i[a]),s[a]||(s[a]=Ta(o.functionToString,o,a)),!s[a])return n;s[a]!==i[a]&&(u=!0)}else s[a]=void 0;return{status:r.Clean,functions:u?s:i,helpers:o,errors:[]}}(t,n),i.status===r.Clean)return[2,i];(s=t.document.createElement("iframe")).id="FullStory-iframe",s.className="fs-hide",s.style.display="none",o=t.document.body||t.document.head||t.document.documentElement||t.document;try{o.appendChild(s)}catch(t){return[2,(0,e.__assign)((0,e.__assign)({},n),{status:r.Clean})]}return s.contentWindow?(a=u(s.contentWindow,r.Clean),s.parentNode&&s.parentNode.removeChild(s),a.status===r.UnrecoverableFailure?[2,(0,e.__assign)((0,e.__assign)({},n),{status:r.Clean})]:[4,xa(a,n)]):[2,(0,e.__assign)((0,e.__assign)({},n),{status:r.Clean})];case 1:return[2,h.sent()];case 2:return c=h.sent(),Tt.sendToBugsnag(c,"error"),[2,(0,e.__assign)((0,e.__assign)({},n),{status:r.Clean})];case 3:return[2];}})})}function xa(t,n){var i,s=new Yn(function(t){return i=t});return setTimeout(function(){try{t.functions.jsonParse("[]").push(0)}catch(t){i((0,e.__assign)((0,e.__assign)({},n),{status:r.Clean}))}i(t)}),s}function ka(t,n){var i;if(void 0===n&&(n=0),!t)return!1;try{t.call(function(){})}catch(t){return!1}var r=function(t){try{return void t.call(null)}catch(t){return(t.stack||"").replace(/__fs_nomangle_check_stack(.|\n)*$/,"")}},e=void 0;0!==n&&"number"==typeof Error.stackTraceLimit&&(e=Error.stackTraceLimit,Error.stackTraceLimit=Number.POSITIVE_INFINITY);var s=[function(){throw new Error("")},t],o=function __fs_nomangle_check_stack(){return s.map(r)}(),u=o[0],a=o[1];if(void 0!==e&&(Error.stackTraceLimit=e),!u||!a)return!1;for(var c="\n".charCodeAt(0),h=u.length>a.length?a.length:u.length,f=1,v=f;v<h;v++){var l=u.charCodeAt(u.length-v),d=a.charCodeAt(a.length-v);if(l!=d)break;d!=c&&v!=h-1||(f=v)}return(null!==(i=a.slice(0,a.length-f+1).match(/\.js:\d+([:)]|$)/gm))&&void 0!==i?i:[]).length<=n}function _a(t,n){return t.call(n).indexOf("[native code]")>=0}var Aa=["__zone_symbol__OriginalDelegate","nr@original"];function Ia(t,n){if(n){for(var i=0,r=Aa;i<r.length;i++){var e=n[r[i]];if("function"==typeof e&&_a(t,e))return e}return _a(t,n)?n:void 0}}function Ta(t,n,i){if("arrayIsArray"===i){var r=Ia(t,n.objectToString);if(!r)return;return n.objectToString=r,function(t){return"[object Array]"==r.call(t)}}}var Ca=function(){function t(t,n){void 0===n&&(n=function(t){return new WebSocket(t)}),this.rc=n,this.ec=!1,this.sc=!1,this.At={},this.oc=1,this._t=t,this.zo=t.options.scheme,this.$o=t.options.cdnHost}return t.isSupported=function(){return"WebSocket"in window},t.prototype.page=function(t){var n=this;return new Yn(function(i,r){n.uc({Cmd:un.Page,Page:t},vu(n._t),function(t){t.Cmd===an.Page?i(t.Page):(t.Cmd,r(t.Cmd))},r)})},t.prototype.settings=function(t){var n=t.previewMode?vu(this._t):this.$o;return fu(this.zo,n,t)},t.prototype.bundle=function(t){return(0,e.__awaiter)(this,void 0,Yn,function(){var n,i,r,s=this;return(0,e.__generator)(this,function(e){switch(e.label){case 0:return[4,ei()];case 1:return e.sent(),n=t.deltaT,i=t.serverPageStart,r=t.serverBundleTime,[2,new Yn(function(e,o){var u=vu(s._t);Pa(t.recHost,u);var a=s.uc({Cmd:un.Bundle,Bundle:{Bundle:t.bundle,DeltaT:null===n?void 0:n,OrgId:t.orgId,PageId:t.pageId,PageStart:null==i?void 0:i,PrevBundleTime:null==r?void 0:r,Seq:t.bundle.Seq,SessionId:t.sessionId,UserId:t.userId}},u,function(t){t.Cmd===an.Bundle?e([null!=a?a:0,t.Bundle]):t.Cmd},o)})];}})})},t.prototype.bundleBeacon=function(t){var n=vu(this._t);return Pa(t.recHost,n),hu(this.zo,n,t)},t.prototype.exponentialBackoffMs=function(t,n){var i=o.mathMin(cn.BackoffMax,5e3*o.mathPow(2,t));return n?i+.25*o.mathRandom()*i:i},t.prototype.uc=function(t,n,i,r){var e=t;e.Seq=this.oc++;var s=vt(e);return this.At[e.Seq]={payload:s,win:i,lose:r},this.ac(n),s.length},t.prototype.cc=function(t){var n;try{n=pt(t)}catch(t){return}var i=this.At[n.Seq];delete this.At[n.Seq],i?n.Cmd===an.Error?(n.Fail.Error,i.lose(new iu(n.Fail.Status,n.Fail.Error))):i.win(n):n.Seq},t.prototype.hc=function(){if(this.sc&&this.fc)for(var t in this.At){var n=this.At[t];n.sent||(this.fc.send(n.payload),n.sent=!0)}},t.prototype.vc=function(){for(var t in this.At){var n=this.At[t];n.sent&&(delete this.At[t],n.lose(new iu(0,"Pending request")))}},t.prototype.ac=function(t){var n=this;if(this.sc)this.hc();else if(!this.ec){this.ec=!0;var i=("https:"==this.zo?"wss:":"ws:")+"//"+t+"/rec/sock";this.fc=this.rc(i),this.fc.onopen=function(t){n.ec=!1,n.sc=!0,n.hc()},this.fc.onmessage=function(t){n.cc(t.data),n.hc()},this.fc.onclose=function(t){n.ec=n.sc=!1,n.vc()},this.fc.onerror=function(t){n.ec=n.sc=!1,n.vc()}}},t}();function Pa(t,n){t&&jt(n===t,"sock recHost mismatch")}var ja,Oa,Ma,Ka,Ra=m.V2.EventTypes,Ha=m.V2.EventTypeName,Na=function(){function t(){this.lc={start:[],shutdown:[],"internal/bundle":[],"internal/error":[],"internal/fs-init":[]}}return t.prototype.registerListener=function(t,n){var i;if(-1===Ra.indexOf(t)||!n)throw new Error("Invalid event type or missing callback.");var r={disconnected:!1,callback:n},e=(null!==(i=this.lc[t])&&void 0!==i?i:[]).filter(function(t){return!t.disconnected});return e.push(r),this.lc[t]=e,{disconnect:function(){r.disconnected=!0}}},t.prototype.hasListeners=function(t){var n;return(null!==(n=this.lc[t])&&void 0!==n?n:[]).length>0&&this.lc[t].some(function(t){return!t.disconnected})},t.prototype.takeRecords=function(t){var n,i=null!==(n=this.lc[t.type])&&void 0!==n?n:[];if(0!==i.length)for(var r=0,e=i;r<e.length;r++){var s=e[r],o=s.disconnected,u=s.callback;if(!o)try{u(t.data)}catch(t){Tt.sendToBugsnag("Recording observer callback error","error",{err:t})}}},t}(),La=function(){function t(t){var n=this;this.qn=t,this.At=[],this.eu=new eo(function(){n.Yr()})}return t.prototype.addEvent=function(t,n){this.qn.hasListeners(t)&&(this.At.push({type:t,data:n}),this.eu.schedule())},t.prototype.onStart=function(t,n){this.addEvent(Ha.START,{sessionUrl:t,settings:n})},t.prototype.onShutdown=function(t){this.addEvent(Ha.SHUTDOWN,{reason:t})},t.prototype.onBundleSent=function(t){this.addEvent(Ha.INTERNAL_BUNDLE,{size:t})},t.prototype.onFSInit=function(){this.addEvent(Ha.INTERNAL_FS_INIT,{})},t.prototype.Yr=function(){for(var t=0,n=this.At;t<n.length;t++){var i=n[t];this.qn.takeRecords(i)}this.At=[]},t}(),Ua=(Oa=(ja=window.navigator).vendor,Ma=void 0!==window.opr,Ka=ja.userAgent.indexOf("Edge")>-1,!!ja.userAgent.match("CriOS")||"Google Inc."===Oa&&!Ma&&!Ka),Fa=/Firefox/.test(window.navigator.userAgent);function Da(t){if(!Fa)return!1;var n=window.navigator.userAgent.match(/Firefox\/(\d+)/);return!(!n||!n[1])&&parseInt(n[1],10)<t}function Ba(t){if(!Ua)return!1;var n=window.navigator.userAgent.match(/Chrome\/(\d+)/);return!(!n||!n[1])&&parseInt(n[1],10)<t}function Wa(t){if(t===top||B(t)||function(t){return!!R(t,"_fs_run_in_iframe","boolean")}(t)||W(t))return!0;try{return t.parent.document,Wa(t.parent)}catch(t){}return!1}function qa(t){return!_r&&t.postMessage&&t.MutationObserver&&Qa(t.Map)&&Qa(t.Set)&&Qa(t.WeakMap)&&o.snapshot.status!==r.UnrecoverableFailure?!!Wa(t)||!1:(function(t){try{t.snapshot.status===r.UnrecoverableFailure&&(Tt.sendToBugsnag(t.snapshot.errors[0],"error"),t.snapshot.errors.forEach(s))}catch(t){}}(o),!1)}function Qa(t){try{if(t)return new t,!0}catch(t){}return!1}Da(28),Da(27),Ba(23),Ba(38),Ba(57),Ba(60);var Va=function(t,n){var i,r,e;switch(n){case"url.now":return null!==(i=t.getCurrentSessionURL(!0))&&void 0!==i?i:null;case"id":return null!==(r=t.getCurrentSession())&&void 0!==r?r:null;default:return null!==(e=t.getCurrentSessionURL())&&void 0!==e?e:null;}};function za(t,n){switch(t){case"getSession":case"init":case"observe":case"restart":case"setConfig":case"setIdentity":case"setPage":case"shutdown":case"source":case"start":case"trackEvent":return{operation:t,option:n};case"stat":return{operation:t,option:{event_type:(i=n).eventType||i.event_type,properties:i.payload||i.properties}};case"log":var i=n;return o.arrayIsArray(n)&&(i={level:n[0],msg:n[1]}),{operation:t,option:i};case"setVars":case"setProperties":var r=m.V2.OperationName.SetProperties;return i=n,o.arrayIsArray(n)&&(i={type:n[0],properties:e=n[1]}),{operation:r,option:i};case"event":return i=n,n&&"object"==typeof n&&"n"in n&&(i={name:n.n,properties:n.p}),{operation:r=m.V2.OperationName.TrackEvent,option:i};case"user":var e=n;return{operation:r=m.V2.OperationName.SetProperties,option:{type:"user",properties:e}};case"consent":var s=n;return{operation:r=m.V2.OperationName.SetIdentity,option:{consent:s}};case"rec":return n?{operation:m.V2.OperationName.Restart}:{operation:r=m.V2.OperationName.Shutdown};}}var $a="must be an object";function Ga(t){return!!t&&"object"==typeof t}function Xa(t,n){return n in t}function Ja(t,n){return"Init Api - invalid "+t+" config, "+n}function Za(t){var n;if(!t||"object"!=typeof t)return!1;var i=t;return Ya(i.target,["any","exclude","mask"])&&Ya(i.tag)&&Ya(i.action,["erase","maskText","scrubUrl","scrubCss"])&&Ya(null!==(n=i.type)&&void 0!==n?n:"static",["static","prefix"])}function Ya(t,n){return void 0===n&&(n=[]),"string"==typeof t&&(0===n.length||-1!==n.indexOf(t))}var tc=X(function(){}),nc={commit:tc,discard:tc},ic=[m.V2.OperationName.Source,m.V2.OperationName.TrackEvent,m.V2.OperationName.GetSession],rc=function(){function t(){}return t.prototype.createTopRecorder=function(t){var n=R(t.window,"_fs_use_socket","boolean")&&Ca.isSupported()?new Ca(t):new eu(t);return new Vu(t,n)},t.prototype.createInnerRecorder=function(t){return new Gu(t)},t}(),ec=function(){function t(t,n){void 0===t&&(t=window),void 0===n&&(n=new rc),this.Dn=t,this.dc=n,this.zo="https:",this.wc=!1,this.gc=!0,this.Uu=null,this.mc=!1,this.yc=vn.Shutdown,this.bc=new Na,this.Ec=new La(this.bc)}return t.prototype.init=function(){var t,n;I(this.Dn)||(this.Dn,t=this.Dn,n=A(this.Dn),t._fs_loaded=n,n in t||(t[n]={}),function(t){(0,e.__awaiter)(this,void 0,Yn,function(){var n;return(0,e.__generator)(this,function(i){switch(i.label){case 0:return[4,Sa(t,o.snapshot)];case 1:return n=i.sent(),o.rebuildFromSnapshot(n),[2];}})})}(this.Dn),this.Sc(),this.xc(),this.Dn,this.Ec.onFSInit())},t.prototype.initCaptureSettings=function(){var t=function(t){var n={orgId:F(t)||"",script:H(t)||"",recHost:L(t)||"",cdnHost:N(t)||"",appHost:U(t)||"",captureOnStart:D(t)};return n.orgId&&n.script&&n.recHost&&n.cdnHost&&n.appHost?n:null}(this.Dn);if(null===t)return!1;var n=t.appHost,i=t.cdnHost,r=t.orgId,e=t.recHost,s=t.script,o=t.captureOnStart;return this.Su=n,this.$o=i,this.xu=r,this.Eu=e,this.bu=s,this.kc=o,"localhost:8080"==this.Eu&&(this.zo="http:"),this._c=function(t,n){var i,r=W(n);return B(n)?i=!1:n!==top?i=!0:r?t&&r.init&&r.init(t)&&(i=!0):i=!1,i}(r,this.Dn),void 0!==this._c&&(function(t){var n;pe(null!==(n=te[t])&&void 0!==n?n:cn.DefaultOrgSettings.UrlPrivacyConfig,cn.DefaultOrgSettings.MaxUrlLength)}(r),qa(this.Dn))},t.prototype.log=function(){for(var t=[],n=0;n<arguments.length;n++)t[n]=arguments[n];this.Ac([m.V1.OperationName.Log,t])},t.prototype.getCurrentSessionURL=function(t){return this.Ic(t?"url.now":"url")},t.prototype.getCurrentSession=function(){return this.Ic("id")},t.prototype.Ic=function(t){return this.Tc?Va(this.Tc,t):null},t.prototype.enableConsole=function(){this.Ac([m.V2.OperationName.SetConfig,{console:!0}])},t.prototype.disableConsole=function(){this.Ac([m.V2.OperationName.SetConfig,{console:!1}])},t.prototype.shutdown=function(t){void 0===t&&(t=Wt.Api),this.yc=vn.Shutdown,this.Tc&&!this.Cc&&(this.Tc.shutdown(t),this.Tc=null,!this._c&&this.Pc&&this.Pc.unloadCrossPageVars(t),this.Ec.onShutdown(t))},t.prototype.restart=function(){if(this.gc)return this.Cc?(this.Cc(),void(this.Cc=null)):void(this.Tc||this.jc(!0))},t.prototype.splitPage=function(t,n){return(0,e.__awaiter)(this,void 0,Yn,function(){return(0,e.__generator)(this,function(i){switch(i.label){case 0:return n&&null==this.Uu?[2]:this.mc?(this.Oc=[t,n],[2]):(this.shutdown(t),[4,ni(0)]);case 1:return i.sent(),[4,ni(0)];case 2:return i.sent(),n&&this.Uu&&this.Uu.clear(),this.restart(),[2];}})})},t.prototype._api=function(t,n,i,r,e){var s;return this.Ac([t,n,i,r||function(t){s=t},e]),s},t.prototype.executeApiSequenceWrapper=function(t,n){return function(t,n){for(var i,r,e,s,o,u,a,c=n.inFrame,h=n.initConfig,f=n.recorder,v=n.recordingObserver,l=n.state,d=n.vars,p=function(t){for(var n=[],i=0,r=t;i<r.length;i++){var e=r[i],s=e[0],o=e[1],u=e[2],a=e[3],c=e[4],h=za(s,o);h&&(h.source="string"==typeof u?{integration:u}:u,h.resolve=a,h.reject=c,n.push(h))}return n}(t),w=[],g=!1,y=!1,b=[],E=[],S=function(t){if(d){var n=d.api(t),i=n.events;n.reidentify&&(w=[],g=!0,E.push.apply(E,b),b=[]),w.push.apply(w,i)}},x=function(t,n){b.push(function(t,n){return t?{commit:X(function(){return t(n)}),discard:X(function(){return t(n)})}:nc}(t.resolve,n))},k=function(t,n){var i,r;b.push((i=t.reject,r=n,i?{commit:X(function(){return i(r)}),discard:X(function(){return i(r)})}:nc))},_=function(t){try{if(t.operation,c&&-1===ic.indexOf(t.operation)){var n="FS."+t.operation+"() is not available in an inner frame";return y||(y=!0),k(t,new Error(n)),"continue"}switch(t.operation){case m.V2.OperationName.Restart:case m.V2.OperationName.Start:o=!0,x(t);break;case m.V2.OperationName.Shutdown:o=!1,x(t);break;case m.V2.OperationName.Log:var d=t.option,p=d.level,g=(n=d.msg,f.console().logEvent(p,n?[n]:[],"fs"));g&&w.push(g),x(t);break;case m.V2.OperationName.SetIdentity:var E=function(n){S({operation:m.V2.OperationName.SetProperties,option:n,source:t.source,resolve:t.resolve,reject:t.reject})};t.option&&"object"==typeof t.option?(Object.prototype.hasOwnProperty.call(t.option,"consent")&&(u=null!==(i=t.option.consent)&&void 0!==i&&i),Object.prototype.hasOwnProperty.call(t.option,"uid")&&E({type:"user",properties:{uid:t.option.uid}}),Object.prototype.hasOwnProperty.call(t.option,"properties")&&E({type:"user",properties:null!==(r=t.option.properties)&&void 0!==r?r:{}}),(null===(e=t.option)||void 0===e?void 0:e.anonymous)&&E({type:"user",properties:{uid:!1}})):E({type:"user",properties:{uid:t.option}}),x(t);break;case m.V2.OperationName.TrackEvent:case m.V2.OperationName.SetPage:case m.V2.OperationName.SetProperties:S(t),x(t);break;case m.V2.OperationName.GetSession:var _=Va(f,null===(s=t.option)||void 0===s?void 0:s.format);x(t,_);break;case m.V2.OperationName.SetConfig:var A=t.option.console;b.push({commit:X(function(){A?f.console().start({ConsoleWatcher:!0}):f.console().stop()}),discard:X(function(){})}),x(t);break;case m.V2.OperationName.Stat:var I=t.option,T=I.event_type,C=I.properties;w.push(function(t,n){var i=cn.DefaultStatsSettings,r=i.MaxEventTypeLength,e=i.MaxPayloadLength,s="string"==typeof t?t.trim().slice(0,r):"";return{Kind:Ot.STATS,Args:[s,be(Qi(n,e))]}}(T,C)),x(t);break;case m.V2.OperationName.Observe:var P=t.option,j=P.type,O=P.callback;x(t,null==v?void 0:v.registerListener(j,O));break;case m.V2.OperationName.Source:var M=Uu({source:t.option.source,type:"default",entrypoint:"source"});w.push(M),x(t);break;case m.V2.OperationName.Init:if(l!==vn.Shutdown){n="Capture already started - init rejected.",k(t,new Error(n));break}if(void 0!==a||void 0!==h){n="Multiple calls to init - init rejected.",k(t,new Error(n));break}var K=function(t){var n,i={recoverable:[],unrecoverable:[]};if(!Ga(t))return i.unrecoverable.push(Ja("options",$a)),[i,null];var r={};if(Xa(t,"privacy")){var e=function(t){var n="privacy.attributeBlocklist",i=[];if(!Ga(t))return i.push(Ja("privacy",$a)),[i,void 0];if(!Xa(t,"attributeBlocklist"))return[i,void 0];if(!tt(t.attributeBlocklist))return i.push(Ja(n,"must be an array")),[i,void 0];for(var r={attributeBlocklist:[]},e=0,s=t.attributeBlocklist;e<s.length;e++){var o=s[e];Za(o)?r.attributeBlocklist.push(o):i.push(Ja(n,"invalid rule: "+Qi(o)))}return[i,r]}(t.privacy),s=e[0],o=e[1];(n=i.recoverable).push.apply(n,s),r.privacy=o}return[i,r]}(t.option),R=K[0],H=K[1];if(R.unrecoverable.length>0||null===H){n="Init config rejected: "+R.unrecoverable.join(",\n"),k(t,new Error(n));break}R.recoverable.length>0&&(n="Init config partially rejected: "+R.recoverable.join(",\n")),a=H,x(t);break;default:(0,Ir.nt)(t,"invalid operation");}}catch(n){Tt.sendToBugsnag(n,"error"),k(t,n)}},A=0,I=p;A<I.length;A++)_(I[A]);return{applyApi:function(){for(var t=f.queue(),n=0,i=w;n<i.length;n++){var r=i[n];t.enqueue(r)}void 0!==u&&f.setConsent(u),void 0!==a&&f.setInitConfig(a),E.forEach(function(t){return t.discard()}),b.forEach(function(t){return t.commit()})},initConfig:a,recordingShouldBeEnabled:o,reidentified:g}}(n,{inFrame:this._c,initConfig:this._u,recorder:t,recordingObserver:this.bc,state:this.yc,vars:this.Pc})},t.prototype.Ac=function(t){var n;if(this.Tc&&!this.Oc){var i=null!==(n=this.executeApiSequenceWrapper(this.Tc,[t]))&&void 0!==n?n:{reidentified:!1,applyApi:function(){}},r=i.applyApi,e=i.initConfig,s=i.recordingShouldBeEnabled;i.reidentified?(Q(this.Dn,t),this.splitPage(Wt.Reidentify,!0)):(void 0!==e&&(this._u=e),r()),void 0!==s&&(s?this.restart():this.shutdown(Wt.Api))}else{var o=t[0],u=t[3];"restart"===o||"start"===o?((void 0===u?function(){}:u)(null),this.restart()):Q(this.Dn,t)}},t.prototype._cookies=function(){return this.Uu?this.Uu.getCookies():null},t.prototype._setCookie=function(t,n){this.Uu&&this.Uu.setCookie(t,n)},t.prototype._withEventQueue=function(t,n){if(this.Tc){var i=this.Tc.queue(),r=this.Tc.pageSignature();null!=i&&null!=r&&(t===r?n(i):Qi({msg:"Error in _withEventQueue: Page Signature mismatch",pageSignature:r,callerSignature:t},1024))}},t.prototype._withRecorder=function(t,n){if(this.Tc){var i=this.Tc.pageSignature();null!==i&&(void 0===t||t===i?n(this.Tc):Qi({msg:"Error in _withRecorder: Page Signature mismatch",pageSignature:i,callerSignature:t},1024))}},t.prototype.Sc=function(){var t=T(this.Dn);if(t)for(var n=0,i=["disableConsole","enableConsole","log","restart","shutdown","getCurrentSession","getCurrentSessionURL","_api","_withEventQueue","_withRecorder","_cookies","_setCookie"];n<i.length;n++){var r=i[n];t[r]=ft(this[r],this,ct)}},t.prototype.xc=function(){var t=this;this.gc=this.initCaptureSettings(),this.gc&&(this.jc(!1),this.Mc(),this.Dn.addEventListener("message",Tt.wrap(function(n){return t.Kc(n)})))},t.prototype.Rc=function(){var t=this;this.xu&&(this.Uu=new ea(this.xu,this.Dn.document,function(n){for(var i,r=0,e=n;r<e.length;r++){var s=e[r];null===(i=t.Tc)||void 0===i||i.queue().enqueue({Kind:Ot.STORAGE_WRITE_FAILURE,Args:s})}},this._c),this.Pc?this.Pc.setIdentity(this.Uu):this.Pc=new pa(this.Uu))},t.prototype.Kc=function(t){if("string"==typeof t.data&&(t.source==this.Dn.parent||t.source==this.Dn))switch(yu(t.data)[0]){case du.ShutdownFrame:this.shutdown(Wt.FsShutdownFrame);break;case du.RestartFrame:this.restart();}},t.prototype.jc=function(t){this.Rc(),this.Tc=this.Hc(t),this.Tc},t.prototype.Nc=function(t,n){var i,r=this,e=o.mathRound(null!==(i=X(function(){var t;return null===(t=window.performance)||void 0===t?void 0:t.now()})())&&void 0!==i?i:-1);return{window:this.Dn,time:new nr,measurer:ui.create(this.Dn),options:{appHost:this.Su,orgId:this.xu,recHost:this.Eu,cdnHost:this.$o,scheme:this.zo,script:this.bu},recording:{bundleUploadInterval:function(){var n,i;return null!==(i=null===(n=t())||void 0===n?void 0:n.bundleUploadInterval())&&void 0!==i?i:cn.DefaultBundleUploadInterval},getCurrentSessionURL:function(n){var i,r;return null!==(r=null===(i=t())||void 0===i?void 0:i.getCurrentSessionURL(n))&&void 0!==r?r:null},identity:this.Uu,inFrame:n,pageResponse:function(){var n;return null===(n=t())||void 0===n?void 0:n.getPageResponse()},pageSignature:function(){var n,i;return null!==(i=null===(n=t())||void 0===n?void 0:n.pageSignature())&&void 0!==i?i:null},preroll:e,splitPage:function(t,n){return r.splitPage(t,n)},vars:this.Pc,observer:this.Ec,bundleApiVersion:function(){var n,i;return null!==(i=null===(n=t())||void 0===n?void 0:n.getBundleApiVersion())&&void 0!==i?i:"v1"}},queue:function(){var n;return null===(n=t())||void 0===n?void 0:n.queue()}}},t.prototype.Lc=function(t,n){if(n&&this.Pc){for(var i=0,r=this.Pc.getDocumentVars();i<r.length;i++){var e=r[i];t.enqueue(e)}var s=this.Pc.getCrossPageVars();void 0!==s&&t.enqueue(s)}},t.prototype.Hc=function(t){var n,i=this,r=this._c,e=this.Nc(function(){return n},!!r),s=function(r){void 0===r&&(r=!1),i.yc=vn.Starting,n.start(r,function(){i.yc=vn.Started,i.mc=!1,t&&n.tellAllFramesTo([du.RestartFrame]),i.Oc&&(i.splitPage(i.Oc[0],i.Oc[1]),i.Oc=null)},function(){i.yc=vn.Shutdown})};return r?(n=this.dc.createInnerRecorder(e),this.Uc(n,s)):(n=this.dc.createTopRecorder(e),this.Fc(n,s,t)),n},t.prototype.Fc=function(t,n,i){var r;this.mc=!0;var e,s=!1,o=[];this.Lc(t.queue(),i);var u=R(this.Dn,"_fs_asset_map_id");u&&o.push([m.V1.VarOperationName.Vars,[Xt.Document,{assetMapId:u}]]),o.push.apply(o,q(this.Dn));var a=null!==(r=this.executeApiSequenceWrapper(t,o))&&void 0!==r?r:{applyApi:function(){}},c=a.applyApi,h=a.initConfig,f=a.recordingShouldBeEnabled,v=a.reidentified;t.queue().enqueue({Kind:Ot.REC_FEAT_SUPPORTED,Args:[zt.CaptureOnStartEnabled,!!this.kc]}),void 0!==f?s=!f:this.kc&&(s=!0),this.kc=!1,void 0!==h&&(this._u=h),e=!!v,c(),s?this.Cc=function(){return n(e)}:n(e)},t.prototype.Uc=function(t,n){var i;this.mc=!0,(0,(null!==(i=this.executeApiSequenceWrapper(t,q(this.Dn)))&&void 0!==i?i:{applyApi:function(){}}).applyApi)(),n(!1)},t.prototype.Mc=function(){var t=this,n=function(){t.wc||(t.wc=!0,t.Tc&&t.Tc.onDomLoad())},i=!1,r=function(){i||(i=!0,t.Tc&&t.Tc.onLoad())};switch(document.readyState){case"interactive":n();break;case"complete":n(),r();}this.wc||document.addEventListener("DOMContentLoaded",Tt.wrap(n)),i||this.Dn.addEventListener("load",Tt.wrap(function(t){n(),r()}))},t}();!function(){try{new ec().init()}catch(t){Tt.sendToBugsnag(t,"error")}}()},220:function(t,n,i){n.nt=void 0,i(940),i(327),n.nt=function(t,n){throw void 0===n&&(n="Reached unexpected case in exhaustive switch"),new Error(n)}},327:function(t,n){Object.defineProperty(n,"__esModule",{value:!0}),n.ExtendedObject=void 0,n.ExtendedObject=Object},940:function(t,n,i){i.r(n),i.d(n,{__extends:function(){return e},__assign:function(){return s},__rest:function(){return o},__decorate:function(){return u},__param:function(){return a},__metadata:function(){return c},__awaiter:function(){return h},__generator:function(){return f},__createBinding:function(){return v},__exportStar:function(){return l},__values:function(){return d},__read:function(){return p},__spread:function(){return w},__spreadArrays:function(){return g},__spreadArray:function(){return m},__await:function(){return y},__asyncGenerator:function(){return b},__asyncDelegator:function(){return E},__asyncValues:function(){return S},__makeTemplateObject:function(){return x},__importStar:function(){return _},__importDefault:function(){return A},__classPrivateFieldGet:function(){return I},__classPrivateFieldSet:function(){return T},__classPrivateFieldIn:function(){return C}});var r=function(t,n){return r=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,n){t.__proto__=n}||function(t,n){for(var i in n)Object.prototype.hasOwnProperty.call(n,i)&&(t[i]=n[i])},r(t,n)};function e(t,n){if("function"!=typeof n&&null!==n)throw new TypeError("Class extends value "+String(n)+" is not a constructor or null");function i(){this.constructor=t}r(t,n),t.prototype=null===n?Object.create(n):(i.prototype=n.prototype,new i)}var s=function(){return s=Object.assign||function(t){for(var n,i=1,r=arguments.length;i<r;i++)for(var e in n=arguments[i])Object.prototype.hasOwnProperty.call(n,e)&&(t[e]=n[e]);return t},s.apply(this,arguments)};function o(t,n){var i={};for(var r in t)Object.prototype.hasOwnProperty.call(t,r)&&n.indexOf(r)<0&&(i[r]=t[r]);if(null!=t&&"function"==typeof Object.getOwnPropertySymbols){var e=0;for(r=Object.getOwnPropertySymbols(t);e<r.length;e++)n.indexOf(r[e])<0&&Object.prototype.propertyIsEnumerable.call(t,r[e])&&(i[r[e]]=t[r[e]])}return i}function u(t,n,i,r){var e,s=arguments.length,o=s<3?n:null===r?r=Object.getOwnPropertyDescriptor(n,i):r;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)o=Reflect.decorate(t,n,i,r);else for(var u=t.length-1;u>=0;u--)(e=t[u])&&(o=(s<3?e(o):s>3?e(n,i,o):e(n,i))||o);return s>3&&o&&Object.defineProperty(n,i,o),o}function a(t,n){return function(i,r){n(i,r,t)}}function c(t,n){if("object"==typeof Reflect&&"function"==typeof Reflect.metadata)return Reflect.metadata(t,n)}function h(t,n,i,r){return new(i||(i=Promise))(function(e,s){function o(t){try{a(r.next(t))}catch(t){s(t)}}function u(t){try{a(r["throw"](t))}catch(t){s(t)}}function a(t){var n;t.done?e(t.value):(n=t.value,n instanceof i?n:new i(function(t){t(n)})).then(o,u)}a((r=r.apply(t,n||[])).next())})}function f(t,n){var i,r,e,s,o={label:0,sent:function(){if(1&e[0])throw e[1];return e[1]},trys:[],ops:[]};return s={next:u(0),"throw":u(1),"return":u(2)},"function"==typeof Symbol&&(s[Symbol.iterator]=function(){return this}),s;function u(s){return function(u){return function(s){if(i)throw new TypeError("Generator is already executing.");for(;o;)try{if(i=1,r&&(e=2&s[0]?r["return"]:s[0]?r["throw"]||((e=r["return"])&&e.call(r),0):r.next)&&!(e=e.call(r,s[1])).done)return e;switch(r=0,e&&(s=[2&s[0],e.value]),s[0]){case 0:case 1:e=s;break;case 4:return o.label++,{value:s[1],done:!1};case 5:o.label++,r=s[1],s=[0];continue;case 7:s=o.ops.pop(),o.trys.pop();continue;default:if(!((e=(e=o.trys).length>0&&e[e.length-1])||6!==s[0]&&2!==s[0])){o=0;continue}if(3===s[0]&&(!e||s[1]>e[0]&&s[1]<e[3])){o.label=s[1];break}if(6===s[0]&&o.label<e[1]){o.label=e[1],e=s;break}if(e&&o.label<e[2]){o.label=e[2],o.ops.push(s);break}e[2]&&o.ops.pop(),o.trys.pop();continue;}s=n.call(t,o)}catch(t){s=[6,t],r=0}finally{i=e=0}if(5&s[0])throw s[1];return{value:s[0]?s[1]:void 0,done:!0}}([s,u])}}}var v=Object.create?function(t,n,i,r){void 0===r&&(r=i);var e=Object.getOwnPropertyDescriptor(n,i);e&&!("get"in e?!n.__esModule:e.writable||e.configurable)||(e={enumerable:!0,get:function(){return n[i]}}),Object.defineProperty(t,r,e)}:function(t,n,i,r){void 0===r&&(r=i),t[r]=n[i]};function l(t,n){for(var i in t)"default"===i||Object.prototype.hasOwnProperty.call(n,i)||v(n,t,i)}function d(t){var n="function"==typeof Symbol&&Symbol.iterator,i=n&&t[n],r=0;if(i)return i.call(t);if(t&&"number"==typeof t.length)return{next:function(){return t&&r>=t.length&&(t=void 0),{value:t&&t[r++],done:!t}}};throw new TypeError(n?"Object is not iterable.":"Symbol.iterator is not defined.")}function p(t,n){var i="function"==typeof Symbol&&t[Symbol.iterator];if(!i)return t;var r,e,s=i.call(t),o=[];try{for(;(void 0===n||n-->0)&&!(r=s.next()).done;)o.push(r.value)}catch(t){e={error:t}}finally{try{r&&!r.done&&(i=s["return"])&&i.call(s)}finally{if(e)throw e.error}}return o}function w(){for(var t=[],n=0;n<arguments.length;n++)t=t.concat(p(arguments[n]));return t}function g(){for(var t=0,n=0,i=arguments.length;n<i;n++)t+=arguments[n].length;var r=Array(t),e=0;for(n=0;n<i;n++)for(var s=arguments[n],o=0,u=s.length;o<u;o++,e++)r[e]=s[o];return r}function m(t,n,i){if(i||2===arguments.length)for(var r,e=0,s=n.length;e<s;e++)!r&&e in n||(r||(r=Array.prototype.slice.call(n,0,e)),r[e]=n[e]);return t.concat(r||Array.prototype.slice.call(n))}function y(t){return this instanceof y?(this.v=t,this):new y(t)}function b(t,n,i){if(!Symbol.asyncIterator)throw new TypeError("Symbol.asyncIterator is not defined.");var r,e=i.apply(t,n||[]),s=[];return r={},o("next"),o("throw"),o("return"),r[Symbol.asyncIterator]=function(){return this},r;function o(t){e[t]&&(r[t]=function(n){return new Promise(function(i,r){s.push([t,n,i,r])>1||u(t,n)})})}function u(t,n){try{(i=e[t](n)).value instanceof y?Promise.resolve(i.value.v).then(a,c):h(s[0][2],i)}catch(t){h(s[0][3],t)}var i}function a(t){u("next",t)}function c(t){u("throw",t)}function h(t,n){t(n),s.shift(),s.length&&u(s[0][0],s[0][1])}}function E(t){var n,i;return n={},r("next"),r("throw",function(t){throw t}),r("return"),n[Symbol.iterator]=function(){return this},n;function r(r,e){n[r]=t[r]?function(n){return(i=!i)?{value:y(t[r](n)),done:"return"===r}:e?e(n):n}:e}}function S(t){if(!Symbol.asyncIterator)throw new TypeError("Symbol.asyncIterator is not defined.");var n,i=t[Symbol.asyncIterator];return i?i.call(t):(t=d(t),n={},r("next"),r("throw"),r("return"),n[Symbol.asyncIterator]=function(){return this},n);function r(i){n[i]=t[i]&&function(n){return new Promise(function(r,e){!function(t,n,i,r){Promise.resolve(r).then(function(n){t({value:n,done:i})},n)}(r,e,(n=t[i](n)).done,n.value)})}}}function x(t,n){return Object.defineProperty?Object.defineProperty(t,"raw",{value:n}):t.raw=n,t}var k=Object.create?function(t,n){Object.defineProperty(t,"default",{enumerable:!0,value:n})}:function(t,n){t["default"]=n};function _(t){if(t&&t.__esModule)return t;var n={};if(null!=t)for(var i in t)"default"!==i&&Object.prototype.hasOwnProperty.call(t,i)&&v(n,t,i);return k(n,t),n}function A(t){return t&&t.__esModule?t:{"default":t}}function I(t,n,i,r){if("a"===i&&!r)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof n?t!==n||!r:!n.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===i?r:"a"===i?r.call(t):r?r.value:n.get(t)}function T(t,n,i,r,e){if("m"===r)throw new TypeError("Private method is not writable");if("a"===r&&!e)throw new TypeError("Private accessor was defined without a setter");if("function"==typeof n?t!==n||!e:!n.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");return"a"===r?e.call(t,i):e?e.value=i:n.set(t,i),i}function C(t,n){if(null===n||"object"!=typeof n&&"function"!=typeof n)throw new TypeError("Cannot use 'in' operator on non-object");return"function"==typeof t?n===t:t.has(n)}}},n={};function i(r){var e=n[r];if(void 0!==e)return e.exports;var s=n[r]={exports:{}};return t[r](s,s.exports,i),s.exports}i.d=function(t,n){for(var r in n)i.o(n,r)&&!i.o(t,r)&&Object.defineProperty(t,r,{enumerable:!0,get:n[r]})},i.o=function(t,n){return Object.prototype.hasOwnProperty.call(t,n)},i.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},i(248)}();

From 75c978151a7da7a620f9b7fbec2cac1fb0d75aca Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 18 Apr 2023 07:16:49 -0400
Subject: [PATCH 012/100] Update dependency elastic-apm-node to ^3.44.1 (main)
 (#154971)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [elastic-apm-node](https://togithub.com/elastic/apm-agent-nodejs) |
[`^3.44.0` ->
`^3.44.1`](https://renovatebot.com/diffs/npm/elastic-apm-node/3.44.1/3.44.1)
|
[![age](https://badges.renovateapi.com/packages/npm/elastic-apm-node/3.44.1/age-slim)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://badges.renovateapi.com/packages/npm/elastic-apm-node/3.44.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://badges.renovateapi.com/packages/npm/elastic-apm-node/3.44.1/compatibility-slim/3.44.1)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://badges.renovateapi.com/packages/npm/elastic-apm-node/3.44.1/confidence-slim/3.44.1)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://app.renovatebot.com/dashboard#github/elastic/kibana).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNS40MC4wIiwidXBkYXRlZEluVmVyIjoiMzUuNDAuMCJ9-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 460a4769ad09a..e439f886118ee 100644
--- a/package.json
+++ b/package.json
@@ -770,7 +770,7 @@
     "deepmerge": "^4.2.2",
     "del": "^6.1.0",
     "elastic-apm-http-client": "^11.0.1",
-    "elastic-apm-node": "^3.44.0",
+    "elastic-apm-node": "^3.44.1",
     "email-addresses": "^5.0.0",
     "execa": "^4.0.2",
     "expiry-js": "0.1.7",
diff --git a/yarn.lock b/yarn.lock
index 66fb913bb59c3..2776f05861c0c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14275,7 +14275,7 @@ elastic-apm-node@^3.38.0:
     traverse "^0.6.6"
     unicode-byte-truncate "^1.0.0"
 
-elastic-apm-node@^3.44.0:
+elastic-apm-node@^3.44.1:
   version "3.44.1"
   resolved "https://registry.yarnpkg.com/elastic-apm-node/-/elastic-apm-node-3.44.1.tgz#8a6e88fa9f3401455dddb87f9d5559f6d894964d"
   integrity sha512-hSf+S6GtQ+Ff5ueyQ1n2BAgAdiDOZ+XmHKFurzpB5/rvRFz6JbXLq+pcI11HMlK3ImiMVG9LQxHWMN6gqkqzYQ==

From b6d4090de3b946f6cea157ffa2cc6cd6b9528103 Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad31comp@gmail.com>
Date: Tue, 18 Apr 2023 13:31:40 +0200
Subject: [PATCH 013/100] [Synthetics UI] update sync service endpoints
 (#155054)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Alejandro Fernández Gómez <alejandro.fernandez@elastic.co>
---
 .../getting_started/getting_started_page.tsx  |   4 +
 .../service_api_client.test.ts                | 114 ++++++++++++++++--
 .../synthetics_service/service_api_client.ts  |  60 +++++----
 .../synthetics_service/synthetics_service.ts  |   2 +-
 4 files changed, 149 insertions(+), 31 deletions(-)

diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/getting_started/getting_started_page.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/getting_started/getting_started_page.tsx
index c63faf20904a4..f42b781089aea 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/getting_started/getting_started_page.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/getting_started/getting_started_page.tsx
@@ -29,6 +29,7 @@ import {
   setAddingNewPrivateLocation,
   getAgentPoliciesAction,
   selectAgentPolicies,
+  cleanMonitorListState,
 } from '../../state';
 import { MONITOR_ADD_ROUTE } from '../../../../../common/constants/ui';
 import { PrivateLocation } from '../../../../../common/runtime_types';
@@ -46,6 +47,9 @@ export const GettingStartedPage = () => {
     if (canReadAgentPolicies) {
       dispatch(getAgentPoliciesAction.get());
     }
+    return () => {
+      dispatch(cleanMonitorListState());
+    };
   }, [canReadAgentPolicies, dispatch]);
 
   useBreadcrumbs([{ text: MONITORING_OVERVIEW_LABEL }]); // No extra breadcrumbs on overview
diff --git a/x-pack/plugins/synthetics/server/synthetics_service/service_api_client.test.ts b/x-pack/plugins/synthetics/server/synthetics_service/service_api_client.test.ts
index b65d4a30e0b62..22ec8e8a3213e 100644
--- a/x-pack/plugins/synthetics/server/synthetics_service/service_api_client.test.ts
+++ b/x-pack/plugins/synthetics/server/synthetics_service/service_api_client.test.ts
@@ -177,7 +177,6 @@ describe('callAPI', () => {
       1,
       {
         isEdit: undefined,
-        runOnce: undefined,
         monitors: testMonitors.filter((monitor: any) =>
           monitor.locations.some((loc: any) => loc.id === 'us_central')
         ),
@@ -192,7 +191,6 @@ describe('callAPI', () => {
       2,
       {
         isEdit: undefined,
-        runOnce: undefined,
         monitors: testMonitors.filter((monitor: any) =>
           monitor.locations.some((loc: any) => loc.id === 'us_central_qa')
         ),
@@ -207,7 +205,6 @@ describe('callAPI', () => {
       3,
       {
         isEdit: undefined,
-        runOnce: undefined,
         monitors: testMonitors.filter((monitor: any) =>
           monitor.locations.some((loc: any) => loc.id === 'us_central_staging')
         ),
@@ -284,15 +281,15 @@ describe('callAPI', () => {
     });
     expect(logger.debug).toHaveBeenNthCalledWith(
       2,
-      'Successfully called service location https://service.dev with method POST with 4 monitors '
+      'Successfully called service location https://service.devundefined with method POST with 4 monitors'
     );
     expect(logger.debug).toHaveBeenNthCalledWith(
       4,
-      'Successfully called service location https://qa.service.elstc.co with method POST with 4 monitors '
+      'Successfully called service location https://qa.service.elstc.coundefined with method POST with 4 monitors'
     );
     expect(logger.debug).toHaveBeenNthCalledWith(
       6,
-      'Successfully called service location https://qa.service.stg.co with method POST with 1 monitors '
+      'Successfully called service location https://qa.service.stg.coundefined with method POST with 1 monitors'
     );
   });
 
@@ -320,7 +317,6 @@ describe('callAPI', () => {
         coreStart: mockCoreStart,
       } as UptimeServerSetup
     );
-
     apiClient.locations = testLocations;
 
     const output = { hosts: ['https://localhost:9200'], api_key: '12345' };
@@ -354,6 +350,110 @@ describe('callAPI', () => {
       url: 'https://service.dev/monitors',
     });
   });
+
+  it('Calls the `/run` endpoint when calling `runOnce`', async () => {
+    const axiosSpy = (axios as jest.MockedFunction<typeof axios>).mockResolvedValue({
+      status: 200,
+      statusText: 'ok',
+      headers: {},
+      config: {},
+      data: { allowed: true, signupUrl: 'http://localhost:666/example' },
+    });
+
+    const apiClient = new ServiceAPIClient(
+      logger,
+      {
+        manifestUrl: 'http://localhost:8080/api/manifest',
+        tls: { certificate: 'test-certificate', key: 'test-key' } as any,
+      },
+      { isDev: true, stackVersion: '8.7.0' } as UptimeServerSetup
+    );
+
+    apiClient.locations = testLocations;
+
+    const output = { hosts: ['https://localhost:9200'], api_key: '12345' };
+
+    await apiClient.runOnce({
+      monitors: testMonitors,
+      output,
+      licenseLevel: 'trial',
+    });
+
+    expect(axiosSpy).toHaveBeenNthCalledWith(1, {
+      data: {
+        monitors: request1,
+        is_edit: undefined,
+        output,
+        stack_version: '8.7.0',
+        license_level: 'trial',
+      },
+      headers: {
+        'x-kibana-version': '8.7.0',
+      },
+      httpsAgent: expect.objectContaining({
+        options: {
+          rejectUnauthorized: true,
+          path: null,
+          cert: 'test-certificate',
+          key: 'test-key',
+        },
+      }),
+      method: 'POST',
+      url: 'https://service.dev/run',
+    });
+  });
+
+  it('Calls the `/monitors/sync` endpoint when calling `syncMonitors`', async () => {
+    const axiosSpy = (axios as jest.MockedFunction<typeof axios>).mockResolvedValue({
+      status: 200,
+      statusText: 'ok',
+      headers: {},
+      config: {},
+      data: { allowed: true, signupUrl: 'http://localhost:666/example' },
+    });
+
+    const apiClient = new ServiceAPIClient(
+      logger,
+      {
+        manifestUrl: 'http://localhost:8080/api/manifest',
+        tls: { certificate: 'test-certificate', key: 'test-key' } as any,
+      },
+      { isDev: true, stackVersion: '8.7.0' } as UptimeServerSetup
+    );
+
+    apiClient.locations = testLocations;
+
+    const output = { hosts: ['https://localhost:9200'], api_key: '12345' };
+
+    await apiClient.syncMonitors({
+      monitors: testMonitors,
+      output,
+      licenseLevel: 'trial',
+    });
+
+    expect(axiosSpy).toHaveBeenNthCalledWith(1, {
+      data: {
+        monitors: request1,
+        is_edit: undefined,
+        output,
+        stack_version: '8.7.0',
+        license_level: 'trial',
+      },
+      headers: {
+        'x-kibana-version': '8.7.0',
+      },
+      httpsAgent: expect.objectContaining({
+        options: {
+          rejectUnauthorized: true,
+          path: null,
+          cert: 'test-certificate',
+          key: 'test-key',
+        },
+      }),
+      method: 'PUT',
+      url: 'https://service.dev/monitors/sync',
+    });
+  });
 });
 
 const testLocations: PublicLocations = [
diff --git a/x-pack/plugins/synthetics/server/synthetics_service/service_api_client.ts b/x-pack/plugins/synthetics/server/synthetics_service/service_api_client.ts
index 362fffea3a5a8..bfc872f3680a8 100644
--- a/x-pack/plugins/synthetics/server/synthetics_service/service_api_client.ts
+++ b/x-pack/plugins/synthetics/server/synthetics_service/service_api_client.ts
@@ -25,7 +25,7 @@ export interface ServiceData {
     hosts: string[];
     api_key: string;
   };
-  runOnce?: boolean;
+  endpoint?: 'monitors' | 'runOnce' | 'sync';
   isEdit?: boolean;
   licenseLevel: string;
 }
@@ -81,7 +81,7 @@ export class ServiceAPIClient {
   }
 
   async post(data: ServiceData) {
-    return this.callAPI('PUT', data);
+    return this.callAPI('POST', data);
   }
 
   async put(data: ServiceData) {
@@ -93,7 +93,11 @@ export class ServiceAPIClient {
   }
 
   async runOnce(data: ServiceData) {
-    return this.callAPI('POST', { ...data, runOnce: true });
+    return this.callAPI('POST', { ...data, endpoint: 'runOnce' });
+  }
+
+  async syncMonitors(data: ServiceData) {
+    return this.callAPI('PUT', { ...data, endpoint: 'sync' });
   }
 
   addVersionHeader(req: AxiosRequestConfig) {
@@ -112,7 +116,7 @@ export class ServiceAPIClient {
       const url = this.locations[Math.floor(Math.random() * this.locations.length)].url;
 
       /* url is required for service locations, but omitted for private locations.
-  /* this.locations is only service locations */
+      /* this.locations is only service locations */
       const httpsAgent = this.getHttpsAgent(url);
 
       if (httpsAgent) {
@@ -138,7 +142,7 @@ export class ServiceAPIClient {
 
   async callAPI(
     method: 'POST' | 'PUT' | 'DELETE',
-    { monitors: allMonitors, output, runOnce, isEdit, licenseLevel }: ServiceData
+    { monitors: allMonitors, output, endpoint, isEdit, licenseLevel }: ServiceData
   ) {
     if (this.username === TEST_SERVICE_USERNAME) {
       // we don't want to call service while local integration tests are running
@@ -154,25 +158,24 @@ export class ServiceAPIClient {
         locations?.find((loc) => loc.id === id && loc.isServiceManaged)
       );
       if (locMonitors.length > 0) {
+        const promise = this.callServiceEndpoint(
+          { monitors: locMonitors, isEdit, endpoint, output, licenseLevel },
+          method,
+          url
+        );
         promises.push(
-          rxjsFrom(
-            this.callServiceEndpoint(
-              { monitors: locMonitors, isEdit, runOnce, output, licenseLevel },
-              method,
-              url
-            )
-          ).pipe(
+          rxjsFrom(promise).pipe(
             tap((result) => {
               this.logger.debug(result.data);
               this.logger.debug(
-                `Successfully called service location ${url} with method ${method} with ${locMonitors.length} monitors `
+                `Successfully called service location ${url}${result.request?.path} with method ${method} with ${locMonitors.length} monitors`
               );
             }),
             catchError((err: AxiosError<{ reason: string; status: number }>) => {
               pushErrors.push({ locationId: id, error: err.response?.data! });
               const reason = err.response?.data?.reason ?? '';
 
-              err.message = `Failed to call service location ${url} with method ${method} with ${locMonitors.length} monitors:  ${err.message}, ${reason}`;
+              err.message = `Failed to call service location ${url}${err.request?.path} with method ${method} with ${locMonitors.length} monitors:  ${err.message}, ${reason}`;
               this.logger.error(err);
               sendErrorTelemetryEvents(this.logger, this.server.telemetry, {
                 reason: err.response?.data?.reason,
@@ -197,19 +200,34 @@ export class ServiceAPIClient {
   }
 
   async callServiceEndpoint(
-    { monitors, output, runOnce, isEdit, licenseLevel }: ServiceData,
+    { monitors, output, endpoint = 'monitors', isEdit, licenseLevel }: ServiceData,
     method: 'POST' | 'PUT' | 'DELETE',
-    url: string
+    baseUrl: string
   ) {
     // don't need to pass locations to heartbeat
     const monitorsStreams = monitors.map(({ locations, ...rest }) =>
       convertToDataStreamFormat(rest)
     );
 
+    let url = baseUrl;
+    switch (endpoint) {
+      case 'monitors':
+        url += '/monitors';
+        break;
+      case 'runOnce':
+        url += '/run';
+        break;
+      case 'sync':
+        url += '/monitors/sync';
+        break;
+    }
+
+    const authHeader = this.authorization ? { Authorization: this.authorization } : undefined;
+
     return axios(
       this.addVersionHeader({
         method,
-        url: url + (runOnce ? '/run' : '/monitors'),
+        url,
         data: {
           monitors: monitorsStreams,
           output,
@@ -217,12 +235,8 @@ export class ServiceAPIClient {
           is_edit: isEdit,
           license_level: licenseLevel,
         },
-        headers: this.authorization
-          ? {
-              Authorization: this.authorization,
-            }
-          : undefined,
-        httpsAgent: this.getHttpsAgent(url),
+        headers: authHeader,
+        httpsAgent: this.getHttpsAgent(baseUrl),
       })
     );
   }
diff --git a/x-pack/plugins/synthetics/server/synthetics_service/synthetics_service.ts b/x-pack/plugins/synthetics/server/synthetics_service/synthetics_service.ts
index 10b20e819abb0..dd3af249aa3e7 100644
--- a/x-pack/plugins/synthetics/server/synthetics_service/synthetics_service.ts
+++ b/x-pack/plugins/synthetics/server/synthetics_service/synthetics_service.ts
@@ -369,7 +369,7 @@ export class SyntheticsService {
 
         this.logger.debug(`${monitors.length} monitors will be pushed to synthetics service.`);
 
-        service.syncErrors = await this.apiClient.put({
+        service.syncErrors = await this.apiClient.syncMonitors({
           monitors,
           output,
           licenseLevel: license.type,

From 9d30965a1dc4c40eed940d1339d549ddc72c8217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?=
 <alejandro.haro@elastic.co>
Date: Tue, 18 Apr 2023 14:10:57 +0200
Subject: [PATCH 014/100] Allow using the `--serverless` CLI flag in
 serverless-capable distros (#155009)

---
 src/cli/serve/serve.js | 41 +++++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/cli/serve/serve.js b/src/cli/serve/serve.js
index 4a875d6955428..9facf94408235 100644
--- a/src/cli/serve/serve.js
+++ b/src/cli/serve/serve.js
@@ -78,25 +78,43 @@ const configPathCollector = pathCollector();
 const pluginPathCollector = pathCollector();
 
 /**
- * @param {string} name
- * @param {string[]} configs
- * @param {'push' | 'unshift'} method
+ * @param {string} name The config file name
+ * @returns {boolean} Whether the file exists
  */
-function maybeAddConfig(name, configs, method) {
+function configFileExists(name) {
   const path = resolve(getConfigDirectory(), name);
   try {
-    if (statSync(path).isFile()) {
-      configs[method](path);
-    }
+    return statSync(path).isFile();
   } catch (err) {
     if (err.code === 'ENOENT') {
-      return;
+      return false;
     }
 
     throw err;
   }
 }
 
+/**
+ * @returns {boolean} Whether the distribution can run in Serverless mode
+ */
+function isServerlessCapableDistribution() {
+  // For now, checking if the `serverless.yml` config file exists should be enough
+  // We could also check the following as well, but I don't think it's necessary:
+  // VALID_SERVERLESS_PROJECT_MODE.some((projectType) => configFileExists(`serverless.${projectType}.yml`))
+  return configFileExists('serverless.yml');
+}
+
+/**
+ * @param {string} name
+ * @param {string[]} configs
+ * @param {'push' | 'unshift'} method
+ */
+function maybeAddConfig(name, configs, method) {
+  if (configFileExists(name)) {
+    configs[method](resolve(getConfigDirectory(), name));
+  }
+}
+
 /**
  * @returns {string[]}
  */
@@ -233,8 +251,11 @@ export default function (program) {
       .option(
         '--run-examples',
         'Adds plugin paths for all the Kibana example plugins and runs with no base path'
-      )
-      .option('--serverless <oblt|security|es>', 'Start Kibana in a serverless project mode');
+      );
+  }
+
+  if (isServerlessCapableDistribution()) {
+    command.option('--serverless <oblt|security|es>', 'Start Kibana in a serverless project mode');
   }
 
   if (DEV_MODE_SUPPORTED) {

From 56459aed5854e87f6336b4f2d22d9bede0cdef60 Mon Sep 17 00:00:00 2001
From: Marco Antonio Ghiani <marcoantonio.ghiani01@gmail.com>
Date: Tue, 18 Apr 2023 14:14:53 +0200
Subject: [PATCH 015/100] [Infrastructure UI] Dinamically set sticky bar
 position for Hosts View (#155139)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## 📓  Summary

Closes #155114

Instead of having a fixed value for the sticky bar position, we now set
it accordingly to the top position of the main app container.


https://user-images.githubusercontent.com/34506779/232760797-c91f8ade-b1bc-4921-9ef7-30d4647219b5.mov

Co-authored-by: Marco Antonio Ghiani <marcoantonio.ghiani@elastic.co>
---
 x-pack/plugins/infra/public/apps/metrics_app.tsx   |  4 +++-
 .../hosts/components/unified_search_bar.tsx        | 14 ++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/infra/public/apps/metrics_app.tsx b/x-pack/plugins/infra/public/apps/metrics_app.tsx
index 799cf83b4ee44..16f19523b4591 100644
--- a/x-pack/plugins/infra/public/apps/metrics_app.tsx
+++ b/x-pack/plugins/infra/public/apps/metrics_app.tsx
@@ -22,6 +22,8 @@ import { CommonInfraProviders, CoreProviders } from './common_providers';
 import { prepareMountElement } from './common_styles';
 import { SourceProvider } from '../containers/metrics_source';
 
+export const METRICS_APP_DATA_TEST_SUBJ = 'infraMetricsPage';
+
 export const renderApp = (
   core: CoreStart,
   plugins: InfraClientStartDeps,
@@ -30,7 +32,7 @@ export const renderApp = (
 ) => {
   const storage = new Storage(window.localStorage);
 
-  prepareMountElement(element, 'infraMetricsPage');
+  prepareMountElement(element, METRICS_APP_DATA_TEST_SUBJ);
 
   ReactDOM.render(
     <MetricsApp
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/components/unified_search_bar.tsx b/x-pack/plugins/infra/public/pages/metrics/hosts/components/unified_search_bar.tsx
index 1dd81fdb40e49..168f825a9d2d1 100644
--- a/x-pack/plugins/infra/public/pages/metrics/hosts/components/unified_search_bar.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/components/unified_search_bar.tsx
@@ -5,12 +5,13 @@
  * 2.0.
  */
 
-import React from 'react';
+import React, { useMemo } from 'react';
 import { compareFilters, COMPARE_ALL_OPTIONS, type Filter } from '@kbn/es-query';
 import { i18n } from '@kbn/i18n';
 import { EuiFlexGrid, useEuiTheme } from '@elastic/eui';
 import { css } from '@emotion/react';
 import { EuiHorizontalRule } from '@elastic/eui';
+import { METRICS_APP_DATA_TEST_SUBJ } from '../../../../apps/metrics_app';
 import { useKibanaContextForPlugin } from '../../../../hooks/use_kibana';
 import { useUnifiedSearchContext } from '../hooks/use_unified_search';
 import { ControlsContent } from './controls_content';
@@ -71,12 +72,21 @@ export const UnifiedSearchBar = () => {
 const StickyContainer = (props: { children: React.ReactNode }) => {
   const { euiTheme } = useEuiTheme();
 
+  const top = useMemo(() => {
+    const wrapper = document.querySelector(`[data-test-subj="${METRICS_APP_DATA_TEST_SUBJ}"]`);
+    if (!wrapper) {
+      return `calc(${euiTheme.size.xxxl} * 2)`;
+    }
+
+    return `${wrapper.getBoundingClientRect().top}px`;
+  }, [euiTheme]);
+
   return (
     <EuiFlexGrid
       gutterSize="none"
       css={css`
         position: sticky;
-        top: calc(${euiTheme.size.xxxl} * 2);
+        top: ${top};
         z-index: ${euiTheme.levels.header};
         background: ${euiTheme.colors.emptyShade};
         padding-top: ${euiTheme.size.m};

From 8e17c8b3ee478a48d5b39e8fb3b485ffe8f8f29a Mon Sep 17 00:00:00 2001
From: Dominik Giger <dominik.giger@gmail.com>
Date: Tue, 18 Apr 2023 14:15:34 +0200
Subject: [PATCH 016/100] Update email.asciidoc: Remove reference to Elastic
 Cloud email allowlist. (#153854)

Removes the warning about the email allowlist in Elastic Cloud from the docs.

It is not necessary anymore to allowlist individual email addresses in Elastic Cloud. The connector can now be used immediately without any additional config.

Instead I added a link to the list of limitations for the Elastic Cloud connector (rate-limit etc.)
---
 docs/management/connectors/action-types/email.asciidoc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/docs/management/connectors/action-types/email.asciidoc b/docs/management/connectors/action-types/email.asciidoc
index 6b2684c1a15b4..65bc85a7d7133 100644
--- a/docs/management/connectors/action-types/email.asciidoc
+++ b/docs/management/connectors/action-types/email.asciidoc
@@ -234,14 +234,12 @@ is considered `false`.  Typically, `port: 465` uses `secure: true`, and
 [float]
 [[elasticcloud]]
 ==== Sending email from Elastic Cloud
-
-IMPORTANT: To receive notifications, the email addresses must be added to an
-    link:{cloud}/ec-watcher.html#ec-watcher-allowlist[allowlist] in the 
-    Elasticsearch Service Console.
     
 Use the preconfigured email connector (`Elastic-Cloud-SMTP`) to send emails from 
 Elastic Cloud.
 
+NOTE: For more information on the preconfigured email connector, see link:{cloud}/ec-watcher.html#ec-cloud-email-service-limits[Elastic Cloud email service limits].
+
 [float]
 [[gmail]]
 ==== Sending email from Gmail

From 9f126a95b09211ac439abdaf973e356657b32957 Mon Sep 17 00:00:00 2001
From: Josh Dover <1813008+joshdover@users.noreply.github.com>
Date: Tue, 18 Apr 2023 14:20:52 +0200
Subject: [PATCH 017/100] [Fleet] Add support for dynamic_namespace and
 dynamic_dataset (#154732)

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
---
 .../plugins/fleet/common/types/models/epm.ts  |   2 +
 .../common/types/models/package_policy.ts     |   6 +
 ...kage_policies_to_agent_permissions.test.ts |  54 +++++++-
 .../package_policies_to_agent_permissions.ts  |  26 ++--
 .../server/services/epm/archive/parse.test.ts |  51 +++++++
 .../server/services/epm/archive/parse.ts      |  10 +-
 .../server/services/package_policy.test.ts    |  36 +++++
 .../fleet/server/services/package_policy.ts   |  24 +++-
 .../server/types/models/package_policy.ts     |   2 +
 .../agent_policy_datastream_permissions.ts    | 127 ++++++++++++++++++
 .../apis/agent_policy/index.js                |   3 +-
 .../test_logs/agent/stream/log.yml.hbs        |   4 +
 .../data_stream/test_logs/fields/ecs.yml      |   6 +
 .../data_stream/test_logs/fields/fields.yml   |  16 +++
 .../0.2.0/data_stream/test_logs/manifest.yml  |  20 +++
 .../test_metrics/agent/stream/cpu.yml.hbs     |   6 +
 .../data_stream/test_metrics/fields/ecs.yml   |   6 +
 .../test_metrics/fields/fields.yml            |  16 +++
 .../data_stream/test_metrics/manifest.yml     |  31 +++++
 .../dynamic_datastream/0.2.0/docs/README.md   |   3 +
 .../dynamic_datastream/0.2.0/manifest.yml     |  21 +++
 21 files changed, 451 insertions(+), 19 deletions(-)
 create mode 100644 x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy_datastream_permissions.ts
 create mode 100644 x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_logs/agent/stream/log.yml.hbs
 create mode 100644 x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_logs/fields/ecs.yml
 create mode 100644 x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_logs/fields/fields.yml
 create mode 100644 x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_logs/manifest.yml
 create mode 100644 x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_metrics/agent/stream/cpu.yml.hbs
 create mode 100644 x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_metrics/fields/ecs.yml
 create mode 100644 x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_metrics/fields/fields.yml
 create mode 100644 x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_metrics/manifest.yml
 create mode 100644 x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/docs/README.md
 create mode 100644 x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/manifest.yml

diff --git a/x-pack/plugins/fleet/common/types/models/epm.ts b/x-pack/plugins/fleet/common/types/models/epm.ts
index 41974a5fa04d5..86dc732e9648e 100644
--- a/x-pack/plugins/fleet/common/types/models/epm.ts
+++ b/x-pack/plugins/fleet/common/types/models/epm.ts
@@ -363,6 +363,8 @@ export interface RegistryElasticsearch {
   'ingest_pipeline.name'?: string;
   source_mode?: 'default' | 'synthetic';
   index_mode?: 'time_series';
+  dynamic_dataset?: boolean;
+  dynamic_namespace?: boolean;
 }
 
 export interface RegistryDataStreamProperties {
diff --git a/x-pack/plugins/fleet/common/types/models/package_policy.ts b/x-pack/plugins/fleet/common/types/models/package_policy.ts
index a0609a5c5be52..55e75a50c3c42 100644
--- a/x-pack/plugins/fleet/common/types/models/package_policy.ts
+++ b/x-pack/plugins/fleet/common/types/models/package_policy.ts
@@ -30,9 +30,15 @@ export interface NewPackagePolicyInputStream {
     dataset: string;
     type: string;
     elasticsearch?: {
+      // TODO: these don't really need to be defined in the package policy schema and could be pulled directly from
+      // the package where needed.
+      dynamic_dataset?: boolean;
+      dynamic_namespace?: boolean;
       privileges?: {
         indices?: string[];
       };
+
+      // Package policy specific values
       index_mode?: string;
       source_mode?: string;
     };
diff --git a/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_permissions.test.ts b/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_permissions.test.ts
index 774fe790f9aa5..1f5ea87c6d6f9 100644
--- a/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_permissions.test.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_permissions.test.ts
@@ -9,6 +9,7 @@ jest.mock('../epm/packages');
 
 import type { PackagePolicy, RegistryDataStream } from '../../types';
 
+import type { DataStreamMeta } from './package_policies_to_agent_permissions';
 import {
   getDataStreamPrivileges,
   storedPackagePoliciesToAgentPermissions,
@@ -404,7 +405,7 @@ describe('getDataStreamPrivileges()', () => {
       type: 'logs',
       dataset: 'test',
       hidden: true,
-    } as RegistryDataStream;
+    } as DataStreamMeta;
     const privileges = getDataStreamPrivileges(dataStream, 'namespace');
 
     expect(privileges).toMatchObject({
@@ -420,7 +421,7 @@ describe('getDataStreamPrivileges()', () => {
       elasticsearch: {
         privileges: { indices: ['read', 'monitor'] },
       },
-    } as RegistryDataStream;
+    } as DataStreamMeta;
     const privileges = getDataStreamPrivileges(dataStream, 'namespace');
 
     expect(privileges).toMatchObject({
@@ -428,4 +429,53 @@ describe('getDataStreamPrivileges()', () => {
       privileges: ['read', 'monitor'],
     });
   });
+
+  it('sets a wildcard namespace when dynamic_namespace: true', () => {
+    const dataStream = {
+      type: 'logs',
+      dataset: 'test',
+      elasticsearch: {
+        dynamic_namespace: true,
+      },
+    } as DataStreamMeta;
+    const privileges = getDataStreamPrivileges(dataStream, 'namespace');
+
+    expect(privileges).toMatchObject({
+      names: ['logs-test-*'],
+      privileges: ['auto_configure', 'create_doc'],
+    });
+  });
+
+  it('sets a wildcard dataset when dynamic_dataset: true', () => {
+    const dataStream = {
+      type: 'logs',
+      dataset: 'test',
+      elasticsearch: {
+        dynamic_dataset: true,
+      },
+    } as DataStreamMeta;
+    const privileges = getDataStreamPrivileges(dataStream, 'namespace');
+
+    expect(privileges).toMatchObject({
+      names: ['logs-*-namespace'],
+      privileges: ['auto_configure', 'create_doc'],
+    });
+  });
+
+  it('sets a wildcard namespace and dataset when dynamic_namespace: true and dynamic_dataset: true', () => {
+    const dataStream = {
+      type: 'logs',
+      dataset: 'test',
+      elasticsearch: {
+        dynamic_dataset: true,
+        dynamic_namespace: true,
+      },
+    } as DataStreamMeta;
+    const privileges = getDataStreamPrivileges(dataStream, 'namespace');
+
+    expect(privileges).toMatchObject({
+      names: ['logs-*-*'],
+      privileges: ['auto_configure', 'create_doc'],
+    });
+  });
 });
diff --git a/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_permissions.ts b/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_permissions.ts
index 974ec1221dc7c..02c44024421ce 100644
--- a/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_permissions.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_permissions.ts
@@ -135,29 +135,37 @@ export async function storedPackagePoliciesToAgentPermissions(
   return Object.fromEntries(await Promise.all(permissionEntries));
 }
 
-interface DataStreamMeta {
+export interface DataStreamMeta {
   type: string;
   dataset: string;
   dataset_is_prefix?: boolean;
   hidden?: boolean;
   elasticsearch?: {
     privileges?: RegistryDataStreamPrivileges;
+    dynamic_namespace?: boolean;
+    dynamic_dataset?: boolean;
   };
 }
 
 export function getDataStreamPrivileges(dataStream: DataStreamMeta, namespace: string = '*') {
-  let index = `${dataStream.type}-${dataStream.dataset}`;
-
-  if (dataStream.dataset_is_prefix) {
-    index = `${index}.*`;
+  let index = dataStream.hidden ? `.${dataStream.type}-` : `${dataStream.type}-`;
+
+  // Determine dataset
+  if (dataStream.elasticsearch?.dynamic_dataset) {
+    index += `*`;
+  } else if (dataStream.dataset_is_prefix) {
+    index += `${dataStream.dataset}.*`;
+  } else {
+    index += dataStream.dataset;
   }
 
-  if (dataStream.hidden) {
-    index = `.${index}`;
+  // Determine namespace
+  if (dataStream.elasticsearch?.dynamic_namespace) {
+    index += `-*`;
+  } else {
+    index += `-${namespace}`;
   }
 
-  index += `-${namespace}`;
-
   const privileges = dataStream?.elasticsearch?.privileges?.indices?.length
     ? dataStream.elasticsearch.privileges.indices
     : PACKAGE_POLICY_DEFAULT_INDEX_PRIVILEGES;
diff --git a/x-pack/plugins/fleet/server/services/epm/archive/parse.test.ts b/x-pack/plugins/fleet/server/services/epm/archive/parse.test.ts
index 444c095ace4b3..b7c2628eab19e 100644
--- a/x-pack/plugins/fleet/server/services/epm/archive/parse.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/archive/parse.test.ts
@@ -193,6 +193,24 @@ describe('parseDataStreamElasticsearchEntry', () => {
       },
     });
   });
+  it('Should handle dynamic_dataset', () => {
+    expect(
+      parseDataStreamElasticsearchEntry({
+        dynamic_dataset: true,
+      })
+    ).toEqual({
+      dynamic_dataset: true,
+    });
+  });
+  it('Should handle dynamic_namespace', () => {
+    expect(
+      parseDataStreamElasticsearchEntry({
+        dynamic_namespace: true,
+      })
+    ).toEqual({
+      dynamic_namespace: true,
+    });
+  });
 });
 
 describe('parseTopLevelElasticsearchEntry', () => {
@@ -499,6 +517,39 @@ describe('parseAndVerifyDataStreams', () => {
       },
     ]);
   });
+
+  it('should parse dotted elasticsearch keys', async () => {
+    expect(
+      parseAndVerifyDataStreams({
+        paths: ['input-only-0.1.0/data_stream/stream1/manifest.yml'],
+        pkgName: 'input-only',
+        pkgVersion: '0.1.0',
+        manifests: {
+          'input-only-0.1.0/data_stream/stream1/manifest.yml': Buffer.from(
+            `
+          title: Custom Logs
+          type: logs
+          dataset: ds
+          version: 0.1.0
+          elasticsearch.dynamic_dataset: true`,
+            'utf8'
+          ),
+        },
+      })
+    ).toEqual([
+      {
+        dataset: 'ds',
+        elasticsearch: {
+          dynamic_dataset: true,
+        },
+        package: 'input-only',
+        path: 'stream1',
+        release: 'ga',
+        title: 'Custom Logs',
+        type: 'logs',
+      },
+    ]);
+  });
 });
 
 describe('parseAndVerifyStreams', () => {
diff --git a/x-pack/plugins/fleet/server/services/epm/archive/parse.ts b/x-pack/plugins/fleet/server/services/epm/archive/parse.ts
index 8ec5312aa1484..a55276dc621e3 100644
--- a/x-pack/plugins/fleet/server/services/epm/archive/parse.ts
+++ b/x-pack/plugins/fleet/server/services/epm/archive/parse.ts
@@ -324,7 +324,7 @@ export function parseAndVerifyDataStreams(opts: {
       streams: manifestStreams,
       elasticsearch,
       ...restOfProps
-    } = manifest;
+    } = expandDottedObject(manifest);
 
     if (!(dataStreamTitle && type)) {
       throw new PackageInvalidArchiveError(
@@ -578,6 +578,14 @@ export function parseDataStreamElasticsearchEntry(
     parsedElasticsearchEntry.index_mode = expandedElasticsearch.index_mode;
   }
 
+  if (expandedElasticsearch?.dynamic_dataset) {
+    parsedElasticsearchEntry.dynamic_dataset = expandedElasticsearch.dynamic_dataset;
+  }
+
+  if (expandedElasticsearch?.dynamic_namespace) {
+    parsedElasticsearchEntry.dynamic_namespace = expandedElasticsearch.dynamic_namespace;
+  }
+
   return parsedElasticsearchEntry;
 }
 
diff --git a/x-pack/plugins/fleet/server/services/package_policy.test.ts b/x-pack/plugins/fleet/server/services/package_policy.test.ts
index 314dc6c5f1bd1..ab1555270e710 100644
--- a/x-pack/plugins/fleet/server/services/package_policy.test.ts
+++ b/x-pack/plugins/fleet/server/services/package_policy.test.ts
@@ -4956,6 +4956,42 @@ describe('_applyIndexPrivileges()', () => {
     expect(streamOut).toEqual(inputStream);
   });
 
+  it('should apply dynamic_dataset', () => {
+    const packageStream = createPackageStream();
+    packageStream.elasticsearch = { dynamic_dataset: true };
+    const inputStream = createInputStream();
+    const expectedStream = {
+      ...inputStream,
+      data_stream: {
+        ...inputStream.data_stream,
+        elasticsearch: {
+          dynamic_dataset: true,
+        },
+      },
+    };
+
+    const streamOut = _applyIndexPrivileges(packageStream, inputStream);
+    expect(streamOut).toEqual(expectedStream);
+  });
+
+  it('should apply dynamic_namespace', () => {
+    const packageStream = createPackageStream();
+    packageStream.elasticsearch = { dynamic_namespace: true };
+    const inputStream = createInputStream();
+    const expectedStream = {
+      ...inputStream,
+      data_stream: {
+        ...inputStream.data_stream,
+        elasticsearch: {
+          dynamic_namespace: true,
+        },
+      },
+    };
+
+    const streamOut = _applyIndexPrivileges(packageStream, inputStream);
+    expect(streamOut).toEqual(expectedStream);
+  });
+
   it('should not apply privileges if all privileges are forbidden', () => {
     const forbiddenPrivileges = ['write', 'delete', 'delete_index', 'all'];
     const packageStream = createPackageStream(forbiddenPrivileges);
diff --git a/x-pack/plugins/fleet/server/services/package_policy.ts b/x-pack/plugins/fleet/server/services/package_policy.ts
index 759a6bc3d05c3..c746d62cb49fd 100644
--- a/x-pack/plugins/fleet/server/services/package_policy.ts
+++ b/x-pack/plugins/fleet/server/services/package_policy.ts
@@ -6,7 +6,7 @@
  */
 /* eslint-disable max-classes-per-file */
 
-import { omit, partition, isEqual } from 'lodash';
+import { omit, partition, isEqual, cloneDeep } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import semverLt from 'semver/functions/lt';
 import { getFlattenedObject } from '@kbn/std';
@@ -1738,11 +1738,24 @@ async function _compilePackageStreams(
 }
 
 // temporary export to enable testing pending refactor https://github.com/elastic/kibana/issues/112386
+// TODO: Move this logic into `package_policies_to_agent_permissions.ts` since this is not a package policy concern
+// and is based entirely on the package contents
 export function _applyIndexPrivileges(
   packageDataStream: RegistryDataStream,
   stream: PackagePolicyInputStream
 ): PackagePolicyInputStream {
-  const streamOut = { ...stream };
+  const streamOut = cloneDeep(stream);
+
+  if (packageDataStream?.elasticsearch?.dynamic_dataset) {
+    streamOut.data_stream.elasticsearch = streamOut.data_stream.elasticsearch ?? {};
+    streamOut.data_stream.elasticsearch.dynamic_dataset =
+      packageDataStream.elasticsearch.dynamic_dataset;
+  }
+  if (packageDataStream?.elasticsearch?.dynamic_namespace) {
+    streamOut.data_stream.elasticsearch = streamOut.data_stream.elasticsearch ?? {};
+    streamOut.data_stream.elasticsearch.dynamic_namespace =
+      packageDataStream.elasticsearch.dynamic_namespace;
+  }
 
   const indexPrivileges = packageDataStream?.elasticsearch?.privileges?.indices;
 
@@ -1763,10 +1776,9 @@ export function _applyIndexPrivileges(
   }
 
   if (valid.length) {
-    stream.data_stream.elasticsearch = {
-      privileges: {
-        indices: valid,
-      },
+    streamOut.data_stream.elasticsearch = streamOut.data_stream.elasticsearch ?? {};
+    streamOut.data_stream.elasticsearch.privileges = {
+      indices: valid,
     };
   }
 
diff --git a/x-pack/plugins/fleet/server/types/models/package_policy.ts b/x-pack/plugins/fleet/server/types/models/package_policy.ts
index 32199c2e8be48..b94becf1fe449 100644
--- a/x-pack/plugins/fleet/server/types/models/package_policy.ts
+++ b/x-pack/plugins/fleet/server/types/models/package_policy.ts
@@ -45,6 +45,8 @@ const PackagePolicyStreamsSchema = {
             indices: schema.maybe(schema.arrayOf(schema.string())),
           })
         ),
+        dynamic_dataset: schema.maybe(schema.boolean()),
+        dynamic_namespace: schema.maybe(schema.boolean()),
       })
     ),
   }),
diff --git a/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy_datastream_permissions.ts b/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy_datastream_permissions.ts
new file mode 100644
index 0000000000000..9fe3f24b14a73
--- /dev/null
+++ b/x-pack/test/fleet_api_integration/apis/agent_policy/agent_policy_datastream_permissions.ts
@@ -0,0 +1,127 @@
+/*
+ * 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 { v4 as uuidv4 } from 'uuid';
+import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
+import { setupFleetAndAgents } from '../agents/services';
+import { skipIfNoDockerRegistry } from '../../helpers';
+
+export default function (providerContext: FtrProviderContext) {
+  const { getService } = providerContext;
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+
+  describe('datastream privileges', () => {
+    skipIfNoDockerRegistry(providerContext);
+    before(async () => {
+      await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
+    });
+    setupFleetAndAgents(providerContext);
+
+    after(async () => {
+      await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
+    });
+
+    describe('dynamic privileges', () => {
+      // Use the dynamic_datastreams test package
+      before(async () => {
+        await supertest
+          .post(`/api/fleet/epm/packages/dynamic_datastream/1.2.0`)
+          .set('kbn-xsrf', 'xxxx')
+          .send({ force: true })
+          .expect(200);
+      });
+      after(async () => {
+        await supertest
+          .delete(`/api/fleet/epm/packages/dynamic_datastream/1.2.0`)
+          .set('kbn-xsrf', 'xxxx')
+          .send({ force: true })
+          .expect(200);
+      });
+
+      it('correctly specifies wildcards for dynamic_dataset and dynamic_namespace', async () => {
+        // Create agent policy
+        const {
+          body: {
+            item: { id: agentPolicyId },
+          },
+        } = await supertest
+          .post(`/api/fleet/agent_policies`)
+          .set('kbn-xsrf', 'xxxx')
+          .send({
+            name: `Test policy ${uuidv4()}`,
+            namespace: 'default',
+            monitoring_enabled: [],
+          })
+          .expect(200);
+
+        // Create package policy
+        const {
+          body: {
+            item: { id: packagePolicyId },
+          },
+        } = await supertest
+          .post(`/api/fleet/package_policies`)
+          .set('kbn-xsrf', 'xxxx')
+          .send({
+            name: `dynamic-${uuidv4()}`,
+            description: '',
+            namespace: 'default',
+            policy_id: agentPolicyId,
+            package: {
+              name: 'dynamic_datastream',
+              version: '1.2.0',
+            },
+            inputs: {
+              'dynamic_datastream-logfile': {
+                enabled: true,
+                streams: {
+                  'dynamic_datastream.test_logs': {
+                    enabled: true,
+                    vars: {
+                      paths: ['/var/log/auth.log*', '/var/log/secure*'],
+                    },
+                  },
+                },
+              },
+              'dynamic_datastream-system/metrics': {
+                enabled: true,
+                streams: {
+                  'dynamic_datastream.test_metrics': {
+                    enabled: true,
+                    vars: {},
+                  },
+                },
+              },
+            },
+          })
+          .expect(200);
+
+        // Fetch the agent policy
+        const {
+          body: { item: fullAgentPolicy },
+        } = await supertest
+          .get(`/api/fleet/agent_policies/${agentPolicyId}/full`)
+          .set('kbn-xsrf', 'xxxx');
+
+        // Check that the privileges are correct
+        expect(fullAgentPolicy.output_permissions.default[packagePolicyId].indices).to.eql([
+          { names: ['logs-*-*'], privileges: ['auto_configure', 'create_doc'] },
+          { names: ['metrics-*-*'], privileges: ['auto_configure', 'create_doc'] },
+        ]);
+
+        // Cleanup agent and package policy
+        await supertest
+          .post(`/api/fleet/agent_policies/delete`)
+          .send({ agentPolicyId })
+          .set('kbn-xsrf', 'xxxx')
+          .expect(200);
+      });
+    });
+  });
+}
diff --git a/x-pack/test/fleet_api_integration/apis/agent_policy/index.js b/x-pack/test/fleet_api_integration/apis/agent_policy/index.js
index 8054a45acb728..21aa25cd3c0d3 100644
--- a/x-pack/test/fleet_api_integration/apis/agent_policy/index.js
+++ b/x-pack/test/fleet_api_integration/apis/agent_policy/index.js
@@ -6,8 +6,9 @@
  */
 
 export default function loadTests({ loadTestFile }) {
-  describe('Fleet Endpoints', () => {
+  describe('Agent policies', () => {
     loadTestFile(require.resolve('./agent_policy_with_agents_setup'));
     loadTestFile(require.resolve('./agent_policy'));
+    loadTestFile(require.resolve('./agent_policy_datastream_permissions'));
   });
 }
diff --git a/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_logs/agent/stream/log.yml.hbs b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_logs/agent/stream/log.yml.hbs
new file mode 100644
index 0000000000000..cc801fea22a77
--- /dev/null
+++ b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_logs/agent/stream/log.yml.hbs
@@ -0,0 +1,4 @@
+paths:
+{{#each paths as |path i|}}
+  - {{path}}
+{{/each}}
diff --git a/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_logs/fields/ecs.yml b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_logs/fields/ecs.yml
new file mode 100644
index 0000000000000..7df52cc11fd20
--- /dev/null
+++ b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_logs/fields/ecs.yml
@@ -0,0 +1,6 @@
+- name: logs_test_name
+  title: logs_test_title
+  type: text
+- name: new_field_name
+  title: new_field_title
+  type: keyword
diff --git a/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_logs/fields/fields.yml b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_logs/fields/fields.yml
new file mode 100644
index 0000000000000..6e003ed0ad147
--- /dev/null
+++ b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_logs/fields/fields.yml
@@ -0,0 +1,16 @@
+- name: data_stream.type
+  type: constant_keyword
+  description: >
+    Data stream type.
+- name: data_stream.dataset
+  type: constant_keyword
+  description: >
+    Data stream dataset.
+- name: data_stream.namespace
+  type: constant_keyword
+  description: >
+    Data stream namespace.
+- name: '@timestamp'
+  type: date
+  description: >
+    Event timestamp.
diff --git a/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_logs/manifest.yml b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_logs/manifest.yml
new file mode 100644
index 0000000000000..fdc69553a74b3
--- /dev/null
+++ b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_logs/manifest.yml
@@ -0,0 +1,20 @@
+title: Test Dataset
+type: logs
+elasticsearch:
+  dynamic_dataset: true
+  dynamic_namespace: true
+
+streams:
+- input: logfile
+  title: Test logs
+  template_path: log.yml.hbs
+  vars:
+  - name: paths
+    type: text
+    title: Paths
+    multi: true
+    required: true
+    show_user: true
+    default:
+      - /var/log/auth.log*
+      - /var/log/secure*
diff --git a/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_metrics/agent/stream/cpu.yml.hbs b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_metrics/agent/stream/cpu.yml.hbs
new file mode 100644
index 0000000000000..0c1ea9cdcc492
--- /dev/null
+++ b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_metrics/agent/stream/cpu.yml.hbs
@@ -0,0 +1,6 @@
+metricsets: ["cpu"]
+cpu.metrics:
+{{#each cpu.metrics}}
+- {{this}}
+{{/each}}
+period: {{period}}
diff --git a/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_metrics/fields/ecs.yml b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_metrics/fields/ecs.yml
new file mode 100644
index 0000000000000..8fb3ccd3de8fd
--- /dev/null
+++ b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_metrics/fields/ecs.yml
@@ -0,0 +1,6 @@
+- name: metrics_test_name
+  title: metrics_test_title
+  type: keyword
+- name: metrics_test_name2
+  title: metrics_test_title2
+  type: keyword
\ No newline at end of file
diff --git a/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_metrics/fields/fields.yml b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_metrics/fields/fields.yml
new file mode 100644
index 0000000000000..6e003ed0ad147
--- /dev/null
+++ b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_metrics/fields/fields.yml
@@ -0,0 +1,16 @@
+- name: data_stream.type
+  type: constant_keyword
+  description: >
+    Data stream type.
+- name: data_stream.dataset
+  type: constant_keyword
+  description: >
+    Data stream dataset.
+- name: data_stream.namespace
+  type: constant_keyword
+  description: >
+    Data stream namespace.
+- name: '@timestamp'
+  type: date
+  description: >
+    Event timestamp.
diff --git a/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_metrics/manifest.yml b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_metrics/manifest.yml
new file mode 100644
index 0000000000000..fa098ea9ab29f
--- /dev/null
+++ b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/data_stream/test_metrics/manifest.yml
@@ -0,0 +1,31 @@
+title: Test metrics
+type: metrics
+
+elasticsearch:
+  dynamic_dataset: true
+  dynamic_namespace: true
+
+streams:
+- input: system/metrics
+  title: Test metrics
+  template_path: cpu.yml.hbs
+  vars:
+    - name: period
+      type: text
+      title: Period
+      multi: false
+      required: true
+      show_user: true
+      default: 10s
+    - name: cpu.metrics
+      type: text
+      title: Cpu Metrics
+      multi: true
+      required: true
+      show_user: true
+      description: >
+        How to report CPU metrics. Can be "percentages", "normalized_percentages", or "ticks"
+
+      default:
+        - percentages
+        - normalized_percentages
diff --git a/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/docs/README.md b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/docs/README.md
new file mode 100644
index 0000000000000..08b9bf19c4e17
--- /dev/null
+++ b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/docs/README.md
@@ -0,0 +1,3 @@
+# Test package
+
+This is a test package for testing that dynamic_dataset and dynamic_namespace generate the correct API key privileges
diff --git a/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/manifest.yml b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/manifest.yml
new file mode 100644
index 0000000000000..2cd4eaa4e962b
--- /dev/null
+++ b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/dynamic_datastream/0.2.0/manifest.yml
@@ -0,0 +1,21 @@
+format_version: 1.0.0
+name: dynamic_datastream
+title: dynamic_datastream test
+description: This is a test package for testing that dynamic_dataset and dynamic_namespace generate the correct API key privileges
+version: 1.2.0
+categories: []
+release: ga
+type: integration
+license: basic
+owner:
+  github: elastic/fleet
+
+policy_templates:
+  - name: dynamic_datastream
+    title: Dynamic datastream
+    description: foo
+    inputs:
+      - type: logfile
+        title: Test dynamic logs
+      - type: system/metrics
+        title: Test dynamic metrics

From 581bfb37b3d922a93b0a1fd4e54a86a279ea04b7 Mon Sep 17 00:00:00 2001
From: Stratoula Kalafateli <efstratia.kalafateli@elastic.co>
Date: Tue, 18 Apr 2023 15:23:43 +0300
Subject: [PATCH 018/100] [Lens] Improve sampling notification title (#155127)

## Summary

Improves the title of the notification popover for sampled data per
feedback given

<img width="689" alt="image"
src="https://user-images.githubusercontent.com/17003240/232739407-c3a7eb9b-7403-41c4-a427-1999b0fd0b7b.png">
---
 x-pack/plugins/lens/public/datasources/form_based/utils.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/plugins/lens/public/datasources/form_based/utils.tsx b/x-pack/plugins/lens/public/datasources/form_based/utils.tsx
index d14cf42e3c31b..c136aab767b65 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/utils.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/utils.tsx
@@ -514,7 +514,7 @@ export function getNotifiableFeatures(
       severity: 'info',
       fixableInEditor: false,
       shortMessage: i18n.translate('xpack.lens.indexPattern.samplingPerLayer', {
-        defaultMessage: 'Layers with reduced sampling',
+        defaultMessage: 'Sampling probability by layer',
       }),
       longMessage: (
         <ReducedSamplingSectionEntries

From 6f0b64ce6353cb1d6878940b3fbcb8a48b3209cd Mon Sep 17 00:00:00 2001
From: Paul Tavares <56442535+paul-tavares@users.noreply.github.com>
Date: Tue, 18 Apr 2023 08:34:07 -0400
Subject: [PATCH 019/100] [Security Solution][Endpoint] Update test data for
 endpoint list FTR tests and un-skip test suite (#155060)

## Summary

- Update test data for endpoint list FTR tests and un-skip test suite

Fixes #154916
Fixes #154917
---
 .../apps/endpoint/endpoint_list.ts                        | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
index 0bfb0cc5bba1d..5d19932090168 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
@@ -37,7 +37,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       'x',
       'x',
       'Warning',
-      'Linux',
+      'macOS',
       '10.2.17.24, 10.56.215.200,10.254.196.130',
       'x',
       'x',
@@ -59,7 +59,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       'x',
       'x',
       'Warning',
-      'Linux',
+      'macOS',
       '10.87.11.145, 10.117.106.109,10.242.136.97',
       'x',
       'x',
@@ -81,9 +81,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
     return tableData;
   };
 
-  // Failing: See https://github.com/elastic/kibana/issues/154917
-  // Failing: See https://github.com/elastic/kibana/issues/154916
-  describe.skip('endpoint list', function () {
+  describe('endpoint list', function () {
     const sleep = (ms = 100) => new Promise((resolve) => setTimeout(resolve, ms));
     let indexedData: IndexedHostsAndAlertsResponse;
     describe('when initially navigating to page', () => {

From 7235345601ec86df804afe1d8853aa8627482569 Mon Sep 17 00:00:00 2001
From: Matthew Kime <matt@mattki.me>
Date: Tue, 18 Apr 2023 07:36:20 -0500
Subject: [PATCH 020/100] [data view field editor] Runtime field code editor -
 move state out of controller (#155107)

## Summary

Resolves odd behavior with the runtime field code editor - most common
case is inability to remove last character.

Move some field state back to react and out of controller.

Fixes https://github.com/elastic/kibana/issues/154351
---
 .../field_editor/form_fields/script_field.tsx     |  7 +++++--
 .../components/preview/field_preview_context.tsx  | 15 +++++++++------
 .../components/preview/preview_controller.ts      |  2 ++
 .../public/components/preview/types.ts            |  5 +++++
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/plugins/data_view_field_editor/public/components/field_editor/form_fields/script_field.tsx b/src/plugins/data_view_field_editor/public/components/field_editor/form_fields/script_field.tsx
index 6a53ae14186de..fddf14c864743 100644
--- a/src/plugins/data_view_field_editor/public/components/field_editor/form_fields/script_field.tsx
+++ b/src/plugins/data_view_field_editor/public/components/field_editor/form_fields/script_field.tsx
@@ -59,6 +59,9 @@ const currentDocumentSelector = (state: PreviewState) => state.documents[state.c
 const currentDocumentIsLoadingSelector = (state: PreviewState) => state.isLoadingDocuments;
 
 const ScriptFieldComponent = ({ existingConcreteFields, links, placeholder }: Props) => {
+  const {
+    validation: { setScriptEditorValidation },
+  } = useFieldPreviewContext();
   const monacoEditor = useRef<monaco.editor.IStandaloneCodeEditor | null>(null);
   const editorValidationSubscription = useRef<Subscription>();
   const fieldCurrentValue = useRef<string>('');
@@ -143,7 +146,7 @@ const ScriptFieldComponent = ({ existingConcreteFields, links, placeholder }: Pr
 
       editorValidationSubscription.current = PainlessLang.validation$().subscribe(
         ({ isValid, isValidating, errors }) => {
-          controller.setScriptEditorValidation({
+          setScriptEditorValidation({
             isValid,
             isValidating,
             message: errors[0]?.message ?? null,
@@ -151,7 +154,7 @@ const ScriptFieldComponent = ({ existingConcreteFields, links, placeholder }: Pr
         }
       );
     },
-    [controller]
+    [setScriptEditorValidation]
   );
 
   const updateMonacoMarkers = useCallback((markers: monaco.editor.IMarkerData[]) => {
diff --git a/src/plugins/data_view_field_editor/public/components/preview/field_preview_context.tsx b/src/plugins/data_view_field_editor/public/components/preview/field_preview_context.tsx
index 3addd448f1e7e..f554025ce9f4b 100644
--- a/src/plugins/data_view_field_editor/public/components/preview/field_preview_context.tsx
+++ b/src/plugins/data_view_field_editor/public/components/preview/field_preview_context.tsx
@@ -75,8 +75,6 @@ const documentsSelector = (state: PreviewState) => {
   };
 };
 
-const scriptEditorValidationSelector = (state: PreviewState) => state.scriptEditorValidation;
-
 export const FieldPreviewProvider: FunctionComponent<{ controller: PreviewController }> = ({
   controller,
   children,
@@ -121,6 +119,12 @@ export const FieldPreviewProvider: FunctionComponent<{ controller: PreviewContro
   /** The parameters required for the Painless _execute API */
   const [params, setParams] = useState<Params>(defaultParams);
 
+  const [scriptEditorValidation, setScriptEditorValidation] = useState<{
+    isValidating: boolean;
+    isValid: boolean;
+    message: string | null;
+  }>({ isValidating: false, isValid: true, message: null });
+
   /** Flag to show/hide the preview panel */
   const [isPanelVisible, setIsPanelVisible] = useState(true);
   /** Flag to indicate if we are loading document from cluster */
@@ -133,10 +137,6 @@ export const FieldPreviewProvider: FunctionComponent<{ controller: PreviewContro
 
   const { currentDocument, currentDocIndex, currentDocId, totalDocs, currentIdx } =
     useStateSelector(controller.state$, documentsSelector);
-  const scriptEditorValidation = useStateSelector(
-    controller.state$,
-    scriptEditorValidationSelector
-  );
 
   let isPreviewAvailable = true;
 
@@ -513,6 +513,9 @@ export const FieldPreviewProvider: FunctionComponent<{ controller: PreviewContro
         isVisible: isPanelVisible,
         setIsVisible: setIsPanelVisible,
       },
+      validation: {
+        setScriptEditorValidation,
+      },
       reset,
     }),
     [
diff --git a/src/plugins/data_view_field_editor/public/components/preview/preview_controller.ts b/src/plugins/data_view_field_editor/public/components/preview/preview_controller.ts
index 80b11e74597aa..b572827eac06d 100644
--- a/src/plugins/data_view_field_editor/public/components/preview/preview_controller.ts
+++ b/src/plugins/data_view_field_editor/public/components/preview/preview_controller.ts
@@ -95,9 +95,11 @@ export class PreviewController {
     }
   };
 
+  /* disabled while investigating issues with painless script editor
   setScriptEditorValidation = (scriptEditorValidation: PreviewState['scriptEditorValidation']) => {
     this.updateState({ scriptEditorValidation });
   };
+  */
 
   setCustomId = (customId?: string) => {
     this.updateState({ customId });
diff --git a/src/plugins/data_view_field_editor/public/components/preview/types.ts b/src/plugins/data_view_field_editor/public/components/preview/types.ts
index 377aed627ba54..347e0a709cf28 100644
--- a/src/plugins/data_view_field_editor/public/components/preview/types.ts
+++ b/src/plugins/data_view_field_editor/public/components/preview/types.ts
@@ -133,6 +133,11 @@ export interface Context {
     isLastDoc: boolean;
   };
   reset: () => void;
+  validation: {
+    setScriptEditorValidation: React.Dispatch<
+      React.SetStateAction<{ isValid: boolean; isValidating: boolean; message: string | null }>
+    >;
+  };
 }
 
 export type PainlessExecuteContext =

From dec97d412980838ea9d897062f2987bdb6cd0159 Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@elastic.co>
Date: Tue, 18 Apr 2023 06:36:58 -0600
Subject: [PATCH 021/100] [maps] reduce bundle size (#154789)

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
---
 x-pack/plugins/maps/common/constants.ts       |   6 +
 x-pack/plugins/maps/common/i18n_getters.ts    |  12 -
 .../public/api/create_layer_descriptors.ts    |  19 +-
 x-pack/plugins/maps/public/api/ems.ts         |   7 +-
 .../maps/public/classes/layers/index.ts       |   2 +-
 .../assign_feature_ids.test.ts                |   3 +-
 .../assign_feature_ids.ts                     |   5 +-
 .../geojson_vector_layer.tsx                  |   2 +-
 .../public/classes/layers/wizards/index.ts    |   2 +-
 .../map_container/map_container.tsx           |   1 +
 .../maps/public/embeddable/map_component.tsx  |  85 ++----
 .../maps/public/embeddable/map_embeddable.tsx |  21 +-
 .../embeddable/map_embeddable_factory.ts      |  11 +-
 .../maps/public/feature_catalogue_entry.ts    |   5 +-
 x-pack/plugins/maps/public/index.ts           |   6 +-
 x-pack/plugins/maps/public/kibana_services.ts |  29 +-
 .../maps/public/lazy_load_bundle/index.ts     | 106 --------
 .../public/lazy_load_bundle/lazy/index.ts     |  17 --
 .../public/legacy_visualizations/index.ts     |   1 -
 .../region_map/region_map_visualization.tsx   |   8 +-
 .../tile_map/tile_map_visualization.tsx       |  10 +-
 x-pack/plugins/maps/public/locators.ts        | 257 ------------------
 .../locators/map_locator/get_location.ts      |  50 ++++
 .../map_locator/locator_definition.test.ts}   |   8 +-
 .../map_locator/locator_definition.ts         |  22 ++
 .../maps/public/locators/map_locator/types.ts |  64 +++++
 .../region_map_locator/get_location.ts        |  55 ++++
 .../region_map_locator/locator_definition.ts  |  24 ++
 .../locators/region_map_locator/types.ts      |  33 +++
 .../locators/tile_map_locator/get_location.ts |  52 ++++
 .../tile_map_locator/locator_definition.ts    |  24 ++
 .../public/locators/tile_map_locator/types.ts |  31 +++
 .../maps/public/map_attribute_service.ts      |   5 +-
 x-pack/plugins/maps/public/plugin.ts          |  27 +-
 .../routes/list_page/maps_list_view.tsx       |   9 +-
 .../routes/map_page/map_app/map_app.tsx       |  12 +-
 .../map_page/saved_map/get_breadcrumbs.tsx    |   4 +-
 .../public/routes/map_page/top_nav_config.tsx |   4 +-
 .../action.ts}                                |  34 +--
 .../filter_by_map_extent/is_compatible.ts     |  17 ++
 .../modal.tsx}                                |  13 +-
 .../filter_by_map_extent/types.ts             |  16 ++
 .../public/trigger_actions/get_maps_link.ts   |  50 ++++
 .../synchronize_movement/action.ts            |  40 +++
 .../synchronize_movement/is_compatible.ts     |  32 +++
 .../modal.tsx}                                |  13 +-
 .../synchronize_movement/types.ts             |  12 +
 .../synchronize_movement_action.tsx           |  69 -----
 .../visualize_geo_field_action.ts             |  50 +---
 x-pack/plugins/maps/public/util.ts            |   5 +-
 .../translations/translations/fr-FR.json      |   1 -
 .../translations/translations/ja-JP.json      |   1 -
 .../translations/translations/zh-CN.json      |   1 -
 53 files changed, 679 insertions(+), 714 deletions(-)
 delete mode 100644 x-pack/plugins/maps/public/lazy_load_bundle/index.ts
 delete mode 100644 x-pack/plugins/maps/public/lazy_load_bundle/lazy/index.ts
 delete mode 100644 x-pack/plugins/maps/public/locators.ts
 create mode 100644 x-pack/plugins/maps/public/locators/map_locator/get_location.ts
 rename x-pack/plugins/maps/public/{locators.test.ts => locators/map_locator/locator_definition.test.ts} (92%)
 create mode 100644 x-pack/plugins/maps/public/locators/map_locator/locator_definition.ts
 create mode 100644 x-pack/plugins/maps/public/locators/map_locator/types.ts
 create mode 100644 x-pack/plugins/maps/public/locators/region_map_locator/get_location.ts
 create mode 100644 x-pack/plugins/maps/public/locators/region_map_locator/locator_definition.ts
 create mode 100644 x-pack/plugins/maps/public/locators/region_map_locator/types.ts
 create mode 100644 x-pack/plugins/maps/public/locators/tile_map_locator/get_location.ts
 create mode 100644 x-pack/plugins/maps/public/locators/tile_map_locator/locator_definition.ts
 create mode 100644 x-pack/plugins/maps/public/locators/tile_map_locator/types.ts
 rename x-pack/plugins/maps/public/trigger_actions/{filter_by_map_extent_action.tsx => filter_by_map_extent/action.ts} (63%)
 create mode 100644 x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent/is_compatible.ts
 rename x-pack/plugins/maps/public/trigger_actions/{filter_by_map_extent_modal.tsx => filter_by_map_extent/modal.tsx} (78%)
 create mode 100644 x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent/types.ts
 create mode 100644 x-pack/plugins/maps/public/trigger_actions/get_maps_link.ts
 create mode 100644 x-pack/plugins/maps/public/trigger_actions/synchronize_movement/action.ts
 create mode 100644 x-pack/plugins/maps/public/trigger_actions/synchronize_movement/is_compatible.ts
 rename x-pack/plugins/maps/public/trigger_actions/{synchronize_movement_modal.tsx => synchronize_movement/modal.tsx} (84%)
 create mode 100644 x-pack/plugins/maps/public/trigger_actions/synchronize_movement/types.ts
 delete mode 100644 x-pack/plugins/maps/public/trigger_actions/synchronize_movement_action.tsx

diff --git a/x-pack/plugins/maps/common/constants.ts b/x-pack/plugins/maps/common/constants.ts
index c4dab3f156caa..6c8f719bf2886 100644
--- a/x-pack/plugins/maps/common/constants.ts
+++ b/x-pack/plugins/maps/common/constants.ts
@@ -15,6 +15,10 @@ export const APP_ICON_SOLUTION = 'logoKibana';
 export const APP_NAME = i18n.translate('xpack.maps.visTypeAlias.title', {
   defaultMessage: 'Maps',
 });
+export const MAP_EMBEDDABLE_NAME = i18n.translate('xpack.maps.embeddableDisplayName', {
+  defaultMessage: 'map',
+});
+
 export const INITIAL_LAYERS_KEY = 'initialLayers';
 
 export const MAPS_APP_PATH = `app/${APP_ID}`;
@@ -36,6 +40,8 @@ export const OPEN_LAYER_WIZARD = 'openLayerWizard';
 // Centroids are a single point for representing lines, multiLines, polygons, and multiPolygons
 export const KBN_IS_CENTROID_FEATURE = '__kbn_is_centroid_feature__';
 
+export const GEOJSON_FEATURE_ID_PROPERTY_NAME = '__kbn__feature_id__';
+
 export function getNewMapPath() {
   return `/${MAPS_APP_PATH}/${MAP_PATH}`;
 }
diff --git a/x-pack/plugins/maps/common/i18n_getters.ts b/x-pack/plugins/maps/common/i18n_getters.ts
index 0c59cc891504e..09df14ef9f289 100644
--- a/x-pack/plugins/maps/common/i18n_getters.ts
+++ b/x-pack/plugins/maps/common/i18n_getters.ts
@@ -9,18 +9,6 @@ import { i18n } from '@kbn/i18n';
 
 import { ES_SPATIAL_RELATIONS } from './constants';
 
-export function getAppTitle() {
-  return i18n.translate('xpack.maps.appTitle', {
-    defaultMessage: 'Maps',
-  });
-}
-
-export function getMapEmbeddableDisplayName() {
-  return i18n.translate('xpack.maps.embeddableDisplayName', {
-    defaultMessage: 'map',
-  });
-}
-
 export function getDataSourceLabel() {
   return i18n.translate('xpack.maps.source.dataSourceLabel', {
     defaultMessage: 'Data source',
diff --git a/x-pack/plugins/maps/public/api/create_layer_descriptors.ts b/x-pack/plugins/maps/public/api/create_layer_descriptors.ts
index cfc914ef7c0f4..553abcf7d5481 100644
--- a/x-pack/plugins/maps/public/api/create_layer_descriptors.ts
+++ b/x-pack/plugins/maps/public/api/create_layer_descriptors.ts
@@ -5,8 +5,7 @@
  * 2.0.
  */
 
-import { LayerDescriptor } from '../../common/descriptor_types';
-import { lazyLoadMapModules } from '../lazy_load_bundle';
+import type { LayerDescriptor } from '../../common/descriptor_types';
 import type { CreateLayerDescriptorParams } from '../classes/sources/es_search_source';
 
 export const createLayerDescriptors = {
@@ -14,17 +13,21 @@ export const createLayerDescriptors = {
     indexPatternId: string,
     indexPatternTitle: string
   ): Promise<LayerDescriptor[]> {
-    const mapModules = await lazyLoadMapModules();
-    return mapModules.createSecurityLayerDescriptors(indexPatternId, indexPatternTitle);
+    const { createSecurityLayerDescriptors } = await import(
+      '../classes/layers/wizards/solution_layers/security'
+    );
+    return createSecurityLayerDescriptors(indexPatternId, indexPatternTitle);
   },
   async createBasemapLayerDescriptor(): Promise<LayerDescriptor | null> {
-    const mapModules = await lazyLoadMapModules();
-    return mapModules.createBasemapLayerDescriptor();
+    const { createBasemapLayerDescriptor } = await import(
+      '../classes/layers/create_basemap_layer_descriptor'
+    );
+    return createBasemapLayerDescriptor();
   },
   async createESSearchSourceLayerDescriptor(
     params: CreateLayerDescriptorParams
   ): Promise<LayerDescriptor> {
-    const mapModules = await lazyLoadMapModules();
-    return mapModules.createESSearchSourceLayerDescriptor(params);
+    const { createLayerDescriptor } = await import('../classes/sources/es_search_source');
+    return createLayerDescriptor(params);
   },
 };
diff --git a/x-pack/plugins/maps/public/api/ems.ts b/x-pack/plugins/maps/public/api/ems.ts
index da6e88c84e22c..64395bddefab4 100644
--- a/x-pack/plugins/maps/public/api/ems.ts
+++ b/x-pack/plugins/maps/public/api/ems.ts
@@ -5,12 +5,11 @@
  * 2.0.
  */
 
-import { EMSTermJoinConfig, SampleValuesConfig } from '../ems_autosuggest';
-import { lazyLoadMapModules } from '../lazy_load_bundle';
+import type { EMSTermJoinConfig, SampleValuesConfig } from '../ems_autosuggest';
 
 export async function suggestEMSTermJoinConfig(
   sampleValuesConfig: SampleValuesConfig
 ): Promise<EMSTermJoinConfig | null> {
-  const mapModules = await lazyLoadMapModules();
-  return await mapModules.suggestEMSTermJoinConfig(sampleValuesConfig);
+  const { suggestEMSTermJoinConfig: suggestEms } = await import('../ems_autosuggest');
+  return await suggestEms(sampleValuesConfig);
 }
diff --git a/x-pack/plugins/maps/public/classes/layers/index.ts b/x-pack/plugins/maps/public/classes/layers/index.ts
index b068d4d234170..fe7e297ba8a1d 100644
--- a/x-pack/plugins/maps/public/classes/layers/index.ts
+++ b/x-pack/plugins/maps/public/classes/layers/index.ts
@@ -6,4 +6,4 @@
  */
 
 export type { LayerWizard, LayerWizardWithMeta, RenderWizardArguments } from './wizards';
-export { getLayerWizards, registerLayerWizardExternal } from './wizards';
+export { getLayerWizards } from './wizards';
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/assign_feature_ids.test.ts b/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/assign_feature_ids.test.ts
index 2250e86da0ec2..d4a34c9104a2e 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/assign_feature_ids.test.ts
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/assign_feature_ids.test.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { assignFeatureIds, GEOJSON_FEATURE_ID_PROPERTY_NAME } from './assign_feature_ids';
+import { GEOJSON_FEATURE_ID_PROPERTY_NAME } from '../../../../../common/constants';
+import { assignFeatureIds } from './assign_feature_ids';
 import { FeatureCollection, Feature, Point } from 'geojson';
 
 const featureId = 'myFeature1';
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/assign_feature_ids.ts b/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/assign_feature_ids.ts
index 3611256d246fb..f4b39c7a0d324 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/assign_feature_ids.ts
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/assign_feature_ids.ts
@@ -6,9 +6,8 @@
  */
 
 import _ from 'lodash';
-import { FeatureCollection, Feature } from 'geojson';
-
-export const GEOJSON_FEATURE_ID_PROPERTY_NAME = '__kbn__feature_id__';
+import type { FeatureCollection, Feature } from 'geojson';
+import { GEOJSON_FEATURE_ID_PROPERTY_NAME } from '../../../../../common/constants';
 
 let idCounter = 0;
 
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/geojson_vector_layer.tsx b/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/geojson_vector_layer.tsx
index 419757e24633c..a337cdbfaa7a5 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/geojson_vector_layer.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/geojson_vector_layer.tsx
@@ -14,6 +14,7 @@ import type { FilterSpecification, Map as MbMap, GeoJSONSource } from '@kbn/mapb
 import {
   EMPTY_FEATURE_COLLECTION,
   FEATURE_VISIBLE_PROPERTY_NAME,
+  GEOJSON_FEATURE_ID_PROPERTY_NAME,
   LAYER_TYPE,
   SOURCE_BOUNDS_DATA_REQUEST_ID,
 } from '../../../../../common/constants';
@@ -35,7 +36,6 @@ import {
 } from '../vector_layer';
 import { DataRequestAbortError } from '../../../util/data_request';
 import { getFeatureCollectionBounds } from '../../../util/get_feature_collection_bounds';
-import { GEOJSON_FEATURE_ID_PROPERTY_NAME } from './assign_feature_ids';
 import { syncGeojsonSourceData } from './geojson_source_data';
 import { performInnerJoins } from './perform_inner_joins';
 import { pluckStyleMetaFromFeatures } from './pluck_style_meta_from_features';
diff --git a/x-pack/plugins/maps/public/classes/layers/wizards/index.ts b/x-pack/plugins/maps/public/classes/layers/wizards/index.ts
index 814a2ec8e5c2f..ecb690b3d1f15 100644
--- a/x-pack/plugins/maps/public/classes/layers/wizards/index.ts
+++ b/x-pack/plugins/maps/public/classes/layers/wizards/index.ts
@@ -10,4 +10,4 @@ export type {
   LayerWizardWithMeta,
   RenderWizardArguments,
 } from './layer_wizard_registry';
-export { getLayerWizards, registerLayerWizardExternal } from './layer_wizard_registry';
+export { getLayerWizards } from './layer_wizard_registry';
diff --git a/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx b/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx
index e11b1a0530466..fa77048f6b88e 100644
--- a/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx
+++ b/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import '../../_index.scss';
 import React, { Component } from 'react';
 import classNames from 'classnames';
 import { EuiFlexGroup, EuiFlexItem, EuiCallOut } from '@elastic/eui';
diff --git a/x-pack/plugins/maps/public/embeddable/map_component.tsx b/x-pack/plugins/maps/public/embeddable/map_component.tsx
index 13a589ebd0946..2e080a46d8478 100644
--- a/x-pack/plugins/maps/public/embeddable/map_component.tsx
+++ b/x-pack/plugins/maps/public/embeddable/map_component.tsx
@@ -8,25 +8,19 @@
 import React, { Component, RefObject } from 'react';
 import { first } from 'rxjs/operators';
 import { v4 as uuidv4 } from 'uuid';
-import { EuiLoadingChart } from '@elastic/eui';
 import type { Filter } from '@kbn/es-query';
 import type { Query, TimeRange } from '@kbn/es-query';
 import type { LayerDescriptor, MapCenterAndZoom } from '../../common/descriptor_types';
 import type { MapEmbeddableType } from './types';
-import type { LazyLoadedMapModules } from '../lazy_load_bundle';
-import { lazyLoadMapModules } from '../lazy_load_bundle';
+import { MapEmbeddable } from './map_embeddable';
+import { createBasemapLayerDescriptor } from '../classes/layers/create_basemap_layer_descriptor';
 
 interface Props {
   title: string;
   filters?: Filter[];
   query?: Query;
   timeRange?: TimeRange;
-  getLayerDescriptors: (
-    mapModules: Pick<
-      LazyLoadedMapModules,
-      'createTileMapLayerDescriptor' | 'createRegionMapLayerDescriptor'
-    >
-  ) => LayerDescriptor[];
+  getLayerDescriptors: () => LayerDescriptor[];
   mapCenter?: MapCenterAndZoom;
   onInitialRenderComplete?: () => void;
   /*
@@ -35,48 +29,13 @@ interface Props {
   isSharable?: boolean;
 }
 
-interface State {
-  isLoaded: boolean;
-}
-
-export class MapComponent extends Component<Props, State> {
-  private _isMounted = false;
-  private _mapEmbeddable?: MapEmbeddableType | undefined;
+export class MapComponent extends Component<Props> {
+  private _mapEmbeddable: MapEmbeddableType;
   private readonly _embeddableRef: RefObject<HTMLDivElement> = React.createRef<HTMLDivElement>();
 
-  state: State = { isLoaded: false };
-
-  componentDidMount() {
-    this._isMounted = true;
-    this._load();
-  }
-
-  componentWillUnmount() {
-    this._isMounted = false;
-    if (this._mapEmbeddable) {
-      this._mapEmbeddable.destroy();
-    }
-  }
-
-  componentDidUpdate() {
-    if (this._mapEmbeddable) {
-      this._mapEmbeddable.updateInput({
-        filters: this.props.filters,
-        query: this.props.query,
-        timeRange: this.props.timeRange,
-      });
-    }
-  }
-
-  async _load() {
-    const mapModules = await lazyLoadMapModules();
-    if (!this._isMounted) {
-      return;
-    }
-
-    this.setState({ isLoaded: true });
-
-    this._mapEmbeddable = new mapModules.MapEmbeddable(
+  constructor(props: Props) {
+    super(props);
+    this._mapEmbeddable = new MapEmbeddable(
       {
         editable: false,
       },
@@ -85,11 +44,8 @@ export class MapComponent extends Component<Props, State> {
         attributes: {
           title: this.props.title,
           layerListJSON: JSON.stringify([
-            mapModules.createBasemapLayerDescriptor(),
-            ...this.props.getLayerDescriptors({
-              createRegionMapLayerDescriptor: mapModules.createRegionMapLayerDescriptor,
-              createTileMapLayerDescriptor: mapModules.createTileMapLayerDescriptor,
-            }),
+            createBasemapLayerDescriptor(),
+            ...this.props.getLayerDescriptors(),
           ]),
         },
         mapCenter: this.props.mapCenter,
@@ -101,7 +57,7 @@ export class MapComponent extends Component<Props, State> {
         .getOnRenderComplete$()
         .pipe(first())
         .subscribe(() => {
-          if (this._isMounted && this.props.onInitialRenderComplete) {
+          if (this.props.onInitialRenderComplete) {
             this.props.onInitialRenderComplete();
           }
         });
@@ -110,16 +66,27 @@ export class MapComponent extends Component<Props, State> {
     if (this.props.isSharable !== undefined) {
       this._mapEmbeddable.setIsSharable(this.props.isSharable);
     }
+  }
+
+  componentDidMount() {
     if (this._embeddableRef.current) {
       this._mapEmbeddable.render(this._embeddableRef.current);
     }
   }
 
-  render() {
-    if (!this.state.isLoaded) {
-      return <EuiLoadingChart mono size="l" />;
-    }
+  componentWillUnmount() {
+    this._mapEmbeddable.destroy();
+  }
 
+  componentDidUpdate() {
+    this._mapEmbeddable.updateInput({
+      filters: this.props.filters,
+      query: this.props.query,
+      timeRange: this.props.timeRange,
+    });
+  }
+
+  render() {
     return <div className="mapEmbeddableContainer" ref={this._embeddableRef} />;
   }
 }
diff --git a/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx b/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
index 33552613c0c95..834023182f45b 100644
--- a/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
+++ b/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
@@ -21,6 +21,7 @@ import {
   startWith,
 } from 'rxjs/operators';
 import { Unsubscribe } from 'redux';
+import type { PaletteRegistry } from '@kbn/coloring';
 import type { KibanaExecutionContext } from '@kbn/core/public';
 import { EuiEmptyPrompt } from '@elastic/eui';
 import { type Filter } from '@kbn/es-query';
@@ -82,7 +83,7 @@ import {
 } from '../../common/constants';
 import { RenderToolTipContent } from '../classes/tooltips/tooltip_property';
 import {
-  getChartsPaletteServiceGetColor,
+  getCharts,
   getCoreI18n,
   getExecutionContextService,
   getHttp,
@@ -109,6 +110,24 @@ import {
   MapEmbeddableOutput,
 } from './types';
 
+async function getChartsPaletteServiceGetColor(): Promise<((value: string) => string) | null> {
+  const chartsService = getCharts();
+  const paletteRegistry: PaletteRegistry | null = chartsService
+    ? await chartsService.palettes.getPalettes()
+    : null;
+  if (!paletteRegistry) {
+    return null;
+  }
+
+  const paletteDefinition = paletteRegistry.get('default');
+  const chartConfiguration = { syncColors: true };
+  return (value: string) => {
+    const series = [{ name: value, rankAtDepth: 0, totalSeriesAtDepth: 1 }];
+    const color = paletteDefinition.getCategoricalColor(series, chartConfiguration);
+    return color ? color : '#3d3d3d';
+  };
+}
+
 function getIsRestore(searchSessionId?: string) {
   if (!searchSessionId) {
     return false;
diff --git a/x-pack/plugins/maps/public/embeddable/map_embeddable_factory.ts b/x-pack/plugins/maps/public/embeddable/map_embeddable_factory.ts
index 3642448774c58..ae9d4b6d39329 100644
--- a/x-pack/plugins/maps/public/embeddable/map_embeddable_factory.ts
+++ b/x-pack/plugins/maps/public/embeddable/map_embeddable_factory.ts
@@ -8,12 +8,10 @@
 import { first } from 'rxjs/operators';
 import { i18n } from '@kbn/i18n';
 import { EmbeddableFactoryDefinition, IContainer } from '@kbn/embeddable-plugin/public';
-import { MAP_SAVED_OBJECT_TYPE, APP_ICON } from '../../common/constants';
-import { getMapEmbeddableDisplayName } from '../../common/i18n_getters';
+import { MAP_SAVED_OBJECT_TYPE, APP_ICON, MAP_EMBEDDABLE_NAME } from '../../common/constants';
 import { extract, inject } from '../../common/embeddable';
 import { MapByReferenceInput, MapEmbeddableInput } from './types';
-import { lazyLoadMapModules } from '../lazy_load_bundle';
-import { getApplication, getUsageCollection } from '../kibana_services';
+import { getApplication, getMapsCapabilities, getUsageCollection } from '../kibana_services';
 
 export class MapEmbeddableFactory implements EmbeddableFactoryDefinition {
   type = MAP_SAVED_OBJECT_TYPE;
@@ -26,7 +24,6 @@ export class MapEmbeddableFactory implements EmbeddableFactoryDefinition {
   };
 
   async isEditable() {
-    const { getMapsCapabilities } = await lazyLoadMapModules();
     return getMapsCapabilities().save as boolean;
   }
 
@@ -36,7 +33,7 @@ export class MapEmbeddableFactory implements EmbeddableFactoryDefinition {
   }
 
   getDisplayName() {
-    return getMapEmbeddableDisplayName();
+    return MAP_EMBEDDABLE_NAME;
   }
 
   createFromSavedObject = async (
@@ -51,7 +48,7 @@ export class MapEmbeddableFactory implements EmbeddableFactoryDefinition {
   };
 
   create = async (input: MapEmbeddableInput, parent?: IContainer) => {
-    const { MapEmbeddable } = await lazyLoadMapModules();
+    const { MapEmbeddable } = await import('./map_embeddable');
     const usageCollection = getUsageCollection();
     if (usageCollection) {
       // currentAppId$ is a BehaviorSubject exposed as an observable so subscription gets last value upon subscribe
diff --git a/x-pack/plugins/maps/public/feature_catalogue_entry.ts b/x-pack/plugins/maps/public/feature_catalogue_entry.ts
index 80d37aa0288e7..b897795e2eb49 100644
--- a/x-pack/plugins/maps/public/feature_catalogue_entry.ts
+++ b/x-pack/plugins/maps/public/feature_catalogue_entry.ts
@@ -7,12 +7,11 @@
 
 import { i18n } from '@kbn/i18n';
 import type { FeatureCatalogueCategory } from '@kbn/home-plugin/public';
-import { APP_ID, APP_ICON } from '../common/constants';
-import { getAppTitle } from '../common/i18n_getters';
+import { APP_ID, APP_ICON, APP_NAME } from '../common/constants';
 
 export const featureCatalogueEntry = {
   id: APP_ID,
-  title: getAppTitle(),
+  title: APP_NAME,
   subtitle: i18n.translate('xpack.maps.featureCatalogue.mapsSubtitle', {
     defaultMessage: 'Plot geographic data.',
   }),
diff --git a/x-pack/plugins/maps/public/index.ts b/x-pack/plugins/maps/public/index.ts
index beb0d5153d89e..e88a167a6da24 100644
--- a/x-pack/plugins/maps/public/index.ts
+++ b/x-pack/plugins/maps/public/index.ts
@@ -17,12 +17,10 @@ export const plugin: PluginInitializer<MapsPluginSetup, MapsPluginStart> = (
   return new MapsPlugin(initContext);
 };
 
-export { MAP_SAVED_OBJECT_TYPE } from '../common/constants';
-export { MAPS_APP_LOCATOR } from './locators';
+export { GEOJSON_FEATURE_ID_PROPERTY_NAME, MAP_SAVED_OBJECT_TYPE } from '../common/constants';
+export { MAPS_APP_LOCATOR } from './locators/map_locator/locator_definition';
 export type { PreIndexedShape } from '../common/elasticsearch_util';
 
-export { GEOJSON_FEATURE_ID_PROPERTY_NAME } from './classes/layers/vector_layer/geojson_vector_layer/assign_feature_ids';
-
 export type {
   ITooltipProperty,
   RenderTooltipContentParams,
diff --git a/x-pack/plugins/maps/public/kibana_services.ts b/x-pack/plugins/maps/public/kibana_services.ts
index 315f75c313fa5..623f82a473472 100644
--- a/x-pack/plugins/maps/public/kibana_services.ts
+++ b/x-pack/plugins/maps/public/kibana_services.ts
@@ -6,7 +6,6 @@
  */
 
 import type { CoreStart } from '@kbn/core/public';
-import type { PaletteRegistry } from '@kbn/coloring';
 import type { EMSSettings } from '@kbn/maps-ems-plugin/common/ems_settings';
 import { MapsEmsPluginPublicStart } from '@kbn/maps-ems-plugin/public';
 import type { MapsConfigType } from '../config';
@@ -50,6 +49,7 @@ export const getMapsCapabilities = () => coreStart.application.capabilities.maps
 export const getVisualizeCapabilities = () => coreStart.application.capabilities.visualize;
 export const getDocLinks = () => coreStart.docLinks;
 export const getCoreOverlays = () => coreStart.overlays;
+export const getCharts = () => pluginsStart.charts;
 export const getData = () => pluginsStart.data;
 export const getUiActions = () => pluginsStart.uiActions;
 export const getCore = () => coreStart;
@@ -90,34 +90,7 @@ export const getEMSSettings: () => EMSSettings = () => {
 
 export const getEmsTileLayerId = () => mapsEms.config.emsTileLayerId;
 
-export const getTilemap = () => {
-  if (mapsEms.config.tilemap) {
-    return mapsEms.config.tilemap;
-  } else {
-    return {};
-  }
-};
-
 export const getShareService = () => pluginsStart.share;
 
 export const getIsAllowByValueEmbeddables = () =>
   pluginsStart.dashboard.dashboardFeatureFlagConfig.allowByValueEmbeddables;
-
-export async function getChartsPaletteServiceGetColor(): Promise<
-  ((value: string) => string) | null
-> {
-  const paletteRegistry: PaletteRegistry | null = pluginsStart.charts
-    ? await pluginsStart.charts.palettes.getPalettes()
-    : null;
-  if (!paletteRegistry) {
-    return null;
-  }
-
-  const paletteDefinition = paletteRegistry.get('default');
-  const chartConfiguration = { syncColors: true };
-  return (value: string) => {
-    const series = [{ name: value, rankAtDepth: 0, totalSeriesAtDepth: 1 }];
-    const color = paletteDefinition.getCategoricalColor(series, chartConfiguration);
-    return color ? color : '#3d3d3d';
-  };
-}
diff --git a/x-pack/plugins/maps/public/lazy_load_bundle/index.ts b/x-pack/plugins/maps/public/lazy_load_bundle/index.ts
deleted file mode 100644
index a2f4f4004797e..0000000000000
--- a/x-pack/plugins/maps/public/lazy_load_bundle/index.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * 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 { DataViewsContract } from '@kbn/data-views-plugin/common';
-import { AppMountParameters, CoreStart } from '@kbn/core/public';
-import { IContainer } from '@kbn/embeddable-plugin/public';
-import type { SavedObjectTaggingPluginStart } from '@kbn/saved-objects-tagging-plugin/public';
-import { LayerDescriptor } from '../../common/descriptor_types';
-import type {
-  MapEmbeddableConfig,
-  MapEmbeddableInput,
-  MapEmbeddableType,
-} from '../embeddable/types';
-import type { CreateLayerDescriptorParams } from '../classes/sources/es_search_source';
-import type { EMSTermJoinConfig, SampleValuesConfig } from '../ems_autosuggest';
-import type { CreateTileMapLayerDescriptorParams } from '../classes/layers/create_tile_map_layer_descriptor';
-import type { CreateRegionMapLayerDescriptorParams } from '../classes/layers/create_region_map_layer_descriptor';
-
-let loadModulesPromise: Promise<LazyLoadedMapModules>;
-
-export interface LazyLoadedMapModules {
-  MapEmbeddable: new (
-    config: MapEmbeddableConfig,
-    initialInput: MapEmbeddableInput,
-    parent?: IContainer
-  ) => MapEmbeddableType;
-  getIndexPatternService: () => DataViewsContract;
-  getMapsCapabilities: () => any;
-  renderApp: (
-    params: AppMountParameters,
-    deps: {
-      coreStart: CoreStart;
-      AppUsageTracker: React.FC;
-      savedObjectsTagging?: SavedObjectTaggingPluginStart;
-    }
-  ) => Promise<() => void>;
-  createSecurityLayerDescriptors: (
-    indexPatternId: string,
-    indexPatternTitle: string
-  ) => LayerDescriptor[];
-  createTileMapLayerDescriptor: ({
-    label,
-    mapType,
-    colorSchema,
-    indexPatternId,
-    geoFieldName,
-    metricAgg,
-    metricFieldName,
-  }: CreateTileMapLayerDescriptorParams) => LayerDescriptor | null;
-  createRegionMapLayerDescriptor: ({
-    label,
-    emsLayerId,
-    leftFieldName,
-    termsFieldName,
-    termsSize,
-    colorSchema,
-    indexPatternId,
-    metricAgg,
-    metricFieldName,
-  }: CreateRegionMapLayerDescriptorParams) => LayerDescriptor | null;
-  createBasemapLayerDescriptor: () => LayerDescriptor | null;
-  createESSearchSourceLayerDescriptor: (params: CreateLayerDescriptorParams) => LayerDescriptor;
-  suggestEMSTermJoinConfig: (config: SampleValuesConfig) => Promise<EMSTermJoinConfig | null>;
-}
-
-export async function lazyLoadMapModules(): Promise<LazyLoadedMapModules> {
-  if (typeof loadModulesPromise !== 'undefined') {
-    return loadModulesPromise;
-  }
-
-  loadModulesPromise = new Promise(async (resolve, reject) => {
-    try {
-      const {
-        MapEmbeddable,
-        getIndexPatternService,
-        getMapsCapabilities,
-        renderApp,
-        createSecurityLayerDescriptors,
-        createTileMapLayerDescriptor,
-        createRegionMapLayerDescriptor,
-        createBasemapLayerDescriptor,
-        createESSearchSourceLayerDescriptor,
-        suggestEMSTermJoinConfig,
-      } = await import('./lazy');
-      resolve({
-        MapEmbeddable,
-        getIndexPatternService,
-        getMapsCapabilities,
-        renderApp,
-        createSecurityLayerDescriptors,
-        createTileMapLayerDescriptor,
-        createRegionMapLayerDescriptor,
-        createBasemapLayerDescriptor,
-        createESSearchSourceLayerDescriptor,
-        suggestEMSTermJoinConfig,
-      });
-    } catch (error) {
-      reject(error);
-    }
-  });
-  return loadModulesPromise;
-}
diff --git a/x-pack/plugins/maps/public/lazy_load_bundle/lazy/index.ts b/x-pack/plugins/maps/public/lazy_load_bundle/lazy/index.ts
deleted file mode 100644
index fb5321dfc03f8..0000000000000
--- a/x-pack/plugins/maps/public/lazy_load_bundle/lazy/index.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * 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 '../../_index.scss';
-export * from '../../embeddable/map_embeddable';
-export * from '../../kibana_services';
-export { renderApp } from '../../render_app';
-export * from '../../classes/layers/wizards/solution_layers/security';
-export { createTileMapLayerDescriptor } from '../../classes/layers/create_tile_map_layer_descriptor';
-export { createRegionMapLayerDescriptor } from '../../classes/layers/create_region_map_layer_descriptor';
-export { createBasemapLayerDescriptor } from '../../classes/layers/create_basemap_layer_descriptor';
-export { createLayerDescriptor as createESSearchSourceLayerDescriptor } from '../../classes/sources/es_search_source';
-export { suggestEMSTermJoinConfig } from '../../ems_autosuggest';
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/index.ts b/x-pack/plugins/maps/public/legacy_visualizations/index.ts
index d99544bbb207d..177cc608a975c 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/index.ts
+++ b/x-pack/plugins/maps/public/legacy_visualizations/index.ts
@@ -8,4 +8,3 @@
 export { GEOHASH_GRID, getGeoHashBucketAgg } from './tile_map';
 export { createRegionMapFn, regionMapRenderer, regionMapVisType } from './region_map';
 export { createTileMapFn, tileMapRenderer, tileMapVisType } from './tile_map';
-export { isLegacyMap } from './is_legacy_map';
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_visualization.tsx b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_visualization.tsx
index b6945995da9d9..4dedb97202857 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_visualization.tsx
+++ b/x-pack/plugins/maps/public/legacy_visualizations/region_map/region_map_visualization.tsx
@@ -9,8 +9,8 @@ import React from 'react';
 import type { Filter } from '@kbn/es-query';
 import type { Query, TimeRange } from '@kbn/es-query';
 import { RegionMapVisConfig } from './types';
-import type { LazyLoadedMapModules } from '../../lazy_load_bundle';
 import { MapComponent } from '../../embeddable/map_component';
+import { createRegionMapLayerDescriptor } from '../../classes/layers/create_region_map_layer_descriptor';
 
 interface Props {
   filters?: Filter[];
@@ -26,11 +26,7 @@ function RegionMapVisualization(props: Props) {
     lon: props.visConfig.mapCenter[1],
     zoom: props.visConfig.mapZoom,
   };
-  function getLayerDescriptors({
-    createRegionMapLayerDescriptor,
-  }: {
-    createRegionMapLayerDescriptor: LazyLoadedMapModules['createRegionMapLayerDescriptor'];
-  }) {
+  function getLayerDescriptors() {
     const layerDescriptor = createRegionMapLayerDescriptor(props.visConfig.layerDescriptorParams);
     return layerDescriptor ? [layerDescriptor] : [];
   }
diff --git a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_visualization.tsx b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_visualization.tsx
index 97a3609d765a4..5eb4132528de5 100644
--- a/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_visualization.tsx
+++ b/x-pack/plugins/maps/public/legacy_visualizations/tile_map/tile_map_visualization.tsx
@@ -8,9 +8,9 @@
 import React from 'react';
 import type { Filter } from '@kbn/es-query';
 import type { Query, TimeRange } from '@kbn/es-query';
-import { TileMapVisConfig } from './types';
-import type { LazyLoadedMapModules } from '../../lazy_load_bundle';
+import type { TileMapVisConfig } from './types';
 import { MapComponent } from '../../embeddable/map_component';
+import { createTileMapLayerDescriptor } from '../../classes/layers/create_tile_map_layer_descriptor';
 
 interface Props {
   filters?: Filter[];
@@ -26,11 +26,7 @@ function TileMapVisualization(props: Props) {
     lon: props.visConfig.mapCenter[1],
     zoom: props.visConfig.mapZoom,
   };
-  function getLayerDescriptors({
-    createTileMapLayerDescriptor,
-  }: {
-    createTileMapLayerDescriptor: LazyLoadedMapModules['createTileMapLayerDescriptor'];
-  }) {
+  function getLayerDescriptors() {
     const layerDescriptor = createTileMapLayerDescriptor(props.visConfig.layerDescriptorParams);
     return layerDescriptor ? [layerDescriptor] : [];
   }
diff --git a/x-pack/plugins/maps/public/locators.ts b/x-pack/plugins/maps/public/locators.ts
deleted file mode 100644
index ff2ac6590708e..0000000000000
--- a/x-pack/plugins/maps/public/locators.ts
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * 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.
- */
-
-/* eslint-disable max-classes-per-file */
-
-import rison from '@kbn/rison';
-import type { DataViewSpec } from '@kbn/data-views-plugin/public';
-import type { SerializableRecord } from '@kbn/utility-types';
-import { type Filter, isFilterPinned, type TimeRange, type Query } from '@kbn/es-query';
-import type { GlobalQueryStateFromUrl, RefreshInterval } from '@kbn/data-plugin/public';
-import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
-import type { LocatorDefinition, LocatorPublic } from '@kbn/share-plugin/public';
-import type { LayerDescriptor } from '../common/descriptor_types';
-import { INITIAL_LAYERS_KEY, APP_ID } from '../common/constants';
-import { lazyLoadMapModules } from './lazy_load_bundle';
-
-export interface MapsAppLocatorParams extends SerializableRecord {
-  /**
-   * If given, it will load the given map else will load the create a new map page.
-   */
-  mapId?: string;
-
-  /**
-   * Optionally set the time range in the time picker.
-   */
-  timeRange?: TimeRange;
-
-  /**
-   * Optionally set the initial Layers.
-   */
-  initialLayers?: LayerDescriptor[] & SerializableRecord;
-
-  /**
-   * Optionally set the refresh interval.
-   */
-  refreshInterval?: RefreshInterval & SerializableRecord;
-
-  /**
-   * Optionally apply filers. NOTE: if given and used in conjunction with `mapId`, and the
-   * saved map has filters saved with it, this will _replace_ those filters.
-   */
-  filters?: Filter[];
-
-  /**
-   * Optionally set a query. NOTE: if given and used in conjunction with `mapId`, and the
-   * saved map has a query saved with it, this will _replace_ that query.
-   */
-  query?: Query;
-
-  /**
-   * If not given, will use the uiSettings configuration for `storeInSessionStorage`. useHash determines
-   * whether to hash the data in the url to avoid url length issues.
-   */
-  hash?: boolean;
-
-  /**
-   * Optionally pass adhoc data view spec.
-   */
-  dataViewSpec?: DataViewSpec;
-}
-
-export const MAPS_APP_LOCATOR = 'MAPS_APP_LOCATOR' as const;
-
-export type MapsAppLocator = LocatorPublic<MapsAppLocatorParams>;
-
-export interface MapsAppLocatorDependencies {
-  useHash: boolean;
-}
-
-export class MapsAppLocatorDefinition implements LocatorDefinition<MapsAppLocatorParams> {
-  public readonly id = MAPS_APP_LOCATOR;
-
-  constructor(protected readonly deps: MapsAppLocatorDependencies) {}
-
-  public readonly getLocation = async (params: MapsAppLocatorParams) => {
-    const { mapId, filters, query, refreshInterval, timeRange, initialLayers, hash } = params;
-    const useHash = hash ?? this.deps.useHash;
-    const appState: {
-      query?: Query;
-      filters?: Filter[];
-      vis?: unknown;
-    } = {};
-    const queryState: GlobalQueryStateFromUrl = {};
-
-    if (query) appState.query = query;
-    if (filters && filters.length) appState.filters = filters?.filter((f) => !isFilterPinned(f));
-    if (timeRange) queryState.time = timeRange;
-    if (filters && filters.length) queryState.filters = filters?.filter((f) => isFilterPinned(f));
-    if (refreshInterval) queryState.refreshInterval = refreshInterval;
-
-    let path = `/map#/${mapId || ''}`;
-    path = setStateToKbnUrl<GlobalQueryStateFromUrl>('_g', queryState, { useHash }, path);
-    path = setStateToKbnUrl('_a', appState, { useHash }, path);
-
-    if (initialLayers && initialLayers.length) {
-      const risonEncodedInitialLayers = rison.encodeArray(initialLayers);
-      path = `${path}&${INITIAL_LAYERS_KEY}=${encodeURIComponent(risonEncodedInitialLayers)}`;
-    }
-
-    return {
-      app: APP_ID,
-      path,
-      state: params.dataViewSpec
-        ? {
-            dataViewSpec: params.dataViewSpec,
-          }
-        : {},
-    };
-  };
-}
-
-export interface MapsAppTileMapLocatorParams extends SerializableRecord {
-  label: string;
-  mapType: string;
-  colorSchema: string;
-  indexPatternId?: string;
-  geoFieldName?: string;
-  metricAgg: string;
-  metricFieldName?: string;
-  timeRange?: TimeRange;
-  filters?: Filter[];
-  query?: Query;
-  hash?: boolean;
-}
-
-export type MapsAppTileMapLocator = LocatorPublic<MapsAppLocatorParams>;
-
-export const MAPS_APP_TILE_MAP_LOCATOR = 'MAPS_APP_TILE_MAP_LOCATOR' as const;
-
-export interface MapsAppTileMapLocatorDependencies {
-  locator: MapsAppLocator;
-}
-
-export class MapsAppTileMapLocatorDefinition
-  implements LocatorDefinition<MapsAppTileMapLocatorParams>
-{
-  public readonly id = MAPS_APP_TILE_MAP_LOCATOR;
-
-  constructor(protected readonly deps: MapsAppTileMapLocatorDependencies) {}
-
-  public readonly getLocation = async (params: MapsAppTileMapLocatorParams) => {
-    const {
-      label,
-      mapType,
-      colorSchema,
-      indexPatternId,
-      geoFieldName,
-      metricAgg,
-      metricFieldName,
-      filters,
-      query,
-      timeRange,
-      hash = true,
-    } = params;
-    const mapModules = await lazyLoadMapModules();
-    const initialLayers = [] as unknown as LayerDescriptor[] & SerializableRecord;
-    const tileMapLayerDescriptor = mapModules.createTileMapLayerDescriptor({
-      label,
-      mapType,
-      colorSchema,
-      indexPatternId,
-      geoFieldName,
-      metricAgg,
-      metricFieldName,
-    });
-
-    if (tileMapLayerDescriptor) {
-      initialLayers.push(tileMapLayerDescriptor);
-    }
-
-    return await this.deps.locator.getLocation({
-      initialLayers,
-      filters,
-      query,
-      timeRange,
-      hash,
-    });
-  };
-}
-
-export interface MapsAppRegionMapLocatorParams extends SerializableRecord {
-  label: string;
-  emsLayerId?: string;
-  leftFieldName?: string;
-  termsFieldName?: string;
-  termsSize?: number;
-  colorSchema: string;
-  indexPatternId?: string;
-  metricAgg: string;
-  metricFieldName?: string;
-  timeRange?: TimeRange;
-  filters?: Filter[];
-  query?: Query;
-  hash?: boolean;
-}
-
-export type MapsAppRegionMapLocator = LocatorPublic<MapsAppRegionMapLocatorParams>;
-
-export const MAPS_APP_REGION_MAP_LOCATOR = 'MAPS_APP_REGION_MAP_LOCATOR' as const;
-
-export interface MapsAppRegionMapLocatorDependencies {
-  locator: MapsAppLocator;
-}
-
-export class MapsAppRegionMapLocatorDefinition
-  implements LocatorDefinition<MapsAppRegionMapLocatorParams>
-{
-  public readonly id = MAPS_APP_REGION_MAP_LOCATOR;
-
-  constructor(protected readonly deps: MapsAppRegionMapLocatorDependencies) {}
-
-  public readonly getLocation = async (params: MapsAppRegionMapLocatorParams) => {
-    const {
-      label,
-      emsLayerId,
-      leftFieldName,
-      termsFieldName,
-      termsSize,
-      colorSchema,
-      indexPatternId,
-      metricAgg,
-      metricFieldName,
-      filters,
-      query,
-      timeRange,
-      hash = true,
-    } = params;
-    const mapModules = await lazyLoadMapModules();
-    const initialLayers = [] as unknown as LayerDescriptor[] & SerializableRecord;
-    const regionMapLayerDescriptor = mapModules.createRegionMapLayerDescriptor({
-      label,
-      emsLayerId,
-      leftFieldName,
-      termsFieldName,
-      termsSize,
-      colorSchema,
-      indexPatternId,
-      metricAgg,
-      metricFieldName,
-    });
-    if (regionMapLayerDescriptor) {
-      initialLayers.push(regionMapLayerDescriptor);
-    }
-
-    return await this.deps.locator.getLocation({
-      initialLayers,
-      filters,
-      query,
-      timeRange,
-      hash,
-    });
-  };
-}
diff --git a/x-pack/plugins/maps/public/locators/map_locator/get_location.ts b/x-pack/plugins/maps/public/locators/map_locator/get_location.ts
new file mode 100644
index 0000000000000..2a451183dd8e0
--- /dev/null
+++ b/x-pack/plugins/maps/public/locators/map_locator/get_location.ts
@@ -0,0 +1,50 @@
+/*
+ * 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 rison from '@kbn/rison';
+import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
+import type { GlobalQueryStateFromUrl } from '@kbn/data-plugin/public';
+import type { Filter, Query } from '@kbn/es-query';
+import { isFilterPinned } from '@kbn/es-query';
+import { INITIAL_LAYERS_KEY, APP_ID } from '../../../common/constants';
+import type { MapsAppLocatorDependencies, MapsAppLocatorParams } from './types';
+
+export function getLocation(params: MapsAppLocatorParams, deps: MapsAppLocatorDependencies) {
+  const { mapId, filters, query, refreshInterval, timeRange, initialLayers, hash } = params;
+  const useHash = hash ?? deps.useHash;
+  const appState: {
+    query?: Query;
+    filters?: Filter[];
+    vis?: unknown;
+  } = {};
+  const queryState: GlobalQueryStateFromUrl = {};
+
+  if (query) appState.query = query;
+  if (filters && filters.length) appState.filters = filters?.filter((f) => !isFilterPinned(f));
+  if (timeRange) queryState.time = timeRange;
+  if (filters && filters.length) queryState.filters = filters?.filter((f) => isFilterPinned(f));
+  if (refreshInterval) queryState.refreshInterval = refreshInterval;
+
+  let path = `/map#/${mapId || ''}`;
+  path = setStateToKbnUrl<GlobalQueryStateFromUrl>('_g', queryState, { useHash }, path);
+  path = setStateToKbnUrl('_a', appState, { useHash }, path);
+
+  if (initialLayers && initialLayers.length) {
+    const risonEncodedInitialLayers = rison.encodeArray(initialLayers);
+    path = `${path}&${INITIAL_LAYERS_KEY}=${encodeURIComponent(risonEncodedInitialLayers)}`;
+  }
+
+  return {
+    app: APP_ID,
+    path,
+    state: params.dataViewSpec
+      ? {
+          dataViewSpec: params.dataViewSpec,
+        }
+      : {},
+  };
+}
diff --git a/x-pack/plugins/maps/public/locators.test.ts b/x-pack/plugins/maps/public/locators/map_locator/locator_definition.test.ts
similarity index 92%
rename from x-pack/plugins/maps/public/locators.test.ts
rename to x-pack/plugins/maps/public/locators/map_locator/locator_definition.test.ts
index cc954d5f73717..d281ad00c2b59 100644
--- a/x-pack/plugins/maps/public/locators.test.ts
+++ b/x-pack/plugins/maps/public/locators/map_locator/locator_definition.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { LAYER_TYPE, SOURCE_TYPES, SCALING_TYPES } from '../common/constants';
+import { LAYER_TYPE, SOURCE_TYPES, SCALING_TYPES } from '../../../common/constants';
 import { FilterStateStore } from '@kbn/es-query';
-import { MapsAppLocatorDefinition } from './locators';
-import { SerializableRecord } from '@kbn/utility-types';
-import { LayerDescriptor } from '../common/descriptor_types';
+import { MapsAppLocatorDefinition } from './locator_definition';
+import type { SerializableRecord } from '@kbn/utility-types';
+import type { LayerDescriptor } from '../../../common/descriptor_types';
 
 const MAP_ID: string = '2c9c1f60-1909-11e9-919b-ffe5949a18d2';
 const LAYER_ID: string = '13823000-99b9-11ea-9eb6-d9e8adceb647';
diff --git a/x-pack/plugins/maps/public/locators/map_locator/locator_definition.ts b/x-pack/plugins/maps/public/locators/map_locator/locator_definition.ts
new file mode 100644
index 0000000000000..7c2d71ebeb0dd
--- /dev/null
+++ b/x-pack/plugins/maps/public/locators/map_locator/locator_definition.ts
@@ -0,0 +1,22 @@
+/*
+ * 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 { LocatorDefinition } from '@kbn/share-plugin/public';
+import type { MapsAppLocatorDependencies, MapsAppLocatorParams } from './types';
+
+export const MAPS_APP_LOCATOR = 'MAPS_APP_LOCATOR' as const;
+
+export class MapsAppLocatorDefinition implements LocatorDefinition<MapsAppLocatorParams> {
+  public readonly id = MAPS_APP_LOCATOR;
+
+  constructor(protected readonly deps: MapsAppLocatorDependencies) {}
+
+  public readonly getLocation = async (params: MapsAppLocatorParams) => {
+    const { getLocation } = await import('./get_location');
+    return getLocation(params, this.deps);
+  };
+}
diff --git a/x-pack/plugins/maps/public/locators/map_locator/types.ts b/x-pack/plugins/maps/public/locators/map_locator/types.ts
new file mode 100644
index 0000000000000..bf32465cb5cc3
--- /dev/null
+++ b/x-pack/plugins/maps/public/locators/map_locator/types.ts
@@ -0,0 +1,64 @@
+/*
+ * 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 { SerializableRecord } from '@kbn/utility-types';
+import type { Filter, TimeRange, Query } from '@kbn/es-query';
+import type { DataViewSpec } from '@kbn/data-views-plugin/public';
+import type { RefreshInterval } from '@kbn/data-plugin/public';
+import type { LocatorPublic } from '@kbn/share-plugin/public';
+import type { LayerDescriptor } from '../../../common/descriptor_types';
+
+export interface MapsAppLocatorParams extends SerializableRecord {
+  /**
+   * If given, it will load the given map else will load the create a new map page.
+   */
+  mapId?: string;
+
+  /**
+   * Optionally set the time range in the time picker.
+   */
+  timeRange?: TimeRange;
+
+  /**
+   * Optionally set the initial Layers.
+   */
+  initialLayers?: LayerDescriptor[] & SerializableRecord;
+
+  /**
+   * Optionally set the refresh interval.
+   */
+  refreshInterval?: RefreshInterval & SerializableRecord;
+
+  /**
+   * Optionally apply filers. NOTE: if given and used in conjunction with `mapId`, and the
+   * saved map has filters saved with it, this will _replace_ those filters.
+   */
+  filters?: Filter[];
+
+  /**
+   * Optionally set a query. NOTE: if given and used in conjunction with `mapId`, and the
+   * saved map has a query saved with it, this will _replace_ that query.
+   */
+  query?: Query;
+
+  /**
+   * If not given, will use the uiSettings configuration for `storeInSessionStorage`. useHash determines
+   * whether to hash the data in the url to avoid url length issues.
+   */
+  hash?: boolean;
+
+  /**
+   * Optionally pass adhoc data view spec.
+   */
+  dataViewSpec?: DataViewSpec;
+}
+
+export type MapsAppLocator = LocatorPublic<MapsAppLocatorParams>;
+
+export interface MapsAppLocatorDependencies {
+  useHash: boolean;
+}
diff --git a/x-pack/plugins/maps/public/locators/region_map_locator/get_location.ts b/x-pack/plugins/maps/public/locators/region_map_locator/get_location.ts
new file mode 100644
index 0000000000000..b7706fe8c2e4a
--- /dev/null
+++ b/x-pack/plugins/maps/public/locators/region_map_locator/get_location.ts
@@ -0,0 +1,55 @@
+/*
+ * 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 { SerializableRecord } from '@kbn/utility-types';
+import type { LayerDescriptor } from '../../../common/descriptor_types';
+import { createRegionMapLayerDescriptor } from '../../classes/layers/create_region_map_layer_descriptor';
+import type { MapsAppRegionMapLocatorParams, MapsAppRegionMapLocatorDependencies } from './types';
+
+export async function getLocation(
+  params: MapsAppRegionMapLocatorParams,
+  deps: MapsAppRegionMapLocatorDependencies
+) {
+  const {
+    label,
+    emsLayerId,
+    leftFieldName,
+    termsFieldName,
+    termsSize,
+    colorSchema,
+    indexPatternId,
+    metricAgg,
+    metricFieldName,
+    filters,
+    query,
+    timeRange,
+    hash = true,
+  } = params;
+  const initialLayers = [] as unknown as LayerDescriptor[] & SerializableRecord;
+  const regionMapLayerDescriptor = createRegionMapLayerDescriptor({
+    label,
+    emsLayerId,
+    leftFieldName,
+    termsFieldName,
+    termsSize,
+    colorSchema,
+    indexPatternId,
+    metricAgg,
+    metricFieldName,
+  });
+  if (regionMapLayerDescriptor) {
+    initialLayers.push(regionMapLayerDescriptor);
+  }
+
+  return await deps.locator.getLocation({
+    initialLayers,
+    filters,
+    query,
+    timeRange,
+    hash,
+  });
+}
diff --git a/x-pack/plugins/maps/public/locators/region_map_locator/locator_definition.ts b/x-pack/plugins/maps/public/locators/region_map_locator/locator_definition.ts
new file mode 100644
index 0000000000000..b8b7e0fba3cb8
--- /dev/null
+++ b/x-pack/plugins/maps/public/locators/region_map_locator/locator_definition.ts
@@ -0,0 +1,24 @@
+/*
+ * 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 { LocatorDefinition } from '@kbn/share-plugin/public';
+import type { MapsAppRegionMapLocatorParams, MapsAppRegionMapLocatorDependencies } from './types';
+
+export const MAPS_APP_REGION_MAP_LOCATOR = 'MAPS_APP_REGION_MAP_LOCATOR' as const;
+
+export class MapsAppRegionMapLocatorDefinition
+  implements LocatorDefinition<MapsAppRegionMapLocatorParams>
+{
+  public readonly id = MAPS_APP_REGION_MAP_LOCATOR;
+
+  constructor(protected readonly deps: MapsAppRegionMapLocatorDependencies) {}
+
+  public readonly getLocation = async (params: MapsAppRegionMapLocatorParams) => {
+    const { getLocation } = await import('./get_location');
+    return getLocation(params, this.deps);
+  };
+}
diff --git a/x-pack/plugins/maps/public/locators/region_map_locator/types.ts b/x-pack/plugins/maps/public/locators/region_map_locator/types.ts
new file mode 100644
index 0000000000000..f42ee3554ee0c
--- /dev/null
+++ b/x-pack/plugins/maps/public/locators/region_map_locator/types.ts
@@ -0,0 +1,33 @@
+/*
+ * 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 { SerializableRecord } from '@kbn/utility-types';
+import type { Filter, TimeRange, Query } from '@kbn/es-query';
+import type { LocatorPublic } from '@kbn/share-plugin/public';
+import type { MapsAppLocator } from '../map_locator/types';
+
+export interface MapsAppRegionMapLocatorParams extends SerializableRecord {
+  label: string;
+  emsLayerId?: string;
+  leftFieldName?: string;
+  termsFieldName?: string;
+  termsSize?: number;
+  colorSchema: string;
+  indexPatternId?: string;
+  metricAgg: string;
+  metricFieldName?: string;
+  timeRange?: TimeRange;
+  filters?: Filter[];
+  query?: Query;
+  hash?: boolean;
+}
+
+export type MapsAppRegionMapLocator = LocatorPublic<MapsAppRegionMapLocatorParams>;
+
+export interface MapsAppRegionMapLocatorDependencies {
+  locator: MapsAppLocator;
+}
diff --git a/x-pack/plugins/maps/public/locators/tile_map_locator/get_location.ts b/x-pack/plugins/maps/public/locators/tile_map_locator/get_location.ts
new file mode 100644
index 0000000000000..fb7bb0b7d3bd3
--- /dev/null
+++ b/x-pack/plugins/maps/public/locators/tile_map_locator/get_location.ts
@@ -0,0 +1,52 @@
+/*
+ * 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 { SerializableRecord } from '@kbn/utility-types';
+import type { LayerDescriptor } from '../../../common/descriptor_types';
+import { createTileMapLayerDescriptor } from '../../classes/layers/create_tile_map_layer_descriptor';
+import type { MapsAppTileMapLocatorParams, MapsAppTileMapLocatorDependencies } from './types';
+
+export async function getLocation(
+  params: MapsAppTileMapLocatorParams,
+  deps: MapsAppTileMapLocatorDependencies
+) {
+  const {
+    label,
+    mapType,
+    colorSchema,
+    indexPatternId,
+    geoFieldName,
+    metricAgg,
+    metricFieldName,
+    filters,
+    query,
+    timeRange,
+    hash = true,
+  } = params;
+  const initialLayers = [] as unknown as LayerDescriptor[] & SerializableRecord;
+  const tileMapLayerDescriptor = createTileMapLayerDescriptor({
+    label,
+    mapType,
+    colorSchema,
+    indexPatternId,
+    geoFieldName,
+    metricAgg,
+    metricFieldName,
+  });
+
+  if (tileMapLayerDescriptor) {
+    initialLayers.push(tileMapLayerDescriptor);
+  }
+
+  return await deps.locator.getLocation({
+    initialLayers,
+    filters,
+    query,
+    timeRange,
+    hash,
+  });
+}
diff --git a/x-pack/plugins/maps/public/locators/tile_map_locator/locator_definition.ts b/x-pack/plugins/maps/public/locators/tile_map_locator/locator_definition.ts
new file mode 100644
index 0000000000000..e511d641fc5ae
--- /dev/null
+++ b/x-pack/plugins/maps/public/locators/tile_map_locator/locator_definition.ts
@@ -0,0 +1,24 @@
+/*
+ * 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 { LocatorDefinition } from '@kbn/share-plugin/public';
+import type { MapsAppTileMapLocatorParams, MapsAppTileMapLocatorDependencies } from './types';
+
+export const MAPS_APP_TILE_MAP_LOCATOR = 'MAPS_APP_TILE_MAP_LOCATOR' as const;
+
+export class MapsAppTileMapLocatorDefinition
+  implements LocatorDefinition<MapsAppTileMapLocatorParams>
+{
+  public readonly id = MAPS_APP_TILE_MAP_LOCATOR;
+
+  constructor(protected readonly deps: MapsAppTileMapLocatorDependencies) {}
+
+  public readonly getLocation = async (params: MapsAppTileMapLocatorParams) => {
+    const { getLocation } = await import('./get_location');
+    return getLocation(params, this.deps);
+  };
+}
diff --git a/x-pack/plugins/maps/public/locators/tile_map_locator/types.ts b/x-pack/plugins/maps/public/locators/tile_map_locator/types.ts
new file mode 100644
index 0000000000000..5743feca993d6
--- /dev/null
+++ b/x-pack/plugins/maps/public/locators/tile_map_locator/types.ts
@@ -0,0 +1,31 @@
+/*
+ * 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 { SerializableRecord } from '@kbn/utility-types';
+import type { Filter, TimeRange, Query } from '@kbn/es-query';
+import type { LocatorPublic } from '@kbn/share-plugin/public';
+import type { MapsAppLocator } from '../map_locator/types';
+
+export interface MapsAppTileMapLocatorParams extends SerializableRecord {
+  label: string;
+  mapType: string;
+  colorSchema: string;
+  indexPatternId?: string;
+  geoFieldName?: string;
+  metricAgg: string;
+  metricFieldName?: string;
+  timeRange?: TimeRange;
+  filters?: Filter[];
+  query?: Query;
+  hash?: boolean;
+}
+
+export type MapsAppTileMapLocator = LocatorPublic<MapsAppTileMapLocatorParams>;
+
+export interface MapsAppTileMapLocatorDependencies {
+  locator: MapsAppLocator;
+}
diff --git a/x-pack/plugins/maps/public/map_attribute_service.ts b/x-pack/plugins/maps/public/map_attribute_service.ts
index b93c5421f5cb3..5a4d3e8cf0038 100644
--- a/x-pack/plugins/maps/public/map_attribute_service.ts
+++ b/x-pack/plugins/maps/public/map_attribute_service.ts
@@ -10,8 +10,7 @@ import type { ResolvedSimpleSavedObject } from '@kbn/core/public';
 import { AttributeService } from '@kbn/embeddable-plugin/public';
 import type { OnSaveProps } from '@kbn/saved-objects-plugin/public';
 import type { MapAttributes } from '../common/content_management';
-import { MAP_SAVED_OBJECT_TYPE } from '../common/constants';
-import { getMapEmbeddableDisplayName } from '../common/i18n_getters';
+import { MAP_EMBEDDABLE_NAME, MAP_SAVED_OBJECT_TYPE } from '../common/constants';
 import { getCoreOverlays, getEmbeddableService } from './kibana_services';
 import { extractReferences, injectReferences } from '../common/migrations/references';
 import { mapsClient, checkForDuplicateTitle } from './content_management';
@@ -108,7 +107,7 @@ export function getMapAttributeService(): MapAttributeService {
           copyOnSave: false,
           lastSavedTitle: '',
           isTitleDuplicateConfirmed: props.isTitleDuplicateConfirmed,
-          getDisplayName: getMapEmbeddableDisplayName,
+          getDisplayName: () => MAP_EMBEDDABLE_NAME,
           onTitleDuplicate: props.onTitleDuplicate,
         },
         {
diff --git a/x-pack/plugins/maps/public/plugin.ts b/x-pack/plugins/maps/public/plugin.ts
index 0d558699e6e51..75c4211c54d58 100644
--- a/x-pack/plugins/maps/public/plugin.ts
+++ b/x-pack/plugins/maps/public/plugin.ts
@@ -56,32 +56,29 @@ import {
   tileMapRenderer,
   tileMapVisType,
 } from './legacy_visualizations';
-import {
-  MapsAppLocatorDefinition,
-  MapsAppRegionMapLocatorDefinition,
-  MapsAppTileMapLocatorDefinition,
-} from './locators';
+import { MapsAppLocatorDefinition } from './locators/map_locator/locator_definition';
+import { MapsAppTileMapLocatorDefinition } from './locators/tile_map_locator/locator_definition';
+import { MapsAppRegionMapLocatorDefinition } from './locators/region_map_locator/locator_definition';
 import { registerLicensedFeatures, setLicensingPluginStart } from './licensed_features';
 import { registerSource } from './classes/sources/source_registry';
-import { registerLayerWizardExternal } from './classes/layers';
+import { registerLayerWizardExternal } from './classes/layers/wizards/layer_wizard_registry';
 import {
   createLayerDescriptors,
   MapsSetupApi,
   MapsStartApi,
   suggestEMSTermJoinConfig,
 } from './api';
-import { lazyLoadMapModules } from './lazy_load_bundle';
-import { getAppTitle } from '../common/i18n_getters';
 import { MapsXPackConfig, MapsConfigType } from '../config';
 import { MapEmbeddableFactory } from './embeddable/map_embeddable_factory';
-import { filterByMapExtentAction } from './trigger_actions/filter_by_map_extent_action';
-import { synchronizeMovementAction } from './trigger_actions/synchronize_movement_action';
+import { filterByMapExtentAction } from './trigger_actions/filter_by_map_extent/action';
+import { synchronizeMovementAction } from './trigger_actions/synchronize_movement/action';
 import { visualizeGeoFieldAction } from './trigger_actions/visualize_geo_field_action';
-import { APP_ICON_SOLUTION, APP_ID, MAP_SAVED_OBJECT_TYPE } from '../common/constants';
+import { APP_NAME, APP_ICON_SOLUTION, APP_ID, MAP_SAVED_OBJECT_TYPE } from '../common/constants';
 import { getMapsVisTypeAlias } from './maps_vis_type_alias';
 import { featureCatalogueEntry } from './feature_catalogue_entry';
 import { setIsCloudEnabled, setMapAppConfig, setStartServices } from './kibana_services';
-import { MapInspectorView, VectorTileInspectorView } from './inspector';
+import { MapInspectorView } from './inspector/map_adapter/map_inspector_view';
+import { VectorTileInspectorView } from './inspector/vector_tile_adapter/vector_tile_inspector_view';
 
 import { setupLensChoroplethChart } from './lens';
 import { CONTENT_ID, LATEST_VERSION } from '../common/content_management';
@@ -193,7 +190,7 @@ export class MapsPlugin
 
     core.application.register({
       id: APP_ID,
-      title: getAppTitle(),
+      title: APP_NAME,
       order: 4000,
       icon: `plugins/${APP_ID}/icon.svg`,
       euiIconType: APP_ICON_SOLUTION,
@@ -202,7 +199,7 @@ export class MapsPlugin
         const [coreStart, { savedObjectsTagging }] = await core.getStartServices();
         const UsageTracker =
           plugins.usageCollection?.components.ApplicationUsageTrackingProvider ?? React.Fragment;
-        const { renderApp } = await lazyLoadMapModules();
+        const { renderApp } = await import('./render_app');
         return renderApp(params, { coreStart, AppUsageTracker: UsageTracker, savedObjectsTagging });
       },
     });
@@ -212,7 +209,7 @@ export class MapsPlugin
       version: {
         latest: LATEST_VERSION,
       },
-      name: getAppTitle(),
+      name: APP_NAME,
     });
 
     setupLensChoroplethChart(core, plugins.expressions, plugins.lens);
diff --git a/x-pack/plugins/maps/public/routes/list_page/maps_list_view.tsx b/x-pack/plugins/maps/public/routes/list_page/maps_list_view.tsx
index e1ce3e801aac3..95063f728a8fc 100644
--- a/x-pack/plugins/maps/public/routes/list_page/maps_list_view.tsx
+++ b/x-pack/plugins/maps/public/routes/list_page/maps_list_view.tsx
@@ -13,7 +13,7 @@ import { TableListView } from '@kbn/content-management-table-list';
 import type { UserContentCommonSchema } from '@kbn/content-management-table-list';
 
 import type { MapItem } from '../../../common/content_management';
-import { APP_ID, getEditPath, MAP_PATH } from '../../../common/constants';
+import { APP_ID, APP_NAME, getEditPath, MAP_PATH } from '../../../common/constants';
 import {
   getMapsCapabilities,
   getCoreChrome,
@@ -22,7 +22,6 @@ import {
   getUiSettings,
   getUsageCollection,
 } from '../../kibana_services';
-import { getAppTitle } from '../../../common/i18n_getters';
 import { mapsClient } from '../../content_management';
 
 const SAVED_OBJECTS_LIMIT_SETTING = 'savedObjects:listingLimit';
@@ -73,8 +72,8 @@ function MapsListViewComp({ history }: Props) {
   const listingLimit = getUiSettings().get(SAVED_OBJECTS_LIMIT_SETTING);
   const initialPageSize = getUiSettings().get(SAVED_OBJECTS_PER_PAGE_SETTING);
 
-  getCoreChrome().docTitle.change(getAppTitle());
-  getCoreChrome().setBreadcrumbs([{ text: getAppTitle() }]);
+  getCoreChrome().docTitle.change(APP_NAME);
+  getCoreChrome().setBreadcrumbs([{ text: APP_NAME }]);
 
   const findMaps = useCallback(
     async (
@@ -128,7 +127,7 @@ function MapsListViewComp({ history }: Props) {
       entityNamePlural={i18n.translate('xpack.maps.mapListing.entityNamePlural', {
         defaultMessage: 'maps',
       })}
-      tableListTitle={getAppTitle()}
+      tableListTitle={APP_NAME}
       onClickTitle={({ id }) => history.push(getEditPath(id))}
     />
   );
diff --git a/x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx b/x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx
index 4220e25212f2a..ceb9a487fffdc 100644
--- a/x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx
+++ b/x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx
@@ -47,8 +47,12 @@ import { AppStateManager, startAppStateSyncing } from '../url_state';
 import { MapContainer } from '../../../connected_components/map_container';
 import { getIndexPatternsFromIds } from '../../../index_pattern_util';
 import { getTopNavConfig } from '../top_nav_config';
-import { getEditPath, getFullPath, APP_ID } from '../../../../common/constants';
-import { getMapEmbeddableDisplayName } from '../../../../common/i18n_getters';
+import {
+  getEditPath,
+  getFullPath,
+  APP_ID,
+  MAP_EMBEDDABLE_NAME,
+} from '../../../../common/constants';
 import {
   getInitialQuery,
   getInitialRefreshConfig,
@@ -432,7 +436,7 @@ export class MapApp extends React.Component<Props, State> {
       await spaces.ui.redirectLegacyUrl({
         path: newPath,
         aliasPurpose: sharingSavedObjectProps.aliasPurpose,
-        objectNoun: getMapEmbeddableDisplayName(),
+        objectNoun: MAP_EMBEDDABLE_NAME,
       });
       return;
     }
@@ -547,7 +551,7 @@ export class MapApp extends React.Component<Props, State> {
     const spaces = getSpacesApi();
     return spaces && sharingSavedObjectProps?.outcome === 'conflict'
       ? spaces.ui.components.getLegacyUrlConflict({
-          objectNoun: getMapEmbeddableDisplayName(),
+          objectNoun: MAP_EMBEDDABLE_NAME,
           currentObjectId: this.props.savedMap.getSavedObjectId()!,
           otherObjectId: sharingSavedObjectProps.aliasTargetId!,
           otherObjectPath: `${getEditPath(sharingSavedObjectProps.aliasTargetId!)}${
diff --git a/x-pack/plugins/maps/public/routes/map_page/saved_map/get_breadcrumbs.tsx b/x-pack/plugins/maps/public/routes/map_page/saved_map/get_breadcrumbs.tsx
index ca3022043cd9f..344722a480b08 100644
--- a/x-pack/plugins/maps/public/routes/map_page/saved_map/get_breadcrumbs.tsx
+++ b/x-pack/plugins/maps/public/routes/map_page/saved_map/get_breadcrumbs.tsx
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import { ScopedHistory } from '@kbn/core/public';
 import { getCoreOverlays, getNavigateToApp } from '../../../kibana_services';
-import { getAppTitle } from '../../../../common/i18n_getters';
+import { APP_NAME } from '../../../../common/constants';
 
 export const unsavedChangesWarning = i18n.translate(
   'xpack.maps.breadCrumbs.unsavedChangesWarning',
@@ -49,7 +49,7 @@ export function getBreadcrumbs({
 
   if (!isByValue) {
     breadcrumbs.push({
-      text: getAppTitle(),
+      text: APP_NAME,
       onClick: async () => {
         if (getHasUnsavedChanges()) {
           const confirmed = await getCoreOverlays().openConfirm(unsavedChangesWarning, {
diff --git a/x-pack/plugins/maps/public/routes/map_page/top_nav_config.tsx b/x-pack/plugins/maps/public/routes/map_page/top_nav_config.tsx
index 8b7efa9335858..6bef5987dd9f8 100644
--- a/x-pack/plugins/maps/public/routes/map_page/top_nav_config.tsx
+++ b/x-pack/plugins/maps/public/routes/map_page/top_nav_config.tsx
@@ -27,8 +27,8 @@ import {
   getSavedObjectsTagging,
   getPresentationUtilContext,
 } from '../../kibana_services';
+import { MAP_EMBEDDABLE_NAME } from '../../../common/constants';
 import { SavedMap } from './saved_map';
-import { getMapEmbeddableDisplayName } from '../../../common/i18n_getters';
 import { checkForDuplicateTitle } from '../../content_management';
 
 const SavedObjectSaveModalDashboard = withSuspense(LazySavedObjectSaveModalDashboard);
@@ -179,7 +179,7 @@ export function getTopNavConfig({
                   copyOnSave: props.newCopyOnSave,
                   lastSavedTitle: savedMap.getSavedObjectId() ? savedMap.getTitle() : '',
                   isTitleDuplicateConfirmed: props.isTitleDuplicateConfirmed,
-                  getDisplayName: getMapEmbeddableDisplayName,
+                  getDisplayName: () => MAP_EMBEDDABLE_NAME,
                   onTitleDuplicate: props.onTitleDuplicate,
                 },
                 {
diff --git a/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent_action.tsx b/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent/action.ts
similarity index 63%
rename from x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent_action.tsx
rename to x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent/action.ts
index c2183774cf677..5e21c28d69fe1 100644
--- a/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent_action.tsx
+++ b/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent/action.ts
@@ -5,25 +5,13 @@
  * 2.0.
  */
 
-import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { Embeddable, EmbeddableInput } from '@kbn/embeddable-plugin/public';
-import { createReactOverlays } from '@kbn/kibana-react-plugin/public';
+import type { Embeddable } from '@kbn/embeddable-plugin/public';
 import { createAction } from '@kbn/ui-actions-plugin/public';
-import { isLegacyMap } from '../legacy_visualizations';
-import { MAP_SAVED_OBJECT_TYPE } from '../../common/constants';
-import { getCore } from '../kibana_services';
+import type { FilterByMapExtentActionContext, FilterByMapExtentInput } from './types';
 
 export const FILTER_BY_MAP_EXTENT = 'FILTER_BY_MAP_EXTENT';
 
-interface FilterByMapExtentInput extends EmbeddableInput {
-  filterByMapExtent: boolean;
-}
-
-interface FilterByMapExtentActionContext {
-  embeddable: Embeddable<FilterByMapExtentInput>;
-}
-
 function getContainerLabel(embeddable: Embeddable<FilterByMapExtentInput>) {
   return embeddable.parent?.type === 'dashboard'
     ? i18n.translate('xpack.maps.filterByMapExtentMenuItem.dashboardLabel', {
@@ -58,20 +46,12 @@ export const filterByMapExtentAction = createAction<FilterByMapExtentActionConte
   getIconType: () => {
     return 'filter';
   },
-  isCompatible: async ({ embeddable }: FilterByMapExtentActionContext) => {
-    return (
-      (embeddable.type === MAP_SAVED_OBJECT_TYPE || isLegacyMap(embeddable)) &&
-      !embeddable.getInput().disableTriggers
-    );
+  isCompatible: async (context: FilterByMapExtentActionContext) => {
+    const { isCompatible } = await import('./is_compatible');
+    return isCompatible(context);
   },
   execute: async (context: FilterByMapExtentActionContext) => {
-    const { FilterByMapExtentModal } = await import('./filter_by_map_extent_modal');
-    const { openModal } = createReactOverlays(getCore());
-    const modalSession = openModal(
-      <FilterByMapExtentModal
-        onClose={() => modalSession.close()}
-        title={getDisplayName(context.embeddable)}
-      />
-    );
+    const { openModal } = await import('./modal');
+    openModal(getDisplayName(context.embeddable));
   },
 });
diff --git a/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent/is_compatible.ts b/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent/is_compatible.ts
new file mode 100644
index 0000000000000..32892b6fdc18b
--- /dev/null
+++ b/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent/is_compatible.ts
@@ -0,0 +1,17 @@
+/*
+ * 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 { MAP_SAVED_OBJECT_TYPE } from '../../../common/constants';
+import { isLegacyMap } from '../../legacy_visualizations/is_legacy_map';
+import type { FilterByMapExtentActionContext } from './types';
+
+export function isCompatible({ embeddable }: FilterByMapExtentActionContext) {
+  return (
+    (embeddable.type === MAP_SAVED_OBJECT_TYPE || isLegacyMap(embeddable)) &&
+    !embeddable.getInput().disableTriggers
+  );
+}
diff --git a/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent_modal.tsx b/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent/modal.tsx
similarity index 78%
rename from x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent_modal.tsx
rename to x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent/modal.tsx
index 206f754ae65bb..9e5127f9329ba 100644
--- a/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent_modal.tsx
+++ b/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent/modal.tsx
@@ -14,14 +14,23 @@ import {
   EuiSwitch,
   EuiSwitchEvent,
 } from '@elastic/eui';
-import { mapEmbeddablesSingleton } from '../embeddable/map_embeddables_singleton';
+import { createReactOverlays } from '@kbn/kibana-react-plugin/public';
+import { mapEmbeddablesSingleton } from '../../embeddable/map_embeddables_singleton';
+import { getCore } from '../../kibana_services';
+
+export function openModal(title: string) {
+  const { openModal: reactOverlaysOpenModal } = createReactOverlays(getCore());
+  const modalSession = reactOverlaysOpenModal(
+    <FilterByMapExtentModal onClose={() => modalSession.close()} title={title} />
+  );
+}
 
 interface Props {
   onClose: () => void;
   title: string;
 }
 
-export class FilterByMapExtentModal extends Component<Props> {
+class FilterByMapExtentModal extends Component<Props> {
   _renderSwitches() {
     return mapEmbeddablesSingleton.getMapPanels().map((mapPanel) => {
       return (
diff --git a/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent/types.ts b/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent/types.ts
new file mode 100644
index 0000000000000..5587588b60730
--- /dev/null
+++ b/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent/types.ts
@@ -0,0 +1,16 @@
+/*
+ * 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 { Embeddable, EmbeddableInput } from '@kbn/embeddable-plugin/public';
+
+export interface FilterByMapExtentInput extends EmbeddableInput {
+  filterByMapExtent: boolean;
+}
+
+export interface FilterByMapExtentActionContext {
+  embeddable: Embeddable<FilterByMapExtentInput>;
+}
diff --git a/x-pack/plugins/maps/public/trigger_actions/get_maps_link.ts b/x-pack/plugins/maps/public/trigger_actions/get_maps_link.ts
new file mode 100644
index 0000000000000..da0e8bac59235
--- /dev/null
+++ b/x-pack/plugins/maps/public/trigger_actions/get_maps_link.ts
@@ -0,0 +1,50 @@
+/*
+ * 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 { v4 as uuidv4 } from 'uuid';
+import type { Query } from '@kbn/es-query';
+import type { SerializableRecord } from '@kbn/utility-types';
+import type { VisualizeFieldContext } from '@kbn/ui-actions-plugin/public';
+import { getIndexPatternService, getData, getShareService } from '../kibana_services';
+import { LAYER_TYPE, SOURCE_TYPES, SCALING_TYPES } from '../../common/constants';
+import type { LayerDescriptor } from '../../common/descriptor_types';
+import type { MapsAppLocator } from '../locators/map_locator/types';
+import { MAPS_APP_LOCATOR } from '../locators/map_locator/locator_definition';
+
+export const getMapsLink = async (context: VisualizeFieldContext) => {
+  const dataView = await getIndexPatternService().get(context.dataViewSpec.id!);
+  // create initial layer descriptor
+  const hasTooltips =
+    context?.contextualFields?.length && context?.contextualFields[0] !== '_source';
+  const initialLayers = [
+    {
+      id: uuidv4(),
+      visible: true,
+      type: LAYER_TYPE.MVT_VECTOR,
+      sourceDescriptor: {
+        id: uuidv4(),
+        type: SOURCE_TYPES.ES_SEARCH,
+        tooltipProperties: hasTooltips ? context.contextualFields : [],
+        label: dataView.getIndexPattern(),
+        indexPatternId: context.dataViewSpec.id,
+        geoField: context.fieldName,
+        scalingType: SCALING_TYPES.MVT,
+      },
+    },
+  ];
+
+  const locator = getShareService().url.locators.get(MAPS_APP_LOCATOR) as MapsAppLocator;
+  const location = await locator.getLocation({
+    filters: getData().query.filterManager.getFilters(),
+    query: getData().query.queryString.getQuery() as Query,
+    initialLayers: initialLayers as unknown as LayerDescriptor[] & SerializableRecord,
+    timeRange: getData().query.timefilter.timefilter.getTime(),
+    dataViewSpec: context.dataViewSpec,
+  });
+
+  return location;
+};
diff --git a/x-pack/plugins/maps/public/trigger_actions/synchronize_movement/action.ts b/x-pack/plugins/maps/public/trigger_actions/synchronize_movement/action.ts
new file mode 100644
index 0000000000000..3a3fd78072865
--- /dev/null
+++ b/x-pack/plugins/maps/public/trigger_actions/synchronize_movement/action.ts
@@ -0,0 +1,40 @@
+/*
+ * 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 { i18n } from '@kbn/i18n';
+import { createAction } from '@kbn/ui-actions-plugin/public';
+import type { SynchronizeMovementActionContext } from './types';
+
+export const SYNCHRONIZE_MOVEMENT_ACTION = 'SYNCHRONIZE_MOVEMENT_ACTION';
+
+export const synchronizeMovementAction = createAction<SynchronizeMovementActionContext>({
+  id: SYNCHRONIZE_MOVEMENT_ACTION,
+  type: SYNCHRONIZE_MOVEMENT_ACTION,
+  order: 21,
+  getDisplayName: ({ embeddable }: SynchronizeMovementActionContext) => {
+    return i18n.translate('xpack.maps.synchronizeMovementAction.title', {
+      defaultMessage: 'Synchronize map movement',
+    });
+  },
+  getDisplayNameTooltip: () => {
+    return i18n.translate('xpack.maps.synchronizeMovementAction.tooltipContent', {
+      defaultMessage:
+        'Synchronize maps, so that if you zoom and pan in one map, the movement is reflected in other maps',
+    });
+  },
+  getIconType: () => {
+    return 'crosshairs';
+  },
+  isCompatible: async (context: SynchronizeMovementActionContext) => {
+    const { isCompatible } = await import('./is_compatible');
+    return isCompatible(context);
+  },
+  execute: async (context: SynchronizeMovementActionContext) => {
+    const { openModal } = await import('./modal');
+    openModal();
+  },
+});
diff --git a/x-pack/plugins/maps/public/trigger_actions/synchronize_movement/is_compatible.ts b/x-pack/plugins/maps/public/trigger_actions/synchronize_movement/is_compatible.ts
new file mode 100644
index 0000000000000..ef73f8bb23d11
--- /dev/null
+++ b/x-pack/plugins/maps/public/trigger_actions/synchronize_movement/is_compatible.ts
@@ -0,0 +1,32 @@
+/*
+ * 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 { Embeddable as LensEmbeddable } from '@kbn/lens-plugin/public';
+import { MAP_SAVED_OBJECT_TYPE } from '../../../common/constants';
+import { isLegacyMap } from '../../legacy_visualizations/is_legacy_map';
+import { mapEmbeddablesSingleton } from '../../embeddable/map_embeddables_singleton';
+import type { SynchronizeMovementActionContext } from './types';
+
+export function isCompatible({ embeddable }: SynchronizeMovementActionContext) {
+  if (!mapEmbeddablesSingleton.hasMultipleMaps()) {
+    return false;
+  }
+
+  if (
+    embeddable.type === 'lens' &&
+    typeof (embeddable as LensEmbeddable).getSavedVis === 'function' &&
+    (embeddable as LensEmbeddable).getSavedVis()?.visualizationType === 'lnsChoropleth'
+  ) {
+    return true;
+  }
+
+  if (isLegacyMap(embeddable)) {
+    return true;
+  }
+
+  return embeddable.type === MAP_SAVED_OBJECT_TYPE;
+}
diff --git a/x-pack/plugins/maps/public/trigger_actions/synchronize_movement_modal.tsx b/x-pack/plugins/maps/public/trigger_actions/synchronize_movement/modal.tsx
similarity index 84%
rename from x-pack/plugins/maps/public/trigger_actions/synchronize_movement_modal.tsx
rename to x-pack/plugins/maps/public/trigger_actions/synchronize_movement/modal.tsx
index c6a1dae7eb36b..fa3ad5bfa8031 100644
--- a/x-pack/plugins/maps/public/trigger_actions/synchronize_movement_modal.tsx
+++ b/x-pack/plugins/maps/public/trigger_actions/synchronize_movement/modal.tsx
@@ -15,13 +15,22 @@ import {
   EuiSwitch,
   EuiSwitchEvent,
 } from '@elastic/eui';
-import { mapEmbeddablesSingleton } from '../embeddable/map_embeddables_singleton';
+import { createReactOverlays } from '@kbn/kibana-react-plugin/public';
+import { mapEmbeddablesSingleton } from '../../embeddable/map_embeddables_singleton';
+import { getCore } from '../../kibana_services';
+
+export function openModal() {
+  const { openModal: reactOverlaysOpenModal } = createReactOverlays(getCore());
+  const modalSession = reactOverlaysOpenModal(
+    <SynchronizeMovementModal onClose={() => modalSession.close()} />
+  );
+}
 
 interface Props {
   onClose: () => void;
 }
 
-export class SynchronizeMovementModal extends Component<Props> {
+class SynchronizeMovementModal extends Component<Props> {
   _renderSwitches() {
     const mapPanels = mapEmbeddablesSingleton.getMapPanels();
 
diff --git a/x-pack/plugins/maps/public/trigger_actions/synchronize_movement/types.ts b/x-pack/plugins/maps/public/trigger_actions/synchronize_movement/types.ts
new file mode 100644
index 0000000000000..8b0060ab1efe6
--- /dev/null
+++ b/x-pack/plugins/maps/public/trigger_actions/synchronize_movement/types.ts
@@ -0,0 +1,12 @@
+/*
+ * 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 { Embeddable, EmbeddableInput } from '@kbn/embeddable-plugin/public';
+
+export interface SynchronizeMovementActionContext {
+  embeddable: Embeddable<EmbeddableInput>;
+}
diff --git a/x-pack/plugins/maps/public/trigger_actions/synchronize_movement_action.tsx b/x-pack/plugins/maps/public/trigger_actions/synchronize_movement_action.tsx
deleted file mode 100644
index 7116e55fd521d..0000000000000
--- a/x-pack/plugins/maps/public/trigger_actions/synchronize_movement_action.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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 { i18n } from '@kbn/i18n';
-import { createReactOverlays } from '@kbn/kibana-react-plugin/public';
-import { Embeddable, EmbeddableInput } from '@kbn/embeddable-plugin/public';
-import { createAction } from '@kbn/ui-actions-plugin/public';
-import type { Embeddable as LensEmbeddable } from '@kbn/lens-plugin/public';
-import { isLegacyMap } from '../legacy_visualizations';
-import { MAP_SAVED_OBJECT_TYPE } from '../../common/constants';
-import { getCore } from '../kibana_services';
-
-export const SYNCHRONIZE_MOVEMENT_ACTION = 'SYNCHRONIZE_MOVEMENT_ACTION';
-
-interface SynchronizeMovementActionContext {
-  embeddable: Embeddable<EmbeddableInput>;
-}
-
-export const synchronizeMovementAction = createAction<SynchronizeMovementActionContext>({
-  id: SYNCHRONIZE_MOVEMENT_ACTION,
-  type: SYNCHRONIZE_MOVEMENT_ACTION,
-  order: 21,
-  getDisplayName: ({ embeddable }: SynchronizeMovementActionContext) => {
-    return i18n.translate('xpack.maps.synchronizeMovementAction.title', {
-      defaultMessage: 'Synchronize map movement',
-    });
-  },
-  getDisplayNameTooltip: () => {
-    return i18n.translate('xpack.maps.synchronizeMovementAction.tooltipContent', {
-      defaultMessage:
-        'Synchronize maps, so that if you zoom and pan in one map, the movement is reflected in other maps',
-    });
-  },
-  getIconType: () => {
-    return 'crosshairs';
-  },
-  isCompatible: async ({ embeddable }: SynchronizeMovementActionContext) => {
-    const { mapEmbeddablesSingleton } = await import('../embeddable/map_embeddables_singleton');
-    if (!mapEmbeddablesSingleton.hasMultipleMaps()) {
-      return false;
-    }
-
-    if (
-      embeddable.type === 'lens' &&
-      typeof (embeddable as LensEmbeddable).getSavedVis === 'function' &&
-      (embeddable as LensEmbeddable).getSavedVis()?.visualizationType === 'lnsChoropleth'
-    ) {
-      return true;
-    }
-
-    if (isLegacyMap(embeddable)) {
-      return true;
-    }
-
-    return embeddable.type === MAP_SAVED_OBJECT_TYPE;
-  },
-  execute: async ({ embeddable }: SynchronizeMovementActionContext) => {
-    const { SynchronizeMovementModal } = await import('./synchronize_movement_modal');
-    const { openModal } = createReactOverlays(getCore());
-    const modalSession = openModal(
-      <SynchronizeMovementModal onClose={() => modalSession.close()} />
-    );
-  },
-});
diff --git a/x-pack/plugins/maps/public/trigger_actions/visualize_geo_field_action.ts b/x-pack/plugins/maps/public/trigger_actions/visualize_geo_field_action.ts
index c1194fec094a3..417ff0d0bf1fe 100644
--- a/x-pack/plugins/maps/public/trigger_actions/visualize_geo_field_action.ts
+++ b/x-pack/plugins/maps/public/trigger_actions/visualize_geo_field_action.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 
-import { v4 as uuidv4 } from 'uuid';
 import { i18n } from '@kbn/i18n';
-import type { Query } from '@kbn/es-query';
-import type { SerializableRecord } from '@kbn/utility-types';
 import { METRIC_TYPE } from '@kbn/analytics';
 import {
   createAction,
@@ -18,16 +15,7 @@ import {
 import { getUsageCollection } from '../kibana_services';
 import { APP_ID } from '../../common/constants';
 
-import {
-  getVisualizeCapabilities,
-  getIndexPatternService,
-  getData,
-  getShareService,
-  getCore,
-} from '../kibana_services';
-import { MapsAppLocator, MAPS_APP_LOCATOR } from '../locators';
-import { LAYER_TYPE, SOURCE_TYPES, SCALING_TYPES } from '../../common/constants';
-import { LayerDescriptor } from '../../common/descriptor_types';
+import { getVisualizeCapabilities, getCore } from '../kibana_services';
 
 export const visualizeGeoFieldAction = createAction<VisualizeFieldContext>({
   id: ACTION_VISUALIZE_GEO_FIELD,
@@ -38,6 +26,7 @@ export const visualizeGeoFieldAction = createAction<VisualizeFieldContext>({
     }),
   isCompatible: async () => !!getVisualizeCapabilities().show,
   getHref: async (context) => {
+    const { getMapsLink } = await import('./get_maps_link');
     const { app, path } = await getMapsLink(context);
 
     return getCore().application.getUrlForApp(app, {
@@ -46,6 +35,7 @@ export const visualizeGeoFieldAction = createAction<VisualizeFieldContext>({
     });
   },
   execute: async (context) => {
+    const { getMapsLink } = await import('./get_maps_link');
     const { app, path, state } = await getMapsLink(context);
 
     const usageCollection = getUsageCollection();
@@ -61,37 +51,3 @@ export const visualizeGeoFieldAction = createAction<VisualizeFieldContext>({
     });
   },
 });
-
-const getMapsLink = async (context: VisualizeFieldContext) => {
-  const dataView = await getIndexPatternService().get(context.dataViewSpec.id!);
-  // create initial layer descriptor
-  const hasTooltips =
-    context?.contextualFields?.length && context?.contextualFields[0] !== '_source';
-  const initialLayers = [
-    {
-      id: uuidv4(),
-      visible: true,
-      type: LAYER_TYPE.MVT_VECTOR,
-      sourceDescriptor: {
-        id: uuidv4(),
-        type: SOURCE_TYPES.ES_SEARCH,
-        tooltipProperties: hasTooltips ? context.contextualFields : [],
-        label: dataView.getIndexPattern(),
-        indexPatternId: context.dataViewSpec.id,
-        geoField: context.fieldName,
-        scalingType: SCALING_TYPES.MVT,
-      },
-    },
-  ];
-
-  const locator = getShareService().url.locators.get(MAPS_APP_LOCATOR) as MapsAppLocator;
-  const location = await locator.getLocation({
-    filters: getData().query.filterManager.getFilters(),
-    query: getData().query.queryString.getQuery() as Query,
-    initialLayers: initialLayers as unknown as LayerDescriptor[] & SerializableRecord,
-    timeRange: getData().query.timefilter.timefilter.getTime(),
-    dataViewSpec: context.dataViewSpec,
-  });
-
-  return location;
-};
diff --git a/x-pack/plugins/maps/public/util.ts b/x-pack/plugins/maps/public/util.ts
index 364f72c0b564e..bed83da7e8335 100644
--- a/x-pack/plugins/maps/public/util.ts
+++ b/x-pack/plugins/maps/public/util.ts
@@ -6,11 +6,12 @@
  */
 
 import { EMSClient, FileLayer, TMSService } from '@elastic/ems-client';
-import { getTilemap, getEMSSettings, getMapsEmsStart } from './kibana_services';
+import { getEMSSettings, getMapsEmsStart } from './kibana_services';
 import { getLicenseId } from './licensed_features';
 
 export function getKibanaTileMap(): unknown {
-  return getTilemap();
+  const mapsEms = getMapsEmsStart();
+  return mapsEms.config.tilemap ? mapsEms.config.tilemap : {};
 }
 
 export async function getEmsFileLayers(): Promise<FileLayer[]> {
diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
index 3756275f49b70..21137b5344e2e 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -20422,7 +20422,6 @@
     "xpack.maps.addLayerPanel.changeDataSourceButtonLabel": "Changer de calque",
     "xpack.maps.addLayerPanel.footer.cancelButtonLabel": "Annuler",
     "xpack.maps.aggs.defaultCountLabel": "compte",
-    "xpack.maps.appTitle": "Cartes",
     "xpack.maps.attribution.addBtnAriaLabel": "Ajouter une attribution",
     "xpack.maps.attribution.addBtnLabel": "Ajouter une attribution",
     "xpack.maps.attribution.applyBtnLabel": "Appliquer",
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index f209a10ee17fa..74b4c94ef5d1c 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -20422,7 +20422,6 @@
     "xpack.maps.addLayerPanel.changeDataSourceButtonLabel": "レイヤーを変更",
     "xpack.maps.addLayerPanel.footer.cancelButtonLabel": "キャンセル",
     "xpack.maps.aggs.defaultCountLabel": "カウント",
-    "xpack.maps.appTitle": "マップ",
     "xpack.maps.attribution.addBtnAriaLabel": "属性を追加",
     "xpack.maps.attribution.addBtnLabel": "属性を追加",
     "xpack.maps.attribution.applyBtnLabel": "適用",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 8543c48afec38..d78366da8b8c7 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -20422,7 +20422,6 @@
     "xpack.maps.addLayerPanel.changeDataSourceButtonLabel": "更改图层",
     "xpack.maps.addLayerPanel.footer.cancelButtonLabel": "取消",
     "xpack.maps.aggs.defaultCountLabel": "计数",
-    "xpack.maps.appTitle": "Maps",
     "xpack.maps.attribution.addBtnAriaLabel": "添加归因",
     "xpack.maps.attribution.addBtnLabel": "添加归因",
     "xpack.maps.attribution.applyBtnLabel": "应用",

From c76a68bd899508dc54e313bdf0c73a133c742d24 Mon Sep 17 00:00:00 2001
From: Ersin Erdal <92688503+ersin-erdal@users.noreply.github.com>
Date: Tue, 18 Apr 2023 14:56:57 +0200
Subject: [PATCH 022/100] Make TaskManager health status error/warning reasons
 more visible (#154045)

Resolves: #152289

With this PR we make some of the `debug` logs `warn` and return the
message to the health API as reason to add in the status summary
message.
---
 .../lib/calculate_health_status.mock.ts       | 14 -----
 .../server/lib/calculate_health_status.ts     | 24 +++++---
 .../server/lib/log_health_metrics.test.ts     | 40 +++++++++----
 .../server/lib/log_health_metrics.ts          |  9 +--
 .../server/monitoring/capacity_estimation.ts  | 24 ++++----
 .../monitoring/monitoring_stats_stream.ts     |  1 +
 .../monitoring/task_run_statistics.test.ts    | 12 ++--
 .../server/monitoring/task_run_statistics.ts  |  4 +-
 .../task_manager/server/routes/health.test.ts | 59 ++++++++++++-------
 .../task_manager/server/routes/health.ts      | 24 +++++---
 10 files changed, 126 insertions(+), 85 deletions(-)
 delete mode 100644 x-pack/plugins/task_manager/server/lib/calculate_health_status.mock.ts

diff --git a/x-pack/plugins/task_manager/server/lib/calculate_health_status.mock.ts b/x-pack/plugins/task_manager/server/lib/calculate_health_status.mock.ts
deleted file mode 100644
index f34a26560133b..0000000000000
--- a/x-pack/plugins/task_manager/server/lib/calculate_health_status.mock.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * 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.
- */
-
-const createCalculateHealthStatusMock = () => {
-  return jest.fn();
-};
-
-export const calculateHealthStatusMock = {
-  create: createCalculateHealthStatusMock,
-};
diff --git a/x-pack/plugins/task_manager/server/lib/calculate_health_status.ts b/x-pack/plugins/task_manager/server/lib/calculate_health_status.ts
index 8bd7f5de80810..d900e66360820 100644
--- a/x-pack/plugins/task_manager/server/lib/calculate_health_status.ts
+++ b/x-pack/plugins/task_manager/server/lib/calculate_health_status.ts
@@ -16,7 +16,7 @@ export function calculateHealthStatus(
   config: TaskManagerConfig,
   shouldRunTasks: boolean,
   logger: Logger
-): HealthStatus {
+): { status: HealthStatus; reason?: string } {
   const now = Date.now();
 
   // if "hot" health stats are any more stale than monitored_stats_required_freshness
@@ -28,27 +28,35 @@ export function calculateHealthStatus(
   const requiredColdStatsFreshness: number = config.monitored_aggregated_stats_refresh_rate * 1.5;
 
   if (hasStatus(summarizedStats.stats, HealthStatus.Error)) {
-    return HealthStatus.Error;
+    return {
+      status: HealthStatus.Error,
+      reason: summarizedStats.stats.capacity_estimation?.reason,
+    };
   }
 
   // Hot timestamps look at runtime stats which are not available when tasks are not running
   if (shouldRunTasks) {
     if (hasExpiredHotTimestamps(summarizedStats, now, requiredHotStatsFreshness)) {
-      logger.debug('setting HealthStatus.Error because of expired hot timestamps');
-      return HealthStatus.Error;
+      const reason = 'setting HealthStatus.Error because of expired hot timestamps';
+      logger.warn(reason);
+      return { status: HealthStatus.Error, reason };
     }
   }
 
   if (hasExpiredColdTimestamps(summarizedStats, now, requiredColdStatsFreshness)) {
-    logger.debug('setting HealthStatus.Error because of expired cold timestamps');
-    return HealthStatus.Error;
+    const reason = 'setting HealthStatus.Error because of expired cold timestamps';
+    logger.warn(reason);
+    return { status: HealthStatus.Error, reason };
   }
 
   if (hasStatus(summarizedStats.stats, HealthStatus.Warning)) {
-    return HealthStatus.Warning;
+    return {
+      status: HealthStatus.Warning,
+      reason: summarizedStats.stats.capacity_estimation?.reason,
+    };
   }
 
-  return HealthStatus.OK;
+  return { status: HealthStatus.OK };
 }
 
 function hasStatus(stats: RawMonitoringStats['stats'], status: HealthStatus): boolean {
diff --git a/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts b/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts
index 152f0ae82543e..552648e407fa6 100644
--- a/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts
+++ b/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts
@@ -41,16 +41,30 @@ describe('logHealthMetrics', () => {
     const { calculateHealthStatus } = jest.requireMock('./calculate_health_status');
 
     // We must change from OK to Warning
-    (calculateHealthStatus as jest.Mock<HealthStatus>).mockImplementation(() => HealthStatus.OK);
+    (
+      calculateHealthStatus as jest.Mock<{ status: HealthStatus; reason?: string }>
+    ).mockImplementation(() => ({
+      status: HealthStatus.OK,
+    }));
     logHealthMetrics(health, logger, config, true, docLinks);
-    (calculateHealthStatus as jest.Mock<HealthStatus>).mockImplementation(
-      () => HealthStatus.Warning
-    );
+    (
+      calculateHealthStatus as jest.Mock<{ status: HealthStatus; reason?: string }>
+    ).mockImplementation(() => ({
+      status: HealthStatus.Warning,
+    }));
     logHealthMetrics(health, logger, config, true, docLinks);
     // We must change from OK to Error
-    (calculateHealthStatus as jest.Mock<HealthStatus>).mockImplementation(() => HealthStatus.OK);
+    (
+      calculateHealthStatus as jest.Mock<{ status: HealthStatus; reason?: string }>
+    ).mockImplementation(() => ({
+      status: HealthStatus.OK,
+    }));
     logHealthMetrics(health, logger, config, true, docLinks);
-    (calculateHealthStatus as jest.Mock<HealthStatus>).mockImplementation(() => HealthStatus.Error);
+    (
+      calculateHealthStatus as jest.Mock<{ status: HealthStatus; reason?: string }>
+    ).mockImplementation(() => ({
+      status: HealthStatus.Error,
+    }));
     logHealthMetrics(health, logger, config, true, docLinks);
 
     const debugCalls = (logger as jest.Mocked<Logger>).debug.mock.calls;
@@ -175,9 +189,11 @@ describe('logHealthMetrics', () => {
     });
     const health = getMockMonitoredHealth();
     const { calculateHealthStatus } = jest.requireMock('./calculate_health_status');
-    (calculateHealthStatus as jest.Mock<HealthStatus>).mockImplementation(
-      () => HealthStatus.Warning
-    );
+    (
+      calculateHealthStatus as jest.Mock<{ status: HealthStatus; reason?: string }>
+    ).mockImplementation(() => ({
+      status: HealthStatus.Warning,
+    }));
 
     logHealthMetrics(health, logger, config, true, docLinks);
 
@@ -201,7 +217,11 @@ describe('logHealthMetrics', () => {
     });
     const health = getMockMonitoredHealth();
     const { calculateHealthStatus } = jest.requireMock('./calculate_health_status');
-    (calculateHealthStatus as jest.Mock<HealthStatus>).mockImplementation(() => HealthStatus.Error);
+    (
+      calculateHealthStatus as jest.Mock<{ status: HealthStatus; reason?: string }>
+    ).mockImplementation(() => ({
+      status: HealthStatus.Error,
+    }));
 
     logHealthMetrics(health, logger, config, true, docLinks);
 
diff --git a/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts b/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts
index eff71b28f8abb..bddafb802b41b 100644
--- a/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts
+++ b/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts
@@ -40,12 +40,9 @@ export function logHealthMetrics(
       capacity_estimation: undefined,
     },
   };
-  const statusWithoutCapacity = calculateHealthStatus(
-    healthWithoutCapacity,
-    config,
-    shouldRunTasks,
-    logger
-  );
+  const healthStatus = calculateHealthStatus(healthWithoutCapacity, config, shouldRunTasks, logger);
+
+  const statusWithoutCapacity = healthStatus?.status;
   if (statusWithoutCapacity === HealthStatus.Warning) {
     logLevel = LogLevel.Warn;
   } else if (statusWithoutCapacity === HealthStatus.Error && !isEmpty(monitoredHealth.stats)) {
diff --git a/x-pack/plugins/task_manager/server/monitoring/capacity_estimation.ts b/x-pack/plugins/task_manager/server/monitoring/capacity_estimation.ts
index 88feea306050c..c710d304445e7 100644
--- a/x-pack/plugins/task_manager/server/monitoring/capacity_estimation.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/capacity_estimation.ts
@@ -184,13 +184,14 @@ export function estimateCapacity(
     averageCapacityUsedByNonRecurringAndEphemeralTasksPerKibana +
     averageRecurringRequiredPerMinute / assumedKibanaInstances;
 
-  const status = getHealthStatus(logger, {
+  const { status, reason } = getHealthStatus(logger, {
     assumedRequiredThroughputPerMinutePerKibana,
     assumedAverageRecurringRequiredThroughputPerMinutePerKibana,
     capacityPerMinutePerKibana,
   });
   return {
     status,
+    reason,
     timestamp: new Date().toISOString(),
     value: {
       observed: mapValues(
@@ -231,27 +232,28 @@ interface GetHealthStatusParams {
   capacityPerMinutePerKibana: number;
 }
 
-function getHealthStatus(logger: Logger, params: GetHealthStatusParams): HealthStatus {
+function getHealthStatus(
+  logger: Logger,
+  params: GetHealthStatusParams
+): { status: HealthStatus; reason?: string } {
   const {
     assumedRequiredThroughputPerMinutePerKibana,
     assumedAverageRecurringRequiredThroughputPerMinutePerKibana,
     capacityPerMinutePerKibana,
   } = params;
   if (assumedRequiredThroughputPerMinutePerKibana < capacityPerMinutePerKibana) {
-    return HealthStatus.OK;
+    return { status: HealthStatus.OK };
   }
 
   if (assumedAverageRecurringRequiredThroughputPerMinutePerKibana < capacityPerMinutePerKibana) {
-    logger.debug(
-      `setting HealthStatus.Warning because assumedAverageRecurringRequiredThroughputPerMinutePerKibana (${assumedAverageRecurringRequiredThroughputPerMinutePerKibana}) < capacityPerMinutePerKibana (${capacityPerMinutePerKibana})`
-    );
-    return HealthStatus.Warning;
+    const reason = `setting HealthStatus.Warning because assumedAverageRecurringRequiredThroughputPerMinutePerKibana (${assumedAverageRecurringRequiredThroughputPerMinutePerKibana}) < capacityPerMinutePerKibana (${capacityPerMinutePerKibana})`;
+    logger.warn(reason);
+    return { status: HealthStatus.Warning, reason };
   }
 
-  logger.debug(
-    `setting HealthStatus.Error because assumedRequiredThroughputPerMinutePerKibana (${assumedRequiredThroughputPerMinutePerKibana}) >= capacityPerMinutePerKibana (${capacityPerMinutePerKibana}) AND assumedAverageRecurringRequiredThroughputPerMinutePerKibana (${assumedAverageRecurringRequiredThroughputPerMinutePerKibana}) >= capacityPerMinutePerKibana (${capacityPerMinutePerKibana})`
-  );
-  return HealthStatus.Error;
+  const reason = `setting HealthStatus.Error because assumedRequiredThroughputPerMinutePerKibana (${assumedRequiredThroughputPerMinutePerKibana}) >= capacityPerMinutePerKibana (${capacityPerMinutePerKibana}) AND assumedAverageRecurringRequiredThroughputPerMinutePerKibana (${assumedAverageRecurringRequiredThroughputPerMinutePerKibana}) >= capacityPerMinutePerKibana (${capacityPerMinutePerKibana})`;
+  logger.warn(reason);
+  return { status: HealthStatus.Error, reason };
 }
 
 export function withCapacityEstimate(
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 19485e41c2ae2..e192a72f7092d 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
@@ -68,6 +68,7 @@ export interface MonitoredStat<T> {
 }
 export type RawMonitoredStat<T extends JsonObject> = MonitoredStat<T> & {
   status: HealthStatus;
+  reason?: string;
 };
 
 export interface RawMonitoringStats {
diff --git a/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.test.ts b/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.test.ts
index 4d69b23b699b7..0555f75fda278 100644
--- a/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.test.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.test.ts
@@ -375,24 +375,24 @@ describe('Task Run Statistics', () => {
               { Success: 40, RetryScheduled: 40, Failed: 20, status: 'OK' },
             ]);
 
-            expect(logger.debug).toHaveBeenCalledTimes(5);
-            expect(logger.debug).toHaveBeenNthCalledWith(
+            expect(logger.warn).toHaveBeenCalledTimes(5);
+            expect(logger.warn).toHaveBeenNthCalledWith(
               1,
               'Health Status warn threshold has been exceeded, resultFrequencySummary.Failed (40) is greater than warn_threshold (39)'
             );
-            expect(logger.debug).toHaveBeenNthCalledWith(
+            expect(logger.warn).toHaveBeenNthCalledWith(
               2,
               'Health Status error threshold has been exceeded, resultFrequencySummary.Failed (60) is greater than error_threshold (59)'
             );
-            expect(logger.debug).toHaveBeenNthCalledWith(
+            expect(logger.warn).toHaveBeenNthCalledWith(
               3,
               'Health Status error threshold has been exceeded, resultFrequencySummary.Failed (60) is greater than error_threshold (59)'
             );
-            expect(logger.debug).toHaveBeenNthCalledWith(
+            expect(logger.warn).toHaveBeenNthCalledWith(
               4,
               'Health Status error threshold has been exceeded, resultFrequencySummary.Failed (60) is greater than error_threshold (59)'
             );
-            expect(logger.debug).toHaveBeenNthCalledWith(
+            expect(logger.warn).toHaveBeenNthCalledWith(
               5,
               'Health Status warn threshold has been exceeded, resultFrequencySummary.Failed (40) is greater than warn_threshold (39)'
             );
diff --git a/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.ts b/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.ts
index 0c6063af19286..8dca615f94190 100644
--- a/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/task_run_statistics.ts
@@ -433,11 +433,11 @@ function getHealthStatus(
 ): HealthStatus {
   if (resultFrequencySummary.Failed > executionErrorThreshold.warn_threshold) {
     if (resultFrequencySummary.Failed > executionErrorThreshold.error_threshold) {
-      logger.debug(
+      logger.warn(
         `Health Status error threshold has been exceeded, resultFrequencySummary.Failed (${resultFrequencySummary.Failed}) is greater than error_threshold (${executionErrorThreshold.error_threshold})`
       );
     } else {
-      logger.debug(
+      logger.warn(
         `Health Status warn threshold has been exceeded, resultFrequencySummary.Failed (${resultFrequencySummary.Failed}) is greater than warn_threshold (${executionErrorThreshold.warn_threshold})`
       );
     }
diff --git a/x-pack/plugins/task_manager/server/routes/health.test.ts b/x-pack/plugins/task_manager/server/routes/health.test.ts
index 6105b7487163c..c5b9add0ce294 100644
--- a/x-pack/plugins/task_manager/server/routes/health.test.ts
+++ b/x-pack/plugins/task_manager/server/routes/health.test.ts
@@ -15,15 +15,9 @@ import { mockHandlerArguments } from './_mock_handler_arguments';
 import { sleep } from '../test_utils';
 import { elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { usageCountersServiceMock } from '@kbn/usage-collection-plugin/server/usage_counters/usage_counters_service.mock';
-import {
-  HealthStatus,
-  MonitoringStats,
-  RawMonitoringStats,
-  summarizeMonitoringStats,
-} from '../monitoring';
+import { MonitoringStats, RawMonitoringStats, summarizeMonitoringStats } from '../monitoring';
 import { ServiceStatusLevels, Logger } from '@kbn/core/server';
 import { configSchema, TaskManagerConfig } from '../config';
-import { calculateHealthStatusMock } from '../lib/calculate_health_status.mock';
 import { FillPoolResult } from '../lib/fill_pool';
 
 jest.mock('../lib/log_health_metrics', () => ({
@@ -191,8 +185,6 @@ describe('healthRoute', () => {
 
   it('logs the Task Manager stats at a fixed interval', async () => {
     const router = httpServiceMock.createRouter();
-    const calculateHealthStatus = calculateHealthStatusMock.create();
-    calculateHealthStatus.mockImplementation(() => HealthStatus.OK);
     const { logHealthMetrics } = jest.requireMock('../lib/log_health_metrics');
 
     const mockStat = mockHealthStats();
@@ -253,8 +245,6 @@ describe('healthRoute', () => {
 
   it(`logs at a warn level if the status is warning`, async () => {
     const router = httpServiceMock.createRouter();
-    const calculateHealthStatus = calculateHealthStatusMock.create();
-    calculateHealthStatus.mockImplementation(() => HealthStatus.Warning);
     const { logHealthMetrics } = jest.requireMock('../lib/log_health_metrics');
 
     const warnRuntimeStat = mockHealthStats();
@@ -265,7 +255,7 @@ describe('healthRoute', () => {
     const stats$ = new Subject<MonitoringStats>();
 
     const id = uuidv4();
-    healthRoute({
+    const { serviceStatus$ } = healthRoute({
       router,
       monitoringStats$: stats$,
       logger,
@@ -287,6 +277,8 @@ describe('healthRoute', () => {
       docLinks,
     });
 
+    const serviceStatus = getLatest(serviceStatus$);
+
     stats$.next(warnRuntimeStat);
     await sleep(1001);
     stats$.next(warnConfigurationStat);
@@ -295,6 +287,12 @@ describe('healthRoute', () => {
     await sleep(1001);
     stats$.next(warnEphemeralStat);
 
+    expect(await serviceStatus).toMatchObject({
+      level: ServiceStatusLevels.degraded,
+      summary:
+        'Task Manager is unhealthy - Reason: setting HealthStatus.Warning because assumedAverageRecurringRequiredThroughputPerMinutePerKibana (78.28472222222223) < capacityPerMinutePerKibana (200)',
+    });
+
     expect(logHealthMetrics).toBeCalledTimes(4);
     expect(logHealthMetrics.mock.calls[0][0]).toMatchObject({
       id,
@@ -332,8 +330,6 @@ describe('healthRoute', () => {
 
   it(`logs at an error level if the status is error`, async () => {
     const router = httpServiceMock.createRouter();
-    const calculateHealthStatus = calculateHealthStatusMock.create();
-    calculateHealthStatus.mockImplementation(() => HealthStatus.Error);
     const { logHealthMetrics } = jest.requireMock('../lib/log_health_metrics');
 
     const errorRuntimeStat = mockHealthStats();
@@ -344,7 +340,7 @@ describe('healthRoute', () => {
     const stats$ = new Subject<MonitoringStats>();
 
     const id = uuidv4();
-    healthRoute({
+    const { serviceStatus$ } = healthRoute({
       router,
       monitoringStats$: stats$,
       logger,
@@ -366,6 +362,8 @@ describe('healthRoute', () => {
       docLinks,
     });
 
+    const serviceStatus = getLatest(serviceStatus$);
+
     stats$.next(errorRuntimeStat);
     await sleep(1001);
     stats$.next(errorConfigurationStat);
@@ -374,6 +372,12 @@ describe('healthRoute', () => {
     await sleep(1001);
     stats$.next(errorEphemeralStat);
 
+    expect(await serviceStatus).toMatchObject({
+      level: ServiceStatusLevels.degraded,
+      summary:
+        'Task Manager is unhealthy - Reason: setting HealthStatus.Warning because assumedAverageRecurringRequiredThroughputPerMinutePerKibana (78.28472222222223) < capacityPerMinutePerKibana (200)',
+    });
+
     expect(logHealthMetrics).toBeCalledTimes(4);
     expect(logHealthMetrics.mock.calls[0][0]).toMatchObject({
       id,
@@ -481,12 +485,13 @@ describe('healthRoute', () => {
 
     expect(await serviceStatus).toMatchObject({
       level: ServiceStatusLevels.degraded,
-      summary: 'Task Manager is unhealthy',
+      summary:
+        'Task Manager is unhealthy - Reason: setting HealthStatus.Error because of expired hot timestamps',
     });
-    const debugCalls = (logger as jest.Mocked<Logger>).debug.mock.calls as string[][];
+    const warnCalls = (logger as jest.Mocked<Logger>).warn.mock.calls as string[][];
     const warnMessage =
       /^setting HealthStatus.Warning because assumedAverageRecurringRequiredThroughputPerMinutePerKibana/;
-    const found = debugCalls
+    const found = warnCalls
       .map((arr) => arr[0])
       .find((message) => message.match(warnMessage) != null);
     expect(found).toMatch(warnMessage);
@@ -497,7 +502,7 @@ describe('healthRoute', () => {
 
     const stats$ = new Subject<MonitoringStats>();
 
-    healthRoute({
+    const { serviceStatus$ } = healthRoute({
       router,
       monitoringStats$: stats$,
       logger,
@@ -514,6 +519,8 @@ describe('healthRoute', () => {
       docLinks,
     });
 
+    const serviceStatus = getLatest(serviceStatus$);
+
     await sleep(0);
 
     const lastUpdateOfWorkload = new Date(Date.now() - 120000).toISOString();
@@ -533,6 +540,11 @@ describe('healthRoute', () => {
 
     await sleep(2000);
 
+    expect(await serviceStatus).toMatchObject({
+      level: ServiceStatusLevels.degraded,
+      summary:
+        'Task Manager is unhealthy - Reason: setting HealthStatus.Error because of expired cold timestamps',
+    });
     expect(await handler(context, req, res)).toMatchObject({
       body: {
         status: 'error',
@@ -572,7 +584,7 @@ describe('healthRoute', () => {
     const router = httpServiceMock.createRouter();
 
     const stats$ = new Subject<MonitoringStats>();
-    healthRoute({
+    const { serviceStatus$ } = healthRoute({
       router,
       monitoringStats$: stats$,
       logger,
@@ -588,7 +600,7 @@ describe('healthRoute', () => {
       shouldRunTasks: true,
       docLinks,
     });
-
+    const serviceStatus = getLatest(serviceStatus$);
     await sleep(0);
 
     // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -611,6 +623,11 @@ describe('healthRoute', () => {
 
     const [context, req, res] = mockHandlerArguments({}, {}, ['ok']);
 
+    expect(await serviceStatus).toMatchObject({
+      level: ServiceStatusLevels.degraded,
+      summary:
+        'Task Manager is unhealthy - Reason: setting HealthStatus.Error because of expired hot timestamps',
+    });
     expect(await handler(context, req, res)).toMatchObject({
       body: {
         status: 'error',
diff --git a/x-pack/plugins/task_manager/server/routes/health.ts b/x-pack/plugins/task_manager/server/routes/health.ts
index 9ae3cee2bdcf5..7a348147b0b76 100644
--- a/x-pack/plugins/task_manager/server/routes/health.ts
+++ b/x-pack/plugins/task_manager/server/routes/health.ts
@@ -30,6 +30,7 @@ import { calculateHealthStatus } from '../lib/calculate_health_status';
 
 export type MonitoredHealth = RawMonitoringStats & {
   id: string;
+  reason?: string;
   status: HealthStatus;
   timestamp: string;
 };
@@ -87,10 +88,15 @@ export function healthRoute(params: HealthRouteParams): {
 
   function getHealthStatus(monitoredStats: MonitoringStats) {
     const summarizedStats = summarizeMonitoringStats(logger, monitoredStats, config);
-    const status = calculateHealthStatus(summarizedStats, config, shouldRunTasks, logger);
+    const { status, reason } = calculateHealthStatus(
+      summarizedStats,
+      config,
+      shouldRunTasks,
+      logger
+    );
     const now = Date.now();
     const timestamp = new Date(now).toISOString();
-    return { id: taskManagerId, timestamp, status, ...summarizedStats };
+    return { id: taskManagerId, timestamp, status, reason, ...summarizedStats };
   }
 
   const serviceStatus$: Subject<TaskManagerServiceStatus> = new Subject<TaskManagerServiceStatus>();
@@ -106,7 +112,7 @@ export function healthRoute(params: HealthRouteParams): {
       tap((stats) => {
         lastMonitoredStats = stats;
       }),
-      // Only calculate the summerized stats (calculates all runnign averages and evaluates state)
+      // Only calculate the summarized stats (calculates all running averages and evaluates state)
       // when needed by throttling down to the requiredHotStatsFreshness
       map((stats) => withServiceStatus(getHealthStatus(stats)))
     )
@@ -174,15 +180,19 @@ export function healthRoute(params: HealthRouteParams): {
 export function withServiceStatus(
   monitoredHealth: MonitoredHealth
 ): [MonitoredHealth, TaskManagerServiceStatus] {
+  const { reason, status } = monitoredHealth;
+
   const level =
-    monitoredHealth.status === HealthStatus.OK
-      ? ServiceStatusLevels.available
-      : ServiceStatusLevels.degraded;
+    status === HealthStatus.OK ? ServiceStatusLevels.available : ServiceStatusLevels.degraded;
+
+  const defaultMessage = LEVEL_SUMMARY[level.toString()];
+  const summary = reason ? `${defaultMessage} - Reason: ${reason}` : defaultMessage;
+
   return [
     monitoredHealth,
     {
       level,
-      summary: LEVEL_SUMMARY[level.toString()],
+      summary,
     },
   ];
 }

From dfbb97f307e88c8f94b3c6c85edb0efc86754943 Mon Sep 17 00:00:00 2001
From: Stratoula Kalafateli <efstratia.kalafateli@elastic.co>
Date: Tue, 18 Apr 2023 16:02:35 +0300
Subject: [PATCH 023/100] [Inspector] Improve the display when there are many
 columns (#155119)

## Summary

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

Improves the way the inspector table is rendered when there are multiple
columns. I just applied the eui team feedback

**Now**

<img width="1257" alt="image"
src="https://user-images.githubusercontent.com/17003240/232727448-561cd07a-84ec-472f-9968-27631ef9f4f1.png">


**Before**
<img width="875" alt="image"
src="https://user-images.githubusercontent.com/17003240/232727840-24514f38-0a6f-47a3-89ed-adc0bc7ea2f0.png">
---
 .../__snapshots__/data_view.test.tsx.snap       |  8 ++++----
 .../components/data_table.tsx                   | 17 +++++++++++++++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap b/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap
index f65b08fc632bc..0c60d3b0606be 100644
--- a/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap
+++ b/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap
@@ -204,7 +204,7 @@ Array [
     class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
   />,
   <div
-    class="euiBasicTable insDataTableFormat__table"
+    class="euiBasicTable insDataTableFormat__table eui-xScroll css-1f59z3t"
     data-test-subj="inspectorTable"
   >
     <div>
@@ -255,7 +255,7 @@ Array [
         </div>
       </div>
       <table
-        class="euiTable css-0 euiTable--responsive"
+        class="euiTable css-0 euiTable--responsive euiTable--auto"
         id="__table_generated-id"
         tabindex="-1"
       >
@@ -546,7 +546,7 @@ Array [
     class="euiSpacer euiSpacer--s emotion-euiSpacer-s"
   />,
   <div
-    class="euiBasicTable insDataTableFormat__table"
+    class="euiBasicTable insDataTableFormat__table eui-xScroll css-1f59z3t"
     data-test-subj="inspectorTable"
   >
     <div>
@@ -597,7 +597,7 @@ Array [
         </div>
       </div>
       <table
-        class="euiTable css-0 euiTable--responsive"
+        class="euiTable css-0 euiTable--responsive euiTable--auto"
         id="__table_generated-id"
         tabindex="-1"
       >
diff --git a/src/plugins/data/public/utils/table_inspector_view/components/data_table.tsx b/src/plugins/data/public/utils/table_inspector_view/components/data_table.tsx
index 307c074ce5c6f..3deee5fe0bda9 100644
--- a/src/plugins/data/public/utils/table_inspector_view/components/data_table.tsx
+++ b/src/plugins/data/public/utils/table_inspector_view/components/data_table.tsx
@@ -8,7 +8,7 @@
 
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-
+import { css } from '@emotion/react';
 import {
   EuiButtonIcon,
   EuiFlexGroup,
@@ -192,12 +192,25 @@ export class DataTableFormat extends Component<DataTableFormatProps, DataTableFo
 
     return (
       <EuiInMemoryTable
-        className="insDataTableFormat__table"
+        tableLayout="auto"
+        className="insDataTableFormat__table eui-xScroll"
         data-test-subj="inspectorTable"
         columns={columns}
         items={rows}
         sorting={true}
         pagination={pagination}
+        css={css`
+          // Set a min width on each column - you can use [data-test-subj] to target specific columns
+          .euiTableHeaderCell {
+            min-width: 100px;
+          }
+
+          // Make sure the pagination follows the scroll
+          > div:last-child {
+            position: sticky;
+            left: 0;
+          }
+        `}
       />
     );
   }

From c9c31afd8d88d7f0c05831bcd8788a5629e2c1e0 Mon Sep 17 00:00:00 2001
From: Kevin Delemme <kevin.delemme@elastic.co>
Date: Tue, 18 Apr 2023 09:11:33 -0400
Subject: [PATCH 024/100] chore(slo): improve slo list summary alignment
 (#154932)

---
 .../observability/public/data/slo/common.ts   | 16 ++++-----
 .../pages/slos/components/slo_sparkline.tsx   | 20 ++++++++---
 .../pages/slos/components/slo_summary.tsx     | 35 ++++++++++++++-----
 .../kibana_react.storybook_decorator.tsx      |  1 +
 4 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/x-pack/plugins/observability/public/data/slo/common.ts b/x-pack/plugins/observability/public/data/slo/common.ts
index 3c0e1b7e49408..ae25d150f350b 100644
--- a/x-pack/plugins/observability/public/data/slo/common.ts
+++ b/x-pack/plugins/observability/public/data/slo/common.ts
@@ -35,8 +35,8 @@ export const buildHealthySummary = (
     sliValue: 0.99872,
     errorBudget: {
       initial: 0.02,
-      consumed: 0.064,
-      remaining: 0.936,
+      consumed: 0.0642,
+      remaining: 0.93623,
       isEstimated: false,
     },
     ...params,
@@ -48,11 +48,11 @@ export const buildViolatedSummary = (
 ): SLOWithSummaryResponse['summary'] => {
   return {
     status: 'VIOLATED',
-    sliValue: 0.97,
+    sliValue: 0.81232,
     errorBudget: {
       initial: 0.02,
       consumed: 1,
-      remaining: 0,
+      remaining: -3.1234,
       isEstimated: false,
     },
     ...params,
@@ -80,11 +80,11 @@ export const buildDegradingSummary = (
 ): SLOWithSummaryResponse['summary'] => {
   return {
     status: 'DEGRADING',
-    sliValue: 0.97,
+    sliValue: 0.97982,
     errorBudget: {
-      initial: 0.02,
-      consumed: 0.88,
-      remaining: 0.12,
+      initial: 0.01,
+      consumed: 0.8822,
+      remaining: 0.1244,
       isEstimated: true,
     },
     ...params,
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 4f34ea594ddee..8b3586554abf8 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { AreaSeries, Chart, Fit, LineSeries, ScaleType, Settings } from '@elastic/charts';
+import { AreaSeries, Axis, Chart, Fit, LineSeries, ScaleType, Settings } from '@elastic/charts';
 import React from 'react';
 import { EuiLoadingChart, useEuiTheme } from '@elastic/eui';
 import { EUI_SPARKLINE_THEME_PARTIAL } from '@elastic/eui/dist/eui_charts_theme';
@@ -36,28 +36,38 @@ export function SloSparkline({ chart, data, id, isLoading, state }: Props) {
 
   const color = state === 'error' ? euiTheme.colors.danger : euiTheme.colors.success;
   const ChartComponent = chart === 'area' ? AreaSeries : LineSeries;
+  const LineAxisComponent =
+    chart === 'line' ? (
+      <Axis
+        id="axis"
+        hide
+        domain={{
+          min: 0,
+          max: 1,
+        }}
+        showGridLines={false}
+      />
+    ) : null;
 
   if (isLoading) {
     return <EuiLoadingChart size="m" mono />;
   }
 
   return (
-    <Chart size={{ height: 28, width: 80 }}>
+    <Chart size={{ height: 28, width: 60 }}>
       <Settings
         baseTheme={baseTheme}
         showLegend={false}
         theme={[theme, EUI_SPARKLINE_THEME_PARTIAL]}
         tooltip="none"
       />
+      {LineAxisComponent}
       <ChartComponent
         color={color}
         data={data}
         fit={Fit.Nearest}
         id={id}
         lineSeriesStyle={{
-          line: {
-            strokeWidth: 1,
-          },
           point: { visible: false },
         }}
         xAccessor={'key'}
diff --git a/x-pack/plugins/observability/public/pages/slos/components/slo_summary.tsx b/x-pack/plugins/observability/public/pages/slos/components/slo_summary.tsx
index 5bd7bc7160e64..491eb2e8bc09c 100644
--- a/x-pack/plugins/observability/public/pages/slos/components/slo_summary.tsx
+++ b/x-pack/plugins/observability/public/pages/slos/components/slo_summary.tsx
@@ -29,11 +29,22 @@ export function SloSummary({ slo, historicalSummary = [], historicalSummaryLoadi
   const errorBudgetBurnDownData = formatHistoricalData(historicalSummary, 'error_budget_remaining');
   const historicalSliData = formatHistoricalData(historicalSummary, 'sli_value');
 
+  const errorBudgetRemaining =
+    slo.summary.errorBudget.remaining <= 0
+      ? Math.trunc(slo.summary.errorBudget.remaining * 100) / 100
+      : slo.summary.errorBudget.remaining;
+
   return (
-    <EuiFlexGroup direction="row" justifyContent="spaceBetween" gutterSize="xl">
-      <EuiFlexItem grow={false} style={{ width: 220 }}>
-        <EuiFlexGroup direction="row" responsive={false} gutterSize="xs" alignItems="center">
-          <EuiFlexItem grow={false} style={{ width: 140 }}>
+    <EuiFlexGroup direction="row" justifyContent="spaceBetween" gutterSize="l" responsive={false}>
+      <EuiFlexItem grow={false} style={{ width: 200 }}>
+        <EuiFlexGroup
+          direction="row"
+          responsive={false}
+          gutterSize="s"
+          alignItems="center"
+          justifyContent="flexEnd"
+        >
+          <EuiFlexItem grow={false}>
             <EuiStat
               description={i18n.translate('xpack.observability.slo.slo.stats.objective', {
                 defaultMessage: '{objective} target',
@@ -44,6 +55,7 @@ export function SloSummary({ slo, historicalSummary = [], historicalSummaryLoadi
                   ? NOT_AVAILABLE_LABEL
                   : numeral(slo.summary.sliValue).format(percentFormat)
               }
+              textAlign="right"
               titleColor={titleColor}
               titleSize="m"
               reverse
@@ -61,14 +73,21 @@ export function SloSummary({ slo, historicalSummary = [], historicalSummaryLoadi
         </EuiFlexGroup>
       </EuiFlexItem>
 
-      <EuiFlexItem grow={false} style={{ width: 260 }}>
-        <EuiFlexGroup direction="row" responsive={false} gutterSize="xs" alignItems="center">
-          <EuiFlexItem grow={false} style={{ width: 180 }}>
+      <EuiFlexItem grow={false} style={{ width: 220 }}>
+        <EuiFlexGroup
+          direction="row"
+          responsive={false}
+          gutterSize="s"
+          alignItems="center"
+          justifyContent="flexEnd"
+        >
+          <EuiFlexItem grow={false}>
             <EuiStat
               description={i18n.translate('xpack.observability.slo.slo.stats.budgetRemaining', {
                 defaultMessage: 'Budget remaining',
               })}
-              title={numeral(slo.summary.errorBudget.remaining).format(percentFormat)}
+              textAlign="right"
+              title={numeral(errorBudgetRemaining).format(percentFormat)}
               titleColor={titleColor}
               titleSize="m"
               reverse
diff --git a/x-pack/plugins/observability/public/utils/kibana_react.storybook_decorator.tsx b/x-pack/plugins/observability/public/utils/kibana_react.storybook_decorator.tsx
index 60e55fbd56747..5a562958cb299 100644
--- a/x-pack/plugins/observability/public/utils/kibana_react.storybook_decorator.tsx
+++ b/x-pack/plugins/observability/public/utils/kibana_react.storybook_decorator.tsx
@@ -91,6 +91,7 @@ export function KibanaReactStorybookDecorator(Story: ComponentType) {
         theme: {
           theme$: createTheme$Mock(),
         },
+        triggersActionsUi: { getAddRuleFlyout: {} },
         uiSettings: {
           get: (setting: string) => {
             if (setting === 'dateFormat') {

From 5b1b15af7a9cd478652d996f5e1648ea5cfd4f43 Mon Sep 17 00:00:00 2001
From: Walter Rafelsberger <walter.rafelsberger@elastic.co>
Date: Tue, 18 Apr 2023 15:17:49 +0200
Subject: [PATCH 025/100] [ML] AIOps: Fix race condition where stale url state
 would reset search bar. (#154885)

Fixes an issue there the global state `_g` and app state `_a` would get
out of sync and overwrite each other. For example, a click on Refresh in
the date picker (global state) could reset the search bar (app state) to
empty.

The issue was that in `x-pack/packages/ml/url_state/src/url_state.tsx`
the `searchString` could become a stale value in `setUrlState`. This PR
fixes it by using the approach already used in `usePageUrlState`: The
`searchString` is passed on to be stored via `useRef` so that the
`setUrlState` setter can always access the most recent value.
---
 .../ml/url_state/src/url_state.test.tsx       | 118 +++++++++++++-----
 .../packages/ml/url_state/src/url_state.tsx   |  15 ++-
 x-pack/plugins/aiops/public/hooks/use_data.ts |  52 ++++----
 .../apps/aiops/explain_log_rate_spikes.ts     |  50 +++++---
 .../test/functional/apps/aiops/test_data.ts   |  21 +++-
 x-pack/test/functional/apps/aiops/types.ts    |  43 +++++--
 .../aiops/explain_log_rate_spikes_page.ts     |  32 ++++-
 7 files changed, 236 insertions(+), 95 deletions(-)

diff --git a/x-pack/packages/ml/url_state/src/url_state.test.tsx b/x-pack/packages/ml/url_state/src/url_state.test.tsx
index 734c730dd91ba..033ecd77fadf4 100644
--- a/x-pack/packages/ml/url_state/src/url_state.test.tsx
+++ b/x-pack/packages/ml/url_state/src/url_state.test.tsx
@@ -5,29 +5,18 @@
  * 2.0.
  */
 
-import React, { FC } from 'react';
+import React, { useEffect, type FC } from 'react';
 import { render, act } from '@testing-library/react';
-import { parseUrlState, useUrlState, UrlStateProvider } from './url_state';
+import { MemoryRouter } from 'react-router-dom';
 
-const mockHistoryPush = jest.fn();
+import { parseUrlState, useUrlState, UrlStateProvider } from './url_state';
 
-jest.mock('react-router-dom', () => ({
-  useHistory: () => ({
-    push: mockHistoryPush,
-  }),
-  useLocation: () => ({
-    search:
-      "?_a=(mlExplorerFilter:(),mlExplorerSwimlane:(viewByFieldName:action),query:(query_string:(analyze_wildcard:!t,query:'*')))&_g=(ml:(jobIds:!(dec-2)),refreshInterval:(display:Off,pause:!f,value:0),time:(from:'2019-01-01T00:03:40.000Z',mode:absolute,to:'2019-08-30T11:55:07.000Z'))&savedSearchId=571aaf70-4c88-11e8-b3d7-01146121b73d",
-  }),
-}));
+const mockHistoryInitialState =
+  "?_a=(mlExplorerFilter:(),mlExplorerSwimlane:(viewByFieldName:action),query:(query_string:(analyze_wildcard:!t,query:'*')))&_g=(ml:(jobIds:!(dec-2)),refreshInterval:(display:Off,pause:!f,value:0),time:(from:'2019-01-01T00:03:40.000Z',mode:absolute,to:'2019-08-30T11:55:07.000Z'))&savedSearchId=571aaf70-4c88-11e8-b3d7-01146121b73d";
 
 describe('getUrlState', () => {
   test('properly decode url with _g and _a', () => {
-    expect(
-      parseUrlState(
-        "?_a=(mlExplorerFilter:(),mlExplorerSwimlane:(viewByFieldName:action),query:(query_string:(analyze_wildcard:!t,query:'*')))&_g=(ml:(jobIds:!(dec-2)),refreshInterval:(display:Off,pause:!t,value:0),time:(from:'2019-01-01T00:03:40.000Z',mode:absolute,to:'2019-08-30T11:55:07.000Z'))&savedSearchId=571aaf70-4c88-11e8-b3d7-01146121b73d"
-      )
-    ).toEqual({
+    expect(parseUrlState(mockHistoryInitialState)).toEqual({
       _a: {
         mlExplorerFilter: {},
         mlExplorerSwimlane: {
@@ -46,7 +35,7 @@ describe('getUrlState', () => {
         },
         refreshInterval: {
           display: 'Off',
-          pause: true,
+          pause: false,
           value: 0,
         },
         time: {
@@ -61,29 +50,96 @@ describe('getUrlState', () => {
 });
 
 describe('useUrlState', () => {
-  beforeEach(() => {
-    mockHistoryPush.mockClear();
+  it('pushes a properly encoded search string to history', () => {
+    const TestComponent: FC = () => {
+      const [appState, setAppState] = useUrlState('_a');
+
+      useEffect(() => {
+        setAppState(parseUrlState(mockHistoryInitialState)._a);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+      }, []);
+
+      return (
+        <>
+          <button onClick={() => setAppState({ query: 'my-query' })}>ButtonText</button>
+          <div data-test-subj="appState">{JSON.stringify(appState?.query)}</div>
+        </>
+      );
+    };
+
+    const { getByText, getByTestId } = render(
+      <MemoryRouter>
+        <UrlStateProvider>
+          <TestComponent />
+        </UrlStateProvider>
+      </MemoryRouter>
+    );
+
+    expect(getByTestId('appState').innerHTML).toBe(
+      '{"query_string":{"analyze_wildcard":true,"query":"*"}}'
+    );
+
+    act(() => {
+      getByText('ButtonText').click();
+    });
+
+    expect(getByTestId('appState').innerHTML).toBe('"my-query"');
   });
 
-  test('pushes a properly encoded search string to history', () => {
+  it('updates both _g and _a state successfully', () => {
     const TestComponent: FC = () => {
-      const [, setUrlState] = useUrlState('_a');
-      return <button onClick={() => setUrlState({ query: {} })}>ButtonText</button>;
+      const [globalState, setGlobalState] = useUrlState('_g');
+      const [appState, setAppState] = useUrlState('_a');
+
+      useEffect(() => {
+        setGlobalState({ time: 'initial time' });
+        setAppState({ query: 'initial query' });
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+      }, []);
+
+      return (
+        <>
+          <button onClick={() => setGlobalState({ time: 'now-15m' })}>GlobalStateButton1</button>
+          <button onClick={() => setGlobalState({ time: 'now-5y' })}>GlobalStateButton2</button>
+          <button onClick={() => setAppState({ query: 'the updated query' })}>
+            AppStateButton
+          </button>
+          <div data-test-subj="globalState">{globalState?.time}</div>
+          <div data-test-subj="appState">{appState?.query}</div>
+        </>
+      );
     };
 
-    const { getByText } = render(
-      <UrlStateProvider>
-        <TestComponent />
-      </UrlStateProvider>
+    const { getByText, getByTestId } = render(
+      <MemoryRouter>
+        <UrlStateProvider>
+          <TestComponent />
+        </UrlStateProvider>
+      </MemoryRouter>
     );
 
+    expect(getByTestId('globalState').innerHTML).toBe('initial time');
+    expect(getByTestId('appState').innerHTML).toBe('initial query');
+
     act(() => {
-      getByText('ButtonText').click();
+      getByText('GlobalStateButton1').click();
     });
 
-    expect(mockHistoryPush).toHaveBeenCalledWith({
-      search:
-        '_a=%28mlExplorerFilter%3A%28%29%2CmlExplorerSwimlane%3A%28viewByFieldName%3Aaction%29%2Cquery%3A%28%29%29&_g=%28ml%3A%28jobIds%3A%21%28dec-2%29%29%2CrefreshInterval%3A%28display%3AOff%2Cpause%3A%21f%2Cvalue%3A0%29%2Ctime%3A%28from%3A%272019-01-01T00%3A03%3A40.000Z%27%2Cmode%3Aabsolute%2Cto%3A%272019-08-30T11%3A55%3A07.000Z%27%29%29&savedSearchId=571aaf70-4c88-11e8-b3d7-01146121b73d',
+    expect(getByTestId('globalState').innerHTML).toBe('now-15m');
+    expect(getByTestId('appState').innerHTML).toBe('initial query');
+
+    act(() => {
+      getByText('AppStateButton').click();
+    });
+
+    expect(getByTestId('globalState').innerHTML).toBe('now-15m');
+    expect(getByTestId('appState').innerHTML).toBe('the updated query');
+
+    act(() => {
+      getByText('GlobalStateButton2').click();
     });
+
+    expect(getByTestId('globalState').innerHTML).toBe('now-5y');
+    expect(getByTestId('appState').innerHTML).toBe('the updated query');
   });
 });
diff --git a/x-pack/packages/ml/url_state/src/url_state.tsx b/x-pack/packages/ml/url_state/src/url_state.tsx
index d643a22bde6e4..bd62e1f61029a 100644
--- a/x-pack/packages/ml/url_state/src/url_state.tsx
+++ b/x-pack/packages/ml/url_state/src/url_state.tsx
@@ -94,6 +94,12 @@ export const UrlStateProvider: FC = ({ children }) => {
   const history = useHistory();
   const { search: searchString } = useLocation();
 
+  const searchStringRef = useRef<string>(searchString);
+
+  useEffect(() => {
+    searchStringRef.current = searchString;
+  }, [searchString]);
+
   const setUrlState: SetUrlState = useCallback(
     (
       accessor: Accessor,
@@ -101,7 +107,8 @@ export const UrlStateProvider: FC = ({ children }) => {
       value?: any,
       replaceState?: boolean
     ) => {
-      const prevSearchString = searchString;
+      const prevSearchString = searchStringRef.current;
+
       const urlState = parseUrlState(prevSearchString);
       const parsedQueryString = parse(prevSearchString, { sort: false });
 
@@ -142,6 +149,10 @@ export const UrlStateProvider: FC = ({ children }) => {
 
         if (oldLocationSearchString !== newLocationSearchString) {
           const newSearchString = stringify(parsedQueryString, { sort: false });
+          // Another `setUrlState` call could happen before the updated
+          // `searchString` gets propagated via `useLocation` therefore
+          // we update the ref right away too.
+          searchStringRef.current = newSearchString;
           if (replaceState) {
             history.replace({ search: newSearchString });
           } else {
@@ -154,7 +165,7 @@ export const UrlStateProvider: FC = ({ children }) => {
       }
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [searchString]
+    []
   );
 
   return <Provider value={{ searchString, setUrlState }}>{children}</Provider>;
diff --git a/x-pack/plugins/aiops/public/hooks/use_data.ts b/x-pack/plugins/aiops/public/hooks/use_data.ts
index 3546cead3edab..82db675a94c4f 100644
--- a/x-pack/plugins/aiops/public/hooks/use_data.ts
+++ b/x-pack/plugins/aiops/public/hooks/use_data.ts
@@ -45,9 +45,6 @@ export const useData = (
   } = useAiopsAppContext();
 
   const [lastRefresh, setLastRefresh] = useState(0);
-  const [fieldStatsRequest, setFieldStatsRequest] = useState<
-    DocumentStatsSearchStrategyParams | undefined
-  >();
 
   /** Prepare required params to pass to search strategy **/
   const { searchQueryLanguage, searchString, searchQuery } = useMemo(() => {
@@ -91,12 +88,30 @@ export const useData = (
   ]);
 
   const _timeBuckets = useTimeBuckets();
-
   const timefilter = useTimefilter({
     timeRangeSelector: selectedDataView?.timeFieldName !== undefined,
     autoRefreshSelector: true,
   });
 
+  const fieldStatsRequest: DocumentStatsSearchStrategyParams | undefined = useMemo(() => {
+    const timefilterActiveBounds = timefilter.getActiveBounds();
+    if (timefilterActiveBounds !== undefined) {
+      _timeBuckets.setInterval('auto');
+      _timeBuckets.setBounds(timefilterActiveBounds);
+      _timeBuckets.setBarTarget(barTarget);
+      return {
+        earliest: timefilterActiveBounds.min?.valueOf(),
+        latest: timefilterActiveBounds.max?.valueOf(),
+        intervalMs: _timeBuckets.getInterval()?.asMilliseconds(),
+        index: selectedDataView.getIndexPattern(),
+        searchQuery,
+        timeFieldName: selectedDataView.timeFieldName,
+        runtimeFieldMap: selectedDataView.getRuntimeMappings(),
+      };
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [lastRefresh, searchQuery]);
+
   const overallStatsRequest = useMemo(() => {
     return fieldStatsRequest
       ? {
@@ -125,25 +140,6 @@ export const useData = (
     lastRefresh
   );
 
-  function updateFieldStatsRequest() {
-    const timefilterActiveBounds = timefilter.getActiveBounds();
-    if (timefilterActiveBounds !== undefined) {
-      _timeBuckets.setInterval('auto');
-      _timeBuckets.setBounds(timefilterActiveBounds);
-      _timeBuckets.setBarTarget(barTarget);
-      setFieldStatsRequest({
-        earliest: timefilterActiveBounds.min?.valueOf(),
-        latest: timefilterActiveBounds.max?.valueOf(),
-        intervalMs: _timeBuckets.getInterval()?.asMilliseconds(),
-        index: selectedDataView.getIndexPattern(),
-        searchQuery,
-        timeFieldName: selectedDataView.timeFieldName,
-        runtimeFieldMap: selectedDataView.getRuntimeMappings(),
-      });
-      setLastRefresh(Date.now());
-    }
-  }
-
   useEffect(() => {
     const timefilterUpdateSubscription = merge(
       timefilter.getAutoRefreshFetch$(),
@@ -156,13 +152,13 @@ export const useData = (
           refreshInterval: timefilter.getRefreshInterval(),
         });
       }
-      updateFieldStatsRequest();
+      setLastRefresh(Date.now());
     });
 
     // This listens just for an initial update of the timefilter to be switched on.
     const timefilterEnabledSubscription = timefilter.getEnabledUpdated$().subscribe(() => {
       if (fieldStatsRequest === undefined) {
-        updateFieldStatsRequest();
+        setLastRefresh(Date.now());
       }
     });
 
@@ -173,12 +169,6 @@ export const useData = (
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
-  // Ensure request is updated when search changes
-  useEffect(() => {
-    updateFieldStatsRequest();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [searchString, JSON.stringify(searchQuery)]);
-
   return {
     documentStats,
     timefilter,
diff --git a/x-pack/test/functional/apps/aiops/explain_log_rate_spikes.ts b/x-pack/test/functional/apps/aiops/explain_log_rate_spikes.ts
index d34169b05a408..92320dad62087 100644
--- a/x-pack/test/functional/apps/aiops/explain_log_rate_spikes.ts
+++ b/x-pack/test/functional/apps/aiops/explain_log_rate_spikes.ts
@@ -10,7 +10,7 @@ import { orderBy } from 'lodash';
 import expect from '@kbn/expect';
 
 import type { FtrProviderContext } from '../../ftr_provider_context';
-import type { TestData } from './types';
+import { isTestDataExpectedWithSampleProbability, type TestData } from './types';
 import { explainLogRateSpikesTestData } from './test_data';
 
 export default function ({ getPageObject, getService }: FtrProviderContext) {
@@ -43,9 +43,21 @@ export default function ({ getPageObject, getService }: FtrProviderContext) {
       await aiops.explainLogRateSpikesPage.assertTimeRangeSelectorSectionExists();
 
       await ml.testExecution.logTestStep(`${testData.suiteTitle} loads data for full time range`);
+      if (testData.query) {
+        await aiops.explainLogRateSpikesPage.setQueryInput(testData.query);
+      }
       await aiops.explainLogRateSpikesPage.clickUseFullDataButton(
         testData.expected.totalDocCountFormatted
       );
+
+      if (isTestDataExpectedWithSampleProbability(testData.expected)) {
+        await aiops.explainLogRateSpikesPage.assertSamplingProbability(
+          testData.expected.sampleProbabilityFormatted
+        );
+      } else {
+        await aiops.explainLogRateSpikesPage.assertSamplingProbabilityMissing();
+      }
+
       await headerPage.waitUntilLoadingHasFinished();
 
       await ml.testExecution.logTestStep(
@@ -147,21 +159,24 @@ export default function ({ getPageObject, getService }: FtrProviderContext) {
 
       await aiops.explainLogRateSpikesAnalysisGroupsTable.assertSpikeAnalysisTableExists();
 
-      const analysisGroupsTable =
-        await aiops.explainLogRateSpikesAnalysisGroupsTable.parseAnalysisTable();
-
-      expect(orderBy(analysisGroupsTable, 'group')).to.be.eql(
-        orderBy(testData.expected.analysisGroupsTable, 'group')
-      );
+      if (!isTestDataExpectedWithSampleProbability(testData.expected)) {
+        const analysisGroupsTable =
+          await aiops.explainLogRateSpikesAnalysisGroupsTable.parseAnalysisTable();
+        expect(orderBy(analysisGroupsTable, 'group')).to.be.eql(
+          orderBy(testData.expected.analysisGroupsTable, 'group')
+        );
+      }
 
       await ml.testExecution.logTestStep('expand table row');
       await aiops.explainLogRateSpikesAnalysisGroupsTable.assertExpandRowButtonExists();
       await aiops.explainLogRateSpikesAnalysisGroupsTable.expandRow();
 
-      const analysisTable = await aiops.explainLogRateSpikesAnalysisTable.parseAnalysisTable();
-      expect(orderBy(analysisTable, ['fieldName', 'fieldValue'])).to.be.eql(
-        orderBy(testData.expected.analysisTable, ['fieldName', 'fieldValue'])
-      );
+      if (!isTestDataExpectedWithSampleProbability(testData.expected)) {
+        const analysisTable = await aiops.explainLogRateSpikesAnalysisTable.parseAnalysisTable();
+        expect(orderBy(analysisTable, ['fieldName', 'fieldValue'])).to.be.eql(
+          orderBy(testData.expected.analysisTable, ['fieldName', 'fieldValue'])
+        );
+      }
 
       // Assert the field selector that allows to costumize grouping
       await aiops.explainLogRateSpikesPage.assertFieldFilterPopoverButtonExists(false);
@@ -182,11 +197,14 @@ export default function ({ getPageObject, getService }: FtrProviderContext) {
 
       if (testData.fieldSelectorApplyAvailable) {
         await aiops.explainLogRateSpikesPage.clickFieldFilterApplyButton();
-        const filteredAnalysisGroupsTable =
-          await aiops.explainLogRateSpikesAnalysisGroupsTable.parseAnalysisTable();
-        expect(orderBy(filteredAnalysisGroupsTable, 'group')).to.be.eql(
-          orderBy(testData.expected.filteredAnalysisGroupsTable, 'group')
-        );
+
+        if (!isTestDataExpectedWithSampleProbability(testData.expected)) {
+          const filteredAnalysisGroupsTable =
+            await aiops.explainLogRateSpikesAnalysisGroupsTable.parseAnalysisTable();
+          expect(orderBy(filteredAnalysisGroupsTable, 'group')).to.be.eql(
+            orderBy(testData.expected.filteredAnalysisGroupsTable, 'group')
+          );
+        }
       }
     });
   }
diff --git a/x-pack/test/functional/apps/aiops/test_data.ts b/x-pack/test/functional/apps/aiops/test_data.ts
index 1ccc441618bdb..b6d3293aeba81 100644
--- a/x-pack/test/functional/apps/aiops/test_data.ts
+++ b/x-pack/test/functional/apps/aiops/test_data.ts
@@ -19,6 +19,24 @@ export const farequoteDataViewTestData: TestData = {
   fieldSelectorApplyAvailable: false,
   expected: {
     totalDocCountFormatted: '86,374',
+    sampleProbabilityFormatted: '0.5',
+    fieldSelectorPopover: ['airline', 'custom_field.keyword'],
+  },
+};
+
+export const farequoteDataViewTestDataWithQuery: TestData = {
+  suiteTitle: 'farequote with spike',
+  dataGenerator: 'farequote_with_spike',
+  isSavedSearch: false,
+  sourceIndexOrSavedSearch: 'ft_farequote',
+  brushDeviationTargetTimestamp: 1455033600000,
+  brushIntervalFactor: 1,
+  chartClickCoordinates: [0, 0],
+  fieldSelectorSearch: 'airline',
+  fieldSelectorApplyAvailable: false,
+  query: 'NOT airline:("SWR" OR "ACA" OR "AWE" OR "BAW" OR "JAL" OR "JBU" OR "JZA" OR "KLM")',
+  expected: {
+    totalDocCountFormatted: '48,799',
     analysisGroupsTable: [
       {
         docCount: '297',
@@ -34,7 +52,7 @@ export const farequoteDataViewTestData: TestData = {
         fieldName: 'airline',
         fieldValue: 'AAL',
         logRate: 'Chart type:bar chart',
-        pValue: '4.66e-11',
+        pValue: '1.18e-8',
         impact: 'High',
       },
     ],
@@ -105,5 +123,6 @@ export const artificialLogDataViewTestData: TestData = {
 
 export const explainLogRateSpikesTestData: TestData[] = [
   farequoteDataViewTestData,
+  farequoteDataViewTestDataWithQuery,
   artificialLogDataViewTestData,
 ];
diff --git a/x-pack/test/functional/apps/aiops/types.ts b/x-pack/test/functional/apps/aiops/types.ts
index 7a758aa4a65ff..01733a8e1a2af 100644
--- a/x-pack/test/functional/apps/aiops/types.ts
+++ b/x-pack/test/functional/apps/aiops/types.ts
@@ -5,6 +5,34 @@
  * 2.0.
  */
 
+import { isPopulatedObject } from '@kbn/ml-is-populated-object';
+
+interface TestDataExpectedWithSampleProbability {
+  totalDocCountFormatted: string;
+  sampleProbabilityFormatted: string;
+  fieldSelectorPopover: string[];
+}
+
+export function isTestDataExpectedWithSampleProbability(
+  arg: unknown
+): arg is TestDataExpectedWithSampleProbability {
+  return isPopulatedObject(arg, ['sampleProbabilityFormatted']);
+}
+
+interface TestDataExpectedWithoutSampleProbability {
+  totalDocCountFormatted: string;
+  analysisGroupsTable: Array<{ group: string; docCount: string }>;
+  filteredAnalysisGroupsTable?: Array<{ group: string; docCount: string }>;
+  analysisTable: Array<{
+    fieldName: string;
+    fieldValue: string;
+    logRate: string;
+    pValue: string;
+    impact: string;
+  }>;
+  fieldSelectorPopover: string[];
+}
+
 export interface TestData {
   suiteTitle: string;
   dataGenerator: string;
@@ -17,17 +45,6 @@ export interface TestData {
   chartClickCoordinates: [number, number];
   fieldSelectorSearch: string;
   fieldSelectorApplyAvailable: boolean;
-  expected: {
-    totalDocCountFormatted: string;
-    analysisGroupsTable: Array<{ group: string; docCount: string }>;
-    filteredAnalysisGroupsTable?: Array<{ group: string; docCount: string }>;
-    analysisTable: Array<{
-      fieldName: string;
-      fieldValue: string;
-      logRate: string;
-      pValue: string;
-      impact: string;
-    }>;
-    fieldSelectorPopover: string[];
-  };
+  query?: string;
+  expected: TestDataExpectedWithSampleProbability | TestDataExpectedWithoutSampleProbability;
 }
diff --git a/x-pack/test/functional/services/aiops/explain_log_rate_spikes_page.ts b/x-pack/test/functional/services/aiops/explain_log_rate_spikes_page.ts
index 3a921a74ee359..3da9ed7c760b7 100644
--- a/x-pack/test/functional/services/aiops/explain_log_rate_spikes_page.ts
+++ b/x-pack/test/functional/services/aiops/explain_log_rate_spikes_page.ts
@@ -9,12 +9,16 @@ import expect from '@kbn/expect';
 
 import type { FtrProviderContext } from '../../ftr_provider_context';
 
-export function ExplainLogRateSpikesPageProvider({ getService }: FtrProviderContext) {
+export function ExplainLogRateSpikesPageProvider({
+  getService,
+  getPageObject,
+}: FtrProviderContext) {
   const browser = getService('browser');
   const elasticChart = getService('elasticChart');
   const ml = getService('ml');
   const testSubjects = getService('testSubjects');
   const retry = getService('retry');
+  const header = getPageObject('header');
 
   return {
     async assertTimeRangeSelectorSectionExists() {
@@ -31,6 +35,32 @@ export function ExplainLogRateSpikesPageProvider({ getService }: FtrProviderCont
       });
     },
 
+    async assertSamplingProbability(expectedFormattedSamplingProbability: string) {
+      await retry.tryForTime(5000, async () => {
+        const samplingProbability = await testSubjects.getVisibleText('aiopsSamplingProbability');
+        expect(samplingProbability).to.eql(
+          expectedFormattedSamplingProbability,
+          `Expected total document count to be '${expectedFormattedSamplingProbability}' (got '${samplingProbability}')`
+        );
+      });
+    },
+
+    async setQueryInput(query: string) {
+      const aiopsQueryInput = await testSubjects.find('aiopsQueryInput');
+      await aiopsQueryInput.type(query);
+      await aiopsQueryInput.pressKeys(browser.keys.ENTER);
+      await header.waitUntilLoadingHasFinished();
+      const queryBarText = await aiopsQueryInput.getVisibleText();
+      expect(queryBarText).to.eql(
+        query,
+        `Expected query bar text to be '${query}' (got '${queryBarText}')`
+      );
+    },
+
+    async assertSamplingProbabilityMissing() {
+      await testSubjects.missingOrFail('aiopsSamplingProbability');
+    },
+
     async clickUseFullDataButton(expectedFormattedTotalDocCount: string) {
       await retry.tryForTime(30 * 1000, async () => {
         await testSubjects.clickWhenNotDisabledWithoutRetry('mlDatePickerButtonUseFullData');

From ebe278490f43152e93f7bf300a1cf65878504891 Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@elastic.co>
Date: Tue, 18 Apr 2023 07:33:15 -0600
Subject: [PATCH 026/100] [reporting] show loading state when creating a
 reporting job (#154939)

<img width="200" alt="Screen Shot 2023-04-13 at 12 04 26 PM"
src="https://user-images.githubusercontent.com/373691/231845867-303fe34d-5032-49cf-8408-dc7b7725e6e8.png">


### Steps to test
* Load your favorite sample data set and open its dashboard
* Click "Share" and then click "PDF Reports"
* Open browser devtools and open network tab. Turn on network throttling
to better see loading state
* Click "Generate PDF". Notice how button now gives feedback its clicked
and something is happening. Before, button would not show loading state
and users are confused into thinking nothing is happening.

---------

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../reporting_panel_content.tsx                     | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content/reporting_panel_content.tsx b/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content/reporting_panel_content.tsx
index 9102802f5d79e..6ac0e374b3919 100644
--- a/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content/reporting_panel_content.tsx
+++ b/x-pack/plugins/reporting/public/share_context_menu/reporting_panel_content/reporting_panel_content.tsx
@@ -62,6 +62,7 @@ interface State {
   absoluteUrl: string;
   layoutId: string;
   objectType: string;
+  isCreatingReportJob: boolean;
 }
 
 class ReportingPanelContentUi extends Component<Props, State> {
@@ -78,6 +79,7 @@ class ReportingPanelContentUi extends Component<Props, State> {
       absoluteUrl: this.getAbsoluteReportGenerationUrl(props),
       layoutId: '',
       objectType,
+      isCreatingReportJob: false,
     };
   }
 
@@ -227,12 +229,13 @@ class ReportingPanelContentUi extends Component<Props, State> {
   private renderGenerateReportButton = (isDisabled: boolean) => {
     return (
       <EuiButton
-        disabled={isDisabled}
+        disabled={isDisabled || this.state.isCreatingReportJob}
         fullWidth
         fill
         onClick={this.createReportingJob}
         data-test-subj="generateReportButton"
         size="s"
+        isLoading={this.state.isCreatingReportJob}
       >
         <FormattedMessage
           id="xpack.reporting.panelContent.generateButtonLabel"
@@ -280,6 +283,8 @@ class ReportingPanelContentUi extends Component<Props, State> {
       this.props.getJobParams()
     );
 
+    this.setState({ isCreatingReportJob: true });
+
     return this.props.apiClient
       .createReportingJob(this.props.reportType, decoratedJobParams)
       .then(() => {
@@ -313,6 +318,9 @@ class ReportingPanelContentUi extends Component<Props, State> {
         if (this.props.onClose) {
           this.props.onClose();
         }
+        if (this.mounted) {
+          this.setState({ isCreatingReportJob: false });
+        }
       })
       .catch((error) => {
         this.props.toasts.addError(error, {
@@ -325,6 +333,9 @@ class ReportingPanelContentUi extends Component<Props, State> {
             <span dangerouslySetInnerHTML={{ __html: error.body.message }} />
           ) as unknown as string,
         });
+        if (this.mounted) {
+          this.setState({ isCreatingReportJob: false });
+        }
       });
   };
 }

From 55b9fd2353b487a3db3997d4313c564e3f3b9853 Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jeanlouis.leysens@elastic.co>
Date: Tue, 18 Apr 2023 15:39:29 +0200
Subject: [PATCH 027/100] [Dev docs] Added final section to HTTP versioning
 tutorial (#154901)

## Summary

Adds the final section to the HTTP versioning tutorial about using the
route versioning specification.
---
 dev_docs/tutorials/versioning_http_apis.mdx | 117 ++++++++++++++++++--
 1 file changed, 110 insertions(+), 7 deletions(-)

diff --git a/dev_docs/tutorials/versioning_http_apis.mdx b/dev_docs/tutorials/versioning_http_apis.mdx
index c8a3625fb4977..81bfed4f4dc4e 100644
--- a/dev_docs/tutorials/versioning_http_apis.mdx
+++ b/dev_docs/tutorials/versioning_http_apis.mdx
@@ -41,7 +41,7 @@ router.get(
 );
 ```
 
-#### Why is this problemetic for versioning?
+#### Why is this problematic for versioning?
 
 Whenever we perform a data migration the body of this endpoint will change for all clients. This prevents us from being able to maintain past interfaces and gracefully introduce new ones.
 
@@ -119,7 +119,7 @@ router.post(
   }
 );
 ```
-#### Why is this problemetic for versioning?
+#### Why is this problematic for versioning?
 
 This HTTP API currently accepts all numbers and strings as input which allows for unexpected inputs like negative numbers or non-URL friendly characters. This may break future migrations or integrations that assume your data will always be within certain parameters.
 
@@ -141,7 +141,7 @@ This HTTP API currently accepts all numbers and strings as input which allows fo
 
 Adding this validation we negate the risk of unexpected values. It is not necessary to use `@kbn/config-schema`, as long as your validation mechanism provides finer grained controls than "number" or "string".
 
-In summary: think about the acceptable paramaters for every input your HTTP API expects.
+In summary: think about the acceptable parameters for every input your HTTP API expects.
 
 ### 3. Keep interfaces as "narrow" as possible
 
@@ -170,7 +170,7 @@ router.get(
 
 The above code follows guidelines from steps 1 and 2, but it allows clients to specify ANY string by which to sort. This is a far "wider" API than we need for this endpoint.
 
-#### Why is this problemetic for versioning?
+#### Why is this problematic for versioning?
 
 Without telemetry it is impossible to know what values clients might be passing through &mdash; and what type of sort behaviour they are expecting.
 
@@ -207,9 +207,112 @@ router.get(
 
 The changes are:
 
-1. New input validation accepts a known set of values. This makes our HTTP API far _narrower_ and specific to our use case. It does not matter that our `sortSchema` has the same values as our persistence schema, what matters is that we created a **translation layer** between our HTTP API and our internal schema. This faclitates easily versioning this endpoint.
+1. New input validation accepts a known set of values. This makes our HTTP API far _narrower_ and specific to our use case. It does not matter that our `sortSchema` has the same values as our persistence schema, what matters is that we created a **translation layer** between our HTTP API and our internal schema. This facilitates easily versioning this endpoint.
 2. **Bonus point**: we use the `escapeKuery` utility to defend against KQL injection attacks.
 
-### 4. Use the versioned API spec
+### 4. Adhere to the HTTP versioning specification
+
+#### Choosing the right version
+
+##### Public endpoints
+Public endpoints include any endpoint that is intended for users to directly integrate with via HTTP.
+
+Choose a date string in the format `YYYY-MM-DD`. This date should be the date that a (group) of APIs was made available.
+
+##### Internal endpoints
+Internal endpoints are all non-public endpoints (see definition above).
+
+If you need to maintain backwards-compatibility for an internal endpoint use a single, larger-than-zero number. Ex. `1`.
+
+
+#### Use the versioned router
+
+Core exposes a versioned router that ensures your endpoint's behaviour and formatting all conforms to the versioning specification.
+
+```typescript
+  router.versioned.
+    .post({
+      access: 'public', // This endpoint is intended for a public audience
+      path: '/api/my-app/foo/{id?}',
+      options: { timeout: { payload: 60000 } },
+    })
+    .addVersion(
+      {
+        version: '2023-01-01', // The public version of this API
+        validate: {
+          request: {
+            query: schema.object({
+              name: schema.maybe(schema.string({ minLength: 2, maxLength: 50 })),
+            }),
+            params: schema.object({
+              id: schema.maybe(schema.string({ minLength: 10, maxLength: 13 })),
+            }),
+            body: schema.object({ foo: schema.string() }),
+          },
+          response: {
+            200: { // In development environments, this validation will run against 200 responses
+              body: schema.object({ foo: schema.string() }),
+            },
+          },
+        },
+      },
+      async (ctx, req, res) => {
+        await ctx.fooService.create(req.body.foo, req.params.id, req.query.name);
+        return res.ok({ body: { foo: req.body.foo } });
+      }
+    )
+    // BREAKING CHANGE: { foo: string } => { fooString: string } in response body
+    .addVersion(
+      {
+        version: '2023-02-01',
+        validate: {
+          request: {
+            query: schema.object({
+              name: schema.maybe(schema.string({ minLength: 2, maxLength: 50 })),
+            }),
+            params: schema.object({
+              id: schema.maybe(schema.string({ minLength: 10, maxLength: 13 })),
+            }),
+            body: schema.object({ fooString: schema.string() }),
+          },
+          response: {
+            200: {
+              body: schema.object({ fooName: schema.string() }),
+            },
+          },
+        },
+      },
+      async (ctx, req, res) => {
+        await ctx.fooService.create(req.body.fooString, req.params.id, req.query.name);
+        return res.ok({ body: { fooName: req.body.fooString } });
+      }
+    )
+    // BREAKING CHANGES: Enforce min/max length on fooString
+    .addVersion(
+      {
+        version: '2023-03-01',
+        validate: {
+          request: {
+            query: schema.object({
+              name: schema.maybe(schema.string({ minLength: 2, maxLength: 50 })),
+            }),
+            params: schema.object({
+              id: schema.maybe(schema.string({ minLength: 10, maxLength: 13 })),
+            }),
+            body: schema.object({ fooString: schema.string({ minLength: 0, maxLength: 1000 }) }),
+          },
+          response: {
+            200: {
+              body: schema.object({ fooName: schema.string() }),
+            },
+          },
+        },
+      },
+      async (ctx, req, res) => {
+        await ctx.fooService.create(req.body.fooString, req.params.id, req.query.name);
+        return res.ok({ body: { fooName: req.body.fooString } });
+      }
+```
 
-_Under construction, check back here soon!_
\ No newline at end of file
+#### Additional reading
+For a more details on the versioning specification see [this document](https://docs.google.com/document/d/1YpF6hXIHZaHvwNaQAxWFzexUF1nbqACTtH2IfDu0ldA/edit?usp=sharing).
\ No newline at end of file

From b81a2705dfae1b65fef7ad18c0cb470ad83fbf6b Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad31comp@gmail.com>
Date: Tue, 18 Apr 2023 15:54:11 +0200
Subject: [PATCH 028/100] [Synthetics] Add tooltip for viewer user for edit
 actions (#155134)

---
 .../common/components/permissions.tsx         |  2 +-
 .../management/monitor_list_table/columns.tsx | 48 ++++++++++++++-----
 .../monitor_list_table/monitor_list.tsx       |  3 --
 3 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/components/permissions.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/components/permissions.tsx
index 97a9ac3e62ce3..17580afbf2cf4 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/components/permissions.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/components/permissions.tsx
@@ -100,7 +100,7 @@ const CANNOT_PERFORM_ACTION_FLEET = i18n.translate(
   }
 );
 
-const CANNOT_PERFORM_ACTION_SYNTHETICS = i18n.translate(
+export const CANNOT_PERFORM_ACTION_SYNTHETICS = i18n.translate(
   'xpack.synthetics.monitorManagement.noSyntheticsPermissions',
   {
     defaultMessage: 'You do not have sufficient permissions to perform this action.',
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_list_table/columns.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_list_table/columns.tsx
index dd56da1e7e563..074695f26c148 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_list_table/columns.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_list_table/columns.tsx
@@ -5,16 +5,20 @@
  * 2.0.
  */
 
-import { EuiBasicTableColumn } from '@elastic/eui';
+import { EuiBasicTableColumn, EuiButtonIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { useHistory } from 'react-router-dom';
 import { FETCH_STATUS } from '@kbn/observability-plugin/public';
+import { useCanEditSynthetics } from '../../../../../../hooks/use_capabilities';
 import {
   isStatusEnabled,
   toggleStatusAlert,
 } from '../../../../../../../common/runtime_types/monitor_management/alert_config';
-import { NoPermissionsTooltip } from '../../../common/components/permissions';
+import {
+  CANNOT_PERFORM_ACTION_SYNTHETICS,
+  NoPermissionsTooltip,
+} from '../../../common/components/permissions';
 import { TagsBadges } from '../../../common/components/tag_badges';
 import { useMonitorAlertEnable } from '../../../../hooks/use_monitor_alert_enable';
 import * as labels from './labels';
@@ -35,17 +39,16 @@ import { MonitorEnabled } from './monitor_enabled';
 import { MonitorLocations } from './monitor_locations';
 
 export function useMonitorListColumns({
-  canEditSynthetics,
   loading,
   overviewStatus,
   setMonitorPendingDeletion,
 }: {
-  canEditSynthetics: boolean;
   loading: boolean;
   overviewStatus: OverviewStatusState | null;
   setMonitorPendingDeletion: (config: EncryptedSyntheticsSavedMonitor) => void;
 }): Array<EuiBasicTableColumn<EncryptedSyntheticsSavedMonitor>> {
   const history = useHistory();
+  const canEditSynthetics = useCanEditSynthetics();
 
   const { alertStatus, updateAlertEnabledState } = useMonitorAlertEnable();
   const { canSaveIntegrations } = useFleetPermissions();
@@ -54,7 +57,7 @@ export function useMonitorListColumns({
     return alertStatus(fields[ConfigKey.CONFIG_ID]) === FETCH_STATUS.LOADING;
   };
 
-  return [
+  const columns: Array<EuiBasicTableColumn<EncryptedSyntheticsSavedMonitor>> = [
     {
       align: 'left' as const,
       field: ConfigKey.NAME as string,
@@ -173,8 +176,8 @@ export function useMonitorListColumns({
             </NoPermissionsTooltip>
           ),
           description: labels.EDIT_LABEL,
-          icon: 'pencil',
-          type: 'icon',
+          icon: 'pencil' as const,
+          type: 'icon' as const,
           enabled: (fields) =>
             canEditSynthetics &&
             !isActionLoading(fields) &&
@@ -197,9 +200,9 @@ export function useMonitorListColumns({
             </NoPermissionsTooltip>
           ),
           description: labels.DELETE_LABEL,
-          icon: 'trash',
-          type: 'icon',
-          color: 'danger',
+          icon: 'trash' as const,
+          type: 'icon' as const,
+          color: 'danger' as const,
           enabled: (fields) =>
             canEditSynthetics &&
             !isActionLoading(fields) &&
@@ -216,8 +219,8 @@ export function useMonitorListColumns({
               : labels.ENABLE_STATUS_ALERT,
           icon: (fields) =>
             isStatusEnabled(fields[ConfigKey.ALERT_CONFIG]) ? 'bellSlash' : 'bell',
-          type: 'icon',
-          color: 'danger',
+          type: 'icon' as const,
+          color: 'danger' as const,
           enabled: (fields) => canEditSynthetics && !isActionLoading(fields),
           onClick: (fields) => {
             updateAlertEnabledState({
@@ -240,4 +243,25 @@ export function useMonitorListColumns({
       ],
     },
   ];
+
+  if (!canEditSynthetics) {
+    // replace last column with a tooltip
+    columns[columns.length - 1] = {
+      align: 'right' as const,
+      name: i18n.translate('xpack.synthetics.management.monitorList.actions', {
+        defaultMessage: 'Actions',
+      }),
+      render: () => (
+        <NoPermissionsTooltip canEditSynthetics={canEditSynthetics} canUpdatePrivateMonitor={true}>
+          <EuiButtonIcon
+            iconType="boxesHorizontal"
+            isDisabled={true}
+            aria-label={CANNOT_PERFORM_ACTION_SYNTHETICS}
+          />
+        </NoPermissionsTooltip>
+      ),
+    };
+  }
+
+  return columns;
 }
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_list_table/monitor_list.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_list_table/monitor_list.tsx
index 2ac8c0f6129d6..55f2d7e80ee1a 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_list_table/monitor_list.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_list_table/monitor_list.tsx
@@ -19,7 +19,6 @@ import { i18n } from '@kbn/i18n';
 import { DeleteMonitor } from './delete_monitor';
 import { IHttpSerializedFetchError } from '../../../../state/utils/http_error';
 import { MonitorListPageState } from '../../../../state';
-import { useCanEditSynthetics } from '../../../../../../hooks/use_capabilities';
 import {
   ConfigKey,
   EncryptedSyntheticsSavedMonitor,
@@ -52,7 +51,6 @@ export const MonitorList = ({
 }: Props) => {
   const { euiTheme } = useEuiTheme();
   const isXl = useIsWithinMinBreakpoint('xxl');
-  const canEditSynthetics = useCanEditSynthetics();
 
   const [monitorPendingDeletion, setMonitorPendingDeletion] =
     useState<EncryptedSyntheticsSavedMonitor | null>(null);
@@ -96,7 +94,6 @@ export const MonitorList = ({
   });
 
   const columns = useMonitorListColumns({
-    canEditSynthetics,
     loading,
     overviewStatus,
     setMonitorPendingDeletion,

From 0a38f85002d8f9096bcd35c073f0faebcff9617d Mon Sep 17 00:00:00 2001
From: Antonio <antonio.coelho@elastic.co>
Date: Tue, 18 Apr 2023 16:02:11 +0200
Subject: [PATCH 029/100] [Cases] Attaching files to cases (#154436)

Fixes #151595

## Summary

In this PR we will be merging a feature branch into `main`.

This feature branch is a collection of several different PRs with file
functionality for cases.

- https://github.com/elastic/kibana/pull/152941
- https://github.com/elastic/kibana/pull/153957
- https://github.com/elastic/kibana/pull/154432
- https://github.com/elastic/kibana/pull/153853

Most of the code was already reviewed so this will mainly be used for
testing.

- Files tab in the case detail view.
- Attach files to a case.
- View a list of all files attached to a case (with pagination).
- Preview image files attached to a case.
- Search for files attached to a case by file name.
- Download files attached to a case.
- Users are now able to see file activity in the case detail view.
- Image files have a different icon and a clickable file name to
preview.
- Other files have a standard "document" icon and the name is not
clickable.
- The file can be downloaded by clicking the download icon.

## Release notes

Support file attachments in Cases.

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
---
 packages/kbn-optimizer/limits.yml             |   2 +-
 .../file/file_upload/impl/src/file_upload.tsx |   2 +-
 .../cases/common/api/cases/comment/files.ts   |  16 +-
 .../cases/common/constants/mime_types.ts      |   8 +-
 x-pack/plugins/cases/common/types.ts          |   1 +
 x-pack/plugins/cases/public/application.tsx   |  21 +-
 .../client/attachment_framework/types.ts      |  28 +-
 .../ui/get_all_cases_selector_modal.tsx       |   6 +-
 .../cases/public/client/ui/get_cases.tsx      |   6 +-
 .../public/client/ui/get_cases_context.tsx    |  12 +-
 .../client/ui/get_create_case_flyout.tsx      |   6 +-
 .../public/client/ui/get_recent_cases.tsx     |   6 +-
 .../public/common/mock/test_providers.tsx     |  54 +++-
 .../public/common/use_cases_toast.test.tsx    |  20 ++
 .../cases/public/common/use_cases_toast.tsx   |   3 +
 .../cases/public/components/app/index.tsx     |  10 +-
 .../components/case_action_bar/actions.tsx    |   4 +
 .../case_view/case_view_page.test.tsx         |   3 +-
 .../components/case_view/case_view_page.tsx   |   2 +
 .../case_view/case_view_tabs.test.tsx         |  64 ++++-
 .../components/case_view/case_view_tabs.tsx   |  42 ++-
 .../components/case_view_files.test.tsx       | 114 +++++++++
 .../case_view/components/case_view_files.tsx  | 104 ++++++++
 .../components/case_view/translations.ts      |   4 +
 .../public/components/cases_context/index.tsx |  54 +++-
 .../public/components/files/add_file.test.tsx | 241 ++++++++++++++++++
 .../public/components/files/add_file.tsx      | 141 ++++++++++
 .../files/file_delete_button.test.tsx         | 155 +++++++++++
 .../components/files/file_delete_button.tsx   |  62 +++++
 .../files/file_download_button.test.tsx       |  57 +++++
 .../components/files/file_download_button.tsx |  46 ++++
 .../components/files/file_name_link.test.tsx  |  58 +++++
 .../components/files/file_name_link.tsx       |  44 ++++
 .../components/files/file_preview.test.tsx    |  38 +++
 .../public/components/files/file_preview.tsx  |  56 ++++
 .../components/files/file_type.test.tsx       | 187 ++++++++++++++
 .../public/components/files/file_type.tsx     | 106 ++++++++
 .../components/files/files_table.test.tsx     | 233 +++++++++++++++++
 .../public/components/files/files_table.tsx   |  83 ++++++
 .../files/files_utility_bar.test.tsx          |  42 +++
 .../components/files/files_utility_bar.tsx    |  36 +++
 .../public/components/files/translations.tsx  | 115 +++++++++
 .../cases/public/components/files/types.ts    |  12 +
 .../files/use_file_preview.test.tsx           |  54 ++++
 .../components/files/use_file_preview.tsx     |  17 ++
 .../files/use_files_table_columns.test.tsx    |  73 ++++++
 .../files/use_files_table_columns.tsx         |  71 ++++++
 .../public/components/files/utils.test.tsx    |  97 +++++++
 .../cases/public/components/files/utils.tsx   |  61 +++++
 .../lens/use_lens_open_visualization.tsx      |   3 +
 .../components/property_actions/index.tsx     |  24 +-
 .../user_actions/comment/comment.test.tsx     | 195 +++++++++++++-
 .../comment/registered_attachments.tsx        |  52 ++--
 .../alert_property_actions.tsx                |   6 +-
 .../property_actions.test.tsx                 |   2 +
 .../property_actions/property_actions.tsx     |   4 +-
 ...ered_attachments_property_actions.test.tsx |  19 +-
 ...egistered_attachments_property_actions.tsx |  11 +-
 .../user_comment_property_actions.tsx         |   5 +
 .../cases/public/containers/__mocks__/api.ts  |  10 +
 .../cases/public/containers/api.test.tsx      |  27 ++
 x-pack/plugins/cases/public/containers/api.ts |  17 ++
 .../cases/public/containers/constants.ts      |   4 +
 .../plugins/cases/public/containers/mock.ts   |  15 ++
 .../cases/public/containers/translations.ts   |   8 +
 .../use_delete_file_attachment.test.tsx       | 120 +++++++++
 .../containers/use_delete_file_attachment.tsx |  43 ++++
 .../use_get_case_file_stats.test.tsx          |  64 +++++
 .../containers/use_get_case_file_stats.tsx    |  57 +++++
 .../containers/use_get_case_files.test.tsx    |  70 +++++
 .../public/containers/use_get_case_files.tsx  |  61 +++++
 x-pack/plugins/cases/public/files/index.ts    |   3 +
 .../public/internal_attachments/index.ts      |  15 ++
 x-pack/plugins/cases/public/plugin.ts         |   7 +
 x-pack/plugins/cases/public/types.ts          |   4 +-
 .../common/limiter_checker/test_utils.ts      |   2 +-
 x-pack/plugins/cases/tsconfig.json            |   4 +
 .../cases_api_integration/common/lib/mock.ts  |   2 +-
 .../public/attachments/external_reference.tsx |  13 +-
 .../public/attachments/persistable_state.tsx  |  11 +-
 80 files changed, 3440 insertions(+), 115 deletions(-)
 create mode 100644 x-pack/plugins/cases/public/components/case_view/components/case_view_files.test.tsx
 create mode 100644 x-pack/plugins/cases/public/components/case_view/components/case_view_files.tsx
 create mode 100644 x-pack/plugins/cases/public/components/files/add_file.test.tsx
 create mode 100644 x-pack/plugins/cases/public/components/files/add_file.tsx
 create mode 100644 x-pack/plugins/cases/public/components/files/file_delete_button.test.tsx
 create mode 100644 x-pack/plugins/cases/public/components/files/file_delete_button.tsx
 create mode 100644 x-pack/plugins/cases/public/components/files/file_download_button.test.tsx
 create mode 100644 x-pack/plugins/cases/public/components/files/file_download_button.tsx
 create mode 100644 x-pack/plugins/cases/public/components/files/file_name_link.test.tsx
 create mode 100644 x-pack/plugins/cases/public/components/files/file_name_link.tsx
 create mode 100644 x-pack/plugins/cases/public/components/files/file_preview.test.tsx
 create mode 100644 x-pack/plugins/cases/public/components/files/file_preview.tsx
 create mode 100644 x-pack/plugins/cases/public/components/files/file_type.test.tsx
 create mode 100644 x-pack/plugins/cases/public/components/files/file_type.tsx
 create mode 100644 x-pack/plugins/cases/public/components/files/files_table.test.tsx
 create mode 100644 x-pack/plugins/cases/public/components/files/files_table.tsx
 create mode 100644 x-pack/plugins/cases/public/components/files/files_utility_bar.test.tsx
 create mode 100644 x-pack/plugins/cases/public/components/files/files_utility_bar.tsx
 create mode 100644 x-pack/plugins/cases/public/components/files/translations.tsx
 create mode 100644 x-pack/plugins/cases/public/components/files/types.ts
 create mode 100644 x-pack/plugins/cases/public/components/files/use_file_preview.test.tsx
 create mode 100644 x-pack/plugins/cases/public/components/files/use_file_preview.tsx
 create mode 100644 x-pack/plugins/cases/public/components/files/use_files_table_columns.test.tsx
 create mode 100644 x-pack/plugins/cases/public/components/files/use_files_table_columns.tsx
 create mode 100644 x-pack/plugins/cases/public/components/files/utils.test.tsx
 create mode 100644 x-pack/plugins/cases/public/components/files/utils.tsx
 create mode 100644 x-pack/plugins/cases/public/containers/use_delete_file_attachment.test.tsx
 create mode 100644 x-pack/plugins/cases/public/containers/use_delete_file_attachment.tsx
 create mode 100644 x-pack/plugins/cases/public/containers/use_get_case_file_stats.test.tsx
 create mode 100644 x-pack/plugins/cases/public/containers/use_get_case_file_stats.tsx
 create mode 100644 x-pack/plugins/cases/public/containers/use_get_case_files.test.tsx
 create mode 100644 x-pack/plugins/cases/public/containers/use_get_case_files.tsx
 create mode 100644 x-pack/plugins/cases/public/internal_attachments/index.ts

diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml
index 74d7df9394153..93d5507c53a1e 100644
--- a/packages/kbn-optimizer/limits.yml
+++ b/packages/kbn-optimizer/limits.yml
@@ -7,7 +7,7 @@ pageLoadAssetSize:
   banners: 17946
   bfetch: 22837
   canvas: 1066647
-  cases: 144442
+  cases: 170000
   charts: 55000
   cloud: 21076
   cloudChat: 19894
diff --git a/packages/shared-ux/file/file_upload/impl/src/file_upload.tsx b/packages/shared-ux/file/file_upload/impl/src/file_upload.tsx
index 498a4a93b5fe4..45e74312e1e55 100644
--- a/packages/shared-ux/file/file_upload/impl/src/file_upload.tsx
+++ b/packages/shared-ux/file/file_upload/impl/src/file_upload.tsx
@@ -19,7 +19,7 @@ import { context } from './context';
 /**
  * An object representing an uploaded file
  */
-interface UploadedFile<Meta = unknown> {
+export interface UploadedFile<Meta = unknown> {
   /**
    * The ID that was generated for the uploaded file
    */
diff --git a/x-pack/plugins/cases/common/api/cases/comment/files.ts b/x-pack/plugins/cases/common/api/cases/comment/files.ts
index 66555b1a584d9..af42a7a779e55 100644
--- a/x-pack/plugins/cases/common/api/cases/comment/files.ts
+++ b/x-pack/plugins/cases/common/api/cases/comment/files.ts
@@ -9,15 +9,15 @@ import * as rt from 'io-ts';
 import { MAX_DELETE_FILES } from '../../../constants';
 import { limitedArraySchema, NonEmptyString } from '../../../schema';
 
+export const SingleFileAttachmentMetadataRt = rt.type({
+  name: rt.string,
+  extension: rt.string,
+  mimeType: rt.string,
+  created: rt.string,
+});
+
 export const FileAttachmentMetadataRt = rt.type({
-  files: rt.array(
-    rt.type({
-      name: rt.string,
-      extension: rt.string,
-      mimeType: rt.string,
-      createdAt: rt.string,
-    })
-  ),
+  files: rt.array(SingleFileAttachmentMetadataRt),
 });
 
 export type FileAttachmentMetadata = rt.TypeOf<typeof FileAttachmentMetadataRt>;
diff --git a/x-pack/plugins/cases/common/constants/mime_types.ts b/x-pack/plugins/cases/common/constants/mime_types.ts
index 9f1f455513dab..c35e5ef674c81 100644
--- a/x-pack/plugins/cases/common/constants/mime_types.ts
+++ b/x-pack/plugins/cases/common/constants/mime_types.ts
@@ -8,7 +8,7 @@
 /**
  * These were retrieved from https://www.iana.org/assignments/media-types/media-types.xhtml#image
  */
-const imageMimeTypes = [
+export const imageMimeTypes = [
   'image/aces',
   'image/apng',
   'image/avci',
@@ -87,9 +87,9 @@ const imageMimeTypes = [
   'image/wmf',
 ];
 
-const textMimeTypes = ['text/plain', 'text/csv', 'text/json', 'application/json'];
+export const textMimeTypes = ['text/plain', 'text/csv', 'text/json', 'application/json'];
 
-const compressionMimeTypes = [
+export const compressionMimeTypes = [
   'application/zip',
   'application/gzip',
   'application/x-bzip',
@@ -98,7 +98,7 @@ const compressionMimeTypes = [
   'application/x-tar',
 ];
 
-const pdfMimeTypes = ['application/pdf'];
+export const pdfMimeTypes = ['application/pdf'];
 
 export const ALLOWED_MIME_TYPES = [
   ...imageMimeTypes,
diff --git a/x-pack/plugins/cases/common/types.ts b/x-pack/plugins/cases/common/types.ts
index 3ff14b0905110..32d6b34b11c16 100644
--- a/x-pack/plugins/cases/common/types.ts
+++ b/x-pack/plugins/cases/common/types.ts
@@ -24,4 +24,5 @@ export type SnakeToCamelCase<T> = T extends Record<string, unknown>
 export enum CASE_VIEW_PAGE_TABS {
   ALERTS = 'alerts',
   ACTIVITY = 'activity',
+  FILES = 'files',
 }
diff --git a/x-pack/plugins/cases/public/application.tsx b/x-pack/plugins/cases/public/application.tsx
index bac423a9f8292..742f254472160 100644
--- a/x-pack/plugins/cases/public/application.tsx
+++ b/x-pack/plugins/cases/public/application.tsx
@@ -9,19 +9,21 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { Router } from 'react-router-dom';
 
-import { I18nProvider } from '@kbn/i18n-react';
 import { EuiErrorBoundary } from '@elastic/eui';
-
+import { I18nProvider } from '@kbn/i18n-react';
+import { EuiThemeProvider as StyledComponentsThemeProvider } from '@kbn/kibana-react-plugin/common';
 import {
   KibanaContextProvider,
   KibanaThemeProvider,
   useUiSetting$,
 } from '@kbn/kibana-react-plugin/public';
-import { EuiThemeProvider as StyledComponentsThemeProvider } from '@kbn/kibana-react-plugin/common';
-import type { RenderAppProps } from './types';
-import { CasesApp } from './components/app';
+
+import type { ScopedFilesClient } from '@kbn/files-plugin/public';
 import type { ExternalReferenceAttachmentTypeRegistry } from './client/attachment_framework/external_reference_registry';
 import type { PersistableStateAttachmentTypeRegistry } from './client/attachment_framework/persistable_state_registry';
+import type { RenderAppProps } from './types';
+
+import { CasesApp } from './components/app';
 
 export const renderApp = (deps: RenderAppProps) => {
   const { mountParams } = deps;
@@ -37,10 +39,15 @@ export const renderApp = (deps: RenderAppProps) => {
 interface CasesAppWithContextProps {
   externalReferenceAttachmentTypeRegistry: ExternalReferenceAttachmentTypeRegistry;
   persistableStateAttachmentTypeRegistry: PersistableStateAttachmentTypeRegistry;
+  getFilesClient: (scope: string) => ScopedFilesClient;
 }
 
 const CasesAppWithContext: React.FC<CasesAppWithContextProps> = React.memo(
-  ({ externalReferenceAttachmentTypeRegistry, persistableStateAttachmentTypeRegistry }) => {
+  ({
+    externalReferenceAttachmentTypeRegistry,
+    persistableStateAttachmentTypeRegistry,
+    getFilesClient,
+  }) => {
     const [darkMode] = useUiSetting$<boolean>('theme:darkMode');
 
     return (
@@ -48,6 +55,7 @@ const CasesAppWithContext: React.FC<CasesAppWithContextProps> = React.memo(
         <CasesApp
           externalReferenceAttachmentTypeRegistry={externalReferenceAttachmentTypeRegistry}
           persistableStateAttachmentTypeRegistry={persistableStateAttachmentTypeRegistry}
+          getFilesClient={getFilesClient}
         />
       </StyledComponentsThemeProvider>
     );
@@ -78,6 +86,7 @@ export const App: React.FC<{ deps: RenderAppProps }> = ({ deps }) => {
                   deps.externalReferenceAttachmentTypeRegistry
                 }
                 persistableStateAttachmentTypeRegistry={deps.persistableStateAttachmentTypeRegistry}
+                getFilesClient={pluginsStart.files.filesClientFactory.asScoped}
               />
             </Router>
           </KibanaContextProvider>
diff --git a/x-pack/plugins/cases/public/client/attachment_framework/types.ts b/x-pack/plugins/cases/public/client/attachment_framework/types.ts
index 414b8a0086654..95a453b9d0a12 100644
--- a/x-pack/plugins/cases/public/client/attachment_framework/types.ts
+++ b/x-pack/plugins/cases/public/client/attachment_framework/types.ts
@@ -13,19 +13,38 @@ import type {
 } from '../../../common/api';
 import type { Case } from '../../containers/types';
 
-export interface AttachmentAction {
+export enum AttachmentActionType {
+  BUTTON = 'button',
+  CUSTOM = 'custom',
+}
+
+interface BaseAttachmentAction {
+  type: AttachmentActionType;
+  label: string;
+  isPrimary?: boolean;
+  disabled?: boolean;
+}
+
+interface ButtonAttachmentAction extends BaseAttachmentAction {
+  type: AttachmentActionType.BUTTON;
   onClick: () => void;
   iconType: string;
-  label: string;
   color?: EuiButtonProps['color'];
-  isPrimary?: boolean;
 }
 
+interface CustomAttachmentAction extends BaseAttachmentAction {
+  type: AttachmentActionType.CUSTOM;
+  render: () => JSX.Element;
+}
+
+export type AttachmentAction = ButtonAttachmentAction | CustomAttachmentAction;
+
 export interface AttachmentViewObject<Props = {}> {
   timelineAvatar?: EuiCommentProps['timelineAvatar'];
   getActions?: (props: Props) => AttachmentAction[];
   event?: EuiCommentProps['event'];
   children?: React.LazyExoticComponent<React.FC<Props>>;
+  hideDefaultActions?: boolean;
 }
 
 export interface CommonAttachmentViewProps {
@@ -46,8 +65,9 @@ export interface AttachmentType<Props> {
   id: string;
   icon: IconType;
   displayName: string;
-  getAttachmentViewObject: () => AttachmentViewObject<Props>;
+  getAttachmentViewObject: (props: Props) => AttachmentViewObject<Props>;
   getAttachmentRemovalObject?: (props: Props) => Pick<AttachmentViewObject<Props>, 'event'>;
+  hideDefaultActions?: boolean;
 }
 
 export type ExternalReferenceAttachmentType = AttachmentType<ExternalReferenceAttachmentViewProps>;
diff --git a/x-pack/plugins/cases/public/client/ui/get_all_cases_selector_modal.tsx b/x-pack/plugins/cases/public/client/ui/get_all_cases_selector_modal.tsx
index b0807b0509135..fc85e84639baa 100644
--- a/x-pack/plugins/cases/public/client/ui/get_all_cases_selector_modal.tsx
+++ b/x-pack/plugins/cases/public/client/ui/get_all_cases_selector_modal.tsx
@@ -14,7 +14,9 @@ import { CasesProvider } from '../../components/cases_context';
 type GetAllCasesSelectorModalPropsInternal = AllCasesSelectorModalProps & CasesContextProps;
 export type GetAllCasesSelectorModalProps = Omit<
   GetAllCasesSelectorModalPropsInternal,
-  'externalReferenceAttachmentTypeRegistry' | 'persistableStateAttachmentTypeRegistry'
+  | 'externalReferenceAttachmentTypeRegistry'
+  | 'persistableStateAttachmentTypeRegistry'
+  | 'getFilesClient'
 >;
 
 const AllCasesSelectorModalLazy: React.FC<AllCasesSelectorModalProps> = lazy(
@@ -23,6 +25,7 @@ const AllCasesSelectorModalLazy: React.FC<AllCasesSelectorModalProps> = lazy(
 export const getAllCasesSelectorModalLazy = ({
   externalReferenceAttachmentTypeRegistry,
   persistableStateAttachmentTypeRegistry,
+  getFilesClient,
   owner,
   permissions,
   hiddenStatuses,
@@ -33,6 +36,7 @@ export const getAllCasesSelectorModalLazy = ({
     value={{
       externalReferenceAttachmentTypeRegistry,
       persistableStateAttachmentTypeRegistry,
+      getFilesClient,
       owner,
       permissions,
     }}
diff --git a/x-pack/plugins/cases/public/client/ui/get_cases.tsx b/x-pack/plugins/cases/public/client/ui/get_cases.tsx
index 45c9f30b984d2..36556523fc3a3 100644
--- a/x-pack/plugins/cases/public/client/ui/get_cases.tsx
+++ b/x-pack/plugins/cases/public/client/ui/get_cases.tsx
@@ -14,7 +14,9 @@ import { CasesProvider } from '../../components/cases_context';
 type GetCasesPropsInternal = CasesProps & CasesContextProps;
 export type GetCasesProps = Omit<
   GetCasesPropsInternal,
-  'externalReferenceAttachmentTypeRegistry' | 'persistableStateAttachmentTypeRegistry'
+  | 'externalReferenceAttachmentTypeRegistry'
+  | 'persistableStateAttachmentTypeRegistry'
+  | 'getFilesClient'
 >;
 
 const CasesRoutesLazy: React.FC<CasesProps> = lazy(() => import('../../components/app/routes'));
@@ -22,6 +24,7 @@ const CasesRoutesLazy: React.FC<CasesProps> = lazy(() => import('../../component
 export const getCasesLazy = ({
   externalReferenceAttachmentTypeRegistry,
   persistableStateAttachmentTypeRegistry,
+  getFilesClient,
   owner,
   permissions,
   basePath,
@@ -39,6 +42,7 @@ export const getCasesLazy = ({
     value={{
       externalReferenceAttachmentTypeRegistry,
       persistableStateAttachmentTypeRegistry,
+      getFilesClient,
       owner,
       permissions,
       basePath,
diff --git a/x-pack/plugins/cases/public/client/ui/get_cases_context.tsx b/x-pack/plugins/cases/public/client/ui/get_cases_context.tsx
index 77e6ca3c87e24..9db49ef9776ba 100644
--- a/x-pack/plugins/cases/public/client/ui/get_cases_context.tsx
+++ b/x-pack/plugins/cases/public/client/ui/get_cases_context.tsx
@@ -13,7 +13,9 @@ import type { CasesContextProps } from '../../components/cases_context';
 export type GetCasesContextPropsInternal = CasesContextProps;
 export type GetCasesContextProps = Omit<
   CasesContextProps,
-  'externalReferenceAttachmentTypeRegistry' | 'persistableStateAttachmentTypeRegistry'
+  | 'externalReferenceAttachmentTypeRegistry'
+  | 'persistableStateAttachmentTypeRegistry'
+  | 'getFilesClient'
 >;
 
 const CasesProviderLazy: React.FC<{ value: GetCasesContextPropsInternal }> = lazy(
@@ -28,6 +30,7 @@ const CasesProviderLazyWrapper = ({
   features,
   children,
   releasePhase,
+  getFilesClient,
 }: GetCasesContextPropsInternal & { children: ReactNode }) => {
   return (
     <Suspense fallback={<EuiLoadingSpinner />}>
@@ -39,6 +42,7 @@ const CasesProviderLazyWrapper = ({
           permissions,
           features,
           releasePhase,
+          getFilesClient,
         }}
       >
         {children}
@@ -52,9 +56,12 @@ CasesProviderLazyWrapper.displayName = 'CasesProviderLazyWrapper';
 export const getCasesContextLazy = ({
   externalReferenceAttachmentTypeRegistry,
   persistableStateAttachmentTypeRegistry,
+  getFilesClient,
 }: Pick<
   GetCasesContextPropsInternal,
-  'externalReferenceAttachmentTypeRegistry' | 'persistableStateAttachmentTypeRegistry'
+  | 'externalReferenceAttachmentTypeRegistry'
+  | 'persistableStateAttachmentTypeRegistry'
+  | 'getFilesClient'
 >): (() => React.FC<GetCasesContextProps>) => {
   const CasesProviderLazyWrapperWithRegistry: React.FC<GetCasesContextProps> = ({
     children,
@@ -64,6 +71,7 @@ export const getCasesContextLazy = ({
       {...props}
       externalReferenceAttachmentTypeRegistry={externalReferenceAttachmentTypeRegistry}
       persistableStateAttachmentTypeRegistry={persistableStateAttachmentTypeRegistry}
+      getFilesClient={getFilesClient}
     >
       {children}
     </CasesProviderLazyWrapper>
diff --git a/x-pack/plugins/cases/public/client/ui/get_create_case_flyout.tsx b/x-pack/plugins/cases/public/client/ui/get_create_case_flyout.tsx
index af932b53e1dde..e52a14033a614 100644
--- a/x-pack/plugins/cases/public/client/ui/get_create_case_flyout.tsx
+++ b/x-pack/plugins/cases/public/client/ui/get_create_case_flyout.tsx
@@ -14,7 +14,9 @@ import { CasesProvider } from '../../components/cases_context';
 type GetCreateCaseFlyoutPropsInternal = CreateCaseFlyoutProps & CasesContextProps;
 export type GetCreateCaseFlyoutProps = Omit<
   GetCreateCaseFlyoutPropsInternal,
-  'externalReferenceAttachmentTypeRegistry' | 'persistableStateAttachmentTypeRegistry'
+  | 'externalReferenceAttachmentTypeRegistry'
+  | 'persistableStateAttachmentTypeRegistry'
+  | 'getFilesClient'
 >;
 
 export const CreateCaseFlyoutLazy: React.FC<CreateCaseFlyoutProps> = lazy(
@@ -23,6 +25,7 @@ export const CreateCaseFlyoutLazy: React.FC<CreateCaseFlyoutProps> = lazy(
 export const getCreateCaseFlyoutLazy = ({
   externalReferenceAttachmentTypeRegistry,
   persistableStateAttachmentTypeRegistry,
+  getFilesClient,
   owner,
   permissions,
   features,
@@ -35,6 +38,7 @@ export const getCreateCaseFlyoutLazy = ({
     value={{
       externalReferenceAttachmentTypeRegistry,
       persistableStateAttachmentTypeRegistry,
+      getFilesClient,
       owner,
       permissions,
       features,
diff --git a/x-pack/plugins/cases/public/client/ui/get_recent_cases.tsx b/x-pack/plugins/cases/public/client/ui/get_recent_cases.tsx
index a047c106246da..7c41cc3842bf7 100644
--- a/x-pack/plugins/cases/public/client/ui/get_recent_cases.tsx
+++ b/x-pack/plugins/cases/public/client/ui/get_recent_cases.tsx
@@ -14,7 +14,9 @@ import type { RecentCasesProps } from '../../components/recent_cases';
 type GetRecentCasesPropsInternal = RecentCasesProps & CasesContextProps;
 export type GetRecentCasesProps = Omit<
   GetRecentCasesPropsInternal,
-  'externalReferenceAttachmentTypeRegistry' | 'persistableStateAttachmentTypeRegistry'
+  | 'externalReferenceAttachmentTypeRegistry'
+  | 'persistableStateAttachmentTypeRegistry'
+  | 'getFilesClient'
 >;
 
 const RecentCasesLazy: React.FC<RecentCasesProps> = lazy(
@@ -23,6 +25,7 @@ const RecentCasesLazy: React.FC<RecentCasesProps> = lazy(
 export const getRecentCasesLazy = ({
   externalReferenceAttachmentTypeRegistry,
   persistableStateAttachmentTypeRegistry,
+  getFilesClient,
   owner,
   permissions,
   maxCasesToShow,
@@ -31,6 +34,7 @@ export const getRecentCasesLazy = ({
     value={{
       externalReferenceAttachmentTypeRegistry,
       persistableStateAttachmentTypeRegistry,
+      getFilesClient,
       owner,
       permissions,
     }}
diff --git a/x-pack/plugins/cases/public/common/mock/test_providers.tsx b/x-pack/plugins/cases/public/common/mock/test_providers.tsx
index 2a5a75bf7a789..f0b2e71231bb1 100644
--- a/x-pack/plugins/cases/public/common/mock/test_providers.tsx
+++ b/x-pack/plugins/cases/public/common/mock/test_providers.tsx
@@ -9,22 +9,30 @@
 
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
+import { ThemeProvider } from 'styled-components';
+
+import type { RenderOptions, RenderResult } from '@testing-library/react';
+import type { ILicense } from '@kbn/licensing-plugin/public';
+import type { FieldHook } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
+import type { ScopedFilesClient } from '@kbn/files-plugin/public';
+
 import { euiDarkVars } from '@kbn/ui-theme';
 import { I18nProvider } from '@kbn/i18n-react';
-import { ThemeProvider } from 'styled-components';
+import { createMockFilesClient } from '@kbn/shared-ux-file-mocks';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 
-import type { RenderOptions, RenderResult } from '@testing-library/react';
 import { render as reactRender } from '@testing-library/react';
 import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
-import type { ILicense } from '@kbn/licensing-plugin/public';
-import type { FieldHook } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
-import { SECURITY_SOLUTION_OWNER } from '../../../common/constants';
+import { FilesContext } from '@kbn/shared-ux-file-context';
+
+import type { DeeplyMockedKeys } from '@kbn/utility-types-jest';
 import type { CasesFeatures, CasesPermissions } from '../../../common/ui/types';
-import { CasesProvider } from '../../components/cases_context';
-import { createStartServicesMock } from '../lib/kibana/kibana_react.mock';
 import type { StartServices } from '../../types';
 import type { ReleasePhase } from '../../components/types';
+
+import { SECURITY_SOLUTION_OWNER } from '../../../common/constants';
+import { CasesProvider } from '../../components/cases_context';
+import { createStartServicesMock } from '../lib/kibana/kibana_react.mock';
 import { ExternalReferenceAttachmentTypeRegistry } from '../../client/attachment_framework/external_reference_registry';
 import { PersistableStateAttachmentTypeRegistry } from '../../client/attachment_framework/persistable_state_registry';
 import { allCasesPermissions } from './permissions';
@@ -43,17 +51,35 @@ type UiRender = (ui: React.ReactElement, options?: RenderOptions) => RenderResul
 
 window.scrollTo = jest.fn();
 
+const mockGetFilesClient = () => {
+  const mockedFilesClient = createMockFilesClient() as unknown as DeeplyMockedKeys<
+    ScopedFilesClient<unknown>
+  >;
+
+  mockedFilesClient.getFileKind.mockImplementation(() => ({
+    id: 'test',
+    maxSizeBytes: 10000,
+    http: {},
+  }));
+
+  return () => mockedFilesClient;
+};
+
+export const mockedTestProvidersOwner = [SECURITY_SOLUTION_OWNER];
+
 /** A utility for wrapping children in the providers required to run most tests */
 const TestProvidersComponent: React.FC<TestProviderProps> = ({
   children,
   features,
-  owner = [SECURITY_SOLUTION_OWNER],
+  owner = mockedTestProvidersOwner,
   permissions = allCasesPermissions(),
   releasePhase = 'ga',
   externalReferenceAttachmentTypeRegistry = new ExternalReferenceAttachmentTypeRegistry(),
   persistableStateAttachmentTypeRegistry = new PersistableStateAttachmentTypeRegistry(),
   license,
 }) => {
+  const services = createStartServicesMock({ license });
+
   const queryClient = new QueryClient({
     defaultOptions: {
       queries: {
@@ -67,7 +93,7 @@ const TestProvidersComponent: React.FC<TestProviderProps> = ({
     },
   });
 
-  const services = createStartServicesMock({ license });
+  const getFilesClient = mockGetFilesClient();
 
   return (
     <I18nProvider>
@@ -82,9 +108,10 @@ const TestProvidersComponent: React.FC<TestProviderProps> = ({
                   features,
                   owner,
                   permissions,
+                  getFilesClient,
                 }}
               >
-                {children}
+                <FilesContext client={createMockFilesClient()}>{children}</FilesContext>
               </CasesProvider>
             </MemoryRouter>
           </QueryClientProvider>
@@ -104,6 +131,7 @@ export interface AppMockRenderer {
   coreStart: StartServices;
   queryClient: QueryClient;
   AppWrapper: React.FC<{ children: React.ReactElement }>;
+  getFilesClient: () => ScopedFilesClient;
 }
 
 export const testQueryClient = new QueryClient({
@@ -125,7 +153,7 @@ export const testQueryClient = new QueryClient({
 
 export const createAppMockRenderer = ({
   features,
-  owner = [SECURITY_SOLUTION_OWNER],
+  owner = mockedTestProvidersOwner,
   permissions = allCasesPermissions(),
   releasePhase = 'ga',
   externalReferenceAttachmentTypeRegistry = new ExternalReferenceAttachmentTypeRegistry(),
@@ -147,6 +175,8 @@ export const createAppMockRenderer = ({
     },
   });
 
+  const getFilesClient = mockGetFilesClient();
+
   const AppWrapper: React.FC<{ children: React.ReactElement }> = ({ children }) => (
     <I18nProvider>
       <KibanaContextProvider services={services}>
@@ -161,6 +191,7 @@ export const createAppMockRenderer = ({
                   owner,
                   permissions,
                   releasePhase,
+                  getFilesClient,
                 }}
               >
                 {children}
@@ -188,6 +219,7 @@ export const createAppMockRenderer = ({
     AppWrapper,
     externalReferenceAttachmentTypeRegistry,
     persistableStateAttachmentTypeRegistry,
+    getFilesClient,
   };
 };
 
diff --git a/x-pack/plugins/cases/public/common/use_cases_toast.test.tsx b/x-pack/plugins/cases/public/common/use_cases_toast.test.tsx
index 6c33c86d29d51..d6597e31362e7 100644
--- a/x-pack/plugins/cases/public/common/use_cases_toast.test.tsx
+++ b/x-pack/plugins/cases/public/common/use_cases_toast.test.tsx
@@ -25,6 +25,7 @@ const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
 describe('Use cases toast hook', () => {
   const successMock = jest.fn();
   const errorMock = jest.fn();
+  const dangerMock = jest.fn();
   const getUrlForApp = jest.fn().mockReturnValue(`/app/cases/${mockCase.id}`);
   const navigateToUrl = jest.fn();
 
@@ -54,6 +55,7 @@ describe('Use cases toast hook', () => {
     return {
       addSuccess: successMock,
       addError: errorMock,
+      addDanger: dangerMock,
     };
   });
 
@@ -352,4 +354,22 @@ describe('Use cases toast hook', () => {
       });
     });
   });
+
+  describe('showDangerToast', () => {
+    it('should show a danger toast', () => {
+      const { result } = renderHook(
+        () => {
+          return useCasesToast();
+        },
+        { wrapper: TestProviders }
+      );
+
+      result.current.showDangerToast('my danger toast');
+
+      expect(dangerMock).toHaveBeenCalledWith({
+        className: 'eui-textBreakWord',
+        title: 'my danger toast',
+      });
+    });
+  });
 });
diff --git a/x-pack/plugins/cases/public/common/use_cases_toast.tsx b/x-pack/plugins/cases/public/common/use_cases_toast.tsx
index fd143345e2deb..26027905f8f0e 100644
--- a/x-pack/plugins/cases/public/common/use_cases_toast.tsx
+++ b/x-pack/plugins/cases/public/common/use_cases_toast.tsx
@@ -169,6 +169,9 @@ export const useCasesToast = () => {
     showSuccessToast: (title: string) => {
       toasts.addSuccess({ title, className: 'eui-textBreakWord' });
     },
+    showDangerToast: (title: string) => {
+      toasts.addDanger({ title, className: 'eui-textBreakWord' });
+    },
     showInfoToast: (title: string, text?: string) => {
       toasts.addInfo({
         title,
diff --git a/x-pack/plugins/cases/public/components/app/index.tsx b/x-pack/plugins/cases/public/components/app/index.tsx
index 42ef9b658fea7..f53e7edf9356a 100644
--- a/x-pack/plugins/cases/public/components/app/index.tsx
+++ b/x-pack/plugins/cases/public/components/app/index.tsx
@@ -6,12 +6,15 @@
  */
 
 import React from 'react';
-import { APP_OWNER } from '../../../common/constants';
+
+import type { ScopedFilesClient } from '@kbn/files-plugin/public';
+
 import type { ExternalReferenceAttachmentTypeRegistry } from '../../client/attachment_framework/external_reference_registry';
 import type { PersistableStateAttachmentTypeRegistry } from '../../client/attachment_framework/persistable_state_registry';
+
+import { APP_OWNER } from '../../../common/constants';
 import { getCasesLazy } from '../../client/ui/get_cases';
 import { useApplicationCapabilities } from '../../common/lib/kibana';
-
 import { Wrapper } from '../wrappers';
 import type { CasesRoutesProps } from './types';
 
@@ -20,11 +23,13 @@ export type CasesProps = CasesRoutesProps;
 interface CasesAppProps {
   externalReferenceAttachmentTypeRegistry: ExternalReferenceAttachmentTypeRegistry;
   persistableStateAttachmentTypeRegistry: PersistableStateAttachmentTypeRegistry;
+  getFilesClient: (scope: string) => ScopedFilesClient;
 }
 
 const CasesAppComponent: React.FC<CasesAppProps> = ({
   externalReferenceAttachmentTypeRegistry,
   persistableStateAttachmentTypeRegistry,
+  getFilesClient,
 }) => {
   const userCapabilities = useApplicationCapabilities();
 
@@ -33,6 +38,7 @@ const CasesAppComponent: React.FC<CasesAppProps> = ({
       {getCasesLazy({
         externalReferenceAttachmentTypeRegistry,
         persistableStateAttachmentTypeRegistry,
+        getFilesClient,
         owner: [APP_OWNER],
         useFetchAlertData: () => [false, {}],
         permissions: userCapabilities.generalCases,
diff --git a/x-pack/plugins/cases/public/components/case_action_bar/actions.tsx b/x-pack/plugins/cases/public/components/case_action_bar/actions.tsx
index 87cd1fc732a30..b80cd5c2dbe74 100644
--- a/x-pack/plugins/cases/public/components/case_action_bar/actions.tsx
+++ b/x-pack/plugins/cases/public/components/case_action_bar/actions.tsx
@@ -16,6 +16,7 @@ import type { Case } from '../../../common/ui/types';
 import { useAllCasesNavigation } from '../../common/navigation';
 import { useCasesContext } from '../cases_context/use_cases_context';
 import { useCasesToast } from '../../common/use_cases_toast';
+import { AttachmentActionType } from '../../client/attachment_framework/types';
 
 interface CaseViewActions {
   caseData: Case;
@@ -40,6 +41,7 @@ const ActionsComponent: React.FC<CaseViewActions> = ({ caseData, currentExternal
   const propertyActions = useMemo(
     () => [
       {
+        type: AttachmentActionType.BUTTON as const,
         iconType: 'copyClipboard',
         label: i18n.COPY_ID_ACTION_LABEL,
         onClick: () => {
@@ -50,6 +52,7 @@ const ActionsComponent: React.FC<CaseViewActions> = ({ caseData, currentExternal
       ...(currentExternalIncident != null && !isEmpty(currentExternalIncident?.externalUrl)
         ? [
             {
+              type: AttachmentActionType.BUTTON as const,
               iconType: 'popout',
               label: i18n.VIEW_INCIDENT(currentExternalIncident?.externalTitle ?? ''),
               onClick: () => window.open(currentExternalIncident?.externalUrl, '_blank'),
@@ -59,6 +62,7 @@ const ActionsComponent: React.FC<CaseViewActions> = ({ caseData, currentExternal
       ...(permissions.delete
         ? [
             {
+              type: AttachmentActionType.BUTTON as const,
               iconType: 'trash',
               label: i18n.DELETE_CASE(),
               color: 'danger' as const,
diff --git a/x-pack/plugins/cases/public/components/case_view/case_view_page.test.tsx b/x-pack/plugins/cases/public/components/case_view/case_view_page.test.tsx
index bf348124e4616..f247945c7c700 100644
--- a/x-pack/plugins/cases/public/components/case_view/case_view_page.test.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/case_view_page.test.tsx
@@ -493,8 +493,9 @@ describe('CaseViewPage', () => {
     it('renders tabs correctly', async () => {
       const result = appMockRenderer.render(<CaseViewPage {...caseProps} />);
       await act(async () => {
-        expect(result.getByTestId('case-view-tab-title-alerts')).toBeTruthy();
         expect(result.getByTestId('case-view-tab-title-activity')).toBeTruthy();
+        expect(result.getByTestId('case-view-tab-title-alerts')).toBeTruthy();
+        expect(result.getByTestId('case-view-tab-title-files')).toBeTruthy();
       });
     });
 
diff --git a/x-pack/plugins/cases/public/components/case_view/case_view_page.tsx b/x-pack/plugins/cases/public/components/case_view/case_view_page.tsx
index a26793e501897..55245de4b22b2 100644
--- a/x-pack/plugins/cases/public/components/case_view/case_view_page.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/case_view_page.tsx
@@ -18,6 +18,7 @@ import { useCasesTitleBreadcrumbs } from '../use_breadcrumbs';
 import { WhitePageWrapperNoBorder } from '../wrappers';
 import { CaseViewActivity } from './components/case_view_activity';
 import { CaseViewAlerts } from './components/case_view_alerts';
+import { CaseViewFiles } from './components/case_view_files';
 import { CaseViewMetrics } from './metrics';
 import type { CaseViewPageProps } from './types';
 import { useRefreshCaseViewPage } from './use_on_refresh_case_view_page';
@@ -140,6 +141,7 @@ export const CaseViewPage = React.memo<CaseViewPageProps>(
             {activeTabId === CASE_VIEW_PAGE_TABS.ALERTS && features.alerts.enabled && (
               <CaseViewAlerts caseData={caseData} />
             )}
+            {activeTabId === CASE_VIEW_PAGE_TABS.FILES && <CaseViewFiles caseData={caseData} />}
           </EuiFlexGroup>
         </WhitePageWrapperNoBorder>
         {timelineUi?.renderTimelineDetailsPanel ? timelineUi.renderTimelineDetailsPanel() : null}
diff --git a/x-pack/plugins/cases/public/components/case_view/case_view_tabs.test.tsx b/x-pack/plugins/cases/public/components/case_view/case_view_tabs.test.tsx
index a3da7d90267cf..bd532d95ba58b 100644
--- a/x-pack/plugins/cases/public/components/case_view/case_view_tabs.test.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/case_view_tabs.test.tsx
@@ -8,23 +8,28 @@
 import React from 'react';
 import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
+
 import type { AppMockRenderer } from '../../common/mock';
-import { createAppMockRenderer } from '../../common/mock';
+import type { UseGetCase } from '../../containers/use_get_case';
+import type { CaseViewTabsProps } from './case_view_tabs';
+
+import { CASE_VIEW_PAGE_TABS } from '../../../common/types';
 import '../../common/mock/match_media';
+import { createAppMockRenderer } from '../../common/mock';
 import { useCaseViewNavigation } from '../../common/navigation/hooks';
-import type { UseGetCase } from '../../containers/use_get_case';
 import { useGetCase } from '../../containers/use_get_case';
 import { CaseViewTabs } from './case_view_tabs';
 import { caseData, defaultGetCase } from './mocks';
-import type { CaseViewTabsProps } from './case_view_tabs';
-import { CASE_VIEW_PAGE_TABS } from '../../../common/types';
+import { useGetCaseFileStats } from '../../containers/use_get_case_file_stats';
 
 jest.mock('../../containers/use_get_case');
 jest.mock('../../common/navigation/hooks');
 jest.mock('../../common/hooks');
+jest.mock('../../containers/use_get_case_file_stats');
 
 const useFetchCaseMock = useGetCase as jest.Mock;
 const useCaseViewNavigationMock = useCaseViewNavigation as jest.Mock;
+const useGetCaseFileStatsMock = useGetCaseFileStats as jest.Mock;
 
 const mockGetCase = (props: Partial<UseGetCase> = {}) => {
   const data = {
@@ -45,8 +50,10 @@ export const caseProps: CaseViewTabsProps = {
 
 describe('CaseViewTabs', () => {
   let appMockRenderer: AppMockRenderer;
+  const data = { total: 3 };
 
   beforeEach(() => {
+    useGetCaseFileStatsMock.mockReturnValue({ data });
     mockGetCase();
 
     appMockRenderer = createAppMockRenderer();
@@ -62,6 +69,7 @@ describe('CaseViewTabs', () => {
 
     expect(await screen.findByTestId('case-view-tab-title-activity')).toBeInTheDocument();
     expect(await screen.findByTestId('case-view-tab-title-alerts')).toBeInTheDocument();
+    expect(await screen.findByTestId('case-view-tab-title-files')).toBeInTheDocument();
   });
 
   it('renders the activity tab by default', async () => {
@@ -82,6 +90,40 @@ describe('CaseViewTabs', () => {
     );
   });
 
+  it('shows the files tab as active', async () => {
+    appMockRenderer.render(<CaseViewTabs {...caseProps} activeTab={CASE_VIEW_PAGE_TABS.FILES} />);
+
+    expect(await screen.findByTestId('case-view-tab-title-files')).toHaveAttribute(
+      'aria-selected',
+      'true'
+    );
+  });
+
+  it('shows the files tab with the correct count and colour', async () => {
+    appMockRenderer.render(<CaseViewTabs {...caseProps} activeTab={CASE_VIEW_PAGE_TABS.FILES} />);
+
+    const badge = await screen.findByTestId('case-view-files-stats-badge');
+
+    expect(badge.getAttribute('class')).toMatch(/accent/);
+    expect(badge).toHaveTextContent('3');
+  });
+
+  it('do not show count on the files tab if the call isLoading', async () => {
+    useGetCaseFileStatsMock.mockReturnValue({ isLoading: true, data });
+
+    appMockRenderer.render(<CaseViewTabs {...caseProps} activeTab={CASE_VIEW_PAGE_TABS.FILES} />);
+
+    expect(screen.queryByTestId('case-view-files-stats-badge')).not.toBeInTheDocument();
+  });
+
+  it('the files tab count has a different colour if the tab is not active', async () => {
+    appMockRenderer.render(<CaseViewTabs {...caseProps} activeTab={CASE_VIEW_PAGE_TABS.ALERTS} />);
+
+    expect(
+      (await screen.findByTestId('case-view-files-stats-badge')).getAttribute('class')
+    ).not.toMatch(/accent/);
+  });
+
   it('navigates to the activity tab when the activity tab is clicked', async () => {
     const navigateToCaseViewMock = useCaseViewNavigationMock().navigateToCaseView;
     appMockRenderer.render(<CaseViewTabs {...caseProps} />);
@@ -109,4 +151,18 @@ describe('CaseViewTabs', () => {
       });
     });
   });
+
+  it('navigates to the files tab when the files tab is clicked', async () => {
+    const navigateToCaseViewMock = useCaseViewNavigationMock().navigateToCaseView;
+    appMockRenderer.render(<CaseViewTabs {...caseProps} />);
+
+    userEvent.click(await screen.findByTestId('case-view-tab-title-files'));
+
+    await waitFor(() => {
+      expect(navigateToCaseViewMock).toHaveBeenCalledWith({
+        detailName: caseData.id,
+        tabId: CASE_VIEW_PAGE_TABS.FILES,
+      });
+    });
+  });
 });
diff --git a/x-pack/plugins/cases/public/components/case_view/case_view_tabs.tsx b/x-pack/plugins/cases/public/components/case_view/case_view_tabs.tsx
index 746311051f147..630248bf79d52 100644
--- a/x-pack/plugins/cases/public/components/case_view/case_view_tabs.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/case_view_tabs.tsx
@@ -5,20 +5,49 @@
  * 2.0.
  */
 
-import { EuiBetaBadge, EuiSpacer, EuiTab, EuiTabs } from '@elastic/eui';
+import { EuiBetaBadge, EuiNotificationBadge, EuiSpacer, EuiTab, EuiTabs } from '@elastic/eui';
 import React, { useCallback, useMemo } from 'react';
 import styled from 'styled-components';
 import { CASE_VIEW_PAGE_TABS } from '../../../common/types';
 import { useCaseViewNavigation } from '../../common/navigation';
 import { useCasesContext } from '../cases_context/use_cases_context';
 import { EXPERIMENTAL_DESC, EXPERIMENTAL_LABEL } from '../header_page/translations';
-import { ACTIVITY_TAB, ALERTS_TAB } from './translations';
+import { ACTIVITY_TAB, ALERTS_TAB, FILES_TAB } from './translations';
 import type { Case } from '../../../common';
+import { useGetCaseFileStats } from '../../containers/use_get_case_file_stats';
 
 const ExperimentalBadge = styled(EuiBetaBadge)`
   margin-left: 5px;
 `;
 
+const StyledNotificationBadge = styled(EuiNotificationBadge)`
+  margin-left: 5px;
+`;
+
+const FilesTab = ({
+  activeTab,
+  fileStatsData,
+  isLoading,
+}: {
+  activeTab: string;
+  fileStatsData: { total: number } | undefined;
+  isLoading: boolean;
+}) => (
+  <>
+    {FILES_TAB}
+    {!isLoading && fileStatsData && (
+      <StyledNotificationBadge
+        data-test-subj="case-view-files-stats-badge"
+        color={activeTab === CASE_VIEW_PAGE_TABS.FILES ? 'accent' : 'subdued'}
+      >
+        {fileStatsData.total > 0 ? fileStatsData.total : 0}
+      </StyledNotificationBadge>
+    )}
+  </>
+);
+
+FilesTab.displayName = 'FilesTab';
+
 export interface CaseViewTabsProps {
   caseData: Case;
   activeTab: CASE_VIEW_PAGE_TABS;
@@ -27,6 +56,7 @@ export interface CaseViewTabsProps {
 export const CaseViewTabs = React.memo<CaseViewTabsProps>(({ caseData, activeTab }) => {
   const { features } = useCasesContext();
   const { navigateToCaseView } = useCaseViewNavigation();
+  const { data: fileStatsData, isLoading } = useGetCaseFileStats({ caseId: caseData.id });
 
   const tabs = useMemo(
     () => [
@@ -56,8 +86,14 @@ export const CaseViewTabs = React.memo<CaseViewTabsProps>(({ caseData, activeTab
             },
           ]
         : []),
+      {
+        id: CASE_VIEW_PAGE_TABS.FILES,
+        name: (
+          <FilesTab isLoading={isLoading} fileStatsData={fileStatsData} activeTab={activeTab} />
+        ),
+      },
     ],
-    [features.alerts.enabled, features.alerts.isExperimental]
+    [activeTab, features.alerts.enabled, features.alerts.isExperimental, fileStatsData, isLoading]
   );
 
   const renderTabs = useCallback(() => {
diff --git a/x-pack/plugins/cases/public/components/case_view/components/case_view_files.test.tsx b/x-pack/plugins/cases/public/components/case_view/components/case_view_files.test.tsx
new file mode 100644
index 0000000000000..dc5b937bd8781
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/case_view/components/case_view_files.test.tsx
@@ -0,0 +1,114 @@
+/*
+ * 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 { screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+
+import type { Case } from '../../../../common';
+import type { AppMockRenderer } from '../../../common/mock';
+
+import { createAppMockRenderer } from '../../../common/mock';
+import { alertCommentWithIndices, basicCase } from '../../../containers/mock';
+import { useGetCaseFiles } from '../../../containers/use_get_case_files';
+import { CaseViewFiles, DEFAULT_CASE_FILES_FILTERING_OPTIONS } from './case_view_files';
+
+jest.mock('../../../containers/use_get_case_files');
+
+const useGetCaseFilesMock = useGetCaseFiles as jest.Mock;
+
+const caseData: Case = {
+  ...basicCase,
+  comments: [...basicCase.comments, alertCommentWithIndices],
+};
+
+describe('Case View Page files tab', () => {
+  let appMockRender: AppMockRenderer;
+
+  useGetCaseFilesMock.mockReturnValue({
+    data: { files: [], total: 11 },
+    isLoading: false,
+  });
+
+  beforeEach(() => {
+    appMockRender = createAppMockRenderer();
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should render the utility bar for the files table', async () => {
+    appMockRender.render(<CaseViewFiles caseData={caseData} />);
+
+    expect((await screen.findAllByTestId('cases-files-add')).length).toBe(2);
+    expect(await screen.findByTestId('cases-files-search')).toBeInTheDocument();
+  });
+
+  it('should render the files table', async () => {
+    appMockRender.render(<CaseViewFiles caseData={caseData} />);
+
+    expect(await screen.findByTestId('cases-files-table')).toBeInTheDocument();
+  });
+
+  it('clicking table pagination triggers calls to useGetCaseFiles', async () => {
+    appMockRender.render(<CaseViewFiles caseData={caseData} />);
+
+    expect(await screen.findByTestId('cases-files-table')).toBeInTheDocument();
+
+    userEvent.click(await screen.findByTestId('pagination-button-next'));
+
+    await waitFor(() =>
+      expect(useGetCaseFilesMock).toHaveBeenCalledWith({
+        caseId: basicCase.id,
+        page: DEFAULT_CASE_FILES_FILTERING_OPTIONS.page + 1,
+        perPage: DEFAULT_CASE_FILES_FILTERING_OPTIONS.perPage,
+      })
+    );
+  });
+
+  it('changing perPage value triggers calls to useGetCaseFiles', async () => {
+    const targetPagination = 50;
+
+    appMockRender.render(<CaseViewFiles caseData={caseData} />);
+
+    expect(await screen.findByTestId('cases-files-table')).toBeInTheDocument();
+
+    userEvent.click(screen.getByTestId('tablePaginationPopoverButton'));
+
+    const pageSizeOption = screen.getByTestId('tablePagination-50-rows');
+
+    pageSizeOption.style.pointerEvents = 'all';
+
+    userEvent.click(pageSizeOption);
+
+    await waitFor(() =>
+      expect(useGetCaseFilesMock).toHaveBeenCalledWith({
+        caseId: basicCase.id,
+        page: DEFAULT_CASE_FILES_FILTERING_OPTIONS.page,
+        perPage: targetPagination,
+      })
+    );
+  });
+
+  it('search by word triggers calls to useGetCaseFiles', async () => {
+    appMockRender.render(<CaseViewFiles caseData={caseData} />);
+
+    expect(await screen.findByTestId('cases-files-table')).toBeInTheDocument();
+
+    await userEvent.type(screen.getByTestId('cases-files-search'), 'Foobar{enter}');
+
+    await waitFor(() =>
+      expect(useGetCaseFilesMock).toHaveBeenCalledWith({
+        caseId: basicCase.id,
+        page: DEFAULT_CASE_FILES_FILTERING_OPTIONS.page,
+        perPage: DEFAULT_CASE_FILES_FILTERING_OPTIONS.perPage,
+        searchTerm: 'Foobar',
+      })
+    );
+  });
+});
diff --git a/x-pack/plugins/cases/public/components/case_view/components/case_view_files.tsx b/x-pack/plugins/cases/public/components/case_view/components/case_view_files.tsx
new file mode 100644
index 0000000000000..54693acfa2390
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/case_view/components/case_view_files.tsx
@@ -0,0 +1,104 @@
+/*
+ * 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 { isEqual } from 'lodash/fp';
+import React, { useCallback, useMemo, useState } from 'react';
+
+import type { Criteria } from '@elastic/eui';
+import type { FileJSON } from '@kbn/shared-ux-file-types';
+
+import { EuiFlexItem, EuiFlexGroup } from '@elastic/eui';
+
+import type { Case } from '../../../../common/ui/types';
+import type { CaseFilesFilteringOptions } from '../../../containers/use_get_case_files';
+
+import { CASE_VIEW_PAGE_TABS } from '../../../../common/types';
+import { useGetCaseFiles } from '../../../containers/use_get_case_files';
+import { FilesTable } from '../../files/files_table';
+import { CaseViewTabs } from '../case_view_tabs';
+import { FilesUtilityBar } from '../../files/files_utility_bar';
+
+interface CaseViewFilesProps {
+  caseData: Case;
+}
+
+export const DEFAULT_CASE_FILES_FILTERING_OPTIONS = {
+  page: 0,
+  perPage: 10,
+};
+
+export const CaseViewFiles = ({ caseData }: CaseViewFilesProps) => {
+  const [filteringOptions, setFilteringOptions] = useState<CaseFilesFilteringOptions>(
+    DEFAULT_CASE_FILES_FILTERING_OPTIONS
+  );
+  const {
+    data: caseFiles,
+    isLoading,
+    isPreviousData,
+  } = useGetCaseFiles({
+    ...filteringOptions,
+    caseId: caseData.id,
+  });
+
+  const onTableChange = useCallback(
+    ({ page }: Criteria<FileJSON>) => {
+      if (page && !isPreviousData) {
+        setFilteringOptions({
+          ...filteringOptions,
+          page: page.index,
+          perPage: page.size,
+        });
+      }
+    },
+    [filteringOptions, isPreviousData]
+  );
+
+  const onSearchChange = useCallback(
+    (newSearch) => {
+      const trimSearch = newSearch.trim();
+      if (!isEqual(trimSearch, filteringOptions.searchTerm)) {
+        setFilteringOptions({
+          ...filteringOptions,
+          searchTerm: trimSearch,
+        });
+      }
+    },
+    [filteringOptions]
+  );
+
+  const pagination = useMemo(
+    () => ({
+      pageIndex: filteringOptions.page,
+      pageSize: filteringOptions.perPage,
+      totalItemCount: caseFiles?.total ?? 0,
+      pageSizeOptions: [10, 25, 50],
+      showPerPageOptions: true,
+    }),
+    [filteringOptions.page, filteringOptions.perPage, caseFiles?.total]
+  );
+
+  return (
+    <EuiFlexGroup>
+      <EuiFlexItem>
+        <CaseViewTabs caseData={caseData} activeTab={CASE_VIEW_PAGE_TABS.FILES} />
+        <EuiFlexGroup>
+          <EuiFlexItem>
+            <FilesUtilityBar caseId={caseData.id} onSearch={onSearchChange} />
+            <FilesTable
+              caseId={caseData.id}
+              isLoading={isLoading}
+              items={caseFiles?.files ?? []}
+              onChange={onTableChange}
+              pagination={pagination}
+            />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+};
+
+CaseViewFiles.displayName = 'CaseViewFiles';
diff --git a/x-pack/plugins/cases/public/components/case_view/translations.ts b/x-pack/plugins/cases/public/components/case_view/translations.ts
index d71c56fc97fca..8fc80c1a0aba3 100644
--- a/x-pack/plugins/cases/public/components/case_view/translations.ts
+++ b/x-pack/plugins/cases/public/components/case_view/translations.ts
@@ -165,6 +165,10 @@ export const ALERTS_TAB = i18n.translate('xpack.cases.caseView.tabs.alerts', {
   defaultMessage: 'Alerts',
 });
 
+export const FILES_TAB = i18n.translate('xpack.cases.caseView.tabs.files', {
+  defaultMessage: 'Files',
+});
+
 export const ALERTS_EMPTY_DESCRIPTION = i18n.translate(
   'xpack.cases.caseView.tabs.alerts.emptyDescription',
   {
diff --git a/x-pack/plugins/cases/public/components/cases_context/index.tsx b/x-pack/plugins/cases/public/components/cases_context/index.tsx
index 4e31fffdd7701..dc7eac6381b4d 100644
--- a/x-pack/plugins/cases/public/components/cases_context/index.tsx
+++ b/x-pack/plugins/cases/public/components/cases_context/index.tsx
@@ -5,25 +5,34 @@
  * 2.0.
  */
 
-import type { Dispatch } from 'react';
-import React, { useState, useEffect, useReducer } from 'react';
+import type { Dispatch, ReactNode } from 'react';
+
 import { merge } from 'lodash';
+import React, { useCallback, useEffect, useState, useReducer } from 'react';
 import useDeepCompareEffect from 'react-use/lib/useDeepCompareEffect';
-import { DEFAULT_FEATURES } from '../../../common/constants';
-import { DEFAULT_BASE_PATH } from '../../common/navigation';
-import { useApplication } from './use_application';
+
+import type { ScopedFilesClient } from '@kbn/files-plugin/public';
+
+import { FilesContext } from '@kbn/shared-ux-file-context';
+
 import type { CasesContextStoreAction } from './cases_context_reducer';
-import { casesContextReducer, getInitialCasesContextState } from './cases_context_reducer';
 import type {
   CasesFeaturesAllRequired,
   CasesFeatures,
   CasesPermissions,
 } from '../../containers/types';
-import { CasesGlobalComponents } from './cases_global_components';
 import type { ReleasePhase } from '../types';
 import type { ExternalReferenceAttachmentTypeRegistry } from '../../client/attachment_framework/external_reference_registry';
 import type { PersistableStateAttachmentTypeRegistry } from '../../client/attachment_framework/persistable_state_registry';
 
+import { CasesGlobalComponents } from './cases_global_components';
+import { DEFAULT_FEATURES } from '../../../common/constants';
+import { constructFileKindIdByOwner } from '../../../common/files';
+import { DEFAULT_BASE_PATH } from '../../common/navigation';
+import { useApplication } from './use_application';
+import { casesContextReducer, getInitialCasesContextState } from './cases_context_reducer';
+import { isRegisteredOwner } from '../../files';
+
 export type CasesContextValueDispatch = Dispatch<CasesContextStoreAction>;
 
 export interface CasesContextValue {
@@ -50,6 +59,7 @@ export interface CasesContextProps
   basePath?: string;
   features?: CasesFeatures;
   releasePhase?: ReleasePhase;
+  getFilesClient: (scope: string) => ScopedFilesClient;
 }
 
 export const CasesContext = React.createContext<CasesContextValue | undefined>(undefined);
@@ -69,6 +79,7 @@ export const CasesProvider: React.FC<{ value: CasesContextProps }> = ({
     basePath = DEFAULT_BASE_PATH,
     features = {},
     releasePhase = 'ga',
+    getFilesClient,
   },
 }) => {
   const { appId, appTitle } = useApplication();
@@ -114,10 +125,35 @@ export const CasesProvider: React.FC<{ value: CasesContextProps }> = ({
     }
   }, [appTitle, appId]);
 
+  const applyFilesContext = useCallback(
+    (contextChildren: ReactNode) => {
+      if (owner.length === 0) {
+        return contextChildren;
+      }
+
+      if (isRegisteredOwner(owner[0])) {
+        return (
+          <FilesContext client={getFilesClient(constructFileKindIdByOwner(owner[0]))}>
+            {contextChildren}
+          </FilesContext>
+        );
+      } else {
+        throw new Error(
+          'Invalid owner provided to cases context. See https://github.com/elastic/kibana/blob/main/x-pack/plugins/cases/README.md#casescontext-setup'
+        );
+      }
+    },
+    [getFilesClient, owner]
+  );
+
   return isCasesContextValue(value) ? (
     <CasesContext.Provider value={value}>
-      <CasesGlobalComponents state={state} />
-      {children}
+      {applyFilesContext(
+        <>
+          <CasesGlobalComponents state={state} />
+          {children}
+        </>
+      )}
     </CasesContext.Provider>
   ) : null;
 };
diff --git a/x-pack/plugins/cases/public/components/files/add_file.test.tsx b/x-pack/plugins/cases/public/components/files/add_file.test.tsx
new file mode 100644
index 0000000000000..911f8a4df538d
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/files/add_file.test.tsx
@@ -0,0 +1,241 @@
+/*
+ * 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 type { FileUploadProps } from '@kbn/shared-ux-file-upload';
+
+import { screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+
+import type { AppMockRenderer } from '../../common/mock';
+
+import * as api from '../../containers/api';
+import {
+  buildCasesPermissions,
+  createAppMockRenderer,
+  mockedTestProvidersOwner,
+} from '../../common/mock';
+import { AddFile } from './add_file';
+import { useToasts } from '../../common/lib/kibana';
+
+import { useCreateAttachments } from '../../containers/use_create_attachments';
+import { basicCaseId, basicFileMock } from '../../containers/mock';
+
+jest.mock('../../containers/api');
+jest.mock('../../containers/use_create_attachments');
+jest.mock('../../common/lib/kibana');
+
+const useToastsMock = useToasts as jest.Mock;
+const useCreateAttachmentsMock = useCreateAttachments as jest.Mock;
+
+const mockedExternalReferenceId = 'externalReferenceId';
+const validateMetadata = jest.fn();
+const mockFileUpload = jest
+  .fn()
+  .mockImplementation(
+    ({
+      kind,
+      onDone,
+      onError,
+      meta,
+    }: Required<Pick<FileUploadProps, 'kind' | 'onDone' | 'onError' | 'meta'>>) => (
+      <>
+        <button
+          data-test-subj="testOnDone"
+          type="button"
+          onClick={() =>
+            onDone([{ id: mockedExternalReferenceId, kind, fileJSON: { ...basicFileMock, meta } }])
+          }
+        >
+          {'test'}
+        </button>
+        <button
+          data-test-subj="testOnError"
+          type="button"
+          onClick={() => onError({ name: 'upload error name', message: 'upload error message' })}
+        >
+          {'test'}
+        </button>
+        <button data-test-subj="testMetadata" type="button" onClick={() => validateMetadata(meta)}>
+          {'test'}
+        </button>
+      </>
+    )
+  );
+
+jest.mock('@kbn/shared-ux-file-upload', () => {
+  const original = jest.requireActual('@kbn/shared-ux-file-upload');
+  return {
+    ...original,
+    FileUpload: (props: unknown) => mockFileUpload(props),
+  };
+});
+
+describe('AddFile', () => {
+  let appMockRender: AppMockRenderer;
+
+  const successMock = jest.fn();
+  const errorMock = jest.fn();
+
+  useToastsMock.mockImplementation(() => {
+    return {
+      addSuccess: successMock,
+      addError: errorMock,
+    };
+  });
+
+  const createAttachmentsMock = jest.fn();
+
+  useCreateAttachmentsMock.mockReturnValue({
+    isLoading: false,
+    createAttachments: createAttachmentsMock,
+  });
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    appMockRender = createAppMockRenderer();
+  });
+
+  it('renders correctly', async () => {
+    appMockRender.render(<AddFile caseId={'foobar'} />);
+
+    expect(await screen.findByTestId('cases-files-add')).toBeInTheDocument();
+  });
+
+  it('AddFile is not rendered if user has no create permission', async () => {
+    appMockRender = createAppMockRenderer({
+      permissions: buildCasesPermissions({ create: false }),
+    });
+
+    appMockRender.render(<AddFile caseId={'foobar'} />);
+
+    expect(screen.queryByTestId('cases-files-add')).not.toBeInTheDocument();
+  });
+
+  it('AddFile is not rendered if user has no update permission', async () => {
+    appMockRender = createAppMockRenderer({
+      permissions: buildCasesPermissions({ update: false }),
+    });
+
+    appMockRender.render(<AddFile caseId={'foobar'} />);
+
+    expect(screen.queryByTestId('cases-files-add')).not.toBeInTheDocument();
+  });
+
+  it('clicking button renders modal', async () => {
+    appMockRender.render(<AddFile caseId={'foobar'} />);
+
+    userEvent.click(await screen.findByTestId('cases-files-add'));
+
+    expect(await screen.findByTestId('cases-files-add-modal')).toBeInTheDocument();
+  });
+
+  it('createAttachments called with right parameters', async () => {
+    appMockRender.render(<AddFile caseId={'foobar'} />);
+
+    userEvent.click(await screen.findByTestId('cases-files-add'));
+
+    expect(await screen.findByTestId('cases-files-add-modal')).toBeInTheDocument();
+
+    userEvent.click(await screen.findByTestId('testOnDone'));
+
+    await waitFor(() =>
+      expect(createAttachmentsMock).toBeCalledWith({
+        caseId: 'foobar',
+        caseOwner: mockedTestProvidersOwner[0],
+        data: [
+          {
+            externalReferenceAttachmentTypeId: '.files',
+            externalReferenceId: mockedExternalReferenceId,
+            externalReferenceMetadata: {
+              files: [
+                {
+                  created: '2020-02-19T23:06:33.798Z',
+                  extension: 'png',
+                  mimeType: 'image/png',
+                  name: 'my-super-cool-screenshot',
+                },
+              ],
+            },
+            externalReferenceStorage: { soType: 'file', type: 'savedObject' },
+            type: 'externalReference',
+          },
+        ],
+        throwOnError: true,
+        updateCase: expect.any(Function),
+      })
+    );
+
+    await waitFor(() =>
+      expect(successMock).toHaveBeenCalledWith({
+        className: 'eui-textBreakWord',
+        title: `File ${basicFileMock.name} uploaded successfully`,
+      })
+    );
+  });
+
+  it('failed upload displays error toast', async () => {
+    appMockRender.render(<AddFile caseId={'foobar'} />);
+
+    userEvent.click(await screen.findByTestId('cases-files-add'));
+
+    expect(await screen.findByTestId('cases-files-add-modal')).toBeInTheDocument();
+
+    userEvent.click(await screen.findByTestId('testOnError'));
+
+    expect(errorMock).toHaveBeenCalledWith(
+      { name: 'upload error name', message: 'upload error message' },
+      {
+        title: 'Failed to upload file',
+      }
+    );
+  });
+
+  it('correct metadata is passed to FileUpload component', async () => {
+    const caseId = 'foobar';
+
+    appMockRender.render(<AddFile caseId={caseId} />);
+
+    userEvent.click(await screen.findByTestId('cases-files-add'));
+
+    expect(await screen.findByTestId('cases-files-add-modal')).toBeInTheDocument();
+
+    userEvent.click(await screen.findByTestId('testMetadata'));
+
+    await waitFor(() =>
+      expect(validateMetadata).toHaveBeenCalledWith({
+        caseIds: [caseId],
+        owner: [mockedTestProvidersOwner[0]],
+      })
+    );
+  });
+
+  it('deleteFileAttachments is called correctly if createAttachments fails', async () => {
+    const spyOnDeleteFileAttachments = jest.spyOn(api, 'deleteFileAttachments');
+
+    createAttachmentsMock.mockImplementation(() => {
+      throw new Error();
+    });
+
+    appMockRender.render(<AddFile caseId={basicCaseId} />);
+
+    userEvent.click(await screen.findByTestId('cases-files-add'));
+
+    expect(await screen.findByTestId('cases-files-add-modal')).toBeInTheDocument();
+
+    userEvent.click(await screen.findByTestId('testOnDone'));
+
+    expect(spyOnDeleteFileAttachments).toHaveBeenCalledWith({
+      caseId: basicCaseId,
+      fileIds: [mockedExternalReferenceId],
+      signal: expect.any(AbortSignal),
+    });
+
+    createAttachmentsMock.mockRestore();
+  });
+});
diff --git a/x-pack/plugins/cases/public/components/files/add_file.tsx b/x-pack/plugins/cases/public/components/files/add_file.tsx
new file mode 100644
index 0000000000000..a3c9fba1188ea
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/files/add_file.tsx
@@ -0,0 +1,141 @@
+/*
+ * 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 {
+  EuiButton,
+  EuiFlexItem,
+  EuiModal,
+  EuiModalBody,
+  EuiModalHeader,
+  EuiModalHeaderTitle,
+} from '@elastic/eui';
+import React, { useCallback, useState } from 'react';
+
+import type { UploadedFile } from '@kbn/shared-ux-file-upload/src/file_upload';
+
+import { FILE_SO_TYPE } from '@kbn/files-plugin/common';
+import { FileUpload } from '@kbn/shared-ux-file-upload';
+
+import { constructFileKindIdByOwner } from '../../../common/files';
+import type { Owner } from '../../../common/constants/types';
+
+import { CommentType, ExternalReferenceStorageType } from '../../../common';
+import { FILE_ATTACHMENT_TYPE } from '../../../common/api';
+import { useCasesToast } from '../../common/use_cases_toast';
+import { useCreateAttachments } from '../../containers/use_create_attachments';
+import { useCasesContext } from '../cases_context/use_cases_context';
+import * as i18n from './translations';
+import { useRefreshCaseViewPage } from '../case_view/use_on_refresh_case_view_page';
+import { deleteFileAttachments } from '../../containers/api';
+
+interface AddFileProps {
+  caseId: string;
+}
+
+const AddFileComponent: React.FC<AddFileProps> = ({ caseId }) => {
+  const { owner, permissions } = useCasesContext();
+  const { showDangerToast, showErrorToast, showSuccessToast } = useCasesToast();
+  const { isLoading, createAttachments } = useCreateAttachments();
+  const refreshAttachmentsTable = useRefreshCaseViewPage();
+  const [isModalVisible, setIsModalVisible] = useState(false);
+
+  const closeModal = () => setIsModalVisible(false);
+  const showModal = () => setIsModalVisible(true);
+
+  const onError = useCallback(
+    (error) => {
+      showErrorToast(error, {
+        title: i18n.FAILED_UPLOAD,
+      });
+    },
+    [showErrorToast]
+  );
+
+  const onUploadDone = useCallback(
+    async (chosenFiles: UploadedFile[]) => {
+      if (chosenFiles.length === 0) {
+        showDangerToast(i18n.FAILED_UPLOAD);
+        return;
+      }
+
+      const file = chosenFiles[0];
+
+      try {
+        await createAttachments({
+          caseId,
+          caseOwner: owner[0],
+          data: [
+            {
+              type: CommentType.externalReference,
+              externalReferenceId: file.id,
+              externalReferenceStorage: {
+                type: ExternalReferenceStorageType.savedObject,
+                soType: FILE_SO_TYPE,
+              },
+              externalReferenceAttachmentTypeId: FILE_ATTACHMENT_TYPE,
+              externalReferenceMetadata: {
+                files: [
+                  {
+                    name: file.fileJSON.name,
+                    extension: file.fileJSON.extension ?? '',
+                    mimeType: file.fileJSON.mimeType ?? '',
+                    created: file.fileJSON.created,
+                  },
+                ],
+              },
+            },
+          ],
+          updateCase: refreshAttachmentsTable,
+          throwOnError: true,
+        });
+
+        showSuccessToast(i18n.SUCCESSFUL_UPLOAD_FILE_NAME(file.fileJSON.name));
+      } catch (error) {
+        // error toast is handled inside  createAttachments
+
+        // we need to delete the file if attachment creation failed
+        const abortCtrlRef = new AbortController();
+        return deleteFileAttachments({ caseId, fileIds: [file.id], signal: abortCtrlRef.signal });
+      }
+
+      closeModal();
+    },
+    [caseId, createAttachments, owner, refreshAttachmentsTable, showDangerToast, showSuccessToast]
+  );
+
+  return permissions.create && permissions.update ? (
+    <EuiFlexItem grow={false}>
+      <EuiButton
+        data-test-subj="cases-files-add"
+        iconType="plusInCircle"
+        isDisabled={isLoading}
+        isLoading={isLoading}
+        onClick={showModal}
+      >
+        {i18n.ADD_FILE}
+      </EuiButton>
+      {isModalVisible && (
+        <EuiModal data-test-subj="cases-files-add-modal" onClose={closeModal}>
+          <EuiModalHeader>
+            <EuiModalHeaderTitle>{i18n.ADD_FILE}</EuiModalHeaderTitle>
+          </EuiModalHeader>
+          <EuiModalBody>
+            <FileUpload
+              kind={constructFileKindIdByOwner(owner[0] as Owner)}
+              onDone={onUploadDone}
+              onError={onError}
+              meta={{ caseIds: [caseId], owner: [owner[0]] }}
+            />
+          </EuiModalBody>
+        </EuiModal>
+      )}
+    </EuiFlexItem>
+  ) : null;
+};
+AddFileComponent.displayName = 'AddFile';
+
+export const AddFile = React.memo(AddFileComponent);
diff --git a/x-pack/plugins/cases/public/components/files/file_delete_button.test.tsx b/x-pack/plugins/cases/public/components/files/file_delete_button.test.tsx
new file mode 100644
index 0000000000000..38ed8a20eab40
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/files/file_delete_button.test.tsx
@@ -0,0 +1,155 @@
+/*
+ * 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 { screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+
+import type { AppMockRenderer } from '../../common/mock';
+
+import { buildCasesPermissions, createAppMockRenderer } from '../../common/mock';
+import { basicCaseId, basicFileMock } from '../../containers/mock';
+import { useDeleteFileAttachment } from '../../containers/use_delete_file_attachment';
+import { FileDeleteButton } from './file_delete_button';
+
+jest.mock('../../containers/use_delete_file_attachment');
+
+const useDeleteFileAttachmentMock = useDeleteFileAttachment as jest.Mock;
+
+describe('FileDeleteButton', () => {
+  let appMockRender: AppMockRenderer;
+  const mutate = jest.fn();
+
+  useDeleteFileAttachmentMock.mockReturnValue({ isLoading: false, mutate });
+
+  describe('isIcon', () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+      appMockRender = createAppMockRenderer();
+    });
+
+    it('renders delete button correctly', async () => {
+      appMockRender.render(
+        <FileDeleteButton caseId={basicCaseId} fileId={basicFileMock.id} isIcon={true} />
+      );
+
+      expect(await screen.findByTestId('cases-files-delete-button')).toBeInTheDocument();
+
+      expect(useDeleteFileAttachmentMock).toBeCalledTimes(1);
+    });
+
+    it('clicking delete button opens the confirmation modal', async () => {
+      appMockRender.render(
+        <FileDeleteButton caseId={basicCaseId} fileId={basicFileMock.id} isIcon={true} />
+      );
+
+      const deleteButton = await screen.findByTestId('cases-files-delete-button');
+
+      expect(deleteButton).toBeInTheDocument();
+
+      userEvent.click(deleteButton);
+
+      expect(await screen.findByTestId('property-actions-confirm-modal')).toBeInTheDocument();
+    });
+
+    it('clicking delete button in the confirmation modal calls deleteFileAttachment with proper params', async () => {
+      appMockRender.render(
+        <FileDeleteButton caseId={basicCaseId} fileId={basicFileMock.id} isIcon={true} />
+      );
+
+      const deleteButton = await screen.findByTestId('cases-files-delete-button');
+
+      expect(deleteButton).toBeInTheDocument();
+
+      userEvent.click(deleteButton);
+
+      expect(await screen.findByTestId('property-actions-confirm-modal')).toBeInTheDocument();
+
+      userEvent.click(await screen.findByTestId('confirmModalConfirmButton'));
+
+      await waitFor(() => {
+        expect(mutate).toHaveBeenCalledTimes(1);
+        expect(mutate).toHaveBeenCalledWith({
+          caseId: basicCaseId,
+          fileId: basicFileMock.id,
+        });
+      });
+    });
+
+    it('delete button is not rendered if user has no delete permission', async () => {
+      appMockRender = createAppMockRenderer({
+        permissions: buildCasesPermissions({ delete: false }),
+      });
+
+      appMockRender.render(
+        <FileDeleteButton caseId={basicCaseId} fileId={basicFileMock.id} isIcon={true} />
+      );
+
+      expect(screen.queryByTestId('cases-files-delete-button')).not.toBeInTheDocument();
+    });
+  });
+
+  describe('not isIcon', () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+      appMockRender = createAppMockRenderer();
+    });
+
+    it('renders delete button correctly', async () => {
+      appMockRender.render(<FileDeleteButton caseId={basicCaseId} fileId={basicFileMock.id} />);
+
+      expect(await screen.findByTestId('cases-files-delete-button')).toBeInTheDocument();
+
+      expect(useDeleteFileAttachmentMock).toBeCalledTimes(1);
+    });
+
+    it('clicking delete button opens the confirmation modal', async () => {
+      appMockRender.render(<FileDeleteButton caseId={basicCaseId} fileId={basicFileMock.id} />);
+
+      const deleteButton = await screen.findByTestId('cases-files-delete-button');
+
+      expect(deleteButton).toBeInTheDocument();
+
+      userEvent.click(deleteButton);
+
+      expect(await screen.findByTestId('property-actions-confirm-modal')).toBeInTheDocument();
+    });
+
+    it('clicking delete button in the confirmation modal calls deleteFileAttachment with proper params', async () => {
+      appMockRender.render(<FileDeleteButton caseId={basicCaseId} fileId={basicFileMock.id} />);
+
+      const deleteButton = await screen.findByTestId('cases-files-delete-button');
+
+      expect(deleteButton).toBeInTheDocument();
+
+      userEvent.click(deleteButton);
+
+      expect(await screen.findByTestId('property-actions-confirm-modal')).toBeInTheDocument();
+
+      userEvent.click(await screen.findByTestId('confirmModalConfirmButton'));
+
+      await waitFor(() => {
+        expect(mutate).toHaveBeenCalledTimes(1);
+        expect(mutate).toHaveBeenCalledWith({
+          caseId: basicCaseId,
+          fileId: basicFileMock.id,
+        });
+      });
+    });
+
+    it('delete button is not rendered if user has no delete permission', async () => {
+      appMockRender = createAppMockRenderer({
+        permissions: buildCasesPermissions({ delete: false }),
+      });
+
+      appMockRender.render(<FileDeleteButton caseId={basicCaseId} fileId={basicFileMock.id} />);
+
+      expect(screen.queryByTestId('cases-files-delete-button')).not.toBeInTheDocument();
+    });
+  });
+});
diff --git a/x-pack/plugins/cases/public/components/files/file_delete_button.tsx b/x-pack/plugins/cases/public/components/files/file_delete_button.tsx
new file mode 100644
index 0000000000000..f344b942aa2c2
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/files/file_delete_button.tsx
@@ -0,0 +1,62 @@
+/*
+ * 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 { EuiButtonEmpty, EuiButtonIcon } from '@elastic/eui';
+import * as i18n from './translations';
+import { useDeleteFileAttachment } from '../../containers/use_delete_file_attachment';
+import { useDeletePropertyAction } from '../user_actions/property_actions/use_delete_property_action';
+import { DeleteAttachmentConfirmationModal } from '../user_actions/delete_attachment_confirmation_modal';
+import { useCasesContext } from '../cases_context/use_cases_context';
+
+interface FileDeleteButtonProps {
+  caseId: string;
+  fileId: string;
+  isIcon?: boolean;
+}
+
+const FileDeleteButtonComponent: React.FC<FileDeleteButtonProps> = ({ caseId, fileId, isIcon }) => {
+  const { permissions } = useCasesContext();
+  const { isLoading, mutate: deleteFileAttachment } = useDeleteFileAttachment();
+
+  const { showDeletionModal, onModalOpen, onConfirm, onCancel } = useDeletePropertyAction({
+    onDelete: () => deleteFileAttachment({ caseId, fileId }),
+  });
+
+  const buttonProps = {
+    iconType: 'trash',
+    'aria-label': i18n.DELETE_FILE,
+    color: 'danger' as const,
+    isDisabled: isLoading,
+    onClick: onModalOpen,
+    'data-test-subj': 'cases-files-delete-button',
+  };
+
+  return permissions.delete ? (
+    <>
+      {isIcon ? (
+        <EuiButtonIcon {...buttonProps} />
+      ) : (
+        <EuiButtonEmpty {...buttonProps}>{i18n.DELETE_FILE}</EuiButtonEmpty>
+      )}
+      {showDeletionModal ? (
+        <DeleteAttachmentConfirmationModal
+          title={i18n.DELETE_FILE_TITLE}
+          confirmButtonText={i18n.DELETE}
+          onCancel={onCancel}
+          onConfirm={onConfirm}
+        />
+      ) : null}
+    </>
+  ) : (
+    <></>
+  );
+};
+FileDeleteButtonComponent.displayName = 'FileDeleteButton';
+
+export const FileDeleteButton = React.memo(FileDeleteButtonComponent);
diff --git a/x-pack/plugins/cases/public/components/files/file_download_button.test.tsx b/x-pack/plugins/cases/public/components/files/file_download_button.test.tsx
new file mode 100644
index 0000000000000..0c729900a9ea6
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/files/file_download_button.test.tsx
@@ -0,0 +1,57 @@
+/*
+ * 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 { screen } from '@testing-library/react';
+
+import type { AppMockRenderer } from '../../common/mock';
+import { createAppMockRenderer, mockedTestProvidersOwner } from '../../common/mock';
+import { FileDownloadButton } from './file_download_button';
+import { basicFileMock } from '../../containers/mock';
+import { constructFileKindIdByOwner } from '../../../common/files';
+
+describe('FileDownloadButton', () => {
+  let appMockRender: AppMockRenderer;
+
+  describe('isIcon', () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+      appMockRender = createAppMockRenderer();
+    });
+
+    it('renders download button with correct href', async () => {
+      appMockRender.render(<FileDownloadButton fileId={basicFileMock.id} isIcon={true} />);
+
+      expect(await screen.findByTestId('cases-files-download-button')).toBeInTheDocument();
+
+      expect(appMockRender.getFilesClient().getDownloadHref).toBeCalledTimes(1);
+      expect(appMockRender.getFilesClient().getDownloadHref).toHaveBeenCalledWith({
+        fileKind: constructFileKindIdByOwner(mockedTestProvidersOwner[0]),
+        id: basicFileMock.id,
+      });
+    });
+  });
+
+  describe('not isIcon', () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+      appMockRender = createAppMockRenderer();
+    });
+
+    it('renders download button with correct href', async () => {
+      appMockRender.render(<FileDownloadButton fileId={basicFileMock.id} />);
+
+      expect(await screen.findByTestId('cases-files-download-button')).toBeInTheDocument();
+
+      expect(appMockRender.getFilesClient().getDownloadHref).toBeCalledTimes(1);
+      expect(appMockRender.getFilesClient().getDownloadHref).toHaveBeenCalledWith({
+        fileKind: constructFileKindIdByOwner(mockedTestProvidersOwner[0]),
+        id: basicFileMock.id,
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/cases/public/components/files/file_download_button.tsx b/x-pack/plugins/cases/public/components/files/file_download_button.tsx
new file mode 100644
index 0000000000000..856c7000ba9d5
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/files/file_download_button.tsx
@@ -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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+import { EuiButtonEmpty, EuiButtonIcon } from '@elastic/eui';
+import { useFilesContext } from '@kbn/shared-ux-file-context';
+
+import type { Owner } from '../../../common/constants/types';
+
+import { constructFileKindIdByOwner } from '../../../common/files';
+import { useCasesContext } from '../cases_context/use_cases_context';
+import * as i18n from './translations';
+
+interface FileDownloadButtonProps {
+  fileId: string;
+  isIcon?: boolean;
+}
+
+const FileDownloadButtonComponent: React.FC<FileDownloadButtonProps> = ({ fileId, isIcon }) => {
+  const { owner } = useCasesContext();
+  const { client: filesClient } = useFilesContext();
+
+  const buttonProps = {
+    iconType: 'download',
+    'aria-label': i18n.DOWNLOAD_FILE,
+    href: filesClient.getDownloadHref({
+      fileKind: constructFileKindIdByOwner(owner[0] as Owner),
+      id: fileId,
+    }),
+    'data-test-subj': 'cases-files-download-button',
+  };
+
+  return isIcon ? (
+    <EuiButtonIcon {...buttonProps} />
+  ) : (
+    <EuiButtonEmpty {...buttonProps}>{i18n.DOWNLOAD_FILE}</EuiButtonEmpty>
+  );
+};
+FileDownloadButtonComponent.displayName = 'FileDownloadButton';
+
+export const FileDownloadButton = React.memo(FileDownloadButtonComponent);
diff --git a/x-pack/plugins/cases/public/components/files/file_name_link.test.tsx b/x-pack/plugins/cases/public/components/files/file_name_link.test.tsx
new file mode 100644
index 0000000000000..39c62322dedeb
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/files/file_name_link.test.tsx
@@ -0,0 +1,58 @@
+/*
+ * 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 { screen } from '@testing-library/react';
+
+import type { AppMockRenderer } from '../../common/mock';
+import { createAppMockRenderer } from '../../common/mock';
+import userEvent from '@testing-library/user-event';
+import { FileNameLink } from './file_name_link';
+import { basicFileMock } from '../../containers/mock';
+
+describe('FileNameLink', () => {
+  let appMockRender: AppMockRenderer;
+
+  const defaultProps = {
+    file: basicFileMock,
+    showPreview: jest.fn(),
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    appMockRender = createAppMockRenderer();
+  });
+
+  it('renders clickable name if file is image', async () => {
+    appMockRender.render(<FileNameLink {...defaultProps} />);
+
+    const nameLink = await screen.findByTestId('cases-files-name-link');
+
+    expect(nameLink).toBeInTheDocument();
+
+    userEvent.click(nameLink);
+
+    expect(defaultProps.showPreview).toHaveBeenCalled();
+  });
+
+  it('renders simple text name if file is not image', async () => {
+    appMockRender.render(
+      <FileNameLink
+        showPreview={defaultProps.showPreview}
+        file={{ ...basicFileMock, mimeType: 'text/csv' }}
+      />
+    );
+
+    const nameLink = await screen.findByTestId('cases-files-name-text');
+
+    expect(nameLink).toBeInTheDocument();
+
+    userEvent.click(nameLink);
+
+    expect(defaultProps.showPreview).not.toHaveBeenCalled();
+  });
+});
diff --git a/x-pack/plugins/cases/public/components/files/file_name_link.tsx b/x-pack/plugins/cases/public/components/files/file_name_link.tsx
new file mode 100644
index 0000000000000..4c9aedc3ad85b
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/files/file_name_link.tsx
@@ -0,0 +1,44 @@
+/*
+ * 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 { EuiLink } from '@elastic/eui';
+
+import type { FileJSON } from '@kbn/shared-ux-file-types';
+import * as i18n from './translations';
+import { isImage } from './utils';
+
+interface FileNameLinkProps {
+  file: Pick<FileJSON, 'name' | 'extension' | 'mimeType'>;
+  showPreview: () => void;
+}
+
+const FileNameLinkComponent: React.FC<FileNameLinkProps> = ({ file, showPreview }) => {
+  let fileName = file.name;
+
+  if (typeof file.extension !== 'undefined') {
+    fileName += `.${file.extension}`;
+  }
+
+  if (isImage(file)) {
+    return (
+      <EuiLink onClick={showPreview} data-test-subj="cases-files-name-link">
+        {fileName}
+      </EuiLink>
+    );
+  } else {
+    return (
+      <span title={i18n.NO_PREVIEW} data-test-subj="cases-files-name-text">
+        {fileName}
+      </span>
+    );
+  }
+};
+FileNameLinkComponent.displayName = 'FileNameLink';
+
+export const FileNameLink = React.memo(FileNameLinkComponent);
diff --git a/x-pack/plugins/cases/public/components/files/file_preview.test.tsx b/x-pack/plugins/cases/public/components/files/file_preview.test.tsx
new file mode 100644
index 0000000000000..b02df3a82228f
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/files/file_preview.test.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 { screen, waitFor } from '@testing-library/react';
+
+import type { AppMockRenderer } from '../../common/mock';
+
+import { constructFileKindIdByOwner } from '../../../common/files';
+import { createAppMockRenderer, mockedTestProvidersOwner } from '../../common/mock';
+import { basicFileMock } from '../../containers/mock';
+import { FilePreview } from './file_preview';
+
+describe('FilePreview', () => {
+  let appMockRender: AppMockRenderer;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    appMockRender = createAppMockRenderer();
+  });
+
+  it('FilePreview rendered correctly', async () => {
+    appMockRender.render(<FilePreview closePreview={jest.fn()} selectedFile={basicFileMock} />);
+
+    await waitFor(() =>
+      expect(appMockRender.getFilesClient().getDownloadHref).toHaveBeenCalledWith({
+        id: basicFileMock.id,
+        fileKind: constructFileKindIdByOwner(mockedTestProvidersOwner[0]),
+      })
+    );
+
+    expect(await screen.findByTestId('cases-files-image-preview')).toBeInTheDocument();
+  });
+});
diff --git a/x-pack/plugins/cases/public/components/files/file_preview.tsx b/x-pack/plugins/cases/public/components/files/file_preview.tsx
new file mode 100644
index 0000000000000..1bb91c5b53ff7
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/files/file_preview.tsx
@@ -0,0 +1,56 @@
+/*
+ * 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 styled from 'styled-components';
+
+import type { FileJSON } from '@kbn/shared-ux-file-types';
+
+import { EuiOverlayMask, EuiFocusTrap, EuiImage } from '@elastic/eui';
+import { useFilesContext } from '@kbn/shared-ux-file-context';
+
+import type { Owner } from '../../../common/constants/types';
+
+import { constructFileKindIdByOwner } from '../../../common/files';
+import { useCasesContext } from '../cases_context/use_cases_context';
+
+interface FilePreviewProps {
+  closePreview: () => void;
+  selectedFile: Pick<FileJSON, 'id' | 'name'>;
+}
+
+const StyledOverlayMask = styled(EuiOverlayMask)`
+  padding-block-end: 0vh !important;
+
+  img {
+    max-height: 85vh;
+    max-width: 85vw;
+    object-fit: contain;
+  }
+`;
+
+export const FilePreview = ({ closePreview, selectedFile }: FilePreviewProps) => {
+  const { client: filesClient } = useFilesContext();
+  const { owner } = useCasesContext();
+
+  return (
+    <StyledOverlayMask>
+      <EuiFocusTrap onClickOutside={closePreview}>
+        <EuiImage
+          alt={selectedFile.name}
+          size="original"
+          src={filesClient.getDownloadHref({
+            id: selectedFile.id,
+            fileKind: constructFileKindIdByOwner(owner[0] as Owner),
+          })}
+          data-test-subj="cases-files-image-preview"
+        />
+      </EuiFocusTrap>
+    </StyledOverlayMask>
+  );
+};
+
+FilePreview.displayName = 'FilePreview';
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
new file mode 100644
index 0000000000000..8d4fd4c0eabde
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/files/file_type.test.tsx
@@ -0,0 +1,187 @@
+/*
+ * 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 { JsonValue } from '@kbn/utility-types';
+
+import { screen } from '@testing-library/react';
+
+import type { ExternalReferenceAttachmentViewProps } from '../../client/attachment_framework/types';
+import type { AppMockRenderer } from '../../common/mock';
+
+import { AttachmentActionType } from '../../client/attachment_framework/types';
+import { FILE_ATTACHMENT_TYPE } from '../../../common/api';
+import { createAppMockRenderer } from '../../common/mock';
+import { basicCase, basicFileMock } from '../../containers/mock';
+import { getFileType } from './file_type';
+import userEvent from '@testing-library/user-event';
+
+describe('getFileType', () => {
+  const fileType = getFileType();
+
+  it('invalid props return blank FileAttachmentViewObject', () => {
+    expect(fileType).toStrictEqual({
+      id: FILE_ATTACHMENT_TYPE,
+      icon: 'document',
+      displayName: 'File Attachment Type',
+      getAttachmentViewObject: expect.any(Function),
+    });
+  });
+
+  describe('getFileAttachmentViewObject', () => {
+    let appMockRender: AppMockRenderer;
+
+    const attachmentViewProps = {
+      externalReferenceId: basicFileMock.id,
+      externalReferenceMetadata: { files: [basicFileMock] },
+      caseData: { title: basicCase.title, id: basicCase.id },
+    } as unknown as ExternalReferenceAttachmentViewProps;
+
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it('event renders a clickable name if the file is an image', async () => {
+      appMockRender = createAppMockRenderer();
+
+      // @ts-ignore
+      appMockRender.render(fileType.getAttachmentViewObject({ ...attachmentViewProps }).event);
+
+      expect(await screen.findByText('my-super-cool-screenshot.png')).toBeInTheDocument();
+      expect(screen.queryByTestId('cases-files-image-preview')).not.toBeInTheDocument();
+    });
+
+    it('clicking the name rendered in event opens the file preview', async () => {
+      appMockRender = createAppMockRenderer();
+
+      // @ts-ignore
+      appMockRender.render(fileType.getAttachmentViewObject({ ...attachmentViewProps }).event);
+
+      userEvent.click(await screen.findByText('my-super-cool-screenshot.png'));
+      expect(await screen.findByTestId('cases-files-image-preview')).toBeInTheDocument();
+    });
+
+    it('getActions renders a download button', async () => {
+      appMockRender = createAppMockRenderer();
+
+      const attachmentViewObject = fileType.getAttachmentViewObject({ ...attachmentViewProps });
+
+      expect(attachmentViewObject).not.toBeUndefined();
+
+      // @ts-ignore
+      const actions = attachmentViewObject.getActions();
+
+      expect(actions.length).toBe(2);
+      expect(actions[0]).toStrictEqual({
+        type: AttachmentActionType.CUSTOM,
+        isPrimary: false,
+        label: 'Download File',
+        render: expect.any(Function),
+      });
+
+      // @ts-ignore
+      appMockRender.render(actions[0].render());
+
+      expect(await screen.findByTestId('cases-files-download-button')).toBeInTheDocument();
+    });
+
+    it('getActions renders a delete button', async () => {
+      appMockRender = createAppMockRenderer();
+
+      const attachmentViewObject = fileType.getAttachmentViewObject({ ...attachmentViewProps });
+
+      expect(attachmentViewObject).not.toBeUndefined();
+
+      // @ts-ignore
+      const actions = attachmentViewObject.getActions();
+
+      expect(actions.length).toBe(2);
+      expect(actions[1]).toStrictEqual({
+        type: AttachmentActionType.CUSTOM,
+        isPrimary: false,
+        label: 'Delete File',
+        render: expect.any(Function),
+      });
+
+      // @ts-ignore
+      appMockRender.render(actions[1].render());
+
+      expect(await screen.findByTestId('cases-files-delete-button')).toBeInTheDocument();
+    });
+
+    it('clicking the delete button in actions opens deletion modal', async () => {
+      appMockRender = createAppMockRenderer();
+
+      const attachmentViewObject = fileType.getAttachmentViewObject({ ...attachmentViewProps });
+
+      expect(attachmentViewObject).not.toBeUndefined();
+
+      // @ts-ignore
+      const actions = attachmentViewObject.getActions();
+
+      expect(actions.length).toBe(2);
+      expect(actions[1]).toStrictEqual({
+        type: AttachmentActionType.CUSTOM,
+        isPrimary: false,
+        label: 'Delete File',
+        render: expect.any(Function),
+      });
+
+      // @ts-ignore
+      appMockRender.render(actions[1].render());
+
+      const deleteButton = await screen.findByTestId('cases-files-delete-button');
+
+      expect(deleteButton).toBeInTheDocument();
+
+      userEvent.click(deleteButton);
+
+      expect(await screen.findByTestId('property-actions-confirm-modal')).toBeInTheDocument();
+    });
+
+    it('empty externalReferenceMetadata returns blank FileAttachmentViewObject', () => {
+      expect(
+        fileType.getAttachmentViewObject({ ...attachmentViewProps, externalReferenceMetadata: {} })
+      ).toEqual({
+        event: 'added an unknown file',
+        hideDefaultActions: true,
+        timelineAvatar: 'document',
+        type: 'regular',
+        getActions: expect.any(Function),
+      });
+    });
+
+    it('timelineAvatar is image if file is an image', () => {
+      expect(fileType.getAttachmentViewObject(attachmentViewProps)).toEqual(
+        expect.objectContaining({
+          timelineAvatar: 'image',
+        })
+      );
+    });
+
+    it('timelineAvatar is document if file is not an image', () => {
+      expect(
+        fileType.getAttachmentViewObject({
+          ...attachmentViewProps,
+          externalReferenceMetadata: {
+            files: [{ ...basicFileMock, mimeType: 'text/csv' } as JsonValue],
+          },
+        })
+      ).toEqual(
+        expect.objectContaining({
+          timelineAvatar: 'document',
+        })
+      );
+    });
+
+    it('default actions should be hidden', () => {
+      expect(fileType.getAttachmentViewObject(attachmentViewProps)).toEqual(
+        expect.objectContaining({
+          hideDefaultActions: true,
+        })
+      );
+    });
+  });
+});
diff --git a/x-pack/plugins/cases/public/components/files/file_type.tsx b/x-pack/plugins/cases/public/components/files/file_type.tsx
new file mode 100644
index 0000000000000..271bf3008e70e
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/files/file_type.tsx
@@ -0,0 +1,106 @@
+/*
+ * 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 type {
+  ExternalReferenceAttachmentType,
+  ExternalReferenceAttachmentViewProps,
+} from '../../client/attachment_framework/types';
+import type { DownloadableFile } from './types';
+
+import { AttachmentActionType } from '../../client/attachment_framework/types';
+import { FILE_ATTACHMENT_TYPE } from '../../../common/api';
+import { FileDownloadButton } from './file_download_button';
+import { FileNameLink } from './file_name_link';
+import { FilePreview } from './file_preview';
+import * as i18n from './translations';
+import { isImage, isValidFileExternalReferenceMetadata } from './utils';
+import { useFilePreview } from './use_file_preview';
+import { FileDeleteButton } from './file_delete_button';
+
+interface FileAttachmentEventProps {
+  file: DownloadableFile;
+}
+
+const FileAttachmentEvent = ({ file }: FileAttachmentEventProps) => {
+  const { isPreviewVisible, showPreview, closePreview } = useFilePreview();
+
+  return (
+    <>
+      {i18n.ADDED}
+      <FileNameLink file={file} showPreview={showPreview} />
+      {isPreviewVisible && <FilePreview closePreview={closePreview} selectedFile={file} />}
+    </>
+  );
+};
+
+FileAttachmentEvent.displayName = 'FileAttachmentEvent';
+
+function getFileDownloadButton(fileId: string) {
+  return <FileDownloadButton fileId={fileId} isIcon={false} />;
+}
+
+function getFileDeleteButton(caseId: string, fileId: string) {
+  return <FileDeleteButton caseId={caseId} fileId={fileId} isIcon={false} />;
+}
+
+const getFileAttachmentActions = ({ caseId, fileId }: { caseId: string; fileId: string }) => [
+  {
+    type: AttachmentActionType.CUSTOM as const,
+    render: () => getFileDownloadButton(fileId),
+    label: i18n.DOWNLOAD_FILE,
+    isPrimary: false,
+  },
+  {
+    type: AttachmentActionType.CUSTOM as const,
+    render: () => getFileDeleteButton(caseId, fileId),
+    label: i18n.DELETE_FILE,
+    isPrimary: false,
+  },
+];
+
+const getFileAttachmentViewObject = (props: ExternalReferenceAttachmentViewProps) => {
+  const caseId = props.caseData.id;
+  const fileId = props.externalReferenceId;
+
+  if (!isValidFileExternalReferenceMetadata(props.externalReferenceMetadata)) {
+    return {
+      type: 'regular',
+      event: i18n.ADDED_UNKNOWN_FILE,
+      timelineAvatar: 'document',
+      getActions: () => [
+        {
+          type: AttachmentActionType.CUSTOM as const,
+          render: () => getFileDeleteButton(caseId, fileId),
+          label: i18n.DELETE_FILE,
+          isPrimary: false,
+        },
+      ],
+      hideDefaultActions: true,
+    };
+  }
+
+  const fileMetadata = props.externalReferenceMetadata.files[0];
+  const file = {
+    id: fileId,
+    ...fileMetadata,
+  };
+
+  return {
+    event: <FileAttachmentEvent file={file} />,
+    timelineAvatar: isImage(file) ? 'image' : 'document',
+    getActions: () => getFileAttachmentActions({ caseId, fileId }),
+    hideDefaultActions: true,
+  };
+};
+
+export const getFileType = (): ExternalReferenceAttachmentType => ({
+  id: FILE_ATTACHMENT_TYPE,
+  icon: 'document',
+  displayName: 'File Attachment Type',
+  getAttachmentViewObject: getFileAttachmentViewObject,
+});
diff --git a/x-pack/plugins/cases/public/components/files/files_table.test.tsx b/x-pack/plugins/cases/public/components/files/files_table.test.tsx
new file mode 100644
index 0000000000000..651f86e76b462
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/files/files_table.test.tsx
@@ -0,0 +1,233 @@
+/*
+ * 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 { screen, waitFor, within } from '@testing-library/react';
+
+import { basicFileMock } from '../../containers/mock';
+import type { AppMockRenderer } from '../../common/mock';
+
+import { constructFileKindIdByOwner } from '../../../common/files';
+import { createAppMockRenderer, mockedTestProvidersOwner } from '../../common/mock';
+import { FilesTable } from './files_table';
+import userEvent from '@testing-library/user-event';
+
+describe('FilesTable', () => {
+  const onTableChange = jest.fn();
+  const defaultProps = {
+    caseId: 'foobar',
+    items: [basicFileMock],
+    pagination: { pageIndex: 0, pageSize: 10, totalItemCount: 1 },
+    isLoading: false,
+    onChange: onTableChange,
+  };
+
+  let appMockRender: AppMockRenderer;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    appMockRender = createAppMockRenderer();
+  });
+
+  it('renders correctly', async () => {
+    appMockRender.render(<FilesTable {...defaultProps} />);
+
+    expect(await screen.findByTestId('cases-files-table-results-count')).toBeInTheDocument();
+    expect(await screen.findByTestId('cases-files-table-filename')).toBeInTheDocument();
+    expect(await screen.findByTestId('cases-files-table-filetype')).toBeInTheDocument();
+    expect(await screen.findByTestId('cases-files-table-date-added')).toBeInTheDocument();
+    expect(await screen.findByTestId('cases-files-download-button')).toBeInTheDocument();
+    expect(await screen.findByTestId('cases-files-delete-button')).toBeInTheDocument();
+  });
+
+  it('renders loading state', async () => {
+    appMockRender.render(<FilesTable {...defaultProps} isLoading={true} />);
+
+    expect(await screen.findByTestId('cases-files-table-loading')).toBeInTheDocument();
+  });
+
+  it('renders empty table', async () => {
+    appMockRender.render(<FilesTable {...defaultProps} items={[]} />);
+
+    expect(await screen.findByTestId('cases-files-table-empty')).toBeInTheDocument();
+  });
+
+  it('FileAdd in empty table is clickable', async () => {
+    appMockRender.render(<FilesTable {...defaultProps} items={[]} />);
+
+    expect(await screen.findByTestId('cases-files-table-empty')).toBeInTheDocument();
+
+    const addFileButton = await screen.findByTestId('cases-files-add');
+
+    expect(addFileButton).toBeInTheDocument();
+
+    userEvent.click(addFileButton);
+
+    expect(await screen.findByTestId('cases-files-add-modal')).toBeInTheDocument();
+  });
+
+  it('renders single result count properly', async () => {
+    const mockPagination = { pageIndex: 0, pageSize: 10, totalItemCount: 1 };
+    appMockRender.render(<FilesTable {...defaultProps} pagination={mockPagination} />);
+
+    expect(await screen.findByTestId('cases-files-table-results-count')).toHaveTextContent(
+      `Showing ${defaultProps.items.length} file`
+    );
+  });
+
+  it('non image rows dont open file preview', async () => {
+    const nonImageFileMock = { ...basicFileMock, mimeType: 'something/else' };
+
+    appMockRender.render(<FilesTable {...defaultProps} items={[nonImageFileMock]} />);
+
+    userEvent.click(
+      await within(await screen.findByTestId('cases-files-table-filename')).findByTitle(
+        'No preview available'
+      )
+    );
+
+    expect(await screen.queryByTestId('cases-files-image-preview')).not.toBeInTheDocument();
+  });
+
+  it('image rows open file preview', async () => {
+    appMockRender.render(<FilesTable {...defaultProps} />);
+
+    userEvent.click(
+      await screen.findByRole('button', {
+        name: `${basicFileMock.name}.${basicFileMock.extension}`,
+      })
+    );
+
+    expect(await screen.findByTestId('cases-files-image-preview')).toBeInTheDocument();
+  });
+
+  it('different mimeTypes are displayed correctly', async () => {
+    const mockPagination = { pageIndex: 0, pageSize: 10, totalItemCount: 7 };
+    appMockRender.render(
+      <FilesTable
+        {...defaultProps}
+        pagination={mockPagination}
+        items={[
+          { ...basicFileMock, mimeType: '' },
+          { ...basicFileMock, mimeType: 'no-slash' },
+          { ...basicFileMock, mimeType: '/slash-in-the-beginning' },
+          { ...basicFileMock, mimeType: undefined },
+          { ...basicFileMock, mimeType: 'application/gzip' },
+          { ...basicFileMock, mimeType: 'text/csv' },
+          { ...basicFileMock, mimeType: 'image/tiff' },
+        ]}
+      />
+    );
+
+    expect((await screen.findAllByText('Unknown')).length).toBe(4);
+    expect(await screen.findByText('Compressed')).toBeInTheDocument();
+    expect(await screen.findByText('Text')).toBeInTheDocument();
+    expect(await screen.findByText('Image')).toBeInTheDocument();
+  });
+
+  it('download button renders correctly', async () => {
+    appMockRender.render(<FilesTable {...defaultProps} />);
+
+    expect(appMockRender.getFilesClient().getDownloadHref).toBeCalledTimes(1);
+    expect(appMockRender.getFilesClient().getDownloadHref).toHaveBeenCalledWith({
+      fileKind: constructFileKindIdByOwner(mockedTestProvidersOwner[0]),
+      id: basicFileMock.id,
+    });
+
+    expect(await screen.findByTestId('cases-files-download-button')).toBeInTheDocument();
+  });
+
+  it('delete button renders correctly', async () => {
+    appMockRender.render(<FilesTable {...defaultProps} />);
+
+    expect(appMockRender.getFilesClient().getDownloadHref).toBeCalledTimes(1);
+    expect(appMockRender.getFilesClient().getDownloadHref).toHaveBeenCalledWith({
+      fileKind: constructFileKindIdByOwner(mockedTestProvidersOwner[0]),
+      id: basicFileMock.id,
+    });
+
+    expect(await screen.findByTestId('cases-files-delete-button')).toBeInTheDocument();
+  });
+
+  it('clicking delete button opens deletion modal', async () => {
+    appMockRender.render(<FilesTable {...defaultProps} />);
+
+    expect(appMockRender.getFilesClient().getDownloadHref).toBeCalledTimes(1);
+    expect(appMockRender.getFilesClient().getDownloadHref).toHaveBeenCalledWith({
+      fileKind: constructFileKindIdByOwner(mockedTestProvidersOwner[0]),
+      id: basicFileMock.id,
+    });
+
+    const deleteButton = await screen.findByTestId('cases-files-delete-button');
+
+    expect(deleteButton).toBeInTheDocument();
+
+    userEvent.click(deleteButton);
+
+    expect(await screen.findByTestId('property-actions-confirm-modal')).toBeInTheDocument();
+  });
+
+  it('go to next page calls onTableChange with correct values', async () => {
+    const mockPagination = { pageIndex: 0, pageSize: 1, totalItemCount: 2 };
+
+    appMockRender.render(
+      <FilesTable
+        {...defaultProps}
+        pagination={mockPagination}
+        items={[{ ...basicFileMock }, { ...basicFileMock }]}
+      />
+    );
+
+    userEvent.click(await screen.findByTestId('pagination-button-next'));
+
+    await waitFor(() =>
+      expect(onTableChange).toHaveBeenCalledWith({
+        page: { index: mockPagination.pageIndex + 1, size: mockPagination.pageSize },
+      })
+    );
+  });
+
+  it('go to previous page calls onTableChange with correct values', async () => {
+    const mockPagination = { pageIndex: 1, pageSize: 1, totalItemCount: 2 };
+
+    appMockRender.render(
+      <FilesTable
+        {...defaultProps}
+        pagination={mockPagination}
+        items={[{ ...basicFileMock }, { ...basicFileMock }]}
+      />
+    );
+
+    userEvent.click(await screen.findByTestId('pagination-button-previous'));
+
+    await waitFor(() =>
+      expect(onTableChange).toHaveBeenCalledWith({
+        page: { index: mockPagination.pageIndex - 1, size: mockPagination.pageSize },
+      })
+    );
+  });
+
+  it('changing perPage calls onTableChange with correct values', async () => {
+    appMockRender.render(
+      <FilesTable {...defaultProps} items={[{ ...basicFileMock }, { ...basicFileMock }]} />
+    );
+
+    userEvent.click(screen.getByTestId('tablePaginationPopoverButton'));
+
+    const pageSizeOption = screen.getByTestId('tablePagination-50-rows');
+
+    pageSizeOption.style.pointerEvents = 'all';
+
+    userEvent.click(pageSizeOption);
+
+    await waitFor(() =>
+      expect(onTableChange).toHaveBeenCalledWith({
+        page: { index: 0, size: 50 },
+      })
+    );
+  });
+});
diff --git a/x-pack/plugins/cases/public/components/files/files_table.tsx b/x-pack/plugins/cases/public/components/files/files_table.tsx
new file mode 100644
index 0000000000000..6433d90a91d44
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/files/files_table.tsx
@@ -0,0 +1,83 @@
+/*
+ * 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, { useState } from 'react';
+
+import type { Pagination, EuiBasicTableProps } from '@elastic/eui';
+import type { FileJSON } from '@kbn/shared-ux-file-types';
+
+import { EuiBasicTable, EuiLoadingContent, EuiSpacer, EuiText, EuiEmptyPrompt } from '@elastic/eui';
+
+import * as i18n from './translations';
+import { useFilesTableColumns } from './use_files_table_columns';
+import { FilePreview } from './file_preview';
+import { AddFile } from './add_file';
+import { useFilePreview } from './use_file_preview';
+
+const EmptyFilesTable = ({ caseId }: { caseId: string }) => (
+  <EuiEmptyPrompt
+    title={<h3>{i18n.NO_FILES}</h3>}
+    data-test-subj="cases-files-table-empty"
+    titleSize="xs"
+    actions={<AddFile caseId={caseId} />}
+  />
+);
+
+EmptyFilesTable.displayName = 'EmptyFilesTable';
+
+interface FilesTableProps {
+  caseId: string;
+  isLoading: boolean;
+  items: FileJSON[];
+  onChange: EuiBasicTableProps<FileJSON>['onChange'];
+  pagination: Pagination;
+}
+
+export const FilesTable = ({ caseId, items, pagination, onChange, isLoading }: FilesTableProps) => {
+  const { isPreviewVisible, showPreview, closePreview } = useFilePreview();
+
+  const [selectedFile, setSelectedFile] = useState<FileJSON>();
+
+  const displayPreview = (file: FileJSON) => {
+    setSelectedFile(file);
+    showPreview();
+  };
+
+  const columns = useFilesTableColumns({ caseId, showPreview: displayPreview });
+
+  return isLoading ? (
+    <>
+      <EuiSpacer size="l" />
+      <EuiLoadingContent data-test-subj="cases-files-table-loading" lines={10} />
+    </>
+  ) : (
+    <>
+      {pagination.totalItemCount > 0 && (
+        <>
+          <EuiSpacer size="xl" />
+          <EuiText size="xs" color="subdued" data-test-subj="cases-files-table-results-count">
+            {i18n.SHOWING_FILES(items.length)}
+          </EuiText>
+        </>
+      )}
+      <EuiSpacer size="s" />
+      <EuiBasicTable
+        tableCaption={i18n.FILES_TABLE}
+        items={items}
+        columns={columns}
+        pagination={pagination}
+        onChange={onChange}
+        data-test-subj="cases-files-table"
+        noItemsMessage={<EmptyFilesTable caseId={caseId} />}
+      />
+      {isPreviewVisible && selectedFile !== undefined && (
+        <FilePreview closePreview={closePreview} selectedFile={selectedFile} />
+      )}
+    </>
+  );
+};
+
+FilesTable.displayName = 'FilesTable';
diff --git a/x-pack/plugins/cases/public/components/files/files_utility_bar.test.tsx b/x-pack/plugins/cases/public/components/files/files_utility_bar.test.tsx
new file mode 100644
index 0000000000000..bfac1998a857a
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/files/files_utility_bar.test.tsx
@@ -0,0 +1,42 @@
+/*
+ * 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 { screen } from '@testing-library/react';
+
+import type { AppMockRenderer } from '../../common/mock';
+import { createAppMockRenderer } from '../../common/mock';
+import userEvent from '@testing-library/user-event';
+import { FilesUtilityBar } from './files_utility_bar';
+
+const defaultProps = {
+  caseId: 'foobar',
+  onSearch: jest.fn(),
+};
+
+describe('FilesUtilityBar', () => {
+  let appMockRender: AppMockRenderer;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    appMockRender = createAppMockRenderer();
+  });
+
+  it('renders correctly', async () => {
+    appMockRender.render(<FilesUtilityBar {...defaultProps} />);
+
+    expect(await screen.findByTestId('cases-files-add')).toBeInTheDocument();
+    expect(await screen.findByTestId('cases-files-search')).toBeInTheDocument();
+  });
+
+  it('search text passed correctly to callback', async () => {
+    appMockRender.render(<FilesUtilityBar {...defaultProps} />);
+
+    await userEvent.type(screen.getByTestId('cases-files-search'), 'My search{enter}');
+    expect(defaultProps.onSearch).toBeCalledWith('My search');
+  });
+});
diff --git a/x-pack/plugins/cases/public/components/files/files_utility_bar.tsx b/x-pack/plugins/cases/public/components/files/files_utility_bar.tsx
new file mode 100644
index 0000000000000..71b1ef503fc63
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/files/files_utility_bar.tsx
@@ -0,0 +1,36 @@
+/*
+ * 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 { EuiFlexGroup, EuiFlexItem, EuiFieldSearch } from '@elastic/eui';
+import { AddFile } from './add_file';
+
+import * as i18n from './translations';
+
+interface FilesUtilityBarProps {
+  caseId: string;
+  onSearch: (newSearch: string) => void;
+}
+
+export const FilesUtilityBar = ({ caseId, onSearch }: FilesUtilityBarProps) => {
+  return (
+    <EuiFlexGroup alignItems="center">
+      <AddFile caseId={caseId} />
+      <EuiFlexItem grow={false} style={{ minWidth: 400 }}>
+        <EuiFieldSearch
+          fullWidth
+          placeholder={i18n.SEARCH_PLACEHOLDER}
+          onSearch={onSearch}
+          incremental={false}
+          data-test-subj="cases-files-search"
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+};
+
+FilesUtilityBar.displayName = 'FilesUtilityBar';
diff --git a/x-pack/plugins/cases/public/components/files/translations.tsx b/x-pack/plugins/cases/public/components/files/translations.tsx
new file mode 100644
index 0000000000000..4023c5b18cea8
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/files/translations.tsx
@@ -0,0 +1,115 @@
+/*
+ * 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 { i18n } from '@kbn/i18n';
+
+export const ACTIONS = i18n.translate('xpack.cases.caseView.files.actions', {
+  defaultMessage: 'Actions',
+});
+
+export const ADD_FILE = i18n.translate('xpack.cases.caseView.files.addFile', {
+  defaultMessage: 'Add File',
+});
+
+export const CLOSE_MODAL = i18n.translate('xpack.cases.caseView.files.closeModal', {
+  defaultMessage: 'Close',
+});
+
+export const DATE_ADDED = i18n.translate('xpack.cases.caseView.files.dateAdded', {
+  defaultMessage: 'Date Added',
+});
+
+export const DELETE_FILE = i18n.translate('xpack.cases.caseView.files.deleteFile', {
+  defaultMessage: 'Delete File',
+});
+
+export const DOWNLOAD_FILE = i18n.translate('xpack.cases.caseView.files.downloadFile', {
+  defaultMessage: 'Download File',
+});
+
+export const FILES_TABLE = i18n.translate('xpack.cases.caseView.files.filesTable', {
+  defaultMessage: 'Files table',
+});
+
+export const NAME = i18n.translate('xpack.cases.caseView.files.name', {
+  defaultMessage: 'Name',
+});
+
+export const NO_FILES = i18n.translate('xpack.cases.caseView.files.noFilesAvailable', {
+  defaultMessage: 'No files available',
+});
+
+export const NO_PREVIEW = i18n.translate('xpack.cases.caseView.files.noPreviewAvailable', {
+  defaultMessage: 'No preview available',
+});
+
+export const RESULTS_COUNT = i18n.translate('xpack.cases.caseView.files.resultsCount', {
+  defaultMessage: 'Showing',
+});
+
+export const TYPE = i18n.translate('xpack.cases.caseView.files.type', {
+  defaultMessage: 'Type',
+});
+
+export const SEARCH_PLACEHOLDER = i18n.translate('xpack.cases.caseView.files.searchPlaceholder', {
+  defaultMessage: 'Search files',
+});
+
+export const FAILED_UPLOAD = i18n.translate('xpack.cases.caseView.files.failedUpload', {
+  defaultMessage: 'Failed to upload file',
+});
+
+export const UNKNOWN_MIME_TYPE = i18n.translate('xpack.cases.caseView.files.unknownMimeType', {
+  defaultMessage: 'Unknown',
+});
+
+export const IMAGE_MIME_TYPE = i18n.translate('xpack.cases.caseView.files.imageMimeType', {
+  defaultMessage: 'Image',
+});
+
+export const TEXT_MIME_TYPE = i18n.translate('xpack.cases.caseView.files.textMimeType', {
+  defaultMessage: 'Text',
+});
+
+export const COMPRESSED_MIME_TYPE = i18n.translate(
+  'xpack.cases.caseView.files.compressedMimeType',
+  {
+    defaultMessage: 'Compressed',
+  }
+);
+
+export const PDF_MIME_TYPE = i18n.translate('xpack.cases.caseView.files.pdfMimeType', {
+  defaultMessage: 'PDF',
+});
+
+export const SUCCESSFUL_UPLOAD_FILE_NAME = (fileName: string) =>
+  i18n.translate('xpack.cases.caseView.files.successfulUploadFileName', {
+    defaultMessage: 'File {fileName} uploaded successfully',
+    values: { fileName },
+  });
+
+export const SHOWING_FILES = (totalFiles: number) =>
+  i18n.translate('xpack.cases.caseView.files.showingFilesTitle', {
+    values: { totalFiles },
+    defaultMessage: 'Showing {totalFiles} {totalFiles, plural, =1 {file} other {files}}',
+  });
+
+export const ADDED = i18n.translate('xpack.cases.caseView.files.added', {
+  defaultMessage: 'added ',
+});
+
+export const ADDED_UNKNOWN_FILE = i18n.translate('xpack.cases.caseView.files.addedUnknownFile', {
+  defaultMessage: 'added an unknown file',
+});
+
+export const DELETE = i18n.translate('xpack.cases.caseView.files.delete', {
+  defaultMessage: 'Delete',
+});
+
+export const DELETE_FILE_TITLE = i18n.translate('xpack.cases.caseView.files.deleteThisFile', {
+  defaultMessage: 'Delete this file?',
+});
diff --git a/x-pack/plugins/cases/public/components/files/types.ts b/x-pack/plugins/cases/public/components/files/types.ts
new file mode 100644
index 0000000000000..a211b5ac4053d
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/files/types.ts
@@ -0,0 +1,12 @@
+/*
+ * 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 * as rt from 'io-ts';
+
+import type { SingleFileAttachmentMetadataRt } from '../../../common/api';
+
+export type DownloadableFile = rt.TypeOf<typeof SingleFileAttachmentMetadataRt> & { id: string };
diff --git a/x-pack/plugins/cases/public/components/files/use_file_preview.test.tsx b/x-pack/plugins/cases/public/components/files/use_file_preview.test.tsx
new file mode 100644
index 0000000000000..49e18fb818cd9
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/files/use_file_preview.test.tsx
@@ -0,0 +1,54 @@
+/*
+ * 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 { act, renderHook } from '@testing-library/react-hooks';
+
+import { useFilePreview } from './use_file_preview';
+
+describe('useFilePreview', () => {
+  it('isPreviewVisible is false by default', () => {
+    const { result } = renderHook(() => {
+      return useFilePreview();
+    });
+
+    expect(result.current.isPreviewVisible).toBeFalsy();
+  });
+
+  it('showPreview sets isPreviewVisible to true', () => {
+    const { result } = renderHook(() => {
+      return useFilePreview();
+    });
+
+    expect(result.current.isPreviewVisible).toBeFalsy();
+
+    act(() => {
+      result.current.showPreview();
+    });
+
+    expect(result.current.isPreviewVisible).toBeTruthy();
+  });
+
+  it('closePreview sets isPreviewVisible to false', () => {
+    const { result } = renderHook(() => {
+      return useFilePreview();
+    });
+
+    expect(result.current.isPreviewVisible).toBeFalsy();
+
+    act(() => {
+      result.current.showPreview();
+    });
+
+    expect(result.current.isPreviewVisible).toBeTruthy();
+
+    act(() => {
+      result.current.closePreview();
+    });
+
+    expect(result.current.isPreviewVisible).toBeFalsy();
+  });
+});
diff --git a/x-pack/plugins/cases/public/components/files/use_file_preview.tsx b/x-pack/plugins/cases/public/components/files/use_file_preview.tsx
new file mode 100644
index 0000000000000..c802aa38fc688
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/files/use_file_preview.tsx
@@ -0,0 +1,17 @@
+/*
+ * 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 { useState } from 'react';
+
+export const useFilePreview = () => {
+  const [isPreviewVisible, setIsPreviewVisible] = useState(false);
+
+  const closePreview = () => setIsPreviewVisible(false);
+  const showPreview = () => setIsPreviewVisible(true);
+
+  return { isPreviewVisible, showPreview, closePreview };
+};
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
new file mode 100644
index 0000000000000..77070da0dbc57
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/files/use_files_table_columns.test.tsx
@@ -0,0 +1,73 @@
+/*
+ * 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 { FilesTableColumnsProps } from './use_files_table_columns';
+import { useFilesTableColumns } from './use_files_table_columns';
+import type { AppMockRenderer } from '../../common/mock';
+import { createAppMockRenderer } from '../../common/mock';
+import { renderHook } from '@testing-library/react-hooks';
+import { basicCase } from '../../containers/mock';
+
+describe('useFilesTableColumns', () => {
+  let appMockRender: AppMockRenderer;
+
+  const useFilesTableColumnsProps: FilesTableColumnsProps = {
+    caseId: basicCase.id,
+    showPreview: () => {},
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    appMockRender = createAppMockRenderer();
+  });
+
+  it('return all files table columns correctly', async () => {
+    const { result } = renderHook(() => useFilesTableColumns(useFilesTableColumnsProps), {
+      wrapper: appMockRender.AppWrapper,
+    });
+
+    expect(result.current).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "data-test-subj": "cases-files-table-filename",
+          "name": "Name",
+          "render": [Function],
+          "width": "60%",
+        },
+        Object {
+          "data-test-subj": "cases-files-table-filetype",
+          "name": "Type",
+          "render": [Function],
+        },
+        Object {
+          "data-test-subj": "cases-files-table-date-added",
+          "dataType": "date",
+          "field": "created",
+          "name": "Date Added",
+        },
+        Object {
+          "actions": Array [
+            Object {
+              "description": "Download File",
+              "isPrimary": true,
+              "name": "Download",
+              "render": [Function],
+            },
+            Object {
+              "description": "Delete File",
+              "isPrimary": true,
+              "name": "Delete",
+              "render": [Function],
+            },
+          ],
+          "name": "Actions",
+          "width": "120px",
+        },
+      ]
+    `);
+  });
+});
diff --git a/x-pack/plugins/cases/public/components/files/use_files_table_columns.tsx b/x-pack/plugins/cases/public/components/files/use_files_table_columns.tsx
new file mode 100644
index 0000000000000..80568189afb58
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/files/use_files_table_columns.tsx
@@ -0,0 +1,71 @@
+/*
+ * 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 type { EuiBasicTableColumn } from '@elastic/eui';
+import type { FileJSON } from '@kbn/shared-ux-file-types';
+
+import * as i18n from './translations';
+import { parseMimeType } from './utils';
+import { FileNameLink } from './file_name_link';
+import { FileDownloadButton } from './file_download_button';
+import { FileDeleteButton } from './file_delete_button';
+
+export interface FilesTableColumnsProps {
+  caseId: string;
+  showPreview: (file: FileJSON) => void;
+}
+
+export const useFilesTableColumns = ({
+  caseId,
+  showPreview,
+}: FilesTableColumnsProps): Array<EuiBasicTableColumn<FileJSON>> => {
+  return [
+    {
+      name: i18n.NAME,
+      'data-test-subj': 'cases-files-table-filename',
+      render: (file: FileJSON) => (
+        <FileNameLink file={file} showPreview={() => showPreview(file)} />
+      ),
+      width: '60%',
+    },
+    {
+      name: i18n.TYPE,
+      'data-test-subj': 'cases-files-table-filetype',
+      render: (attachment: FileJSON) => {
+        return <span>{parseMimeType(attachment.mimeType)}</span>;
+      },
+    },
+    {
+      name: i18n.DATE_ADDED,
+      field: 'created',
+      'data-test-subj': 'cases-files-table-date-added',
+      dataType: 'date',
+    },
+    {
+      name: i18n.ACTIONS,
+      width: '120px',
+      actions: [
+        {
+          name: 'Download',
+          isPrimary: true,
+          description: i18n.DOWNLOAD_FILE,
+          render: (file: FileJSON) => <FileDownloadButton fileId={file.id} isIcon={true} />,
+        },
+        {
+          name: 'Delete',
+          isPrimary: true,
+          description: i18n.DELETE_FILE,
+          render: (file: FileJSON) => (
+            <FileDeleteButton caseId={caseId} fileId={file.id} isIcon={true} />
+          ),
+        },
+      ],
+    },
+  ];
+};
diff --git a/x-pack/plugins/cases/public/components/files/utils.test.tsx b/x-pack/plugins/cases/public/components/files/utils.test.tsx
new file mode 100644
index 0000000000000..411492d1a2bab
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/files/utils.test.tsx
@@ -0,0 +1,97 @@
+/*
+ * 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 { JsonValue } from '@kbn/utility-types';
+
+import {
+  compressionMimeTypes,
+  imageMimeTypes,
+  pdfMimeTypes,
+  textMimeTypes,
+} from '../../../common/constants/mime_types';
+import { basicFileMock } from '../../containers/mock';
+import { isImage, isValidFileExternalReferenceMetadata, parseMimeType } from './utils';
+
+describe('isImage', () => {
+  it.each(imageMimeTypes)('should return true for image mime type: %s', (mimeType) => {
+    expect(isImage({ mimeType })).toBeTruthy();
+  });
+
+  it.each(textMimeTypes)('should return false for text mime type: %s', (mimeType) => {
+    expect(isImage({ mimeType })).toBeFalsy();
+  });
+});
+
+describe('parseMimeType', () => {
+  it('should return Unknown for empty strings', () => {
+    expect(parseMimeType('')).toBe('Unknown');
+  });
+
+  it('should return Unknown for undefined', () => {
+    expect(parseMimeType(undefined)).toBe('Unknown');
+  });
+
+  it('should return Unknown for strings starting with forward slash', () => {
+    expect(parseMimeType('/start')).toBe('Unknown');
+  });
+
+  it('should return Unknown for strings with no forward slash', () => {
+    expect(parseMimeType('no-slash')).toBe('Unknown');
+  });
+
+  it('should return capitalize first letter for valid strings', () => {
+    expect(parseMimeType('foo/bar')).toBe('Foo');
+  });
+
+  it.each(imageMimeTypes)('should return "Image" for image mime type: %s', (mimeType) => {
+    expect(parseMimeType(mimeType)).toBe('Image');
+  });
+
+  it.each(textMimeTypes)('should return "Text" for text mime type: %s', (mimeType) => {
+    expect(parseMimeType(mimeType)).toBe('Text');
+  });
+
+  it.each(compressionMimeTypes)(
+    'should return "Compressed" for image mime type: %s',
+    (mimeType) => {
+      expect(parseMimeType(mimeType)).toBe('Compressed');
+    }
+  );
+
+  it.each(pdfMimeTypes)('should return "Pdf" for text mime type: %s', (mimeType) => {
+    expect(parseMimeType(mimeType)).toBe('PDF');
+  });
+});
+
+describe('isValidFileExternalReferenceMetadata', () => {
+  it('should return false for empty objects', () => {
+    expect(isValidFileExternalReferenceMetadata({})).toBeFalsy();
+  });
+
+  it('should return false if the files property is missing', () => {
+    expect(isValidFileExternalReferenceMetadata({ foo: 'bar' })).toBeFalsy();
+  });
+
+  it('should return false if the files property is not an array', () => {
+    expect(isValidFileExternalReferenceMetadata({ files: 'bar' })).toBeFalsy();
+  });
+
+  it('should return false if files is not an array of file metadata', () => {
+    expect(isValidFileExternalReferenceMetadata({ files: [3] })).toBeFalsy();
+  });
+
+  it('should return false if files is not an array of file metadata 2', () => {
+    expect(
+      isValidFileExternalReferenceMetadata({ files: [{ name: 'foo', mimeType: 'bar' }] })
+    ).toBeFalsy();
+  });
+
+  it('should return true if the metadata is as expected', () => {
+    expect(
+      isValidFileExternalReferenceMetadata({ files: [basicFileMock as unknown as JsonValue] })
+    ).toBeTruthy();
+  });
+});
diff --git a/x-pack/plugins/cases/public/components/files/utils.tsx b/x-pack/plugins/cases/public/components/files/utils.tsx
new file mode 100644
index 0000000000000..b870c733eb10e
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/files/utils.tsx
@@ -0,0 +1,61 @@
+/*
+ * 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 {
+  CommentRequestExternalReferenceType,
+  FileAttachmentMetadata,
+} from '../../../common/api';
+
+import {
+  compressionMimeTypes,
+  imageMimeTypes,
+  textMimeTypes,
+  pdfMimeTypes,
+} from '../../../common/constants/mime_types';
+import { FileAttachmentMetadataRt } from '../../../common/api';
+import * as i18n from './translations';
+
+export const isImage = (file: { mimeType?: string }) => file.mimeType?.startsWith('image/');
+
+export const parseMimeType = (mimeType: string | undefined) => {
+  if (typeof mimeType === 'undefined') {
+    return i18n.UNKNOWN_MIME_TYPE;
+  }
+
+  if (imageMimeTypes.includes(mimeType)) {
+    return i18n.IMAGE_MIME_TYPE;
+  }
+
+  if (textMimeTypes.includes(mimeType)) {
+    return i18n.TEXT_MIME_TYPE;
+  }
+
+  if (compressionMimeTypes.includes(mimeType)) {
+    return i18n.COMPRESSED_MIME_TYPE;
+  }
+
+  if (pdfMimeTypes.includes(mimeType)) {
+    return i18n.PDF_MIME_TYPE;
+  }
+
+  const result = mimeType.split('/');
+
+  if (result.length <= 1 || result[0] === '') {
+    return i18n.UNKNOWN_MIME_TYPE;
+  }
+
+  return result[0].charAt(0).toUpperCase() + result[0].slice(1);
+};
+
+export const isValidFileExternalReferenceMetadata = (
+  externalReferenceMetadata: CommentRequestExternalReferenceType['externalReferenceMetadata']
+): externalReferenceMetadata is FileAttachmentMetadata => {
+  return (
+    FileAttachmentMetadataRt.is(externalReferenceMetadata) &&
+    externalReferenceMetadata?.files?.length >= 1
+  );
+};
diff --git a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/use_lens_open_visualization.tsx b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/use_lens_open_visualization.tsx
index 1d6a5ec8ca11a..84dddd64ba61b 100644
--- a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/use_lens_open_visualization.tsx
+++ b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/use_lens_open_visualization.tsx
@@ -9,6 +9,8 @@ import { useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 
 import type { TypedLensByValueInput } from '@kbn/lens-plugin/public';
+
+import { AttachmentActionType } from '../../../../client/attachment_framework/types';
 import { useKibana } from '../../../../common/lib/kibana';
 import {
   parseCommentString,
@@ -42,6 +44,7 @@ export const useLensOpenVisualization = ({ comment }: { comment: string }) => {
     actionConfig: !lensVisualization.length
       ? null
       : {
+          type: AttachmentActionType.BUTTON as const,
           iconType: 'lensApp',
           label: i18n.translate(
             'xpack.cases.markdownEditor.plugins.lens.openVisualizationButtonLabel',
diff --git a/x-pack/plugins/cases/public/components/property_actions/index.tsx b/x-pack/plugins/cases/public/components/property_actions/index.tsx
index 4de52d551bf2f..833ace8333d2b 100644
--- a/x-pack/plugins/cases/public/components/property_actions/index.tsx
+++ b/x-pack/plugins/cases/public/components/property_actions/index.tsx
@@ -9,6 +9,9 @@ import React, { useCallback, useState } from 'react';
 import type { EuiButtonProps } from '@elastic/eui';
 import { EuiFlexGroup, EuiFlexItem, EuiPopover, EuiButtonIcon, EuiButtonEmpty } from '@elastic/eui';
 
+import type { AttachmentAction } from '../../client/attachment_framework/types';
+
+import { AttachmentActionType } from '../../client/attachment_framework/types';
 import * as i18n from './translations';
 
 export interface PropertyActionButtonProps {
@@ -45,7 +48,7 @@ const PropertyActionButton = React.memo<PropertyActionButtonProps>(
 PropertyActionButton.displayName = 'PropertyActionButton';
 
 export interface PropertyActionsProps {
-  propertyActions: PropertyActionButtonProps[];
+  propertyActions: AttachmentAction[];
   customDataTestSubj?: string;
 }
 
@@ -93,14 +96,17 @@ export const PropertyActions = React.memo<PropertyActionsProps>(
           {propertyActions.map((action, key) => (
             <EuiFlexItem grow={false} key={`${action.label}${key}`}>
               <span>
-                <PropertyActionButton
-                  disabled={action.disabled}
-                  iconType={action.iconType}
-                  label={action.label}
-                  color={action.color}
-                  onClick={() => onClosePopover(action.onClick)}
-                  customDataTestSubj={customDataTestSubj}
-                />
+                {(action.type === AttachmentActionType.BUTTON && (
+                  <PropertyActionButton
+                    disabled={action.disabled}
+                    iconType={action.iconType}
+                    label={action.label}
+                    color={action.color}
+                    onClick={() => onClosePopover(action.onClick)}
+                    customDataTestSubj={customDataTestSubj}
+                  />
+                )) ||
+                  (action.type === AttachmentActionType.CUSTOM && action.render())}
               </span>
             </EuiFlexItem>
           ))}
diff --git a/x-pack/plugins/cases/public/components/user_actions/comment/comment.test.tsx b/x-pack/plugins/cases/public/components/user_actions/comment/comment.test.tsx
index db21c2f2100c6..4cf6c9844e948 100644
--- a/x-pack/plugins/cases/public/components/user_actions/comment/comment.test.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/comment/comment.test.tsx
@@ -36,6 +36,7 @@ import { useCaseViewNavigation, useCaseViewParams } from '../../../common/naviga
 import { ExternalReferenceAttachmentTypeRegistry } from '../../../client/attachment_framework/external_reference_registry';
 import { PersistableStateAttachmentTypeRegistry } from '../../../client/attachment_framework/persistable_state_registry';
 import { userProfiles } from '../../../containers/user_profiles/api.mock';
+import { AttachmentActionType } from '../../../client/attachment_framework/types';
 
 jest.mock('../../../common/lib/kibana');
 jest.mock('../../../common/navigation/hooks');
@@ -849,9 +850,27 @@ describe('createCommentUserActionBuilder', () => {
 
       const attachment = getExternalReferenceAttachment({
         getActions: () => [
-          { label: 'My primary button', isPrimary: true, iconType: 'danger', onClick },
-          { label: 'My primary 2 button', isPrimary: true, iconType: 'danger', onClick },
-          { label: 'My primary 3 button', isPrimary: true, iconType: 'danger', onClick },
+          {
+            type: AttachmentActionType.BUTTON as const,
+            label: 'My primary button',
+            isPrimary: true,
+            iconType: 'danger',
+            onClick,
+          },
+          {
+            type: AttachmentActionType.BUTTON as const,
+            label: 'My primary 2 button',
+            isPrimary: true,
+            iconType: 'danger',
+            onClick,
+          },
+          {
+            type: AttachmentActionType.BUTTON as const,
+            label: 'My primary 3 button',
+            isPrimary: true,
+            iconType: 'danger',
+            onClick,
+          },
         ],
       });
 
@@ -888,14 +907,75 @@ describe('createCommentUserActionBuilder', () => {
       expect(onClick).toHaveBeenCalledTimes(2);
     });
 
+    it('shows correctly a custom action', async () => {
+      const onClick = jest.fn();
+
+      const attachment = getExternalReferenceAttachment({
+        getActions: () => [
+          {
+            type: AttachmentActionType.CUSTOM as const,
+            isPrimary: true,
+            label: 'Test button',
+            render: () => (
+              <button type="button" onClick={onClick} data-test-subj="my-custom-button" />
+            ),
+          },
+        ],
+      });
+
+      const externalReferenceAttachmentTypeRegistry = new ExternalReferenceAttachmentTypeRegistry();
+      externalReferenceAttachmentTypeRegistry.register(attachment);
+
+      const userAction = getExternalReferenceUserAction();
+      const builder = createCommentUserActionBuilder({
+        ...builderArgs,
+        externalReferenceAttachmentTypeRegistry,
+        caseData: {
+          ...builderArgs.caseData,
+          comments: [externalReferenceAttachment],
+        },
+        userAction,
+      });
+
+      const createdUserAction = builder.build();
+
+      appMockRender.render(<EuiCommentList comments={createdUserAction} />);
+
+      const customButton = await screen.findByTestId('my-custom-button');
+
+      expect(customButton).toBeInTheDocument();
+
+      userEvent.click(customButton);
+
+      expect(onClick).toHaveBeenCalledTimes(1);
+    });
+
     it('shows correctly the non visible primary actions', async () => {
       const onClick = jest.fn();
 
       const attachment = getExternalReferenceAttachment({
         getActions: () => [
-          { label: 'My primary button', isPrimary: true, iconType: 'danger', onClick },
-          { label: 'My primary 2 button', isPrimary: true, iconType: 'danger', onClick },
-          { label: 'My primary 3 button', isPrimary: true, iconType: 'danger', onClick },
+          {
+            type: AttachmentActionType.BUTTON,
+            label: 'My primary button',
+            isPrimary: true,
+            iconType: 'danger',
+            onClick,
+          },
+          {
+            type: AttachmentActionType.BUTTON,
+            label: 'My primary 2 button',
+            isPrimary: true,
+            iconType: 'danger',
+            onClick,
+          },
+          {
+            type: AttachmentActionType.BUTTON,
+            label: 'My primary 3 button',
+            isPrimary: true,
+            iconType: 'danger',
+            onClick,
+          },
         ],
       });
 
@@ -934,16 +1014,101 @@ describe('createCommentUserActionBuilder', () => {
       expect(onClick).toHaveBeenCalled();
     });
 
+    it('hides correctly the  default actions', async () => {
+      const onClick = jest.fn();
+
+      const attachment = getExternalReferenceAttachment({
+        getActions: () => [
+          {
+            type: AttachmentActionType.BUTTON as const,
+            label: 'My primary button',
+            isPrimary: true,
+            iconType: 'danger',
+            onClick,
+          },
+          {
+            type: AttachmentActionType.BUTTON as const,
+            label: 'My button',
+            iconType: 'download',
+            onClick,
+          },
+        ],
+        hideDefaultActions: true,
+      });
+
+      const externalReferenceAttachmentTypeRegistry = new ExternalReferenceAttachmentTypeRegistry();
+      externalReferenceAttachmentTypeRegistry.register(attachment);
+
+      const userAction = getExternalReferenceUserAction();
+      const builder = createCommentUserActionBuilder({
+        ...builderArgs,
+        externalReferenceAttachmentTypeRegistry,
+        caseData: {
+          ...builderArgs.caseData,
+          comments: [externalReferenceAttachment],
+        },
+        userAction,
+      });
+
+      const createdUserAction = builder.build();
+      appMockRender.render(<EuiCommentList comments={createdUserAction} />);
+
+      expect(screen.getByTestId('comment-externalReference-.test')).toBeInTheDocument();
+      expect(screen.getByLabelText('My primary button')).toBeInTheDocument();
+      expect(screen.getByTestId('property-actions-user-action')).toBeInTheDocument();
+
+      userEvent.click(screen.getByTestId('property-actions-user-action-ellipses'));
+
+      await waitForEuiPopoverOpen();
+
+      // default "Delete attachment" action
+      expect(screen.queryByTestId('property-actions-user-action-trash')).not.toBeInTheDocument();
+      expect(screen.queryByText('Delete attachment')).not.toBeInTheDocument();
+      expect(screen.getByText('My button')).toBeInTheDocument();
+
+      userEvent.click(screen.getByText('My button'), undefined, { skipPointerEventsCheck: true });
+
+      expect(onClick).toHaveBeenCalledTimes(1);
+    });
+
     it('shows correctly the registered primary actions and non-primary actions', async () => {
       const onClick = jest.fn();
 
       const attachment = getExternalReferenceAttachment({
         getActions: () => [
-          { label: 'My button', iconType: 'trash', onClick },
-          { label: 'My button 2', iconType: 'download', onClick },
-          { label: 'My primary button', isPrimary: true, iconType: 'danger', onClick },
-          { label: 'My primary 2 button', isPrimary: true, iconType: 'danger', onClick },
-          { label: 'My primary 3 button', isPrimary: true, iconType: 'danger', onClick },
+          {
+            type: AttachmentActionType.BUTTON as const,
+            label: 'My button',
+            iconType: 'trash',
+            onClick,
+          },
+          {
+            type: AttachmentActionType.BUTTON as const,
+            label: 'My button 2',
+            iconType: 'download',
+            onClick,
+          },
+          {
+            type: AttachmentActionType.BUTTON as const,
+            label: 'My primary button',
+            isPrimary: true,
+            iconType: 'danger',
+            onClick,
+          },
+          {
+            type: AttachmentActionType.BUTTON as const,
+            label: 'My primary 2 button',
+            isPrimary: true,
+            iconType: 'danger',
+            onClick,
+          },
+          {
+            type: AttachmentActionType.BUTTON as const,
+            label: 'My primary 3 button',
+            isPrimary: true,
+            iconType: 'danger',
+            onClick,
+          },
         ],
       });
 
@@ -990,7 +1155,13 @@ describe('createCommentUserActionBuilder', () => {
 
       const attachment = getExternalReferenceAttachment({
         getActions: () => [
-          { label: 'My primary button', isPrimary: true, iconType: 'danger', onClick },
+          {
+            type: AttachmentActionType.BUTTON as const,
+            label: 'My primary button',
+            isPrimary: true,
+            iconType: 'danger',
+            onClick,
+          },
         ],
       });
 
diff --git a/x-pack/plugins/cases/public/components/user_actions/comment/registered_attachments.tsx b/x-pack/plugins/cases/public/components/user_actions/comment/registered_attachments.tsx
index 714bfda9e3a99..9142a71ed7184 100644
--- a/x-pack/plugins/cases/public/components/user_actions/comment/registered_attachments.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/comment/registered_attachments.tsx
@@ -15,11 +15,17 @@ import React, { Suspense } from 'react';
 import { memoize, partition } from 'lodash';
 
 import { EuiCallOut, EuiCode, EuiLoadingSpinner, EuiButtonIcon, EuiFlexItem } from '@elastic/eui';
-import type { AttachmentType } from '../../../client/attachment_framework/types';
+
+import type {
+  AttachmentType,
+  AttachmentViewObject,
+} from '../../../client/attachment_framework/types';
+
+import { AttachmentActionType } from '../../../client/attachment_framework/types';
+import { UserActionTimestamp } from '../timestamp';
 import type { AttachmentTypeRegistry } from '../../../../common/registry';
 import type { CommentResponse } from '../../../../common/api';
 import type { UserActionBuilder, UserActionBuilderArgs } from '../types';
-import { UserActionTimestamp } from '../timestamp';
 import type { SnakeToCamelCase } from '../../../../common/types';
 import {
   ATTACHMENT_NOT_REGISTERED_ERROR,
@@ -44,9 +50,7 @@ type BuilderArgs<C, R> = Pick<
 /**
  * Provides a render function for attachment type
  */
-const getAttachmentRenderer = memoize((attachmentType: AttachmentType<unknown>) => {
-  const attachmentViewObject = attachmentType.getAttachmentViewObject();
-
+const getAttachmentRenderer = memoize((attachmentViewObject: AttachmentViewObject) => {
   let AttachmentElement: React.ReactElement;
 
   const renderCallback = (props: object) => {
@@ -108,14 +112,15 @@ export const createRegisteredAttachmentUserActionBuilder = <
     }
 
     const attachmentType = registry.get(attachmentTypeId);
-    const renderer = getAttachmentRenderer(attachmentType);
 
-    const attachmentViewObject = attachmentType.getAttachmentViewObject();
     const props = {
       ...getAttachmentViewProps(),
       caseData: { id: caseData.id, title: caseData.title },
     };
 
+    const attachmentViewObject = attachmentType.getAttachmentViewObject(props);
+
+    const renderer = getAttachmentRenderer(attachmentViewObject);
     const actions = attachmentViewObject.getActions?.(props) ?? [];
     const [primaryActions, nonPrimaryActions] = partition(actions, 'isPrimary');
     const visiblePrimaryActions = primaryActions.slice(0, 2);
@@ -133,24 +138,29 @@ export const createRegisteredAttachmentUserActionBuilder = <
         timelineAvatar: attachmentViewObject.timelineAvatar,
         actions: (
           <UserActionContentToolbar id={comment.id}>
-            {visiblePrimaryActions.map((action) => (
-              <EuiFlexItem
-                grow={false}
-                data-test-subj={`attachment-${attachmentTypeId}-${comment.id}`}
-              >
-                <EuiButtonIcon
-                  aria-label={action.label}
-                  iconType={action.iconType}
-                  color={action.color ?? 'text'}
-                  onClick={action.onClick}
-                  data-test-subj={`attachment-${attachmentTypeId}-${comment.id}-${action.iconType}`}
-                />
-              </EuiFlexItem>
-            ))}
+            {visiblePrimaryActions.map(
+              (action) =>
+                (action.type === AttachmentActionType.BUTTON && (
+                  <EuiFlexItem
+                    grow={false}
+                    data-test-subj={`attachment-${attachmentTypeId}-${comment.id}`}
+                  >
+                    <EuiButtonIcon
+                      aria-label={action.label}
+                      iconType={action.iconType}
+                      color={action.color ?? 'text'}
+                      onClick={action.onClick}
+                      data-test-subj={`attachment-${attachmentTypeId}-${comment.id}-${action.iconType}`}
+                    />
+                  </EuiFlexItem>
+                )) ||
+                (action.type === AttachmentActionType.CUSTOM && action.render())
+            )}
             <RegisteredAttachmentsPropertyActions
               isLoading={isLoading}
               onDelete={() => handleDeleteComment(comment.id, DELETE_REGISTERED_ATTACHMENT)}
               registeredAttachmentActions={[...nonVisiblePrimaryActions, ...nonPrimaryActions]}
+              hideDefaultActions={!!attachmentViewObject.hideDefaultActions}
             />
           </UserActionContentToolbar>
         ),
diff --git a/x-pack/plugins/cases/public/components/user_actions/property_actions/alert_property_actions.tsx b/x-pack/plugins/cases/public/components/user_actions/property_actions/alert_property_actions.tsx
index 9885de69bb551..98a91d279499e 100644
--- a/x-pack/plugins/cases/public/components/user_actions/property_actions/alert_property_actions.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/property_actions/alert_property_actions.tsx
@@ -6,6 +6,8 @@
  */
 
 import React, { useMemo } from 'react';
+
+import { AttachmentActionType } from '../../../client/attachment_framework/types';
 import { useCasesContext } from '../../cases_context/use_cases_context';
 import { DeleteAttachmentConfirmationModal } from '../delete_attachment_confirmation_modal';
 import { UserActionPropertyActions } from './property_actions';
@@ -31,8 +33,10 @@ const AlertPropertyActionsComponent: React.FC<Props> = ({ isLoading, totalAlerts
       ...(showRemoveAlertIcon
         ? [
             {
-              iconType: 'minusInCircle',
+              type: AttachmentActionType.BUTTON as const,
               color: 'danger' as const,
+              disabled: false,
+              iconType: 'minusInCircle',
               label: i18n.REMOVE_ALERTS(totalAlerts),
               onClick: onModalOpen,
             },
diff --git a/x-pack/plugins/cases/public/components/user_actions/property_actions/property_actions.test.tsx b/x-pack/plugins/cases/public/components/user_actions/property_actions/property_actions.test.tsx
index ca310ab5121aa..4d6964da2047c 100644
--- a/x-pack/plugins/cases/public/components/user_actions/property_actions/property_actions.test.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/property_actions/property_actions.test.tsx
@@ -11,6 +11,7 @@ import userEvent from '@testing-library/user-event';
 import type { AppMockRenderer } from '../../../common/mock';
 import { createAppMockRenderer } from '../../../common/mock';
 import { UserActionPropertyActions } from './property_actions';
+import { AttachmentActionType } from '../../../client/attachment_framework/types';
 
 describe('UserActionPropertyActions', () => {
   let appMock: AppMockRenderer;
@@ -20,6 +21,7 @@ describe('UserActionPropertyActions', () => {
     isLoading: false,
     propertyActions: [
       {
+        type: AttachmentActionType.BUTTON as const,
         iconType: 'pencil',
         label: 'Edit',
         onClick,
diff --git a/x-pack/plugins/cases/public/components/user_actions/property_actions/property_actions.tsx b/x-pack/plugins/cases/public/components/user_actions/property_actions/property_actions.tsx
index 975a8670ab096..4e71bbc581e3f 100644
--- a/x-pack/plugins/cases/public/components/user_actions/property_actions/property_actions.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/property_actions/property_actions.tsx
@@ -7,12 +7,12 @@
 
 import { EuiFlexItem, EuiLoadingSpinner } from '@elastic/eui';
 import React from 'react';
-import type { PropertyActionButtonProps } from '../../property_actions';
+import type { AttachmentAction } from '../../../client/attachment_framework/types';
 import { PropertyActions } from '../../property_actions';
 
 interface Props {
   isLoading: boolean;
-  propertyActions: PropertyActionButtonProps[];
+  propertyActions: AttachmentAction[];
   customDataTestSubj?: string;
 }
 
diff --git a/x-pack/plugins/cases/public/components/user_actions/property_actions/registered_attachments_property_actions.test.tsx b/x-pack/plugins/cases/public/components/user_actions/property_actions/registered_attachments_property_actions.test.tsx
index 583dd7d5be416..3f1e33d85d47e 100644
--- a/x-pack/plugins/cases/public/components/user_actions/property_actions/registered_attachments_property_actions.test.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/property_actions/registered_attachments_property_actions.test.tsx
@@ -16,6 +16,7 @@ import {
   createAppMockRenderer,
 } from '../../../common/mock';
 import { RegisteredAttachmentsPropertyActions } from './registered_attachments_property_actions';
+import { AttachmentActionType } from '../../../client/attachment_framework/types';
 
 describe('RegisteredAttachmentsPropertyActions', () => {
   let appMock: AppMockRenderer;
@@ -24,6 +25,7 @@ describe('RegisteredAttachmentsPropertyActions', () => {
     isLoading: false,
     registeredAttachmentActions: [],
     onDelete: jest.fn(),
+    hideDefaultActions: false,
   };
 
   beforeEach(() => {
@@ -90,6 +92,14 @@ describe('RegisteredAttachmentsPropertyActions', () => {
     expect(result.queryByTestId('property-actions-user-action')).not.toBeInTheDocument();
   });
 
+  it('does not show the property actions when hideDefaultActions is enabled', async () => {
+    const result = appMock.render(
+      <RegisteredAttachmentsPropertyActions {...props} hideDefaultActions={true} />
+    );
+
+    expect(result.queryByTestId('property-actions-user-action')).not.toBeInTheDocument();
+  });
+
   it('does show the property actions with only delete permissions', async () => {
     appMock = createAppMockRenderer({ permissions: onlyDeleteCasesPermission() });
     const result = appMock.render(<RegisteredAttachmentsPropertyActions {...props} />);
@@ -99,7 +109,14 @@ describe('RegisteredAttachmentsPropertyActions', () => {
 
   it('renders correctly registered attachments', async () => {
     const onClick = jest.fn();
-    const action = [{ label: 'My button', iconType: 'download', onClick }];
+    const action = [
+      {
+        type: AttachmentActionType.BUTTON as const,
+        label: 'My button',
+        iconType: 'download',
+        onClick,
+      },
+    ];
 
     const result = appMock.render(
       <RegisteredAttachmentsPropertyActions {...props} registeredAttachmentActions={action} />
diff --git a/x-pack/plugins/cases/public/components/user_actions/property_actions/registered_attachments_property_actions.tsx b/x-pack/plugins/cases/public/components/user_actions/property_actions/registered_attachments_property_actions.tsx
index d567298adc5fd..becb745e09a24 100644
--- a/x-pack/plugins/cases/public/components/user_actions/property_actions/registered_attachments_property_actions.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/property_actions/registered_attachments_property_actions.tsx
@@ -6,7 +6,10 @@
  */
 
 import React, { useMemo } from 'react';
+
 import type { AttachmentAction } from '../../../client/attachment_framework/types';
+
+import { AttachmentActionType } from '../../../client/attachment_framework/types';
 import { useCasesContext } from '../../cases_context/use_cases_context';
 import * as i18n from './translations';
 import { UserActionPropertyActions } from './property_actions';
@@ -17,12 +20,14 @@ interface Props {
   isLoading: boolean;
   registeredAttachmentActions: AttachmentAction[];
   onDelete: () => void;
+  hideDefaultActions: boolean;
 }
 
 const RegisteredAttachmentsPropertyActionsComponent: React.FC<Props> = ({
   isLoading,
   registeredAttachmentActions,
   onDelete,
+  hideDefaultActions,
 }) => {
   const { permissions } = useCasesContext();
   const { showDeletionModal, onModalOpen, onConfirm, onCancel } = useDeletePropertyAction({
@@ -30,12 +35,14 @@ const RegisteredAttachmentsPropertyActionsComponent: React.FC<Props> = ({
   });
 
   const propertyActions = useMemo(() => {
-    const showTrashIcon = permissions.delete;
+    const showTrashIcon = permissions.delete && !hideDefaultActions;
 
     return [
       ...(showTrashIcon
         ? [
             {
+              type: AttachmentActionType.BUTTON as const,
+              disabled: false,
               iconType: 'trash',
               color: 'danger' as const,
               label: i18n.DELETE_ATTACHMENT,
@@ -45,7 +52,7 @@ const RegisteredAttachmentsPropertyActionsComponent: React.FC<Props> = ({
         : []),
       ...registeredAttachmentActions,
     ];
-  }, [permissions.delete, onModalOpen, registeredAttachmentActions]);
+  }, [permissions.delete, hideDefaultActions, onModalOpen, registeredAttachmentActions]);
 
   return (
     <>
diff --git a/x-pack/plugins/cases/public/components/user_actions/property_actions/user_comment_property_actions.tsx b/x-pack/plugins/cases/public/components/user_actions/property_actions/user_comment_property_actions.tsx
index a791ef534e5dd..c1654d63a6233 100644
--- a/x-pack/plugins/cases/public/components/user_actions/property_actions/user_comment_property_actions.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/property_actions/user_comment_property_actions.tsx
@@ -6,6 +6,8 @@
  */
 
 import React, { useMemo } from 'react';
+
+import { AttachmentActionType } from '../../../client/attachment_framework/types';
 import { useCasesContext } from '../../cases_context/use_cases_context';
 import { useLensOpenVisualization } from '../../markdown_editor/plugins/lens/use_lens_open_visualization';
 import * as i18n from './translations';
@@ -48,6 +50,7 @@ const UserCommentPropertyActionsComponent: React.FC<Props> = ({
       ...(showEditPencilIcon
         ? [
             {
+              type: AttachmentActionType.BUTTON as const,
               iconType: 'pencil',
               label: i18n.EDIT_COMMENT,
               onClick: onEdit,
@@ -57,6 +60,7 @@ const UserCommentPropertyActionsComponent: React.FC<Props> = ({
       ...(showQuoteIcon
         ? [
             {
+              type: AttachmentActionType.BUTTON as const,
               iconType: 'quote',
               label: i18n.QUOTE,
               onClick: onQuote,
@@ -66,6 +70,7 @@ const UserCommentPropertyActionsComponent: React.FC<Props> = ({
       ...(showTrashIcon
         ? [
             {
+              type: AttachmentActionType.BUTTON as const,
               iconType: 'trash',
               color: 'danger' as const,
               label: i18n.DELETE_COMMENT,
diff --git a/x-pack/plugins/cases/public/containers/__mocks__/api.ts b/x-pack/plugins/cases/public/containers/__mocks__/api.ts
index 000c8a2f4634b..b29e45f6f101e 100644
--- a/x-pack/plugins/cases/public/containers/__mocks__/api.ts
+++ b/x-pack/plugins/cases/public/containers/__mocks__/api.ts
@@ -162,3 +162,13 @@ export const getCaseConnectors = async (
 
 export const getCaseUsers = async (caseId: string, signal: AbortSignal): Promise<CaseUsers> =>
   Promise.resolve(getCaseUsersMockResponse());
+
+export const deleteFileAttachments = async ({
+  caseId,
+  fileIds,
+  signal,
+}: {
+  caseId: string;
+  fileIds: string[];
+  signal: AbortSignal;
+}): Promise<void> => Promise.resolve(undefined);
diff --git a/x-pack/plugins/cases/public/containers/api.test.tsx b/x-pack/plugins/cases/public/containers/api.test.tsx
index e4d7626a36402..3f623795c819c 100644
--- a/x-pack/plugins/cases/public/containers/api.test.tsx
+++ b/x-pack/plugins/cases/public/containers/api.test.tsx
@@ -16,6 +16,7 @@ import {
   INTERNAL_BULK_CREATE_ATTACHMENTS_URL,
   SECURITY_SOLUTION_OWNER,
   INTERNAL_GET_CASE_USER_ACTIONS_STATS_URL,
+  INTERNAL_DELETE_FILE_ATTACHMENTS_URL,
 } from '../../common/constants';
 
 import {
@@ -37,6 +38,7 @@ import {
   postComment,
   getCaseConnectors,
   getCaseUserActionsStats,
+  deleteFileAttachments,
 } from './api';
 
 import {
@@ -59,6 +61,7 @@ import {
   caseUserActionsWithRegisteredAttachmentsSnake,
   basicPushSnake,
   getCaseUserActionsStatsResponse,
+  basicFileMock,
 } from './mock';
 
 import { DEFAULT_FILTER_OPTIONS, DEFAULT_QUERY_PARAMS } from './use_get_cases';
@@ -820,6 +823,30 @@ describe('Cases API', () => {
     });
   });
 
+  describe('deleteFileAttachments', () => {
+    beforeEach(() => {
+      fetchMock.mockClear();
+      fetchMock.mockResolvedValue(null);
+    });
+
+    it('should be called with correct url, method, signal and body', async () => {
+      const resp = await deleteFileAttachments({
+        caseId: basicCaseId,
+        fileIds: [basicFileMock.id],
+        signal: abortCtrl.signal,
+      });
+      expect(fetchMock).toHaveBeenCalledWith(
+        INTERNAL_DELETE_FILE_ATTACHMENTS_URL.replace('{case_id}', basicCaseId),
+        {
+          method: 'POST',
+          body: JSON.stringify({ ids: [basicFileMock.id] }),
+          signal: abortCtrl.signal,
+        }
+      );
+      expect(resp).toBe(undefined);
+    });
+  });
+
   describe('pushCase', () => {
     const connectorId = 'connectorId';
 
diff --git a/x-pack/plugins/cases/public/containers/api.ts b/x-pack/plugins/cases/public/containers/api.ts
index 05bef55a2b508..a45bfa3752c91 100644
--- a/x-pack/plugins/cases/public/containers/api.ts
+++ b/x-pack/plugins/cases/public/containers/api.ts
@@ -37,6 +37,7 @@ import type {
 import {
   CommentType,
   getCaseCommentsUrl,
+  getCasesDeleteFileAttachmentsUrl,
   getCaseDetailsUrl,
   getCaseDetailsMetricsUrl,
   getCasePushUrl,
@@ -401,6 +402,22 @@ export const createAttachments = async (
   return convertCaseToCamelCase(decodeCaseResponse(response));
 };
 
+export const deleteFileAttachments = async ({
+  caseId,
+  fileIds,
+  signal,
+}: {
+  caseId: string;
+  fileIds: string[];
+  signal: AbortSignal;
+}): Promise<void> => {
+  await KibanaServices.get().http.fetch(getCasesDeleteFileAttachmentsUrl(caseId), {
+    method: 'POST',
+    body: JSON.stringify({ ids: fileIds }),
+    signal,
+  });
+};
+
 export const getFeatureIds = async (
   query: { registrationContext: string[] },
   signal: AbortSignal
diff --git a/x-pack/plugins/cases/public/containers/constants.ts b/x-pack/plugins/cases/public/containers/constants.ts
index e700f5064e88d..8799e7b65e1a8 100644
--- a/x-pack/plugins/cases/public/containers/constants.ts
+++ b/x-pack/plugins/cases/public/containers/constants.ts
@@ -23,6 +23,9 @@ export const casesQueriesKeys = {
   cases: (params: unknown) => [...casesQueriesKeys.casesList(), 'all-cases', params] as const,
   caseView: () => [...casesQueriesKeys.all, 'case'] as const,
   case: (id: string) => [...casesQueriesKeys.caseView(), id] as const,
+  caseFiles: (id: string, params: unknown) =>
+    [...casesQueriesKeys.case(id), 'files', params] as const,
+  caseFileStats: (id: string) => [...casesQueriesKeys.case(id), 'files', 'stats'] as const,
   caseMetrics: (id: string, features: SingleCaseMetricsFeature[]) =>
     [...casesQueriesKeys.case(id), 'metrics', features] as const,
   caseConnectors: (id: string) => [...casesQueriesKeys.case(id), 'connectors'],
@@ -50,4 +53,5 @@ export const casesMutationsKeys = {
   deleteCases: ['delete-cases'] as const,
   updateCases: ['update-cases'] as const,
   deleteComment: ['delete-comment'] as const,
+  deleteFileAttachment: ['delete-file-attachment'] as const,
 };
diff --git a/x-pack/plugins/cases/public/containers/mock.ts b/x-pack/plugins/cases/public/containers/mock.ts
index 34552478fcd55..a4192513d7bec 100644
--- a/x-pack/plugins/cases/public/containers/mock.ts
+++ b/x-pack/plugins/cases/public/containers/mock.ts
@@ -4,6 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import type { FileJSON } from '@kbn/shared-ux-file-types';
 
 import type { ActionLicense, Cases, Case, CasesStatus, CaseUserActions, Comment } from './types';
 
@@ -240,6 +241,20 @@ export const basicCase: Case = {
   assignees: [{ uid: 'u_J41Oh6L9ki-Vo2tOogS8WRTENzhHurGtRc87NgEAlkc_0' }],
 };
 
+export const basicFileMock: FileJSON = {
+  id: '7d47d130-bcec-11ed-afa1-0242ac120002',
+  name: 'my-super-cool-screenshot',
+  mimeType: 'image/png',
+  created: basicCreatedAt,
+  updated: basicCreatedAt,
+  size: 999,
+  meta: '',
+  alt: '',
+  fileKind: '',
+  status: 'READY',
+  extension: 'png',
+};
+
 export const caseWithAlerts = {
   ...basicCase,
   totalAlerts: 2,
diff --git a/x-pack/plugins/cases/public/containers/translations.ts b/x-pack/plugins/cases/public/containers/translations.ts
index 6cbc76bb8b361..5d83ea9330ebc 100644
--- a/x-pack/plugins/cases/public/containers/translations.ts
+++ b/x-pack/plugins/cases/public/containers/translations.ts
@@ -21,6 +21,10 @@ export const ERROR_DELETING = i18n.translate('xpack.cases.containers.errorDeleti
   defaultMessage: 'Error deleting data',
 });
 
+export const ERROR_DELETING_FILE = i18n.translate('xpack.cases.containers.errorDeletingFile', {
+  defaultMessage: 'Error deleting file',
+});
+
 export const ERROR_UPDATING = i18n.translate('xpack.cases.containers.errorUpdatingTitle', {
   defaultMessage: 'Error updating data',
 });
@@ -53,3 +57,7 @@ export const STATUS_CHANGED_TOASTER_TEXT = i18n.translate(
     defaultMessage: 'Updated the statuses of attached alerts.',
   }
 );
+
+export const FILE_DELETE_SUCCESS = i18n.translate('xpack.cases.containers.deleteSuccess', {
+  defaultMessage: 'File deleted successfully',
+});
diff --git a/x-pack/plugins/cases/public/containers/use_delete_file_attachment.test.tsx b/x-pack/plugins/cases/public/containers/use_delete_file_attachment.test.tsx
new file mode 100644
index 0000000000000..b738f2b50febd
--- /dev/null
+++ b/x-pack/plugins/cases/public/containers/use_delete_file_attachment.test.tsx
@@ -0,0 +1,120 @@
+/*
+ * 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 { act, renderHook } from '@testing-library/react-hooks';
+import * as api from './api';
+import { basicCaseId, basicFileMock } from './mock';
+import { useRefreshCaseViewPage } from '../components/case_view/use_on_refresh_case_view_page';
+import { useToasts } from '../common/lib/kibana';
+import type { AppMockRenderer } from '../common/mock';
+import { createAppMockRenderer } from '../common/mock';
+import { useDeleteFileAttachment } from './use_delete_file_attachment';
+
+jest.mock('./api');
+jest.mock('../common/lib/kibana');
+jest.mock('../components/case_view/use_on_refresh_case_view_page');
+
+describe('useDeleteFileAttachment', () => {
+  const addSuccess = jest.fn();
+  const addError = jest.fn();
+
+  (useToasts as jest.Mock).mockReturnValue({ addSuccess, addError });
+
+  let appMockRender: AppMockRenderer;
+
+  beforeEach(() => {
+    appMockRender = createAppMockRenderer();
+    jest.clearAllMocks();
+  });
+
+  it('calls deleteFileAttachment with correct arguments - case', async () => {
+    const spyOnDeleteFileAttachments = jest.spyOn(api, 'deleteFileAttachments');
+
+    const { waitForNextUpdate, result } = renderHook(() => useDeleteFileAttachment(), {
+      wrapper: appMockRender.AppWrapper,
+    });
+
+    act(() => {
+      result.current.mutate({
+        caseId: basicCaseId,
+        fileId: basicFileMock.id,
+      });
+    });
+
+    await waitForNextUpdate();
+
+    expect(spyOnDeleteFileAttachments).toHaveBeenCalledWith({
+      caseId: basicCaseId,
+      fileIds: [basicFileMock.id],
+      signal: expect.any(AbortSignal),
+    });
+  });
+
+  it('refreshes the case page view', async () => {
+    const { waitForNextUpdate, result } = renderHook(() => useDeleteFileAttachment(), {
+      wrapper: appMockRender.AppWrapper,
+    });
+
+    act(() =>
+      result.current.mutate({
+        caseId: basicCaseId,
+        fileId: basicFileMock.id,
+      })
+    );
+
+    await waitForNextUpdate();
+
+    expect(useRefreshCaseViewPage()).toBeCalled();
+  });
+
+  it('shows a success toaster correctly', async () => {
+    const { waitForNextUpdate, result } = renderHook(() => useDeleteFileAttachment(), {
+      wrapper: appMockRender.AppWrapper,
+    });
+
+    act(() =>
+      result.current.mutate({
+        caseId: basicCaseId,
+        fileId: basicFileMock.id,
+      })
+    );
+
+    await waitForNextUpdate();
+
+    expect(addSuccess).toHaveBeenCalledWith({
+      title: 'File deleted successfully',
+      className: 'eui-textBreakWord',
+    });
+  });
+
+  it('sets isError when fails to delete a file attachment', async () => {
+    const spyOnDeleteFileAttachments = jest.spyOn(api, 'deleteFileAttachments');
+    spyOnDeleteFileAttachments.mockRejectedValue(new Error('Error'));
+
+    const { waitForNextUpdate, result } = renderHook(() => useDeleteFileAttachment(), {
+      wrapper: appMockRender.AppWrapper,
+    });
+
+    act(() =>
+      result.current.mutate({
+        caseId: basicCaseId,
+        fileId: basicFileMock.id,
+      })
+    );
+
+    await waitForNextUpdate();
+
+    expect(spyOnDeleteFileAttachments).toBeCalledWith({
+      caseId: basicCaseId,
+      fileIds: [basicFileMock.id],
+      signal: expect.any(AbortSignal),
+    });
+
+    expect(addError).toHaveBeenCalled();
+    expect(result.current.isError).toBe(true);
+  });
+});
diff --git a/x-pack/plugins/cases/public/containers/use_delete_file_attachment.tsx b/x-pack/plugins/cases/public/containers/use_delete_file_attachment.tsx
new file mode 100644
index 0000000000000..8f6c0effb7b2c
--- /dev/null
+++ b/x-pack/plugins/cases/public/containers/use_delete_file_attachment.tsx
@@ -0,0 +1,43 @@
+/*
+ * 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 { useMutation } from '@tanstack/react-query';
+import { casesMutationsKeys } from './constants';
+import type { ServerError } from '../types';
+import { useRefreshCaseViewPage } from '../components/case_view/use_on_refresh_case_view_page';
+import { useCasesToast } from '../common/use_cases_toast';
+import { deleteFileAttachments } from './api';
+import * as i18n from './translations';
+
+interface MutationArgs {
+  caseId: string;
+  fileId: string;
+}
+
+export const useDeleteFileAttachment = () => {
+  const { showErrorToast, showSuccessToast } = useCasesToast();
+  const refreshAttachmentsTable = useRefreshCaseViewPage();
+
+  return useMutation(
+    ({ caseId, fileId }: MutationArgs) => {
+      const abortCtrlRef = new AbortController();
+      return deleteFileAttachments({ caseId, fileIds: [fileId], signal: abortCtrlRef.signal });
+    },
+    {
+      mutationKey: casesMutationsKeys.deleteFileAttachment,
+      onSuccess: () => {
+        showSuccessToast(i18n.FILE_DELETE_SUCCESS);
+        refreshAttachmentsTable();
+      },
+      onError: (error: ServerError) => {
+        showErrorToast(error, { title: i18n.ERROR_DELETING_FILE });
+      },
+    }
+  );
+};
+
+export type UseDeleteFileAttachment = ReturnType<typeof useDeleteFileAttachment>;
diff --git a/x-pack/plugins/cases/public/containers/use_get_case_file_stats.test.tsx b/x-pack/plugins/cases/public/containers/use_get_case_file_stats.test.tsx
new file mode 100644
index 0000000000000..e7c55cd1fc0c5
--- /dev/null
+++ b/x-pack/plugins/cases/public/containers/use_get_case_file_stats.test.tsx
@@ -0,0 +1,64 @@
+/*
+ * 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 { renderHook } from '@testing-library/react-hooks';
+
+import { basicCase } from './mock';
+
+import type { AppMockRenderer } from '../common/mock';
+import { mockedTestProvidersOwner, createAppMockRenderer } from '../common/mock';
+import { useToasts } from '../common/lib/kibana';
+import { useGetCaseFileStats } from './use_get_case_file_stats';
+import { constructFileKindIdByOwner } from '../../common/files';
+
+jest.mock('../common/lib/kibana');
+
+const hookParams = {
+  caseId: basicCase.id,
+};
+
+const expectedCallParams = {
+  kind: constructFileKindIdByOwner(mockedTestProvidersOwner[0]),
+  page: 1,
+  perPage: 1,
+  meta: { caseIds: [hookParams.caseId] },
+};
+
+describe('useGetCaseFileStats', () => {
+  let appMockRender: AppMockRenderer;
+
+  beforeEach(() => {
+    appMockRender = createAppMockRenderer();
+    jest.clearAllMocks();
+  });
+
+  it('calls filesClient.list with correct arguments', async () => {
+    const { waitForNextUpdate } = renderHook(() => useGetCaseFileStats(hookParams), {
+      wrapper: appMockRender.AppWrapper,
+    });
+    await waitForNextUpdate();
+
+    expect(appMockRender.getFilesClient().list).toHaveBeenCalledWith(expectedCallParams);
+  });
+
+  it('shows an error toast when filesClient.list throws', async () => {
+    const addError = jest.fn();
+    (useToasts as jest.Mock).mockReturnValue({ addError });
+
+    appMockRender.getFilesClient().list = jest.fn().mockImplementation(() => {
+      throw new Error('Something went wrong');
+    });
+
+    const { waitForNextUpdate } = renderHook(() => useGetCaseFileStats(hookParams), {
+      wrapper: appMockRender.AppWrapper,
+    });
+    await waitForNextUpdate();
+
+    expect(appMockRender.getFilesClient().list).toHaveBeenCalledWith(expectedCallParams);
+    expect(addError).toHaveBeenCalled();
+  });
+});
diff --git a/x-pack/plugins/cases/public/containers/use_get_case_file_stats.tsx b/x-pack/plugins/cases/public/containers/use_get_case_file_stats.tsx
new file mode 100644
index 0000000000000..dd444a5bbb5e9
--- /dev/null
+++ b/x-pack/plugins/cases/public/containers/use_get_case_file_stats.tsx
@@ -0,0 +1,57 @@
+/*
+ * 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 { UseQueryResult } from '@tanstack/react-query';
+
+import type { FileJSON } from '@kbn/shared-ux-file-types';
+
+import { useFilesContext } from '@kbn/shared-ux-file-context';
+import { useQuery } from '@tanstack/react-query';
+
+import type { Owner } from '../../common/constants/types';
+import type { ServerError } from '../types';
+
+import { constructFileKindIdByOwner } from '../../common/files';
+import { useCasesToast } from '../common/use_cases_toast';
+import { useCasesContext } from '../components/cases_context/use_cases_context';
+import { casesQueriesKeys } from './constants';
+import * as i18n from './translations';
+
+const getTotalFromFileList = (data: { files: FileJSON[]; total: number }): { total: number } => ({
+  total: data.total,
+});
+
+export interface GetCaseFileStatsParams {
+  caseId: string;
+}
+
+export const useGetCaseFileStats = ({
+  caseId,
+}: GetCaseFileStatsParams): UseQueryResult<{ total: number }> => {
+  const { owner } = useCasesContext();
+  const { showErrorToast } = useCasesToast();
+  const { client: filesClient } = useFilesContext();
+
+  return useQuery(
+    casesQueriesKeys.caseFileStats(caseId),
+    () => {
+      return filesClient.list({
+        kind: constructFileKindIdByOwner(owner[0] as Owner),
+        page: 1,
+        perPage: 1,
+        meta: { caseIds: [caseId] },
+      });
+    },
+    {
+      select: getTotalFromFileList,
+      keepPreviousData: true,
+      onError: (error: ServerError) => {
+        showErrorToast(error, { title: i18n.ERROR_TITLE });
+      },
+    }
+  );
+};
diff --git a/x-pack/plugins/cases/public/containers/use_get_case_files.test.tsx b/x-pack/plugins/cases/public/containers/use_get_case_files.test.tsx
new file mode 100644
index 0000000000000..712dcb5487c5c
--- /dev/null
+++ b/x-pack/plugins/cases/public/containers/use_get_case_files.test.tsx
@@ -0,0 +1,70 @@
+/*
+ * 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 { renderHook, act } from '@testing-library/react-hooks';
+
+import { basicCase } from './mock';
+
+import type { AppMockRenderer } from '../common/mock';
+import { mockedTestProvidersOwner, createAppMockRenderer } from '../common/mock';
+import { useToasts } from '../common/lib/kibana';
+import { useGetCaseFiles } from './use_get_case_files';
+import { constructFileKindIdByOwner } from '../../common/files';
+
+jest.mock('../common/lib/kibana');
+
+const hookParams = {
+  caseId: basicCase.id,
+  page: 1,
+  perPage: 1,
+  searchTerm: 'foobar',
+};
+
+const expectedCallParams = {
+  kind: constructFileKindIdByOwner(mockedTestProvidersOwner[0]),
+  page: hookParams.page + 1,
+  name: `*${hookParams.searchTerm}*`,
+  perPage: hookParams.perPage,
+  meta: { caseIds: [hookParams.caseId] },
+};
+
+describe('useGetCaseFiles', () => {
+  let appMockRender: AppMockRenderer;
+
+  beforeEach(() => {
+    appMockRender = createAppMockRenderer();
+    jest.clearAllMocks();
+  });
+
+  it('shows an error toast when filesClient.list throws', async () => {
+    const addError = jest.fn();
+    (useToasts as jest.Mock).mockReturnValue({ addError });
+
+    appMockRender.getFilesClient().list = jest.fn().mockImplementation(() => {
+      throw new Error('Something went wrong');
+    });
+
+    const { waitForNextUpdate } = renderHook(() => useGetCaseFiles(hookParams), {
+      wrapper: appMockRender.AppWrapper,
+    });
+    await waitForNextUpdate();
+
+    expect(appMockRender.getFilesClient().list).toBeCalledWith(expectedCallParams);
+    expect(addError).toHaveBeenCalled();
+  });
+
+  it('calls filesClient.list with correct arguments', async () => {
+    await act(async () => {
+      const { waitForNextUpdate } = renderHook(() => useGetCaseFiles(hookParams), {
+        wrapper: appMockRender.AppWrapper,
+      });
+      await waitForNextUpdate();
+
+      expect(appMockRender.getFilesClient().list).toBeCalledWith(expectedCallParams);
+    });
+  });
+});
diff --git a/x-pack/plugins/cases/public/containers/use_get_case_files.tsx b/x-pack/plugins/cases/public/containers/use_get_case_files.tsx
new file mode 100644
index 0000000000000..88fca6d201285
--- /dev/null
+++ b/x-pack/plugins/cases/public/containers/use_get_case_files.tsx
@@ -0,0 +1,61 @@
+/*
+ * 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 { FileJSON } from '@kbn/shared-ux-file-types';
+import type { UseQueryResult } from '@tanstack/react-query';
+
+import { useFilesContext } from '@kbn/shared-ux-file-context';
+import { useQuery } from '@tanstack/react-query';
+
+import type { Owner } from '../../common/constants/types';
+import type { ServerError } from '../types';
+
+import { constructFileKindIdByOwner } from '../../common/files';
+import { useCasesToast } from '../common/use_cases_toast';
+import { casesQueriesKeys } from './constants';
+import * as i18n from './translations';
+import { useCasesContext } from '../components/cases_context/use_cases_context';
+
+export interface CaseFilesFilteringOptions {
+  page: number;
+  perPage: number;
+  searchTerm?: string;
+}
+
+export interface GetCaseFilesParams extends CaseFilesFilteringOptions {
+  caseId: string;
+}
+
+export const useGetCaseFiles = ({
+  caseId,
+  page,
+  perPage,
+  searchTerm,
+}: GetCaseFilesParams): UseQueryResult<{ files: FileJSON[]; total: number }> => {
+  const { owner } = useCasesContext();
+  const { showErrorToast } = useCasesToast();
+  const { client: filesClient } = useFilesContext();
+
+  return useQuery(
+    casesQueriesKeys.caseFiles(caseId, { page, perPage, searchTerm }),
+    () => {
+      return filesClient.list({
+        kind: constructFileKindIdByOwner(owner[0] as Owner),
+        page: page + 1,
+        ...(searchTerm && { name: `*${searchTerm}*` }),
+        perPage,
+        meta: { caseIds: [caseId] },
+      });
+    },
+    {
+      keepPreviousData: true,
+      onError: (error: ServerError) => {
+        showErrorToast(error, { title: i18n.ERROR_TITLE });
+      },
+    }
+  );
+};
diff --git a/x-pack/plugins/cases/public/files/index.ts b/x-pack/plugins/cases/public/files/index.ts
index 30a406c788f63..1804e11b0ea17 100644
--- a/x-pack/plugins/cases/public/files/index.ts
+++ b/x-pack/plugins/cases/public/files/index.ts
@@ -20,6 +20,9 @@ const buildFileKind = (config: FilesConfig, owner: Owner): FileKindBrowser => {
   };
 };
 
+export const isRegisteredOwner = (ownerToCheck: string): ownerToCheck is Owner =>
+  OWNERS.includes(ownerToCheck as Owner);
+
 /**
  * The file kind definition for interacting with the file service for the UI
  */
diff --git a/x-pack/plugins/cases/public/internal_attachments/index.ts b/x-pack/plugins/cases/public/internal_attachments/index.ts
new file mode 100644
index 0000000000000..c8457d9a16a1b
--- /dev/null
+++ b/x-pack/plugins/cases/public/internal_attachments/index.ts
@@ -0,0 +1,15 @@
+/*
+ * 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 { ExternalReferenceAttachmentTypeRegistry } from '../client/attachment_framework/external_reference_registry';
+import { getFileType } from '../components/files/file_type';
+
+export const registerInternalAttachments = (
+  externalRefRegistry: ExternalReferenceAttachmentTypeRegistry
+) => {
+  externalRefRegistry.register(getFileType());
+};
diff --git a/x-pack/plugins/cases/public/plugin.ts b/x-pack/plugins/cases/public/plugin.ts
index b1ab9f32700dd..8897b9ccbd046 100644
--- a/x-pack/plugins/cases/public/plugin.ts
+++ b/x-pack/plugins/cases/public/plugin.ts
@@ -28,6 +28,7 @@ import { getUICapabilities } from './client/helpers/capabilities';
 import { ExternalReferenceAttachmentTypeRegistry } from './client/attachment_framework/external_reference_registry';
 import { PersistableStateAttachmentTypeRegistry } from './client/attachment_framework/persistable_state_registry';
 import { registerCaseFileKinds } from './files';
+import { registerInternalAttachments } from './internal_attachments';
 
 /**
  * @public
@@ -53,6 +54,7 @@ export class CasesUiPlugin
     const externalReferenceAttachmentTypeRegistry = this.externalReferenceAttachmentTypeRegistry;
     const persistableStateAttachmentTypeRegistry = this.persistableStateAttachmentTypeRegistry;
 
+    registerInternalAttachments(externalReferenceAttachmentTypeRegistry);
     const config = this.initializerContext.config.get<CasesUiConfigType>();
     registerCaseFileKinds(config.files, plugins.files);
 
@@ -122,6 +124,7 @@ export class CasesUiPlugin
     const getCasesContext = getCasesContextLazy({
       externalReferenceAttachmentTypeRegistry: this.externalReferenceAttachmentTypeRegistry,
       persistableStateAttachmentTypeRegistry: this.persistableStateAttachmentTypeRegistry,
+      getFilesClient: plugins.files.filesClientFactory.asScoped,
     });
 
     return {
@@ -132,6 +135,7 @@ export class CasesUiPlugin
             ...props,
             externalReferenceAttachmentTypeRegistry: this.externalReferenceAttachmentTypeRegistry,
             persistableStateAttachmentTypeRegistry: this.persistableStateAttachmentTypeRegistry,
+            getFilesClient: plugins.files.filesClientFactory.asScoped,
           }),
         getCasesContext,
         getRecentCases: (props) =>
@@ -139,6 +143,7 @@ export class CasesUiPlugin
             ...props,
             externalReferenceAttachmentTypeRegistry: this.externalReferenceAttachmentTypeRegistry,
             persistableStateAttachmentTypeRegistry: this.persistableStateAttachmentTypeRegistry,
+            getFilesClient: plugins.files.filesClientFactory.asScoped,
           }),
         // @deprecated Please use the hook useCasesAddToNewCaseFlyout
         getCreateCaseFlyout: (props) =>
@@ -146,6 +151,7 @@ export class CasesUiPlugin
             ...props,
             externalReferenceAttachmentTypeRegistry: this.externalReferenceAttachmentTypeRegistry,
             persistableStateAttachmentTypeRegistry: this.persistableStateAttachmentTypeRegistry,
+            getFilesClient: plugins.files.filesClientFactory.asScoped,
           }),
         // @deprecated Please use the hook useCasesAddToExistingCaseModal
         getAllCasesSelectorModal: (props) =>
@@ -153,6 +159,7 @@ export class CasesUiPlugin
             ...props,
             externalReferenceAttachmentTypeRegistry: this.externalReferenceAttachmentTypeRegistry,
             persistableStateAttachmentTypeRegistry: this.persistableStateAttachmentTypeRegistry,
+            getFilesClient: plugins.files.filesClientFactory.asScoped,
           }),
       },
       hooks: {
diff --git a/x-pack/plugins/cases/public/types.ts b/x-pack/plugins/cases/public/types.ts
index e2cb59095f849..6b88c79abb6a3 100644
--- a/x-pack/plugins/cases/public/types.ts
+++ b/x-pack/plugins/cases/public/types.ts
@@ -35,6 +35,7 @@ import type {
   CasesStatusRequest,
   CommentRequestAlertType,
   CommentRequestExternalReferenceNoSOType,
+  CommentRequestExternalReferenceSOType,
   CommentRequestPersistableStateType,
   CommentRequestUserType,
 } from '../common/api';
@@ -167,7 +168,8 @@ export type SupportedCaseAttachment =
   | CommentRequestAlertType
   | CommentRequestUserType
   | CommentRequestPersistableStateType
-  | CommentRequestExternalReferenceNoSOType;
+  | CommentRequestExternalReferenceNoSOType
+  | CommentRequestExternalReferenceSOType;
 
 export type CaseAttachments = SupportedCaseAttachment[];
 export type CaseAttachmentWithoutOwner = DistributiveOmit<SupportedCaseAttachment, 'owner'>;
diff --git a/x-pack/plugins/cases/server/common/limiter_checker/test_utils.ts b/x-pack/plugins/cases/server/common/limiter_checker/test_utils.ts
index 6fa5e0cbbe561..1f0423dc323f5 100644
--- a/x-pack/plugins/cases/server/common/limiter_checker/test_utils.ts
+++ b/x-pack/plugins/cases/server/common/limiter_checker/test_utils.ts
@@ -39,7 +39,7 @@ export const createFileRequests = ({
   const files: FileAttachmentMetadata['files'] = [...Array(numFiles).keys()].map((value) => {
     return {
       name: `${value}`,
-      createdAt: '2023-02-27T20:26:54.345Z',
+      created: '2023-02-27T20:26:54.345Z',
       extension: 'png',
       mimeType: 'image/png',
     };
diff --git a/x-pack/plugins/cases/tsconfig.json b/x-pack/plugins/cases/tsconfig.json
index 7c703b9819300..3dd670e260f9d 100644
--- a/x-pack/plugins/cases/tsconfig.json
+++ b/x-pack/plugins/cases/tsconfig.json
@@ -57,8 +57,12 @@
     "@kbn/shared-ux-router",
     "@kbn/files-plugin",
     "@kbn/shared-ux-file-types",
+    "@kbn/shared-ux-file-context",
+    "@kbn/shared-ux-file-upload",
+    "@kbn/shared-ux-file-mocks",
     "@kbn/saved-objects-finder-plugin",
     "@kbn/saved-objects-management-plugin",
+    "@kbn/utility-types-jest",
   ],
   "exclude": [
     "target/**/*",
diff --git a/x-pack/test/cases_api_integration/common/lib/mock.ts b/x-pack/test/cases_api_integration/common/lib/mock.ts
index bb8233dd058da..1ea6c1b1e1359 100644
--- a/x-pack/test/cases_api_integration/common/lib/mock.ts
+++ b/x-pack/test/cases_api_integration/common/lib/mock.ts
@@ -129,7 +129,7 @@ export const fileMetadata = () => ({
   name: 'test_file',
   extension: 'png',
   mimeType: 'image/png',
-  createdAt: '2023-02-27T20:26:54.345Z',
+  created: '2023-02-27T20:26:54.345Z',
 });
 
 export const fileAttachmentMetadata: FileAttachmentMetadata = {
diff --git a/x-pack/test/functional_with_es_ssl/plugins/cases/public/attachments/external_reference.tsx b/x-pack/test/functional_with_es_ssl/plugins/cases/public/attachments/external_reference.tsx
index dae5945a3d687..3ab6cd69103e0 100644
--- a/x-pack/test/functional_with_es_ssl/plugins/cases/public/attachments/external_reference.tsx
+++ b/x-pack/test/functional_with_es_ssl/plugins/cases/public/attachments/external_reference.tsx
@@ -6,7 +6,10 @@
  */
 
 import { lazy } from 'react';
-import { ExternalReferenceAttachmentType } from '@kbn/cases-plugin/public/client/attachment_framework/types';
+import type {
+  AttachmentActionType,
+  ExternalReferenceAttachmentType,
+} from '@kbn/cases-plugin/public/client/attachment_framework/types';
 
 const AttachmentContentLazy = lazy(() => import('./external_references_content'));
 
@@ -18,7 +21,13 @@ export const getExternalReferenceAttachmentRegular = (): ExternalReferenceAttach
     event: 'added a chart',
     timelineAvatar: 'casesApp',
     getActions: () => [
-      { label: 'See attachment', onClick: () => {}, isPrimary: true, iconType: 'arrowRight' },
+      {
+        type: 'button' as AttachmentActionType.BUTTON,
+        label: 'See attachment',
+        onClick: () => {},
+        isPrimary: true,
+        iconType: 'arrowRight',
+      },
     ],
     children: AttachmentContentLazy,
   }),
diff --git a/x-pack/test/functional_with_es_ssl/plugins/cases/public/attachments/persistable_state.tsx b/x-pack/test/functional_with_es_ssl/plugins/cases/public/attachments/persistable_state.tsx
index 2159c9c7b551d..1a27ef03f0d9d 100644
--- a/x-pack/test/functional_with_es_ssl/plugins/cases/public/attachments/persistable_state.tsx
+++ b/x-pack/test/functional_with_es_ssl/plugins/cases/public/attachments/persistable_state.tsx
@@ -7,7 +7,8 @@
 
 import React from 'react';
 
-import {
+import type {
+  AttachmentActionType,
   PersistableStateAttachmentType,
   PersistableStateAttachmentViewProps,
 } from '@kbn/cases-plugin/public/client/attachment_framework/types';
@@ -50,7 +51,13 @@ export const getPersistableStateAttachmentRegular = (
     event: 'added an embeddable',
     timelineAvatar: 'casesApp',
     getActions: () => [
-      { label: 'See attachment', onClick: () => {}, isPrimary: true, iconType: 'arrowRight' },
+      {
+        type: 'button' as AttachmentActionType.BUTTON,
+        label: 'See attachment',
+        onClick: () => {},
+        isPrimary: true,
+        iconType: 'arrowRight',
+      },
     ],
     children: getLazyComponent(EmbeddableComponent),
   }),

From e0002476ef580ecef50d35d23ca40b22b7140772 Mon Sep 17 00:00:00 2001
From: Rodney Norris <rodney.norris@elastic.co>
Date: Tue, 18 Apr 2023 09:45:33 -0500
Subject: [PATCH 030/100] [Enterprise Search][Search Applications] Remove
 overview page (#155098)

## Summary

Removed the search applications overview page and replaced it as the
default page with the search preview page.
---
 .../api/engines/fetch_indices_api_logic.ts    |   2 +-
 .../components/engine/engine_overview.tsx     | 130 -----
 .../engine/engine_overview_logic.test.ts      | 487 ------------------
 .../engine/engine_overview_logic.ts           |  93 ----
 .../components/engine/engine_router.tsx       |   2 +-
 .../components/engine/engine_view.tsx         |  12 +-
 .../enterprise_search_content/routes.ts       |   3 +-
 .../applications/shared/layout/nav.test.tsx   |  11 +-
 .../public/applications/shared/layout/nav.tsx |  18 +-
 .../translations/translations/fr-FR.json      |   5 -
 .../translations/translations/ja-JP.json      |   5 -
 .../translations/translations/zh-CN.json      |   5 -
 12 files changed, 13 insertions(+), 760 deletions(-)
 delete mode 100644 x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_overview.tsx
 delete mode 100644 x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_overview_logic.test.ts
 delete mode 100644 x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_overview_logic.ts

diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/engines/fetch_indices_api_logic.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/engines/fetch_indices_api_logic.ts
index c9764d7751f73..dbb434032e79f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/engines/fetch_indices_api_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/engines/fetch_indices_api_logic.ts
@@ -30,7 +30,7 @@ export const fetchIndices = async ({
   const { http } = HttpLogic.values;
   const route = '/internal/enterprise_search/indices';
   const query = {
-    page: 1,
+    from: 0,
     return_hidden_indices: false,
     search_query: searchQuery || null,
     size: INDEX_SEARCH_PAGE_SIZE,
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_overview.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_overview.tsx
deleted file mode 100644
index f42b281522adc..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_overview.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * 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 { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiPanel, EuiStat, useEuiTheme } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-
-import { generateEncodedPath } from '../../../shared/encode_path_params';
-import { EuiLinkTo } from '../../../shared/react_router_helpers';
-import { EngineViewTabs, ENGINE_TAB_PATH } from '../../routes';
-import { EnterpriseSearchEnginesPageTemplate } from '../layout/engines_page_template';
-
-import { EngineOverviewLogic } from './engine_overview_logic';
-import { EngineViewHeaderActions } from './engine_view_header_actions';
-
-export const EngineOverview: React.FC = () => {
-  const {
-    euiTheme: { colors: colors },
-  } = useEuiTheme();
-  const {
-    documentsCount,
-    engineName,
-    fieldsCount,
-    hasUnknownIndices,
-    indicesCount,
-    isLoadingEngine,
-  } = useValues(EngineOverviewLogic);
-
-  return (
-    <EnterpriseSearchEnginesPageTemplate
-      pageChrome={[engineName]}
-      pageViewTelemetry={EngineViewTabs.OVERVIEW}
-      isLoading={isLoadingEngine}
-      pageHeader={{
-        pageTitle: i18n.translate('xpack.enterpriseSearch.content.engine.overview.pageTitle', {
-          defaultMessage: 'Overview',
-        }),
-        rightSideItems: [<EngineViewHeaderActions />],
-      }}
-      engineName={engineName}
-    >
-      <>
-        <EuiPanel hasShadow={false} hasBorder paddingSize="l">
-          <EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
-            <EuiFlexItem>
-              <EuiLinkTo
-                to={generateEncodedPath(ENGINE_TAB_PATH, {
-                  engineName,
-                  tabId: EngineViewTabs.INDICES,
-                })}
-                color="text"
-              >
-                <EuiFlexGroup alignItems="center">
-                  {hasUnknownIndices ? (
-                    <EuiIcon size="xxl" type="warning" color={colors.warning} />
-                  ) : (
-                    <EuiIcon size="xxl" type="visTable" color={colors.mediumShade} />
-                  )}
-                  <EuiStat
-                    titleSize="l"
-                    isLoading={isLoadingEngine}
-                    title={indicesCount.toLocaleString()}
-                    description={i18n.translate(
-                      'xpack.enterpriseSearch.content.engine.overview.indicesDescription',
-                      { defaultMessage: 'Indices' }
-                    )}
-                    titleColor={hasUnknownIndices ? colors.warningText : 'primary'}
-                  />
-                </EuiFlexGroup>
-              </EuiLinkTo>
-            </EuiFlexItem>
-            <EuiFlexItem>
-              <EuiLinkTo
-                to={generateEncodedPath(ENGINE_TAB_PATH, {
-                  engineName,
-                  tabId: EngineViewTabs.PREVIEW,
-                })}
-                color="text"
-              >
-                <EuiFlexGroup alignItems="center">
-                  <EuiIcon size="xxl" type="documents" color={colors.mediumShade} />
-                  <EuiStat
-                    titleSize="l"
-                    isLoading={isLoadingEngine}
-                    title={documentsCount.toLocaleString()}
-                    description={i18n.translate(
-                      'xpack.enterpriseSearch.content.engine.overview.documentsDescription',
-                      { defaultMessage: 'Documents' }
-                    )}
-                    titleColor="primary"
-                  />
-                </EuiFlexGroup>
-              </EuiLinkTo>
-            </EuiFlexItem>
-            <EuiFlexItem>
-              <EuiLinkTo
-                to={generateEncodedPath(ENGINE_TAB_PATH, {
-                  engineName,
-                  tabId: EngineViewTabs.SCHEMA,
-                })}
-                color="text"
-              >
-                <EuiFlexGroup alignItems="center">
-                  <EuiIcon size="xxl" type="documents" color={colors.mediumShade} />
-                  <EuiStat
-                    titleSize="l"
-                    isLoading={false}
-                    title={fieldsCount.toLocaleString()}
-                    description={i18n.translate(
-                      'xpack.enterpriseSearch.content.engine.overview.fieldsDescription',
-                      { defaultMessage: 'Fields' }
-                    )}
-                    titleColor="primary"
-                  />
-                </EuiFlexGroup>
-              </EuiLinkTo>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiPanel>
-      </>
-    </EnterpriseSearchEnginesPageTemplate>
-  );
-};
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_overview_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_overview_logic.test.ts
deleted file mode 100644
index ebd7e90f7e188..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_overview_logic.test.ts
+++ /dev/null
@@ -1,487 +0,0 @@
-/*
- * 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 { LogicMounter } from '../../../__mocks__/kea_logic';
-
-import { Status } from '../../../../../common/types/api';
-import { EnterpriseSearchEngineIndex, SchemaField } from '../../../../../common/types/engines';
-
-import {
-  EngineOverviewLogic,
-  EngineOverviewValues,
-  selectDocumentsCount,
-  selectFieldsCount,
-  selectHasUnknownIndices,
-  selectIndices,
-  selectIndicesCount,
-} from './engine_overview_logic';
-
-const DEFAULT_VALUES: EngineOverviewValues = {
-  documentsCount: 0,
-  engineData: undefined,
-  engineFieldCapabilitiesApiStatus: Status.IDLE,
-  engineFieldCapabilitiesData: undefined,
-  engineName: '',
-  fieldsCount: 0,
-  hasUnknownIndices: false,
-  indices: [],
-  indicesCount: 0,
-  isLoadingEngine: true,
-};
-
-describe('EngineOverviewLogic', () => {
-  const { mount } = new LogicMounter(EngineOverviewLogic);
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    jest.useRealTimers();
-
-    mount();
-  });
-
-  it('has expected default values', () => {
-    expect(EngineOverviewLogic.values).toEqual(DEFAULT_VALUES);
-  });
-
-  describe('listeners', () => {
-    describe('setEngineName', () => {
-      it('refetches the engine field capabilities', () => {
-        jest.spyOn(EngineOverviewLogic.actions, 'fetchEngineFieldCapabilities');
-
-        EngineOverviewLogic.actions.setEngineName('foobar');
-
-        expect(EngineOverviewLogic.actions.fetchEngineFieldCapabilities).toHaveBeenCalledTimes(1);
-        expect(EngineOverviewLogic.actions.fetchEngineFieldCapabilities).toHaveBeenCalledWith({
-          engineName: 'foobar',
-        });
-      });
-    });
-  });
-
-  describe('selectors', () => {
-    describe('indices', () => {
-      it('is defined', () => {
-        expect(selectIndices).toBeDefined();
-      });
-      it('returns an empty array before engineData is loaded', () => {
-        expect(selectIndices(undefined)).toEqual([]);
-      });
-      it('returns the array of indices', () => {
-        const indices = [
-          {
-            count: 10,
-            health: 'green',
-            name: 'index-001',
-          },
-          {
-            count: 10,
-            health: 'green',
-            name: 'index-002',
-          },
-        ];
-        const engineData = {
-          indices,
-          name: 'foo-engine',
-          updated_at_millis: 2202018295,
-        } as EngineOverviewValues['engineData'];
-        expect(selectIndices(engineData)).toBe(indices);
-      });
-    });
-    describe('indicesCount', () => {
-      it('is defined', () => {
-        expect(selectIndicesCount).toBeDefined();
-      });
-      it('returns the number of indices', () => {
-        const noIndices: EnterpriseSearchEngineIndex[] = [];
-        const oneIndex = [
-          { count: 23, health: 'unknown', name: 'index-001' },
-        ] as EnterpriseSearchEngineIndex[];
-        const twoIndices = [
-          { count: 23, health: 'unknown', name: 'index-001' },
-          { count: 92, health: 'unknown', name: 'index-002' },
-        ] as EnterpriseSearchEngineIndex[];
-
-        expect(selectIndicesCount(noIndices)).toBe(0);
-        expect(selectIndicesCount(oneIndex)).toBe(1);
-        expect(selectIndicesCount(twoIndices)).toBe(2);
-      });
-    });
-
-    describe('hasUnknownIndices', () => {
-      it('is defined', () => {
-        expect(selectHasUnknownIndices).toBeDefined();
-      });
-      describe('no indices', () => {
-        const indices: EnterpriseSearchEngineIndex[] = [];
-        it('returns false', () => {
-          expect(selectHasUnknownIndices(indices)).toBe(false);
-        });
-      });
-      describe('all indices unknown', () => {
-        const indices = [
-          {
-            count: 12,
-            health: 'unknown',
-            name: 'index-001',
-          },
-          {
-            count: 34,
-            health: 'unknown',
-            name: 'index-002',
-          },
-          {
-            count: 56,
-            health: 'unknown',
-            name: 'index-003',
-          },
-        ] as EnterpriseSearchEngineIndex[];
-        it('returns true', () => {
-          expect(selectHasUnknownIndices(indices)).toBe(true);
-        });
-      });
-
-      describe('one index unknown', () => {
-        const indices = [
-          {
-            count: 12,
-            health: 'unknown',
-            name: 'index-001',
-          },
-          {
-            count: 34,
-            health: 'yellow',
-            name: 'index-002',
-          },
-          {
-            count: 56,
-            health: 'green',
-            name: 'index-003',
-          },
-        ] as EnterpriseSearchEngineIndex[];
-        it('returns true', () => {
-          expect(selectHasUnknownIndices(indices)).toBe(true);
-        });
-      });
-
-      describe('multiple but not all indices unknown', () => {
-        const indices = [
-          {
-            count: 12,
-            health: 'unknown',
-            name: 'index-001',
-          },
-          {
-            count: 34,
-            health: 'yellow',
-            name: 'index-002',
-          },
-          {
-            count: 56,
-            health: 'unknown',
-            name: 'index-003',
-          },
-        ] as EnterpriseSearchEngineIndex[];
-        it('returns true', () => {
-          expect(selectHasUnknownIndices(indices)).toBe(true);
-        });
-      });
-
-      describe('no indices unknown', () => {
-        const indices = [
-          {
-            count: 12,
-            health: 'green',
-            name: 'index-001',
-          },
-          {
-            count: 34,
-            health: 'yellow',
-            name: 'index-002',
-          },
-          {
-            count: 56,
-            health: 'green',
-            name: 'index-003',
-          },
-        ] as EnterpriseSearchEngineIndex[];
-        it('returns false', () => {
-          expect(selectHasUnknownIndices(indices)).toBe(false);
-        });
-      });
-    });
-
-    describe('documentsCount', () => {
-      it('is defined', () => {
-        expect(selectDocumentsCount).toBeDefined();
-      });
-
-      it('returns 0 for no indices', () => {
-        expect(selectDocumentsCount([])).toBe(0);
-      });
-
-      it('returns the `count` for a single index', () => {
-        expect(
-          selectDocumentsCount([
-            {
-              count: 23,
-              health: 'green',
-              name: 'index-001',
-            },
-          ] as EnterpriseSearchEngineIndex[])
-        ).toBe(23);
-      });
-
-      it('returns the sum of all `count`', () => {
-        expect(
-          selectDocumentsCount([
-            {
-              count: 23,
-              health: 'green',
-              name: 'index-001',
-            },
-            {
-              count: 45,
-              health: 'green',
-              name: 'index-002',
-            },
-          ] as EnterpriseSearchEngineIndex[])
-        ).toBe(68);
-      });
-
-      it('does not count indices without a `count`', () => {
-        expect(
-          selectDocumentsCount([
-            {
-              count: 23,
-              health: 'green',
-              name: 'index-001',
-            },
-            {
-              count: null,
-              health: 'unknown',
-              name: 'index-002',
-            },
-            {
-              count: 45,
-              health: 'green',
-              name: 'index-002',
-            },
-          ] as EnterpriseSearchEngineIndex[])
-        ).toBe(68);
-      });
-    });
-
-    describe('fieldsCount', () => {
-      it('is defined', () => {
-        expect(selectFieldsCount).toBeDefined();
-      });
-      it('counts the fields from the field capabilities', () => {
-        const fieldCapabilities = {
-          created: '2023-02-07T19:16:43Z',
-          fields: [
-            {
-              indices: [
-                {
-                  name: 'index-001',
-                  type: 'integer',
-                },
-                {
-                  name: 'index-002',
-                  type: 'integer',
-                },
-              ],
-              name: 'age',
-              type: 'integer',
-            },
-            {
-              indices: [
-                {
-                  name: 'index-001',
-                  type: 'keyword',
-                },
-                {
-                  name: 'index-002',
-                  type: 'keyword',
-                },
-              ],
-              name: 'color',
-              type: 'keyword',
-            },
-            {
-              indices: [
-                {
-                  name: 'index-001',
-                  type: 'text',
-                },
-                {
-                  name: 'index-002',
-                  type: 'text',
-                },
-              ],
-              name: 'name',
-              type: 'text',
-            },
-          ] as SchemaField[],
-          name: 'engine-001',
-          updated_at_millis: 2202018295,
-        };
-        expect(selectFieldsCount(fieldCapabilities)).toBe(3);
-      });
-
-      it('excludes metadata fields from the count', () => {
-        const fieldCapabilities = {
-          created: '2023-02-07T19:16:43Z',
-          fields: [
-            {
-              aggregatable: true,
-              indices: [
-                {
-                  name: 'index-001',
-                  type: 'integer',
-                },
-                {
-                  name: 'index-002',
-                  type: 'integer',
-                },
-              ],
-              metadata_field: true,
-              name: '_doc_count',
-              searchable: true,
-              type: 'integer',
-            },
-            {
-              aggregatable: true,
-              indices: [
-                {
-                  name: 'index-001',
-                  type: '_id',
-                },
-                {
-                  name: 'index-002',
-                  type: '_id',
-                },
-              ],
-              metadata_field: true,
-              name: '_id',
-              searchable: true,
-              type: '_id',
-            },
-            {
-              aggregatable: true,
-              indices: [
-                {
-                  name: 'index-001',
-                  type: '_index',
-                },
-                {
-                  name: 'index-002',
-                  type: '_index',
-                },
-              ],
-              metadata_field: true,
-              name: '_index',
-              searchable: true,
-              type: '_index',
-            },
-            {
-              aggregatable: true,
-              indices: [
-                {
-                  name: 'index-001',
-                  type: '_source',
-                },
-                {
-                  name: 'index-002',
-                  type: '_source',
-                },
-              ],
-              metadata_field: true,
-              name: '_source',
-              searchable: true,
-              type: '_source',
-            },
-            {
-              aggregatable: true,
-              indices: [
-                {
-                  name: 'index-001',
-                  type: '_version',
-                },
-                {
-                  name: 'index-002',
-                  type: '_version',
-                },
-              ],
-              metadata_field: true,
-              name: '_version',
-              searchable: true,
-              type: '_version',
-            },
-            {
-              aggregatable: true,
-              indices: [
-                {
-                  name: 'index-001',
-                  type: 'integer',
-                },
-                {
-                  name: 'index-002',
-                  type: 'integer',
-                },
-              ],
-              metadata_field: false,
-              name: 'age',
-              searchable: true,
-              type: 'integer',
-            },
-            {
-              aggregatable: true,
-              indices: [
-                {
-                  name: 'index-001',
-                  type: 'keyword',
-                },
-                {
-                  name: 'index-002',
-                  type: 'keyword',
-                },
-              ],
-              metadata_field: false,
-              name: 'color',
-              searchable: true,
-              type: 'keyword',
-            },
-            {
-              aggregatable: false,
-              indices: [
-                {
-                  name: 'index-001',
-                  type: 'text',
-                },
-                {
-                  name: 'index-002',
-                  type: 'text',
-                },
-              ],
-              metadata_field: false,
-              name: 'name',
-              searchable: true,
-              type: 'text',
-            },
-          ] as SchemaField[],
-          name: 'foo-engine',
-          updated_at_millis: 2202018295,
-        };
-        expect(selectFieldsCount(fieldCapabilities)).toBe(3);
-      });
-
-      it('returns 0 when field capability data is not available', () => {
-        expect(selectFieldsCount(undefined)).toBe(0);
-      });
-    });
-  });
-});
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_overview_logic.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_overview_logic.ts
deleted file mode 100644
index 7c6051194919a..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_overview_logic.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * 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 { kea, MakeLogicType } from 'kea';
-
-import { Status } from '../../../../../common/types/api';
-import { EnterpriseSearchEngineIndex } from '../../../../../common/types/engines';
-
-import { FetchEngineFieldCapabilitiesApiLogic } from '../../api/engines/fetch_engine_field_capabilities_api_logic';
-
-import { EngineNameLogic } from './engine_name_logic';
-import { EngineViewLogic } from './engine_view_logic';
-
-export interface EngineOverviewActions {
-  fetchEngineFieldCapabilities: typeof FetchEngineFieldCapabilitiesApiLogic.actions.makeRequest;
-  setEngineName: typeof EngineNameLogic.actions.setEngineName;
-}
-export interface EngineOverviewValues {
-  documentsCount: number;
-  engineData: typeof EngineViewLogic.values.engineData;
-  engineFieldCapabilitiesApiStatus: typeof FetchEngineFieldCapabilitiesApiLogic.values.status;
-  engineFieldCapabilitiesData: typeof FetchEngineFieldCapabilitiesApiLogic.values.data;
-  engineName: typeof EngineNameLogic.values.engineName;
-  fieldsCount: number;
-  hasUnknownIndices: boolean;
-  indices: EnterpriseSearchEngineIndex[];
-  indicesCount: number;
-  isLoadingEngine: typeof EngineViewLogic.values.isLoadingEngine;
-}
-
-export const selectIndices = (engineData: EngineOverviewValues['engineData']) =>
-  engineData?.indices ?? [];
-
-export const selectIndicesCount = (indices: EngineOverviewValues['indices']) => indices.length;
-
-export const selectHasUnknownIndices = (indices: EngineOverviewValues['indices']) =>
-  indices.some(({ health }) => health === 'unknown');
-
-export const selectDocumentsCount = (indices: EngineOverviewValues['indices']) =>
-  indices.reduce((sum, { count }) => sum + count, 0);
-
-export const selectFieldsCount = (
-  engineFieldCapabilitiesData: EngineOverviewValues['engineFieldCapabilitiesData']
-) =>
-  engineFieldCapabilitiesData?.fields?.filter(({ metadata_field: isMeta }) => !isMeta).length ?? 0;
-
-export const EngineOverviewLogic = kea<MakeLogicType<EngineOverviewValues, EngineOverviewActions>>({
-  actions: {},
-  connect: {
-    actions: [
-      EngineNameLogic,
-      ['setEngineName'],
-      FetchEngineFieldCapabilitiesApiLogic,
-      ['makeRequest as fetchEngineFieldCapabilities'],
-    ],
-    values: [
-      EngineNameLogic,
-      ['engineName'],
-      EngineViewLogic,
-      ['engineData', 'isLoadingEngine'],
-      FetchEngineFieldCapabilitiesApiLogic,
-      ['data as engineFieldCapabilitiesData', 'status as engineFieldCapabilitiesApiStatus'],
-    ],
-  },
-  events: ({ actions, values }) => ({
-    afterMount: () => {
-      if (values.engineFieldCapabilitiesApiStatus !== Status.SUCCESS && !!values.engineName) {
-        actions.fetchEngineFieldCapabilities({
-          engineName: values.engineName,
-        });
-      }
-    },
-  }),
-  listeners: ({ actions, values }) => ({
-    setEngineName: () => {
-      const { engineName } = values;
-      actions.fetchEngineFieldCapabilities({ engineName });
-    },
-  }),
-  path: ['enterprise_search', 'content', 'engine_overview_logic'],
-  reducers: {},
-  selectors: ({ selectors }) => ({
-    documentsCount: [() => [selectors.indices], selectDocumentsCount],
-    fieldsCount: [() => [selectors.engineFieldCapabilitiesData], selectFieldsCount],
-    hasUnknownIndices: [() => [selectors.indices], selectHasUnknownIndices],
-    indices: [() => [selectors.engineData], selectIndices],
-    indicesCount: [() => [selectors.indices], selectIndicesCount],
-  }),
-});
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_router.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_router.tsx
index 8c93ecc67c1c2..31122af9d8d50 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_router.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_router.tsx
@@ -40,7 +40,7 @@ export const EngineRouter: React.FC = () => {
         from={ENGINE_PATH}
         to={generateEncodedPath(ENGINE_TAB_PATH, {
           engineName,
-          tabId: EngineViewTabs.OVERVIEW,
+          tabId: EngineViewTabs.PREVIEW,
         })}
         exact
       />
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_view.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_view.tsx
index f66a443d62413..f3934c11311a7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_view.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_view.tsx
@@ -23,7 +23,6 @@ import { EnterpriseSearchEnginesPageTemplate } from '../layout/engines_page_temp
 import { EngineAPI } from './engine_api/engine_api';
 import { EngineError } from './engine_error';
 import { EngineIndices } from './engine_indices';
-import { EngineOverview } from './engine_overview';
 import { EngineSchema } from './engine_schema';
 import { EngineSearchPreview } from './engine_search_preview/engine_search_preview';
 import { EngineViewHeaderActions } from './engine_view_header_actions';
@@ -39,7 +38,7 @@ export const EngineView: React.FC = () => {
     isDeleteModalVisible,
     isLoadingEngine,
   } = useValues(EngineViewLogic);
-  const { tabId = EngineViewTabs.OVERVIEW } = useParams<{
+  const { tabId = EngineViewTabs.PREVIEW } = useParams<{
     tabId?: string;
   }>();
   const { renderHeaderActions } = useValues(KibanaLogic);
@@ -73,17 +72,12 @@ export const EngineView: React.FC = () => {
       <Switch>
         <Route
           exact
-          path={`${ENGINE_PATH}/${EngineViewTabs.OVERVIEW}`}
-          component={EngineOverview}
+          path={`${ENGINE_PATH}/${EngineViewTabs.PREVIEW}`}
+          component={EngineSearchPreview}
         />
         <Route exact path={`${ENGINE_PATH}/${EngineViewTabs.INDICES}`} component={EngineIndices} />
         <Route exact path={`${ENGINE_PATH}/${EngineViewTabs.SCHEMA}`} component={EngineSchema} />
         <Route exact path={`${ENGINE_PATH}/${EngineViewTabs.API}`} component={EngineAPI} />
-        <Route
-          exact
-          path={`${ENGINE_PATH}/${EngineViewTabs.PREVIEW}`}
-          component={EngineSearchPreview}
-        />
         <Route // TODO: remove this route when all engine view routes are implemented, replace with a 404 route
           render={() => (
             <EnterpriseSearchEnginesPageTemplate
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 57ff05050ebae..02a1ef68c31f1 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
@@ -30,10 +30,9 @@ export const ENGINE_CREATION_PATH = `${ENGINES_PATH}/new`;
 export const ENGINE_PATH = `${ENGINES_PATH}/:engineName`;
 export const ENGINE_TAB_PATH = `${ENGINE_PATH}/:tabId`;
 export enum EngineViewTabs {
-  OVERVIEW = 'overview',
+  PREVIEW = 'preview',
   INDICES = 'indices',
   SCHEMA = 'schema',
-  PREVIEW = 'preview',
   API = 'api',
 }
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.test.tsx
index ffcb70dcb770b..299f803a6e131 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.test.tsx
@@ -285,9 +285,9 @@ describe('useEnterpriseSearchEngineNav', () => {
       id: 'engineId',
       items: [
         {
-          href: `/app/enterprise_search/content/engines/${engineName}/overview`,
-          id: 'enterpriseSearchEngineOverview',
-          name: 'Overview',
+          href: `/app/enterprise_search/content/engines/${engineName}/preview`,
+          id: 'enterpriseSearchEnginePreview',
+          name: 'Preview',
         },
         {
           href: `/app/enterprise_search/content/engines/${engineName}/indices`,
@@ -299,11 +299,6 @@ describe('useEnterpriseSearchEngineNav', () => {
           id: 'enterpriseSearchEngineSchema',
           name: 'Schema',
         },
-        {
-          href: `/app/enterprise_search/content/engines/${engineName}/preview`,
-          id: 'enterpriseSearchEnginePreview',
-          name: 'Preview',
-        },
         {
           href: `/app/enterprise_search/content/engines/${engineName}/api`,
           id: 'enterpriseSearchEngineAPI',
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.tsx
index a6861b6d29e36..0798de9870f94 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.tsx
@@ -193,13 +193,13 @@ export const useEnterpriseSearchEngineNav = (engineName?: string, isEmptyState?:
           }),
           items: [
             {
-              id: 'enterpriseSearchEngineOverview',
-              name: i18n.translate('xpack.enterpriseSearch.nav.engine.overviewTitle', {
-                defaultMessage: 'Overview',
+              id: 'enterpriseSearchEnginePreview',
+              name: i18n.translate('xpack.enterpriseSearch.nav.engine.previewTitle', {
+                defaultMessage: 'Preview',
               }),
               ...generateNavLink({
                 shouldNotCreateHref: true,
-                to: `${enginePath}/${EngineViewTabs.OVERVIEW}`,
+                to: `${enginePath}/${EngineViewTabs.PREVIEW}`,
               }),
             },
             {
@@ -222,16 +222,6 @@ export const useEnterpriseSearchEngineNav = (engineName?: string, isEmptyState?:
                 to: `${enginePath}/${EngineViewTabs.SCHEMA}`,
               }),
             },
-            {
-              id: 'enterpriseSearchEnginePreview',
-              name: i18n.translate('xpack.enterpriseSearch.nav.engine.previewTitle', {
-                defaultMessage: 'Preview',
-              }),
-              ...generateNavLink({
-                shouldNotCreateHref: true,
-                to: `${enginePath}/${EngineViewTabs.PREVIEW}`,
-              }),
-            },
             {
               id: 'enterpriseSearchEngineAPI',
               name: i18n.translate('xpack.enterpriseSearch.nav.engine.apiTitle', {
diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
index 21137b5344e2e..b8e6993bf9d6a 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -12280,10 +12280,6 @@
     "xpack.enterpriseSearch.content.engine.indices.removeIndexConfirm.title": "Retirer cet index du moteur",
     "xpack.enterpriseSearch.content.engine.indices.searchPlaceholder": "Filtrer les index",
     "xpack.enterpriseSearch.content.engine.indicesSelect.docsLabel": "Documents :",
-    "xpack.enterpriseSearch.content.engine.overview.documentsDescription": "Documents",
-    "xpack.enterpriseSearch.content.engine.overview.fieldsDescription": "Champs",
-    "xpack.enterpriseSearch.content.engine.overview.indicesDescription": "Index",
-    "xpack.enterpriseSearch.content.engine.overview.pageTitle": "Aperçu",
     "xpack.enterpriseSearch.content.engine.schema.field_name.columnTitle": "Nom du champ",
     "xpack.enterpriseSearch.content.engine.schema.field_type.columnTitle": "Type du champ",
     "xpack.enterpriseSearch.content.engine.schema.pageTitle": "Schéma",
@@ -13190,7 +13186,6 @@
     "xpack.enterpriseSearch.nav.elasticsearchTitle": "Elasticsearch",
     "xpack.enterpriseSearch.nav.engine.apiTitle": "API",
     "xpack.enterpriseSearch.nav.engine.indicesTitle": "Index",
-    "xpack.enterpriseSearch.nav.engine.overviewTitle": "Aperçu",
     "xpack.enterpriseSearch.nav.engine.schemaTitle": "Schéma",
     "xpack.enterpriseSearch.nav.enterpriseSearchOverviewTitle": "Aperçu",
     "xpack.enterpriseSearch.nav.searchExperiencesTitle": "Expériences de recherche",
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 74b4c94ef5d1c..7d3317df1bf37 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -12279,10 +12279,6 @@
     "xpack.enterpriseSearch.content.engine.indices.removeIndexConfirm.title": "このインデックスをエンジンから削除",
     "xpack.enterpriseSearch.content.engine.indices.searchPlaceholder": "インデックスのフィルター",
     "xpack.enterpriseSearch.content.engine.indicesSelect.docsLabel": "ドキュメント：",
-    "xpack.enterpriseSearch.content.engine.overview.documentsDescription": "ドキュメント",
-    "xpack.enterpriseSearch.content.engine.overview.fieldsDescription": "フィールド",
-    "xpack.enterpriseSearch.content.engine.overview.indicesDescription": "インデックス",
-    "xpack.enterpriseSearch.content.engine.overview.pageTitle": "概要",
     "xpack.enterpriseSearch.content.engine.schema.field_name.columnTitle": "フィールド名",
     "xpack.enterpriseSearch.content.engine.schema.field_type.columnTitle": "フィールド型",
     "xpack.enterpriseSearch.content.engine.schema.pageTitle": "スキーマ",
@@ -13189,7 +13185,6 @@
     "xpack.enterpriseSearch.nav.elasticsearchTitle": "Elasticsearch",
     "xpack.enterpriseSearch.nav.engine.apiTitle": "API",
     "xpack.enterpriseSearch.nav.engine.indicesTitle": "インデックス",
-    "xpack.enterpriseSearch.nav.engine.overviewTitle": "概要",
     "xpack.enterpriseSearch.nav.engine.schemaTitle": "スキーマ",
     "xpack.enterpriseSearch.nav.enterpriseSearchOverviewTitle": "概要",
     "xpack.enterpriseSearch.nav.searchExperiencesTitle": "検索エクスペリエンス",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index d78366da8b8c7..dce328063bf26 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -12280,10 +12280,6 @@
     "xpack.enterpriseSearch.content.engine.indices.removeIndexConfirm.title": "从引擎中移除此索引",
     "xpack.enterpriseSearch.content.engine.indices.searchPlaceholder": "筛选索引",
     "xpack.enterpriseSearch.content.engine.indicesSelect.docsLabel": "文档：",
-    "xpack.enterpriseSearch.content.engine.overview.documentsDescription": "文档",
-    "xpack.enterpriseSearch.content.engine.overview.fieldsDescription": "字段",
-    "xpack.enterpriseSearch.content.engine.overview.indicesDescription": "索引",
-    "xpack.enterpriseSearch.content.engine.overview.pageTitle": "概览",
     "xpack.enterpriseSearch.content.engine.schema.field_name.columnTitle": "字段名称",
     "xpack.enterpriseSearch.content.engine.schema.field_type.columnTitle": "字段类型",
     "xpack.enterpriseSearch.content.engine.schema.pageTitle": "架构",
@@ -13190,7 +13186,6 @@
     "xpack.enterpriseSearch.nav.elasticsearchTitle": "Elasticsearch",
     "xpack.enterpriseSearch.nav.engine.apiTitle": "API",
     "xpack.enterpriseSearch.nav.engine.indicesTitle": "索引",
-    "xpack.enterpriseSearch.nav.engine.overviewTitle": "概览",
     "xpack.enterpriseSearch.nav.engine.schemaTitle": "架构",
     "xpack.enterpriseSearch.nav.enterpriseSearchOverviewTitle": "概览",
     "xpack.enterpriseSearch.nav.searchExperiencesTitle": "搜索体验",

From 47f0eb8803eff1652e95af8a5fb6b5168dd1eba7 Mon Sep 17 00:00:00 2001
From: Walter Rafelsberger <walter.rafelsberger@elastic.co>
Date: Tue, 18 Apr 2023 17:01:36 +0200
Subject: [PATCH 031/100] [ML] `@kbn/ml-random-sampler-utils`: Fix random
 sampler threshold (#154803)

Fixes the check `isValidProbability` to include `0.5`.
---
 .../src/random_sampler_wrapper.test.ts         | 18 ++++++++++++------
 .../src/random_sampler_wrapper.ts              |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/x-pack/packages/ml/random_sampler_utils/src/random_sampler_wrapper.test.ts b/x-pack/packages/ml/random_sampler_utils/src/random_sampler_wrapper.test.ts
index 58ab666b967ee..2a6a01b23cb8d 100644
--- a/x-pack/packages/ml/random_sampler_utils/src/random_sampler_wrapper.test.ts
+++ b/x-pack/packages/ml/random_sampler_utils/src/random_sampler_wrapper.test.ts
@@ -14,22 +14,28 @@ describe('createRandomSamplerWrapper', () => {
     },
   };
 
-  const wrappedTestAggs = {
+  const getWrappedTestAggs = (probability: number) => ({
     sample: {
       random_sampler: {
-        probability: 0.01,
+        probability,
       },
       aggs: testAggs,
     },
-  };
+  });
 
   it('returns the un-sampled aggregation as-is for a probability of 1', () => {
     expect(createRandomSamplerWrapper({ probability: 1 }).wrap(testAggs)).toEqual(testAggs);
   });
 
+  it('returns wrapped random sampler aggregation for probability of 0.5', () => {
+    expect(createRandomSamplerWrapper({ probability: 0.5 }).wrap(testAggs)).toEqual(
+      getWrappedTestAggs(0.5)
+    );
+  });
+
   it('returns wrapped random sampler aggregation for probability of 0.01', () => {
     expect(createRandomSamplerWrapper({ probability: 0.01 }).wrap(testAggs)).toEqual(
-      wrappedTestAggs
+      getWrappedTestAggs(0.01)
     );
   });
 
@@ -39,9 +45,9 @@ describe('createRandomSamplerWrapper', () => {
     expect(randomSamplerWrapper.wrap(testAggs)).toEqual(testAggs);
   });
 
-  it('returns probability of 0.01 and does not wrap when used for 5000000 docs', () => {
+  it('returns probability of 0.01 and does wrap when used for 5000000 docs', () => {
     const randomSamplerWrapper = createRandomSamplerWrapper({ totalNumDocs: 5000000 });
     expect(randomSamplerWrapper.probability).toBe(0.01);
-    expect(randomSamplerWrapper.wrap(testAggs)).toEqual(wrappedTestAggs);
+    expect(randomSamplerWrapper.wrap(testAggs)).toEqual(getWrappedTestAggs(0.01));
   });
 });
diff --git a/x-pack/packages/ml/random_sampler_utils/src/random_sampler_wrapper.ts b/x-pack/packages/ml/random_sampler_utils/src/random_sampler_wrapper.ts
index b6f51a901ea36..8912dc5470521 100644
--- a/x-pack/packages/ml/random_sampler_utils/src/random_sampler_wrapper.ts
+++ b/x-pack/packages/ml/random_sampler_utils/src/random_sampler_wrapper.ts
@@ -40,7 +40,7 @@ type RandomSamplerOptions = RandomSamplerOptionProbability | RandomSamplerOption
  * @returns {boolean}
  */
 export function isValidProbability(p: unknown): p is number {
-  return typeof p === 'number' && p > 0 && p < 0.5;
+  return typeof p === 'number' && p > 0 && p <= 0.5;
 }
 
 /**

From 9ab0c454541526b1f1dffee28be3a97b16da7826 Mon Sep 17 00:00:00 2001
From: Pablo Machado <pablo.nevesmachado@elastic.co>
Date: Tue, 18 Apr 2023 17:01:53 +0200
Subject: [PATCH 032/100] [Security Solutions] Create a new User Details Flyout
  (#154310)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

issue: https://github.com/elastic/security-team/issues/6154

## Summary

<img width="400" alt="Screenshot 2023-04-11 at 12 50 53"
src="https://user-images.githubusercontent.com/1490444/231138956-efc25a93-9807-434f-be80-d6de2a504f48.png"><img
width="400" alt="Screenshot 2023-04-11 at 12 51 09"
src="https://user-images.githubusercontent.com/1490444/231138890-8e7ea468-7ac8-4c65-97bf-3f9f6c983d8f.png">

<img width="400" alt="Screenshot 2023-04-11 at 12 51 01"
src="https://user-images.githubusercontent.com/1490444/231138927-96b6b66c-f77b-4b63-b805-c410f5a15783.png"><img
width="400" alt="Screenshot 2023-04-11 at 12 47 21"
src="https://user-images.githubusercontent.com/1490444/231138978-de7c495b-56ce-4b7b-bd22-76c53656ef3e.png">

### Main changes
* Creates a new user details flyout displayed on the Alerts page and
timeline.
* Introduce a new experimental feature `newUserDetailsFlyout` (disabled
by default)
* Create `managedUserDetails` API which fetches data from the index
created by the Azure integration.

### Miscellaneous
* Delete unused `lastSeen` and `first_seen` types.
* Delete unused `jobKey`property from anomaly score components
* Rename `userDetails` API and hook to `observedUserDetails`.
* Add `filterQuery` property to `useFirstLastSeen `.
* To use it inside the flyout, since the user flyout show data in the
time range.
* Create a simplified `TestProvidersComponent` for Storybook named
`StorybookProviders`
* It should allow us to render more complex components that require
access to the redux store, theme, and kibana context.
  * Add `experimentalFeatures` property to `queryFactory.buildDsl`.

### Out of scope:
* The user can Snooze or Dismiss this prompt.
* Displaying integration errors inside the flyout
* User page

## Storybook
Please check the "💚 Build Succeeded" message


## How to test it
* You need a kibana instance with user data and alerts
* Enable the experimental feature `newUserDetailsFlyout`
* Go to the alerts page or timeline
* Open the user flyout


## How to install the new Azure integration
_The integration is under development, so you have to follow a series of
steps:_

1. Install docker desktop for Mac (only for macOS)
2. Install elastic-package  https://github.com/elastic/elastic-package
3. Add elastic-package to $PATH
4. Download the integration source code from GitHub branch
https://github.com/taylor-swanson/integrations/tree/entityanalytics_azure
5. Start the local K8 cluster `elastic-package stack up -vd --version
8.8.0-SNAPSHOT`
6. Enter the integration folder `cd packages/entityanalytics_azure/`
7. Build the integration `elastic-package build`
8. Update the registry with the new integration build `elastic-package
stack up -vd --services package-registry`
9. Open kibana integrations
<img width="243" alt="Screenshot 2023-04-11 at 11 24 14"
src="https://user-images.githubusercontent.com/1490444/231116552-2f3a6858-16a7-4654-bbd3-4ce76c693a8a.png">

10. Find entity analytics Azure integration (you need to check the
'display beta integrations' box)

<img width="1176" alt="Screenshot 2023-04-11 at 11 24 29"
src="https://user-images.githubusercontent.com/1490444/231116927-a8ffcb0b-a175-4cfe-b8c3-4a8acade317c.png">

11. Configured the integration with Azure tenant id, application id, and
secret (ask @machadoum)
12. Configured the integration with login URL, Login scopes, and API URL
(ask @machadoum)


### 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
- [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))
- [x] This was checked for [cross-browser
compatibility](https://www.elastic.co/support/matrix#matrix_browsers)

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
---
 .../common/experimental_features.ts           |   6 +
 .../security_solution/index.ts                |  21 +-
 .../security_solution/users/common/index.ts   |  14 +-
 .../security_solution/users/index.ts          |   7 +-
 .../users/managed_details/index.ts            |  33 +++
 .../{details => observed_details}/index.ts    |   4 +-
 .../ml/anomaly/anomaly_table_provider.tsx     |   4 +-
 .../__snapshots__/anomaly_score.test.tsx.snap |   1 +
 .../anomaly_scores.test.tsx.snap              |   3 +-
 .../ml/score/anomaly_score.test.tsx           |   3 -
 .../components/ml/score/anomaly_score.tsx     |   4 +-
 .../components/ml/score/anomaly_scores.tsx    |   3 +-
 .../use_first_last_seen.test.ts               |  19 ++
 .../use_first_last_seen.tsx                   |   6 +-
 .../common/mock/storybook_providers.tsx       |  68 +++++
 .../stat_items/use_kpi_matrix_status.ts       |   4 +-
 .../explore/components/stat_items/utils.tsx   |   8 +-
 .../components/kpi_hosts/common/index.tsx     |   4 +-
 .../index.test.tsx                            |   8 +-
 .../{details => observed_details}/index.tsx   |  19 +-
 .../translations.ts                           |   0
 .../explore/users/pages/details/index.tsx     |   4 +-
 .../components/user_entity_overview.test.tsx  |   7 +-
 .../right/components/user_entity_overview.tsx |   4 +-
 .../timelines/components/side_panel/index.tsx |   6 +
 .../new_user_detail/__mocks__/index.ts        | 105 ++++++++
 .../side_panel/new_user_detail/columns.tsx    | 133 ++++++++++
 .../side_panel/new_user_detail/constants.ts   |  12 +
 .../side_panel/new_user_detail/hooks.test.ts  |  61 +++++
 .../side_panel/new_user_detail/hooks.ts       | 236 ++++++++++++++++++
 .../new_user_detail/managed_user.test.tsx     |  81 ++++++
 .../new_user_detail/managed_user.tsx          | 157 ++++++++++++
 .../new_user_detail/observed_user.test.tsx    |  63 +++++
 .../new_user_detail/observed_user.tsx         | 119 +++++++++
 .../new_user_detail/risk_score_field.test.tsx |  46 ++++
 .../new_user_detail/risk_score_field.tsx      |  68 +++++
 .../new_user_detail/translations.ts           | 222 ++++++++++++++++
 .../side_panel/new_user_detail/types.ts       |  53 ++++
 .../user_details_content.stories.tsx          | 157 ++++++++++++
 .../user_details_content.test.tsx             | 130 ++++++++++
 .../new_user_detail/user_details_content.tsx  | 182 ++++++++++++++
 .../user_details/expandable_user.tsx          |   4 +-
 .../side_panel/user_details/index.tsx         |  27 ++
 .../side_panel/user_details/translations.ts   |  15 ++
 .../side_panel/user_details/types.ts          |   1 +
 .../query.first_or_last_seen.dsl.ts           |   4 +-
 .../factory/users/all/index.ts                |   1 -
 .../security_solution/factory/users/index.ts  |   6 +-
 .../__snapshots__/index.test.tsx.snap         | 173 +++++++++++++
 ...uery.managed_user_details.dsl.test.ts.snap |  36 +++
 .../users/managed_details/index.test.tsx      | 112 +++++++++
 .../factory/users/managed_details/index.ts    |  40 +++
 .../query.managed_user_details.dsl.test.ts    |  20 ++
 .../query.managed_user_details.dsl.ts         |  31 +++
 .../__mocks__/index.ts                        |  16 +-
 .../__snapshots__/index.test.tsx.snap         |  29 ++-
 ...ry.observed_user_details.dsl.test.ts.snap} |  19 ++
 .../helper.test.ts                            |   4 -
 .../{details => observed_details}/helpers.ts  |   7 +-
 .../index.test.tsx                            |  14 +-
 .../{details => observed_details}/index.ts    |  18 +-
 .../query.observed_user_details.dsl.test.ts}  |   4 +-
 .../query.observed_user_details.dsl.ts}       |  12 +-
 .../plugins/security_solution/tsconfig.json   |   3 +-
 64 files changed, 2565 insertions(+), 116 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/common/search_strategy/security_solution/users/managed_details/index.ts
 rename x-pack/plugins/security_solution/common/search_strategy/security_solution/users/{details => observed_details}/index.ts (78%)
 create mode 100644 x-pack/plugins/security_solution/public/common/mock/storybook_providers.tsx
 rename x-pack/plugins/security_solution/public/explore/users/containers/users/{details => observed_details}/index.test.tsx (88%)
 rename x-pack/plugins/security_solution/public/explore/users/containers/users/{details => observed_details}/index.tsx (71%)
 rename x-pack/plugins/security_solution/public/explore/users/containers/users/{details => observed_details}/translations.ts (100%)
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/__mocks__/index.ts
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/columns.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/constants.ts
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/hooks.test.ts
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/hooks.ts
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/managed_user.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/managed_user.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/observed_user.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/observed_user.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/risk_score_field.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/risk_score_field.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/translations.ts
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/types.ts
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/user_details_content.stories.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/user_details_content.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/user_details_content.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/side_panel/user_details/translations.ts
 create mode 100644 x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/managed_details/__snapshots__/index.test.tsx.snap
 create mode 100644 x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/managed_details/__snapshots__/query.managed_user_details.dsl.test.ts.snap
 create mode 100644 x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/managed_details/index.test.tsx
 create mode 100644 x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/managed_details/index.ts
 create mode 100644 x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/managed_details/query.managed_user_details.dsl.test.ts
 create mode 100644 x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/managed_details/query.managed_user_details.dsl.ts
 rename x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/{details => observed_details}/__mocks__/index.ts (91%)
 rename x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/{details => observed_details}/__snapshots__/index.test.tsx.snap (94%)
 rename x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/{details/__snapshots__/query.user_details.dsl.test.ts.snap => observed_details/__snapshots__/query.observed_user_details.dsl.test.ts.snap} (85%)
 rename x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/{details => observed_details}/helper.test.ts (85%)
 rename x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/{details => observed_details}/helpers.ts (86%)
 rename x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/{details => observed_details}/index.test.tsx (59%)
 rename x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/{details => observed_details}/index.ts (64%)
 rename x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/{details/query.user_details.dsl.test.ts => observed_details/query.observed_user_details.dsl.test.ts} (71%)
 rename x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/{details/query.user_details.dsl.ts => observed_details/query.observed_user_details.dsl.ts} (65%)

diff --git a/x-pack/plugins/security_solution/common/experimental_features.ts b/x-pack/plugins/security_solution/common/experimental_features.ts
index c0020b822b760..731d9bfc1177f 100644
--- a/x-pack/plugins/security_solution/common/experimental_features.ts
+++ b/x-pack/plugins/security_solution/common/experimental_features.ts
@@ -123,6 +123,12 @@ export const allowedExperimentalValues = Object.freeze({
    *
    **/
   alertsPageFiltersEnabled: true,
+
+  /*
+   * Enables the new user details flyout displayed on the Alerts page and timeline.
+   *
+   **/
+  newUserDetailsFlyout: false,
 });
 
 type ExperimentalConfigKeys = Array<keyof ExperimentalFeatures>;
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/index.ts
index 3153f5546ed91..399f0a6db1007 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/index.ts
@@ -75,7 +75,10 @@ import type {
   RiskScoreRequestOptions,
 } from './risk_score';
 import type { UsersQueries } from './users';
-import type { UserDetailsRequestOptions, UserDetailsStrategyResponse } from './users/details';
+import type {
+  ObservedUserDetailsRequestOptions,
+  ObservedUserDetailsStrategyResponse,
+} from './users/observed_details';
 import type {
   TotalUsersKpiRequestOptions,
   TotalUsersKpiStrategyResponse,
@@ -96,6 +99,10 @@ import type {
   FirstLastSeenRequestOptions,
   FirstLastSeenStrategyResponse,
 } from './first_last_seen';
+import type {
+  ManagedUserDetailsRequestOptions,
+  ManagedUserDetailsStrategyResponse,
+} from './users/managed_details';
 
 export * from './cti';
 export * from './hosts';
@@ -144,8 +151,10 @@ export type StrategyResponseType<T extends FactoryQueryTypes> = T extends HostsQ
   ? HostsKpiHostsStrategyResponse
   : T extends HostsKpiQueries.kpiUniqueIps
   ? HostsKpiUniqueIpsStrategyResponse
-  : T extends UsersQueries.details
-  ? UserDetailsStrategyResponse
+  : T extends UsersQueries.observedDetails
+  ? ObservedUserDetailsStrategyResponse
+  : T extends UsersQueries.managedDetails
+  ? ManagedUserDetailsStrategyResponse
   : T extends UsersQueries.kpiTotalUsers
   ? TotalUsersKpiStrategyResponse
   : T extends UsersQueries.authentications
@@ -210,8 +219,10 @@ export type StrategyRequestType<T extends FactoryQueryTypes> = T extends HostsQu
   ? HostsKpiUniqueIpsRequestOptions
   : T extends UsersQueries.authentications
   ? UserAuthenticationsRequestOptions
-  : T extends UsersQueries.details
-  ? UserDetailsRequestOptions
+  : T extends UsersQueries.observedDetails
+  ? ObservedUserDetailsRequestOptions
+  : T extends UsersQueries.managedDetails
+  ? ManagedUserDetailsRequestOptions
   : T extends UsersQueries.kpiTotalUsers
   ? TotalUsersKpiRequestOptions
   : T extends UsersQueries.users
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/common/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/common/index.ts
index c281ae45cf55f..9f526309e2c5a 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/common/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/common/index.ts
@@ -18,8 +18,6 @@ export interface UserRiskScoreItem {
 export interface UserItem {
   user?: Maybe<UserEcs>;
   host?: Maybe<HostEcs>;
-  lastSeen?: Maybe<string>;
-  firstSeen?: Maybe<string>;
 }
 
 export type SortableUsersFields = Exclude<UsersFields, typeof UsersFields.domain>;
@@ -27,9 +25,9 @@ export type SortableUsersFields = Exclude<UsersFields, typeof UsersFields.domain
 export type SortUsersField = SortField<SortableUsersFields>;
 
 export enum UsersFields {
-  lastSeen = 'lastSeen',
   name = 'name',
   domain = 'domain',
+  lastSeen = 'lastSeen',
 }
 
 export interface UserAggEsItem {
@@ -39,8 +37,6 @@ export interface UserAggEsItem {
   host_os_name?: UserBuckets;
   host_ip?: UserBuckets;
   host_os_family?: UserBuckets;
-  first_seen?: { value_as_string: string };
-  last_seen?: { value_as_string: string };
 }
 
 export interface UserBuckets {
@@ -68,3 +64,11 @@ interface UsersDomainHitsItem {
     }>;
   };
 }
+
+export const EVENT_KIND_ASSET_FILTER = { term: { 'event.kind': 'asset' } };
+
+export const NOT_EVENT_KIND_ASSET_FILTER = {
+  bool: {
+    must_not: [EVENT_KIND_ASSET_FILTER],
+  },
+};
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/index.ts
index c83b0bcbb3e41..9683b71babf7a 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/index.ts
@@ -10,15 +10,16 @@ import type { TotalUsersKpiStrategyResponse } from './kpi/total_users';
 export * from './all';
 export * from './common';
 export * from './kpi';
-export * from './details';
+export * from './observed_details';
 export * from './authentications';
 
 export enum UsersQueries {
-  details = 'userDetails',
+  observedDetails = 'observedUserDetails',
+  managedDetails = 'managedUserDetails',
   kpiTotalUsers = 'usersKpiTotalUsers',
   users = 'allUsers',
   authentications = 'authentications',
   kpiAuthentications = 'usersKpiAuthentications',
 }
 
-export type UserskKpiStrategyResponse = Omit<TotalUsersKpiStrategyResponse, 'rawResponse'>;
+export type UsersKpiStrategyResponse = Omit<TotalUsersKpiStrategyResponse, 'rawResponse'>;
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/managed_details/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/managed_details/index.ts
new file mode 100644
index 0000000000000..06fdac65bc155
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/managed_details/index.ts
@@ -0,0 +1,33 @@
+/*
+ * 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 { IEsSearchRequest, IEsSearchResponse } from '@kbn/data-plugin/common';
+import type { EcsBase, EcsEvent, EcsHost, EcsUser, EcsAgent } from '@kbn/ecs';
+import type { Inspect, Maybe } from '../../../common';
+import type { RequestBasicOptions } from '../..';
+
+export interface ManagedUserDetailsStrategyResponse extends IEsSearchResponse {
+  userDetails?: AzureManagedUser;
+  inspect?: Maybe<Inspect>;
+}
+
+export interface ManagedUserDetailsRequestOptions
+  extends Pick<RequestBasicOptions, 'defaultIndex' | 'factoryQueryType'>,
+    IEsSearchRequest {
+  userName: string;
+}
+
+export interface AzureManagedUser extends Pick<EcsBase, '@timestamp'> {
+  agent: EcsAgent;
+  host: EcsHost;
+  event: EcsEvent;
+  user: EcsUser & {
+    last_name?: string;
+    first_name?: string;
+    phone?: string[];
+  };
+}
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/details/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/observed_details/index.ts
similarity index 78%
rename from x-pack/plugins/security_solution/common/search_strategy/security_solution/users/details/index.ts
rename to x-pack/plugins/security_solution/common/search_strategy/security_solution/users/observed_details/index.ts
index e1a7255f71195..a8c74932b0492 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/details/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/users/observed_details/index.ts
@@ -11,12 +11,12 @@ import type { Inspect, Maybe, TimerangeInput } from '../../../common';
 import type { UserItem } from '../common';
 import type { RequestBasicOptions } from '../..';
 
-export interface UserDetailsStrategyResponse extends IEsSearchResponse {
+export interface ObservedUserDetailsStrategyResponse extends IEsSearchResponse {
   userDetails: UserItem;
   inspect?: Maybe<Inspect>;
 }
 
-export interface UserDetailsRequestOptions extends Partial<RequestBasicOptions> {
+export interface ObservedUserDetailsRequestOptions extends Partial<RequestBasicOptions> {
   userName: string;
   skip?: boolean;
   timerange: TimerangeInput;
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/anomaly/anomaly_table_provider.tsx b/x-pack/plugins/security_solution/public/common/components/ml/anomaly/anomaly_table_provider.tsx
index 6fb2e807ccae1..fdea3d011c623 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/anomaly/anomaly_table_provider.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/anomaly/anomaly_table_provider.tsx
@@ -10,7 +10,7 @@ import { useInstalledSecurityJobNameById } from '../hooks/use_installed_security
 import type { InfluencerInput, Anomalies, CriteriaFields } from '../types';
 import { useAnomaliesTableData } from './use_anomalies_table_data';
 
-interface ChildrenArgs {
+export interface AnomalyTableProviderChildrenProps {
   isLoadingAnomaliesData: boolean;
   anomaliesData: Anomalies | null;
   jobNameById: Record<string, string | undefined>;
@@ -21,7 +21,7 @@ interface Props {
   startDate: string;
   endDate: string;
   criteriaFields?: CriteriaFields[];
-  children: (args: ChildrenArgs) => React.ReactNode;
+  children: (args: AnomalyTableProviderChildrenProps) => React.ReactNode;
   skip: boolean;
 }
 
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/score/__snapshots__/anomaly_score.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/ml/score/__snapshots__/anomaly_score.test.tsx.snap
index eb1247dded8a0..60f35052b11f4 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/score/__snapshots__/anomaly_score.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/ml/score/__snapshots__/anomaly_score.test.tsx.snap
@@ -3,6 +3,7 @@
 exports[`anomaly_scores renders correctly against snapshot 1`] = `
 <Fragment>
   <EuiFlexItem
+    data-test-subj="anomaly-score"
     grow={false}
   >
     <Score
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/score/__snapshots__/anomaly_scores.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/ml/score/__snapshots__/anomaly_scores.test.tsx.snap
index d911e3706c309..16f3e87b14c93 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/score/__snapshots__/anomaly_scores.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/ml/score/__snapshots__/anomaly_scores.test.tsx.snap
@@ -3,6 +3,7 @@
 exports[`anomaly_scores renders correctly against snapshot 1`] = `
 <Fragment>
   <EuiFlexGroup
+    data-test-subj="anomaly-scores"
     gutterSize="none"
     responsive={false}
   >
@@ -10,7 +11,6 @@ exports[`anomaly_scores renders correctly against snapshot 1`] = `
       endDate="3000-01-01T00:00:00.000Z"
       index={0}
       interval="day"
-      jobKey="job-1-16.193669439507826-process.name-du"
       jobName="job-1"
       key="job-1-16.193669439507826-process.name-du"
       narrowDateRange={[MockFunction]}
@@ -86,7 +86,6 @@ exports[`anomaly_scores renders correctly against snapshot 1`] = `
       endDate="3000-01-01T00:00:00.000Z"
       index={1}
       interval="day"
-      jobKey="job-2-16.193669439507826-process.name-ls"
       jobName="job-2"
       key="job-2-16.193669439507826-process.name-ls"
       narrowDateRange={[MockFunction]}
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/score/anomaly_score.test.tsx b/x-pack/plugins/security_solution/public/common/components/ml/score/anomaly_score.test.tsx
index 4a639da633021..4bdbbdca8bdca 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/score/anomaly_score.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/score/anomaly_score.test.tsx
@@ -34,7 +34,6 @@ describe('anomaly_scores', () => {
   test('renders correctly against snapshot', () => {
     const wrapper = shallow(
       <AnomalyScoreComponent
-        jobKey="job-key-1"
         startDate={startDate}
         endDate={endDate}
         score={anomalies.anomalies[0]}
@@ -50,7 +49,6 @@ describe('anomaly_scores', () => {
     const wrapper = mount(
       <TestProviders>
         <AnomalyScoreComponent
-          jobKey="job-key-1"
           startDate={startDate}
           endDate={endDate}
           score={anomalies.anomalies[0]}
@@ -67,7 +65,6 @@ describe('anomaly_scores', () => {
     const wrapper = mount(
       <TestProviders>
         <AnomalyScoreComponent
-          jobKey="job-key-1"
           startDate={startDate}
           endDate={endDate}
           score={anomalies.anomalies[0]}
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/score/anomaly_score.tsx b/x-pack/plugins/security_solution/public/common/components/ml/score/anomaly_score.tsx
index ad87c23cf0067..e1710b8cbbca5 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/score/anomaly_score.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/score/anomaly_score.tsx
@@ -16,7 +16,6 @@ interface Args {
   startDate: string;
   endDate: string;
   narrowDateRange: NarrowDateRange;
-  jobKey: string;
   index?: number;
   score: Anomaly;
   interval: string;
@@ -31,7 +30,6 @@ const Icon = styled(EuiIcon)`
 Icon.displayName = 'Icon';
 
 export const AnomalyScoreComponent = ({
-  jobKey,
   startDate,
   endDate,
   index = 0,
@@ -43,7 +41,7 @@ export const AnomalyScoreComponent = ({
   const [isOpen, setIsOpen] = useState(false);
   return (
     <>
-      <EuiFlexItem grow={false}>
+      <EuiFlexItem grow={false} data-test-subj="anomaly-score">
         <Score index={index} score={score} />
       </EuiFlexItem>
       <EuiFlexItem grow={false}>
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/score/anomaly_scores.tsx b/x-pack/plugins/security_solution/public/common/components/ml/score/anomaly_scores.tsx
index 3cbdec141e221..919e347f53aca 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/score/anomaly_scores.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/score/anomaly_scores.tsx
@@ -41,13 +41,12 @@ export const AnomalyScoresComponent = ({
   } else {
     return (
       <>
-        <EuiFlexGroup gutterSize="none" responsive={false}>
+        <EuiFlexGroup gutterSize="none" responsive={false} data-test-subj="anomaly-scores">
           {getTopSeverityJobs(anomalies.anomalies, limit).map((score, index) => {
             const jobKey = createJobKey(score);
             return (
               <AnomalyScore
                 key={jobKey}
-                jobKey={jobKey}
                 startDate={startDate}
                 endDate={endDate}
                 index={index}
diff --git a/x-pack/plugins/security_solution/public/common/containers/use_first_last_seen/use_first_last_seen.test.ts b/x-pack/plugins/security_solution/public/common/containers/use_first_last_seen/use_first_last_seen.test.ts
index 662c6db5c5358..a561493f8cac0 100644
--- a/x-pack/plugins/security_solution/public/common/containers/use_first_last_seen/use_first_last_seen.test.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/use_first_last_seen/use_first_last_seen.test.ts
@@ -132,4 +132,23 @@ describe('useFistLastSeen', () => {
     const { result } = renderUseFirstLastSeen({ order: Direction.desc });
     expect(result.current).toEqual([false, { errorMessage: `Error: ${msg}` }]);
   });
+
+  it('should search with given filter query', () => {
+    const filterQuery = { terms: { test: ['test123'] } };
+    mockUseSearchStrategy.mockImplementation(() => ({
+      loading: false,
+      result: {},
+      search: mockSearch,
+      refetch: jest.fn(),
+      inspect: {},
+    }));
+
+    renderUseFirstLastSeen({ order: Direction.desc, filterQuery });
+
+    expect(mockSearch).toHaveBeenCalledWith(
+      expect.objectContaining({
+        filterQuery,
+      })
+    );
+  });
 });
diff --git a/x-pack/plugins/security_solution/public/common/containers/use_first_last_seen/use_first_last_seen.tsx b/x-pack/plugins/security_solution/public/common/containers/use_first_last_seen/use_first_last_seen.tsx
index 81bbf4984c2cb..1eccfd125e2c9 100644
--- a/x-pack/plugins/security_solution/public/common/containers/use_first_last_seen/use_first_last_seen.tsx
+++ b/x-pack/plugins/security_solution/public/common/containers/use_first_last_seen/use_first_last_seen.tsx
@@ -11,6 +11,7 @@ import * as i18n from './translations';
 import { useSearchStrategy } from '../use_search_strategy';
 import { FirstLastSeenQuery } from '../../../../common/search_strategy';
 import type { Direction } from '../../../../common/search_strategy';
+import type { ESQuery } from '../../../../common/typed_json';
 
 export interface FirstLastSeenArgs {
   errorMessage: string | null;
@@ -22,6 +23,7 @@ export interface UseFirstLastSeen {
   value: string;
   order: Direction.asc | Direction.desc;
   defaultIndex: string[];
+  filterQuery?: ESQuery | string;
 }
 
 export const useFirstLastSeen = ({
@@ -29,6 +31,7 @@ export const useFirstLastSeen = ({
   value,
   order,
   defaultIndex,
+  filterQuery,
 }: UseFirstLastSeen): [boolean, FirstLastSeenArgs] => {
   const { loading, result, search, error } = useSearchStrategy<typeof FirstLastSeenQuery>({
     factoryQueryType: FirstLastSeenQuery,
@@ -46,8 +49,9 @@ export const useFirstLastSeen = ({
       field,
       value,
       order,
+      filterQuery,
     });
-  }, [defaultIndex, field, value, order, search]);
+  }, [defaultIndex, field, value, order, search, filterQuery]);
 
   const setFirstLastSeenResponse: FirstLastSeenArgs = useMemo(
     () => ({
diff --git a/x-pack/plugins/security_solution/public/common/mock/storybook_providers.tsx b/x-pack/plugins/security_solution/public/common/mock/storybook_providers.tsx
new file mode 100644
index 0000000000000..dc92b1892541d
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/mock/storybook_providers.tsx
@@ -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 { euiLightVars } from '@kbn/ui-theme';
+import React from 'react';
+import { Provider as ReduxStoreProvider } from 'react-redux';
+import { BehaviorSubject, Subject } from 'rxjs';
+import { ThemeProvider } from 'styled-components';
+import type { CoreStart } from '@kbn/core/public';
+import { createKibanaReactContext } from '@kbn/kibana-react-plugin/public';
+import { I18nProvider } from '@kbn/i18n-react';
+import { CellActionsProvider } from '@kbn/cell-actions';
+import { createStore } from '../store';
+import { mockGlobalState } from './global_state';
+import { SUB_PLUGINS_REDUCER } from './utils';
+import { createSecuritySolutionStorageMock } from './mock_local_storage';
+import type { StartServices } from '../../types';
+
+export const kibanaObservable = new BehaviorSubject({} as unknown as StartServices);
+
+const { storage } = createSecuritySolutionStorageMock();
+
+const uiSettings = {
+  get: (setting: string) => {
+    switch (setting) {
+      case 'dateFormat':
+        return 'MMM D, YYYY @ HH:mm:ss.SSS';
+      case 'dateFormat:scaled':
+        return [['', 'HH:mm:ss.SSS']];
+    }
+  },
+  get$: () => new Subject(),
+};
+
+const coreMock = {
+  application: {
+    getUrlForApp: () => {},
+  },
+  uiSettings,
+} as unknown as CoreStart;
+
+const KibanaReactContext = createKibanaReactContext(coreMock);
+
+/**
+ * A utility for wrapping components in Storybook that provides access to the most common React contexts used by security components.
+ * It is a simplified version of TestProvidersComponent.
+ * To reuse TestProvidersComponent here, we need to remove all references to jest from mocks.
+ */
+export const StorybookProviders: React.FC = ({ children }) => {
+  const store = createStore(mockGlobalState, SUB_PLUGINS_REDUCER, kibanaObservable, storage);
+  return (
+    <I18nProvider>
+      <KibanaReactContext.Provider>
+        <CellActionsProvider getTriggerCompatibleActions={() => Promise.resolve([])}>
+          <ReduxStoreProvider store={store}>
+            <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
+              {children}
+            </ThemeProvider>
+          </ReduxStoreProvider>
+        </CellActionsProvider>
+      </KibanaReactContext.Provider>
+    </I18nProvider>
+  );
+};
diff --git a/x-pack/plugins/security_solution/public/explore/components/stat_items/use_kpi_matrix_status.ts b/x-pack/plugins/security_solution/public/explore/components/stat_items/use_kpi_matrix_status.ts
index 218f8dbe77409..9ddeed04b0786 100644
--- a/x-pack/plugins/security_solution/public/explore/components/stat_items/use_kpi_matrix_status.ts
+++ b/x-pack/plugins/security_solution/public/explore/components/stat_items/use_kpi_matrix_status.ts
@@ -7,7 +7,7 @@
 import type {
   HostsKpiStrategyResponse,
   NetworkKpiStrategyResponse,
-  UserskKpiStrategyResponse,
+  UsersKpiStrategyResponse,
 } from '../../../../common/search_strategy';
 import type { UpdateDateRange } from '../../../common/components/charts/common';
 import type { StatItems, StatItemsProps } from './types';
@@ -15,7 +15,7 @@ import { addValueToAreaChart, addValueToBarChart, addValueToFields } from './uti
 
 export const useKpiMatrixStatus = (
   mappings: Readonly<StatItems[]>,
-  data: HostsKpiStrategyResponse | NetworkKpiStrategyResponse | UserskKpiStrategyResponse,
+  data: HostsKpiStrategyResponse | NetworkKpiStrategyResponse | UsersKpiStrategyResponse,
   id: string,
   from: string,
   to: string,
diff --git a/x-pack/plugins/security_solution/public/explore/components/stat_items/utils.tsx b/x-pack/plugins/security_solution/public/explore/components/stat_items/utils.tsx
index 62fbbdc393f67..c82ac34eee3b5 100644
--- a/x-pack/plugins/security_solution/public/explore/components/stat_items/utils.tsx
+++ b/x-pack/plugins/security_solution/public/explore/components/stat_items/utils.tsx
@@ -14,7 +14,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
 import type {
   HostsKpiStrategyResponse,
   NetworkKpiStrategyResponse,
-  UserskKpiStrategyResponse,
+  UsersKpiStrategyResponse,
 } from '../../../../common/search_strategy';
 import type { ChartSeriesData, ChartData } from '../../../common/components/charts/common';
 
@@ -95,12 +95,12 @@ export const barchartConfigs = (config?: { onElementClick?: ElementClickListener
 
 export const addValueToFields = (
   fields: StatItem[],
-  data: HostsKpiStrategyResponse | NetworkKpiStrategyResponse | UserskKpiStrategyResponse
+  data: HostsKpiStrategyResponse | NetworkKpiStrategyResponse | UsersKpiStrategyResponse
 ): StatItem[] => fields.map((field) => ({ ...field, value: get(field.key, data) }));
 
 export const addValueToAreaChart = (
   fields: StatItem[],
-  data: HostsKpiStrategyResponse | NetworkKpiStrategyResponse | UserskKpiStrategyResponse
+  data: HostsKpiStrategyResponse | NetworkKpiStrategyResponse | UsersKpiStrategyResponse
 ): ChartSeriesData[] =>
   fields
     .filter((field) => get(`${field.key}Histogram`, data) != null)
@@ -112,7 +112,7 @@ export const addValueToAreaChart = (
 
 export const addValueToBarChart = (
   fields: StatItem[],
-  data: HostsKpiStrategyResponse | NetworkKpiStrategyResponse | UserskKpiStrategyResponse
+  data: HostsKpiStrategyResponse | NetworkKpiStrategyResponse | UsersKpiStrategyResponse
 ): ChartSeriesData[] => {
   if (fields.length === 0) return [];
   return fields.reduce((acc: ChartSeriesData[], field: StatItem, idx: number) => {
diff --git a/x-pack/plugins/security_solution/public/explore/hosts/components/kpi_hosts/common/index.tsx b/x-pack/plugins/security_solution/public/explore/hosts/components/kpi_hosts/common/index.tsx
index 0c92362c1b026..7413563e0c950 100644
--- a/x-pack/plugins/security_solution/public/explore/hosts/components/kpi_hosts/common/index.tsx
+++ b/x-pack/plugins/security_solution/public/explore/hosts/components/kpi_hosts/common/index.tsx
@@ -18,7 +18,7 @@ import type {
 import type { StatItemsProps, StatItems } from '../../../../components/stat_items';
 import { StatItemsComponent, useKpiMatrixStatus } from '../../../../components/stat_items';
 import type { UpdateDateRange } from '../../../../../common/components/charts/common';
-import type { UserskKpiStrategyResponse } from '../../../../../../common/search_strategy/security_solution/users';
+import type { UsersKpiStrategyResponse } from '../../../../../../common/search_strategy/security_solution/users';
 
 const kpiWidgetHeight = 247;
 
@@ -30,7 +30,7 @@ FlexGroup.displayName = 'FlexGroup';
 
 interface KpiBaseComponentProps {
   fieldsMapping: Readonly<StatItems[]>;
-  data: HostsKpiStrategyResponse | NetworkKpiStrategyResponse | UserskKpiStrategyResponse;
+  data: HostsKpiStrategyResponse | NetworkKpiStrategyResponse | UsersKpiStrategyResponse;
   loading?: boolean;
   id: string;
   from: string;
diff --git a/x-pack/plugins/security_solution/public/explore/users/containers/users/details/index.test.tsx b/x-pack/plugins/security_solution/public/explore/users/containers/users/observed_details/index.test.tsx
similarity index 88%
rename from x-pack/plugins/security_solution/public/explore/users/containers/users/details/index.test.tsx
rename to x-pack/plugins/security_solution/public/explore/users/containers/users/observed_details/index.test.tsx
index 396cf027ebccb..f0e2536096421 100644
--- a/x-pack/plugins/security_solution/public/explore/users/containers/users/details/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/explore/users/containers/users/observed_details/index.test.tsx
@@ -6,7 +6,7 @@
  */
 import { act, renderHook } from '@testing-library/react-hooks';
 import { TestProviders } from '../../../../../common/mock';
-import { useUserDetails } from '.';
+import { useObservedUserDetails } from '.';
 import { useSearchStrategy } from '../../../../../common/containers/use_search_strategy';
 
 jest.mock('../../../../../common/containers/use_search_strategy', () => ({
@@ -38,7 +38,7 @@ describe('useUserDetails', () => {
   });
 
   it('runs search', () => {
-    renderHook(() => useUserDetails(defaultProps), {
+    renderHook(() => useObservedUserDetails(defaultProps), {
       wrapper: TestProviders,
     });
 
@@ -50,7 +50,7 @@ describe('useUserDetails', () => {
       ...defaultProps,
       skip: true,
     };
-    renderHook(() => useUserDetails(props), {
+    renderHook(() => useObservedUserDetails(props), {
       wrapper: TestProviders,
     });
 
@@ -60,7 +60,7 @@ describe('useUserDetails', () => {
     const props = {
       ...defaultProps,
     };
-    const { rerender } = renderHook(() => useUserDetails(props), {
+    const { rerender } = renderHook(() => useObservedUserDetails(props), {
       wrapper: TestProviders,
     });
     props.skip = true;
diff --git a/x-pack/plugins/security_solution/public/explore/users/containers/users/details/index.tsx b/x-pack/plugins/security_solution/public/explore/users/containers/users/observed_details/index.tsx
similarity index 71%
rename from x-pack/plugins/security_solution/public/explore/users/containers/users/details/index.tsx
rename to x-pack/plugins/security_solution/public/explore/users/containers/users/observed_details/index.tsx
index 7ddd0486a48ba..12e6e583c9a41 100644
--- a/x-pack/plugins/security_solution/public/explore/users/containers/users/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/explore/users/containers/users/observed_details/index.tsx
@@ -11,9 +11,11 @@ import * as i18n from './translations';
 import type { InspectResponse } from '../../../../../types';
 import { UsersQueries } from '../../../../../../common/search_strategy/security_solution/users';
 import type { UserItem } from '../../../../../../common/search_strategy/security_solution/users/common';
+import { NOT_EVENT_KIND_ASSET_FILTER } from '../../../../../../common/search_strategy/security_solution/users/common';
 import { useSearchStrategy } from '../../../../../common/containers/use_search_strategy';
+import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use_experimental_features';
 
-export const ID = 'usersDetailsQuery';
+export const OBSERVED_USER_QUERY_ID = 'observedUsersDetailsQuery';
 
 export interface UserDetailsArgs {
   id: string;
@@ -33,22 +35,23 @@ interface UseUserDetails {
   startDate: string;
 }
 
-export const useUserDetails = ({
+export const useObservedUserDetails = ({
   endDate,
   userName,
   indexNames,
-  id = ID,
+  id = OBSERVED_USER_QUERY_ID,
   skip = false,
   startDate,
 }: UseUserDetails): [boolean, UserDetailsArgs] => {
+  const isNewUserDetailsFlyoutEnabled = useIsExperimentalFeatureEnabled('newUserDetailsFlyout');
   const {
     loading,
     result: response,
     search,
     refetch,
     inspect,
-  } = useSearchStrategy<UsersQueries.details>({
-    factoryQueryType: UsersQueries.details,
+  } = useSearchStrategy<UsersQueries.observedDetails>({
+    factoryQueryType: UsersQueries.observedDetails,
     initialResult: {
       userDetails: {},
     },
@@ -62,7 +65,6 @@ export const useUserDetails = ({
       userDetails: response.userDetails,
       id,
       inspect,
-      isInspected: false,
       refetch,
       startDate,
     }),
@@ -72,15 +74,16 @@ export const useUserDetails = ({
   const userDetailsRequest = useMemo(
     () => ({
       defaultIndex: indexNames,
-      factoryQueryType: UsersQueries.details,
+      factoryQueryType: UsersQueries.observedDetails,
       userName,
       timerange: {
         interval: '12h',
         from: startDate,
         to: endDate,
       },
+      filterQuery: isNewUserDetailsFlyoutEnabled ? NOT_EVENT_KIND_ASSET_FILTER : undefined,
     }),
-    [endDate, indexNames, startDate, userName]
+    [endDate, indexNames, startDate, userName, isNewUserDetailsFlyoutEnabled]
   );
 
   useEffect(() => {
diff --git a/x-pack/plugins/security_solution/public/explore/users/containers/users/details/translations.ts b/x-pack/plugins/security_solution/public/explore/users/containers/users/observed_details/translations.ts
similarity index 100%
rename from x-pack/plugins/security_solution/public/explore/users/containers/users/details/translations.ts
rename to x-pack/plugins/security_solution/public/explore/users/containers/users/observed_details/translations.ts
diff --git a/x-pack/plugins/security_solution/public/explore/users/pages/details/index.tsx b/x-pack/plugins/security_solution/public/explore/users/pages/details/index.tsx
index d991a75880f61..10581694bc36f 100644
--- a/x-pack/plugins/security_solution/public/explore/users/pages/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/explore/users/pages/details/index.tsx
@@ -57,7 +57,7 @@ import { LastEventIndexKey } from '../../../../../common/search_strategy';
 
 import { AnomalyTableProvider } from '../../../../common/components/ml/anomaly/anomaly_table_provider';
 import { UserOverview } from '../../../../overview/components/user_overview';
-import { useUserDetails } from '../../containers/users/details';
+import { useObservedUserDetails } from '../../containers/users/observed_details';
 import { useQueryInspector } from '../../../../common/components/page/manage_query';
 import { scoreIntervalToDateTime } from '../../../../common/components/ml/score/score_interval_to_datetime';
 import { getCriteriaFromUsersType } from '../../../../common/components/ml/criteria/get_criteria_from_users_type';
@@ -134,7 +134,7 @@ const UsersDetailsComponent: React.FC<UsersDetailsProps> = ({
     dispatch(setUsersDetailsTablesActivePageToZero());
   }, [dispatch, detailName]);
 
-  const [loading, { inspect, userDetails, refetch }] = useUserDetails({
+  const [loading, { inspect, userDetails, refetch }] = useObservedUserDetails({
     id: QUERY_ID,
     endDate: to,
     startDate: from,
diff --git a/x-pack/plugins/security_solution/public/flyout/right/components/user_entity_overview.test.tsx b/x-pack/plugins/security_solution/public/flyout/right/components/user_entity_overview.test.tsx
index b868d1161a65b..26895e144ceb8 100644
--- a/x-pack/plugins/security_solution/public/flyout/right/components/user_entity_overview.test.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/right/components/user_entity_overview.test.tsx
@@ -9,12 +9,13 @@ import { render } from '@testing-library/react';
 import { TestProviders } from '../../../common/mock';
 import { UserEntityOverview } from './user_entity_overview';
 import { useRiskScore } from '../../../explore/containers/risk_score';
-import { useUserDetails } from '../../../explore/users/containers/users/details';
+
 import {
   ENTITIES_USER_OVERVIEW_IP_TEST_ID,
   ENTITIES_USER_OVERVIEW_RISK_LEVEL_TEST_ID,
   TECHNICAL_PREVIEW_ICON_TEST_ID,
 } from './test_ids';
+import { useObservedUserDetails } from '../../../explore/users/containers/users/observed_details';
 
 const userName = 'user';
 const ip = '10.200.000.000';
@@ -38,8 +39,8 @@ jest.mock('../../../common/containers/sourcerer', () => {
   };
 });
 
-const mockUseUserDetails = useUserDetails as jest.Mock;
-jest.mock('../../../explore/users/containers/users/details');
+const mockUseUserDetails = useObservedUserDetails as jest.Mock;
+jest.mock('../../../explore/users/containers/users/observed_details');
 
 const mockUseRiskScore = useRiskScore as jest.Mock;
 jest.mock('../../../explore/containers/risk_score');
diff --git a/x-pack/plugins/security_solution/public/flyout/right/components/user_entity_overview.tsx b/x-pack/plugins/security_solution/public/flyout/right/components/user_entity_overview.tsx
index bf793a1d058ac..af1a33580b475 100644
--- a/x-pack/plugins/security_solution/public/flyout/right/components/user_entity_overview.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/right/components/user_entity_overview.tsx
@@ -24,7 +24,6 @@ import { getEmptyTagValue } from '../../../common/components/empty_value';
 import { useSourcererDataView } from '../../../common/containers/sourcerer';
 import { useGlobalTime } from '../../../common/containers/use_global_time';
 import { useRiskScore } from '../../../explore/containers/risk_score';
-import { useUserDetails } from '../../../explore/users/containers/users/details';
 import * as i18n from '../../../overview/components/user_overview/translations';
 import { TECHNICAL_PREVIEW_TITLE, TECHNICAL_PREVIEW_MESSAGE } from './translations';
 import {
@@ -33,6 +32,7 @@ import {
   ENTITIES_USER_OVERVIEW_IP_TEST_ID,
   ENTITIES_USER_OVERVIEW_RISK_LEVEL_TEST_ID,
 } from './test_ids';
+import { useObservedUserDetails } from '../../../explore/users/containers/users/observed_details';
 
 const StyledEuiBetaBadge = styled(EuiBetaBadge)`
   margin-left: ${({ theme }) => theme.eui.euiSizeXS};
@@ -66,7 +66,7 @@ export const UserEntityOverview: React.FC<UserEntityOverviewProps> = ({ userName
     () => (userName ? buildUserNamesFilter([userName]) : undefined),
     [userName]
   );
-  const [_, { userDetails: data }] = useUserDetails({
+  const [_, { userDetails: data }] = useObservedUserDetails({
     endDate: to,
     userName,
     indexNames: selectedPatterns,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.tsx
index 329de290c19c8..19aa3fe2874ec 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/index.tsx
@@ -23,6 +23,7 @@ import { EventDetailsPanel } from './event_details';
 import { HostDetailsPanel } from './host_details';
 import { NetworkDetailsPanel } from './network_details';
 import { UserDetailsPanel } from './user_details';
+import { useIsExperimentalFeatureEnabled } from '../../../common/hooks/use_experimental_features';
 
 interface DetailsPanelProps {
   browserFields: BrowserFields;
@@ -52,6 +53,7 @@ export const DetailsPanel = React.memo(
     isReadOnly,
   }: DetailsPanelProps) => {
     const dispatch = useDispatch();
+    const isNewUserDetailsFlyoutEnable = useIsExperimentalFeatureEnabled('newUserDetailsFlyout');
     const getScope = useMemo(() => {
       if (isTimelineScope(scopeId)) {
         return timelineSelectors.getTimelineByIdSelector();
@@ -124,6 +126,9 @@ export const DetailsPanel = React.memo(
 
     if (currentTabDetail?.panelView === 'userDetail' && currentTabDetail?.params?.userName) {
       flyoutUniqueKey = currentTabDetail.params.userName;
+      if (isNewUserDetailsFlyoutEnable) {
+        panelSize = 'm';
+      }
       visiblePanel = (
         <UserDetailsPanel
           contextID={contextID}
@@ -131,6 +136,7 @@ export const DetailsPanel = React.memo(
           handleOnClose={closePanel}
           isDraggable={isDraggable}
           isFlyoutView={isFlyoutView}
+          isNewUserDetailsFlyoutEnable={isNewUserDetailsFlyoutEnable}
         />
       );
     }
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/__mocks__/index.ts b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/__mocks__/index.ts
new file mode 100644
index 0000000000000..59fafed45b468
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/__mocks__/index.ts
@@ -0,0 +1,105 @@
+/*
+ * 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 { RiskSeverity } from '../../../../../../common/search_strategy';
+import { mockAnomalies } from '../../../../../common/components/ml/mock';
+import type { ObservedUserData } from '../types';
+
+const userRiskScore = {
+  '@timestamp': '123456',
+  user: {
+    name: 'test',
+    risk: {
+      rule_risks: [],
+      calculated_score_norm: 70,
+      multipliers: [],
+      calculated_level: RiskSeverity.high,
+    },
+  },
+  alertsCount: 0,
+  oldestAlertTimestamp: '123456',
+};
+
+export const mockRiskScoreState = {
+  data: [userRiskScore],
+  inspect: {
+    dsl: [],
+    response: [],
+  },
+  isInspected: false,
+  refetch: () => {},
+  totalCount: 0,
+  isModuleEnabled: true,
+  isLicenseValid: true,
+  isDeprecated: false,
+  loading: false,
+};
+
+const anomaly = mockAnomalies.anomalies[0];
+
+export const managedUserDetails = {
+  '@timestamp': '',
+  agent: {},
+  host: {},
+  event: {},
+  user: {
+    id: '123456',
+    last_name: 'user',
+    first_name: 'test',
+    full_name: 'test user',
+    phone: ['123456', '654321'],
+  },
+};
+
+export const observedUserDetails = {
+  user: {
+    id: ['1234', '321'],
+    domain: ['test domain', 'another test domain'],
+  },
+  host: {
+    ip: ['10.0.0.1', '127.0.0.1'],
+    os: {
+      name: ['testOs'],
+      family: ['testFamily'],
+    },
+  },
+};
+
+export const mockManagedUser = {
+  details: managedUserDetails,
+  isLoading: false,
+  isIntegrationEnabled: true,
+  firstSeen: {
+    isLoading: false,
+    date: '2023-03-23T20:03:17.489Z',
+  },
+  lastSeen: {
+    isLoading: false,
+    date: '2023-03-23T20:03:17.489Z',
+  },
+};
+
+export const mockObservedUser: ObservedUserData = {
+  details: observedUserDetails,
+  isLoading: false,
+  firstSeen: {
+    isLoading: false,
+    date: '2023-02-23T20:03:17.489Z',
+  },
+  lastSeen: {
+    isLoading: false,
+    date: '2023-02-23T20:03:17.489Z',
+  },
+  anomalies: {
+    isLoading: false,
+    anomalies: {
+      anomalies: [anomaly],
+      interval: '',
+    },
+    jobNameById: { [anomaly.jobId]: 'job_name' },
+  },
+};
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/columns.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/columns.tsx
new file mode 100644
index 0000000000000..a876a380c8aea
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/columns.tsx
@@ -0,0 +1,133 @@
+/*
+ * 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 { css } from '@emotion/react';
+import React, { useCallback } from 'react';
+import { head } from 'lodash/fp';
+import { euiLightVars } from '@kbn/ui-theme';
+import type { EuiBasicTableColumn } from '@elastic/eui';
+import { useDispatch } from 'react-redux';
+import { DefaultFieldRenderer } from '../../field_renderers/field_renderers';
+import type {
+  ManagedUsersTableColumns,
+  ManagedUserTable,
+  ObservedUsersTableColumns,
+  ObservedUserTable,
+  UserAnomalies,
+} from './types';
+import * as i18n from './translations';
+import { defaultToEmptyTag } from '../../../../common/components/empty_value';
+import { FormattedRelativePreferenceDate } from '../../../../common/components/formatted_date';
+import { AnomalyScores } from '../../../../common/components/ml/score/anomaly_scores';
+import { useGlobalTime } from '../../../../common/containers/use_global_time';
+import { scoreIntervalToDateTime } from '../../../../common/components/ml/score/score_interval_to_datetime';
+import { InputsModelId } from '../../../../common/store/inputs/constants';
+import { setAbsoluteRangeDatePicker } from '../../../../common/store/inputs/actions';
+
+const fieldColumn: EuiBasicTableColumn<ObservedUserTable | ManagedUserTable> = {
+  name: i18n.FIELD_COLUMN_TITLE,
+  field: 'label',
+  render: (label: string) => (
+    <span
+      css={css`
+        font-weight: ${euiLightVars.euiFontWeightMedium};
+        color: ${euiLightVars.euiTitleColor};
+      `}
+    >
+      {label}
+    </span>
+  ),
+};
+
+export const getManagedUserTableColumns = (
+  contextID: string,
+  isDraggable: boolean
+): ManagedUsersTableColumns => [
+  fieldColumn,
+  {
+    name: i18n.VALUES_COLUMN_TITLE,
+    field: 'value',
+    render: (value: ManagedUserTable['value'], { field }) => {
+      return field && value ? (
+        <DefaultFieldRenderer
+          rowItems={[value]}
+          attrName={field}
+          idPrefix={contextID ? `managedUser-${contextID}` : 'managedUser'}
+          isDraggable={isDraggable}
+        />
+      ) : (
+        defaultToEmptyTag(value)
+      );
+    },
+  },
+];
+
+function isAnomalies(
+  field: string | undefined,
+  values: UserAnomalies | unknown
+): values is UserAnomalies {
+  return field === 'anomalies';
+}
+
+export const getObservedUserTableColumns = (
+  contextID: string,
+  isDraggable: boolean
+): ObservedUsersTableColumns => [
+  fieldColumn,
+  {
+    name: i18n.VALUES_COLUMN_TITLE,
+    field: 'values',
+    render: (values: ObservedUserTable['values'], { field }) => {
+      if (isAnomalies(field, values) && values) {
+        return <AnomaliesField anomalies={values} />;
+      }
+
+      if (field === '@timestamp') {
+        return <FormattedRelativePreferenceDate value={head(values)} />;
+      }
+
+      return (
+        <DefaultFieldRenderer
+          rowItems={values}
+          attrName={field}
+          idPrefix={contextID ? `observedUser-${contextID}` : 'observedUser'}
+          isDraggable={isDraggable}
+        />
+      );
+    },
+  },
+];
+
+const AnomaliesField = ({ anomalies }: { anomalies: UserAnomalies }) => {
+  const { to, from } = useGlobalTime();
+  const dispatch = useDispatch();
+
+  const narrowDateRange = useCallback(
+    (score, interval) => {
+      const fromTo = scoreIntervalToDateTime(score, interval);
+      dispatch(
+        setAbsoluteRangeDatePicker({
+          id: InputsModelId.global,
+          from: fromTo.from,
+          to: fromTo.to,
+        })
+      );
+    },
+    [dispatch]
+  );
+
+  return (
+    <AnomalyScores
+      anomalies={anomalies.anomalies}
+      startDate={from}
+      endDate={to}
+      isLoading={anomalies.isLoading}
+      narrowDateRange={narrowDateRange}
+      jobNameById={anomalies.jobNameById}
+    />
+  );
+};
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/constants.ts b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/constants.ts
new file mode 100644
index 0000000000000..4b4f3c39628f6
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/constants.ts
@@ -0,0 +1,12 @@
+/*
+ * 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 MANAGED_USER_INDEX = ['logs-entityanalytics_azure.users-*'];
+export const MANAGED_USER_PACKAGE_NAME = 'entityanalytics_azure';
+export const INSTALL_INTEGRATION_HREF = `/app/fleet/integrations/${MANAGED_USER_PACKAGE_NAME}/add-integration`;
+export const ONE_WEEK_IN_HOURS = 24 * 7;
+export const MANAGED_USER_QUERY_ID = 'managedUserDetailsQuery';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/hooks.test.ts b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/hooks.test.ts
new file mode 100644
index 0000000000000..3c8815a3dcffb
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/hooks.test.ts
@@ -0,0 +1,61 @@
+/*
+ * 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 { renderHook } from '@testing-library/react-hooks';
+import type { InstalledIntegration } from '../../../../../common/detection_engine/fleet_integrations';
+import { TestProviders } from '../../../../common/mock';
+import { MANAGED_USER_PACKAGE_NAME } from './constants';
+import { useManagedUser } from './hooks';
+
+const makeInstalledIntegration = (
+  pkgName = 'testPkg',
+  isEnabled = false
+): InstalledIntegration => ({
+  package_name: pkgName,
+  package_title: '',
+  package_version: '',
+  integration_name: '',
+  integration_title: '',
+  is_enabled: isEnabled,
+});
+
+const mockUseInstalledIntegrations = jest.fn().mockReturnValue({
+  data: [],
+});
+
+jest.mock(
+  '../../../../detections/components/rules/related_integrations/use_installed_integrations',
+  () => ({
+    useInstalledIntegrations: () => mockUseInstalledIntegrations(),
+  })
+);
+
+describe('useManagedUser', () => {
+  it('returns isIntegrationEnabled:true when it finds an enabled integration with the given name', () => {
+    mockUseInstalledIntegrations.mockReturnValue({
+      data: [makeInstalledIntegration(MANAGED_USER_PACKAGE_NAME, true)],
+    });
+
+    const { result } = renderHook(() => useManagedUser('test-userName'), {
+      wrapper: TestProviders,
+    });
+
+    expect(result.current.isIntegrationEnabled).toBeTruthy();
+  });
+
+  it('returns isIntegrationEnabled:false when it does not find an enabled integration with the given name', () => {
+    mockUseInstalledIntegrations.mockReturnValue({
+      data: [makeInstalledIntegration('fake-name', true)],
+    });
+
+    const { result } = renderHook(() => useManagedUser('test-userName'), {
+      wrapper: TestProviders,
+    });
+
+    expect(result.current.isIntegrationEnabled).toBeFalsy();
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/hooks.ts b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/hooks.ts
new file mode 100644
index 0000000000000..13d3b07676238
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/hooks.ts
@@ -0,0 +1,236 @@
+/*
+ * 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 { useMemo, useEffect } from 'react';
+import * as i18n from './translations';
+import type { ManagedUserTable, ObservedUserData, ObservedUserTable } from './types';
+import type { AzureManagedUser } from '../../../../../common/search_strategy/security_solution/users/managed_details';
+
+import {
+  Direction,
+  UsersQueries,
+  NOT_EVENT_KIND_ASSET_FILTER,
+} from '../../../../../common/search_strategy';
+import { useSourcererDataView } from '../../../../common/containers/sourcerer';
+import { useGlobalTime } from '../../../../common/containers/use_global_time';
+import { useSearchStrategy } from '../../../../common/containers/use_search_strategy';
+import { useObservedUserDetails } from '../../../../explore/users/containers/users/observed_details';
+import { useFirstLastSeen } from '../../../../common/containers/use_first_last_seen';
+import { useInstalledIntegrations } from '../../../../detections/components/rules/related_integrations/use_installed_integrations';
+import { MANAGED_USER_INDEX, MANAGED_USER_PACKAGE_NAME, MANAGED_USER_QUERY_ID } from './constants';
+import { useQueryInspector } from '../../../../common/components/page/manage_query';
+
+export const useObservedUserItems = (userData: ObservedUserData): ObservedUserTable[] =>
+  useMemo(
+    () =>
+      !userData.details
+        ? []
+        : [
+            { label: i18n.USER_ID, values: userData.details.user?.id, field: 'user.id' },
+            { label: 'Domain', values: userData.details.user?.domain, field: 'user.domain' },
+            {
+              label: i18n.MAX_ANOMALY_SCORE_BY_JOB,
+              field: 'anomalies',
+              values: userData.anomalies,
+            },
+            {
+              label: i18n.FIRST_SEEN,
+              values: userData.firstSeen.date ? [userData.firstSeen.date] : undefined,
+              field: '@timestamp',
+            },
+            {
+              label: i18n.LAST_SEEN,
+              values: userData.lastSeen.date ? [userData.lastSeen.date] : undefined,
+              field: '@timestamp',
+            },
+            {
+              label: i18n.OPERATING_SYSTEM_TITLE,
+              values: userData.details.host?.os?.name,
+              field: 'host.os.name',
+            },
+            {
+              label: i18n.FAMILY,
+              values: userData.details.host?.os?.family,
+              field: 'host.os.family',
+            },
+            { label: i18n.IP_ADDRESSES, values: userData.details.host?.ip, field: 'host.ip' },
+          ],
+    [userData.details, userData.anomalies, userData.firstSeen, userData.lastSeen]
+  );
+
+export const useManagedUserItems = (
+  managedUserDetails?: AzureManagedUser
+): ManagedUserTable[] | null =>
+  useMemo(
+    () =>
+      !managedUserDetails
+        ? null
+        : [
+            {
+              label: i18n.USER_ID,
+              value: managedUserDetails.user.id,
+              field: 'user.id',
+            },
+            {
+              label: i18n.FULL_NAME,
+              value: managedUserDetails.user.full_name,
+              field: 'user.full_name',
+            },
+            {
+              label: i18n.FIRST_NAME,
+              value: managedUserDetails.user.first_name,
+            },
+            {
+              label: i18n.LAST_NAME,
+              value: managedUserDetails.user.last_name,
+            },
+            { label: i18n.PHONE, value: managedUserDetails.user.phone?.join(', ') },
+          ],
+    [managedUserDetails]
+  );
+
+export const useManagedUser = (userName: string) => {
+  const { to, from, isInitializing, deleteQuery, setQuery } = useGlobalTime();
+  const {
+    loading: loadingManagedUser,
+    result: { userDetails: managedUserDetails },
+    search,
+    refetch,
+    inspect,
+  } = useSearchStrategy<UsersQueries.managedDetails>({
+    factoryQueryType: UsersQueries.managedDetails,
+    initialResult: {},
+    errorMessage: i18n.FAIL_MANAGED_USER,
+  });
+
+  useEffect(() => {
+    if (!isInitializing) {
+      search({
+        defaultIndex: MANAGED_USER_INDEX,
+        factoryQueryType: UsersQueries.managedDetails,
+        userName,
+      });
+    }
+  }, [from, search, to, userName, isInitializing]);
+
+  const { data: installedIntegrations } = useInstalledIntegrations({
+    packages: [MANAGED_USER_PACKAGE_NAME],
+  });
+
+  useQueryInspector({
+    deleteQuery,
+    inspect,
+    refetch,
+    setQuery,
+    queryId: MANAGED_USER_QUERY_ID,
+    loading: loadingManagedUser,
+  });
+
+  const isIntegrationEnabled = useMemo(
+    () =>
+      !!installedIntegrations?.some(
+        ({ package_name: packageName, is_enabled: isEnabled }) =>
+          packageName === MANAGED_USER_PACKAGE_NAME && isEnabled
+      ),
+    [installedIntegrations]
+  );
+
+  const [loadingFirstSeen, { firstSeen }] = useFirstLastSeen({
+    field: 'user.name',
+    value: userName,
+    defaultIndex: MANAGED_USER_INDEX,
+    order: Direction.asc,
+  });
+
+  const [loadingLastSeen, { lastSeen }] = useFirstLastSeen({
+    field: 'user.name',
+    value: userName,
+    defaultIndex: MANAGED_USER_INDEX,
+    order: Direction.desc,
+  });
+
+  return useMemo(
+    () => ({
+      details: managedUserDetails,
+      isLoading: loadingManagedUser,
+      isIntegrationEnabled,
+      firstSeen: {
+        date: firstSeen,
+        isLoading: loadingFirstSeen,
+      },
+      lastSeen: { date: lastSeen, isLoading: loadingLastSeen },
+    }),
+    [
+      firstSeen,
+      isIntegrationEnabled,
+      lastSeen,
+      loadingFirstSeen,
+      loadingLastSeen,
+      loadingManagedUser,
+      managedUserDetails,
+    ]
+  );
+};
+
+export const useObservedUser = (userName: string) => {
+  const { selectedPatterns } = useSourcererDataView();
+  const { to, from, isInitializing, deleteQuery, setQuery } = useGlobalTime();
+
+  const [loadingObservedUser, { userDetails: observedUserDetails, inspect, refetch, id: queryId }] =
+    useObservedUserDetails({
+      endDate: to,
+      startDate: from,
+      userName,
+      indexNames: selectedPatterns,
+      skip: isInitializing,
+    });
+
+  useQueryInspector({
+    deleteQuery,
+    inspect,
+    refetch,
+    setQuery,
+    queryId,
+    loading: loadingObservedUser,
+  });
+
+  const [loadingFirstSeen, { firstSeen }] = useFirstLastSeen({
+    field: 'user.name',
+    value: userName,
+    defaultIndex: selectedPatterns,
+    order: Direction.asc,
+    filterQuery: NOT_EVENT_KIND_ASSET_FILTER,
+  });
+
+  const [loadingLastSeen, { lastSeen }] = useFirstLastSeen({
+    field: 'user.name',
+    value: userName,
+    defaultIndex: selectedPatterns,
+    order: Direction.desc,
+    filterQuery: NOT_EVENT_KIND_ASSET_FILTER,
+  });
+
+  return useMemo(
+    () => ({
+      details: observedUserDetails,
+      isLoading: loadingObservedUser,
+      firstSeen: {
+        date: firstSeen,
+        isLoading: loadingFirstSeen,
+      },
+      lastSeen: { date: lastSeen, isLoading: loadingLastSeen },
+    }),
+    [
+      firstSeen,
+      lastSeen,
+      loadingFirstSeen,
+      loadingLastSeen,
+      loadingObservedUser,
+      observedUserDetails,
+    ]
+  );
+};
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/managed_user.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/managed_user.test.tsx
new file mode 100644
index 0000000000000..fe08629c85367
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/managed_user.test.tsx
@@ -0,0 +1,81 @@
+/*
+ * 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 { fireEvent, render } from '@testing-library/react';
+import React from 'react';
+import { TestProviders } from '../../../../common/mock';
+import { ManagedUser } from './managed_user';
+import { mockManagedUser } from './__mocks__';
+
+describe('ManagedUser', () => {
+  const mockProps = {
+    managedUser: mockManagedUser,
+    contextID: '',
+    isDraggable: false,
+  };
+
+  it('renders', () => {
+    const { getByTestId } = render(
+      <TestProviders>
+        <ManagedUser {...mockProps} />
+      </TestProviders>
+    );
+
+    expect(getByTestId('managedUser-data')).toBeInTheDocument();
+  });
+
+  it('updates the accordion button title when visibility toggles', () => {
+    const { getByTestId } = render(
+      <TestProviders>
+        <ManagedUser {...mockProps} />
+      </TestProviders>
+    );
+    const accordionButton = getByTestId('managedUser-accordion-button');
+
+    expect(accordionButton).toHaveTextContent('Show Azure AD data');
+    fireEvent.click(accordionButton);
+    expect(accordionButton).toHaveTextContent('Hide Azure AD data');
+  });
+
+  it('renders the formatted date', () => {
+    const { getByTestId } = render(
+      <TestProviders>
+        <ManagedUser {...mockProps} />
+      </TestProviders>
+    );
+
+    expect(getByTestId('managedUser-data')).toHaveTextContent('Updated Mar 23, 2023');
+  });
+
+  it('renders enable integration callout when the integration is disabled', () => {
+    const { getByTestId } = render(
+      <TestProviders>
+        <ManagedUser
+          {...{
+            ...mockProps,
+            managedUser: {
+              ...mockManagedUser,
+              isIntegrationEnabled: false,
+            },
+          }}
+        />
+      </TestProviders>
+    );
+
+    expect(getByTestId('managedUser-integration-disable-callout')).toBeInTheDocument();
+  });
+
+  it('renders phone number separated by comma', () => {
+    const { getByTestId } = render(
+      <TestProviders>
+        <ManagedUser {...mockProps} />
+      </TestProviders>
+    );
+
+    expect(getByTestId('managedUser-data')).toHaveTextContent('123456, 654321');
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/managed_user.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/managed_user.tsx
new file mode 100644
index 0000000000000..873a7a5bde78a
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/managed_user.tsx
@@ -0,0 +1,157 @@
+/*
+ * 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 {
+  EuiButton,
+  EuiSpacer,
+  EuiAccordion,
+  EuiTitle,
+  EuiPanel,
+  useEuiTheme,
+  EuiEmptyPrompt,
+  EuiCallOut,
+} from '@elastic/eui';
+
+import React, { useCallback, useMemo, useState } from 'react';
+import { css } from '@emotion/react';
+import { FormattedMessage } from '@kbn/i18n-react';
+import * as i18n from './translations';
+
+import { BasicTable } from '../../../../common/components/ml/tables/basic_table';
+import { getManagedUserTableColumns } from './columns';
+import { useManagedUserItems } from './hooks';
+
+import { FormattedRelativePreferenceDate } from '../../../../common/components/formatted_date';
+import type { ManagedUserData } from './types';
+import { INSTALL_INTEGRATION_HREF, MANAGED_USER_QUERY_ID, ONE_WEEK_IN_HOURS } from './constants';
+import { InspectButton, InspectButtonContainer } from '../../../../common/components/inspect';
+
+export const ManagedUser = ({
+  managedUser,
+  contextID,
+  isDraggable,
+}: {
+  managedUser: ManagedUserData;
+  contextID: string;
+  isDraggable: boolean;
+}) => {
+  const { euiTheme } = useEuiTheme();
+  const managedItems = useManagedUserItems(managedUser.details);
+  const [isManagedDataToggleOpen, setManagedDataToggleOpen] = useState(false);
+  const onToggleManagedData = useCallback(() => {
+    setManagedDataToggleOpen((isOpen) => !isOpen);
+  }, [setManagedDataToggleOpen]);
+  const managedUserTableColumns = useMemo(
+    () => getManagedUserTableColumns(contextID, isDraggable),
+    [isDraggable, contextID]
+  );
+
+  if (!managedUser.isIntegrationEnabled) {
+    return (
+      <>
+        <EuiTitle size="s">
+          <h5>{i18n.MANAGED_DATA_TITLE}</h5>
+        </EuiTitle>
+        <EuiSpacer size="l" />
+        <EuiPanel data-test-subj="managedUser-integration-disable-callout">
+          <EuiEmptyPrompt
+            title={<h2>{i18n.NO_ACTIVE_INTEGRATION_TITLE}</h2>}
+            body={<p>{i18n.NO_ACTIVE_INTEGRATION_TEXT}</p>}
+            actions={
+              <EuiButton fill href={INSTALL_INTEGRATION_HREF}>
+                {i18n.ADD_EXTERNAL_INTEGRATION_BUTTON}
+              </EuiButton>
+            }
+          />
+        </EuiPanel>
+      </>
+    );
+  }
+
+  return (
+    <>
+      <EuiTitle size="s">
+        <h5>{i18n.MANAGED_DATA_TITLE}</h5>
+      </EuiTitle>
+      <EuiSpacer size="l" />
+      <InspectButtonContainer>
+        <EuiAccordion
+          isLoading={managedUser.isLoading}
+          id={'managedUser-data'}
+          data-test-subj="managedUser-data"
+          forceState={isManagedDataToggleOpen ? 'open' : 'closed'}
+          buttonProps={{
+            'data-test-subj': 'managedUser-accordion-button',
+            css: css`
+              color: ${euiTheme.colors.primary};
+            `,
+          }}
+          buttonContent={
+            isManagedDataToggleOpen ? i18n.HIDE_AZURE_DATA_BUTTON : i18n.SHOW_AZURE_DATA_BUTTON
+          }
+          onToggle={onToggleManagedData}
+          extraAction={
+            <>
+              <span
+                css={css`
+                  margin-right: ${euiTheme.size.s};
+                `}
+              >
+                <InspectButton
+                  queryId={MANAGED_USER_QUERY_ID}
+                  title={i18n.MANAGED_USER_INSPECT_TITLE}
+                />
+              </span>
+              {managedUser.lastSeen.date && (
+                <FormattedMessage
+                  id="xpack.securitySolution.timeline.userDetails.updatedTime"
+                  defaultMessage="Updated {time}"
+                  values={{
+                    time: (
+                      <FormattedRelativePreferenceDate
+                        value={managedUser.lastSeen.date}
+                        dateFormat="MMM D, YYYY"
+                        relativeThresholdInHrs={ONE_WEEK_IN_HOURS}
+                      />
+                    ),
+                  }}
+                />
+              )}
+            </>
+          }
+          css={css`
+            .euiAccordion__optionalAction {
+              margin-left: auto;
+            }
+          `}
+        >
+          <EuiPanel color="subdued">
+            {managedItems || managedUser.isLoading ? (
+              <BasicTable
+                loading={managedUser.isLoading}
+                data-test-subj="managedUser-table"
+                columns={managedUserTableColumns}
+                items={managedItems ?? []}
+              />
+            ) : (
+              <>
+                <EuiCallOut
+                  data-test-subj="managedUser-no-data"
+                  title={i18n.NO_AZURE_DATA_TITLE}
+                  color="warning"
+                  iconType="help"
+                >
+                  <p>{i18n.NO_AZURE_DATA_TEXT}</p>
+                </EuiCallOut>
+              </>
+            )}
+          </EuiPanel>
+        </EuiAccordion>
+      </InspectButtonContainer>
+    </>
+  );
+};
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/observed_user.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/observed_user.test.tsx
new file mode 100644
index 0000000000000..d7493ed3a8921
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/observed_user.test.tsx
@@ -0,0 +1,63 @@
+/*
+ * 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 { fireEvent, render } from '@testing-library/react';
+import React from 'react';
+import { TestProviders } from '../../../../common/mock';
+import { mockObservedUser } from './__mocks__';
+import { ObservedUser } from './observed_user';
+
+describe('ObservedUser', () => {
+  const mockProps = {
+    observedUser: mockObservedUser,
+    contextID: '',
+    isDraggable: false,
+  };
+
+  it('renders', () => {
+    const { getByTestId } = render(
+      <TestProviders>
+        <ObservedUser {...mockProps} />
+      </TestProviders>
+    );
+
+    expect(getByTestId('observedUser-data')).toBeInTheDocument();
+  });
+
+  it('updates the accordion button title when visibility toggles', () => {
+    const { getByTestId } = render(
+      <TestProviders>
+        <ObservedUser {...mockProps} />
+      </TestProviders>
+    );
+    const accordionButton = getByTestId('observedUser-accordion-button');
+
+    expect(accordionButton).toHaveTextContent('Show observed data');
+    fireEvent.click(accordionButton);
+    expect(accordionButton).toHaveTextContent('Hide observed data');
+  });
+
+  it('renders the formatted date', () => {
+    const { getByTestId } = render(
+      <TestProviders>
+        <ObservedUser {...mockProps} />
+      </TestProviders>
+    );
+
+    expect(getByTestId('observedUser-data')).toHaveTextContent('Updated Feb 23, 2023');
+  });
+
+  it('renders anomaly score', () => {
+    const { getByTestId } = render(
+      <TestProviders>
+        <ObservedUser {...mockProps} />
+      </TestProviders>
+    );
+
+    expect(getByTestId('anomaly-score')).toHaveTextContent('17');
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/observed_user.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/observed_user.tsx
new file mode 100644
index 0000000000000..c67975d50d238
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/observed_user.tsx
@@ -0,0 +1,119 @@
+/*
+ * 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 { EuiAccordion, EuiSpacer, EuiTitle, useEuiTheme, EuiPanel } from '@elastic/eui';
+
+import React, { useCallback, useMemo, useState } from 'react';
+import { css } from '@emotion/react';
+import { FormattedMessage } from '@kbn/i18n-react';
+import * as i18n from './translations';
+import type { ObservedUserData } from './types';
+import { useObservedUserItems } from './hooks';
+import { BasicTable } from '../../../../common/components/ml/tables/basic_table';
+import { FormattedRelativePreferenceDate } from '../../../../common/components/formatted_date';
+import { getObservedUserTableColumns } from './columns';
+import { ONE_WEEK_IN_HOURS } from './constants';
+import { InspectButton, InspectButtonContainer } from '../../../../common/components/inspect';
+import { OBSERVED_USER_QUERY_ID } from '../../../../explore/users/containers/users/observed_details';
+
+export const ObservedUser = ({
+  observedUser,
+  contextID,
+  isDraggable,
+}: {
+  observedUser: ObservedUserData;
+  contextID: string;
+  isDraggable: boolean;
+}) => {
+  const { euiTheme } = useEuiTheme();
+  const observedItems = useObservedUserItems(observedUser);
+  const [isObservedDataToggleOpen, setObservedDataToggleOpen] = useState(false);
+  const onToggleObservedData = useCallback(() => {
+    setObservedDataToggleOpen((isOpen) => !isOpen);
+  }, [setObservedDataToggleOpen]);
+  const observedUserTableColumns = useMemo(
+    () => getObservedUserTableColumns(contextID, isDraggable),
+    [contextID, isDraggable]
+  );
+
+  return (
+    <>
+      <EuiTitle size="s">
+        <h5>{i18n.OBSERVED_DATA_TITLE}</h5>
+      </EuiTitle>
+      <EuiSpacer size="l" />
+      <InspectButtonContainer>
+        <EuiAccordion
+          isLoading={observedUser.isLoading}
+          id="observedUser-data"
+          data-test-subj="observedUser-data"
+          forceState={isObservedDataToggleOpen ? 'open' : 'closed'}
+          buttonProps={{
+            'data-test-subj': 'observedUser-accordion-button',
+            css: css`
+              color: ${euiTheme.colors.primary};
+            `,
+          }}
+          buttonContent={
+            isObservedDataToggleOpen
+              ? i18n.HIDE_OBSERVED_DATA_BUTTON
+              : i18n.SHOW_OBSERVED_DATA_BUTTON
+          }
+          onToggle={onToggleObservedData}
+          extraAction={
+            <>
+              <span
+                css={css`
+                  margin-right: ${euiTheme.size.s};
+                `}
+              >
+                <InspectButton
+                  queryId={OBSERVED_USER_QUERY_ID}
+                  title={i18n.OBSERVED_USER_INSPECT_TITLE}
+                />
+              </span>
+              {observedUser.lastSeen.date && (
+                <FormattedMessage
+                  id="xpack.securitySolution.timeline.userDetails.observedUserUpdatedTime"
+                  defaultMessage="Updated {time}"
+                  values={{
+                    time: (
+                      <FormattedRelativePreferenceDate
+                        value={observedUser.lastSeen.date}
+                        dateFormat="MMM D, YYYY"
+                        relativeThresholdInHrs={ONE_WEEK_IN_HOURS}
+                      />
+                    ),
+                  }}
+                />
+              )}
+            </>
+          }
+          css={css`
+            .euiAccordion__optionalAction {
+              margin-left: auto;
+            }
+          `}
+        >
+          <EuiPanel color="subdued">
+            <BasicTable
+              loading={
+                observedUser.isLoading ||
+                observedUser.firstSeen.isLoading ||
+                observedUser.lastSeen.isLoading ||
+                observedUser.anomalies.isLoading
+              }
+              data-test-subj="observedUser-table"
+              columns={observedUserTableColumns}
+              items={observedItems}
+            />
+          </EuiPanel>
+        </EuiAccordion>
+      </InspectButtonContainer>
+    </>
+  );
+};
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/risk_score_field.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/risk_score_field.test.tsx
new file mode 100644
index 0000000000000..9e759fd246178
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/risk_score_field.test.tsx
@@ -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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { render } from '@testing-library/react';
+import React from 'react';
+import { TestProviders } from '../../../../common/mock';
+import { RiskScoreField } from './risk_score_field';
+import { mockRiskScoreState } from './__mocks__';
+import { getEmptyValue } from '../../../../common/components/empty_value';
+
+describe('RiskScoreField', () => {
+  it('renders', () => {
+    const { getByTestId } = render(
+      <TestProviders>
+        <RiskScoreField riskScoreState={mockRiskScoreState} />
+      </TestProviders>
+    );
+
+    expect(getByTestId('user-details-risk-score')).toBeInTheDocument();
+    expect(getByTestId('user-details-risk-score')).toHaveTextContent('70');
+  });
+
+  it('does not render content when the license is invalid', () => {
+    const { queryByTestId } = render(
+      <TestProviders>
+        <RiskScoreField riskScoreState={{ ...mockRiskScoreState, isLicenseValid: false }} />
+      </TestProviders>
+    );
+
+    expect(queryByTestId('user-details-risk-score')).not.toBeInTheDocument();
+  });
+
+  it('renders empty tag when risk score is undefined', () => {
+    const { getByTestId } = render(
+      <TestProviders>
+        <RiskScoreField riskScoreState={{ ...mockRiskScoreState, data: [] }} />
+      </TestProviders>
+    );
+
+    expect(getByTestId('user-details-risk-score')).toHaveTextContent(getEmptyValue());
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/risk_score_field.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/risk_score_field.tsx
new file mode 100644
index 0000000000000..9dce74009a0fa
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/risk_score_field.tsx
@@ -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 { EuiFlexItem, EuiFlexGroup, useEuiFontSize, useEuiTheme } from '@elastic/eui';
+
+import React from 'react';
+import { css } from '@emotion/react';
+
+import * as i18n from './translations';
+
+import type { RiskScoreEntity } from '../../../../../common/search_strategy';
+import { RiskSeverity } from '../../../../../common/search_strategy';
+import { getEmptyTagValue } from '../../../../common/components/empty_value';
+import { RiskScore } from '../../../../explore/components/risk_score/severity/common';
+import type { RiskScoreState } from '../../../../explore/containers/risk_score';
+
+export const RiskScoreField = ({
+  riskScoreState,
+}: {
+  riskScoreState: RiskScoreState<RiskScoreEntity.user>;
+}) => {
+  const { euiTheme } = useEuiTheme();
+  const { fontSize: xsFontSize } = useEuiFontSize('xs');
+  const { data: userRisk, isLicenseValid: isRiskLicenseValid } = riskScoreState;
+  const userRiskData = userRisk && userRisk.length > 0 ? userRisk[0] : undefined;
+
+  if (!isRiskLicenseValid) {
+    return null;
+  }
+
+  return (
+    <EuiFlexGroup
+      alignItems="center"
+      gutterSize="none"
+      responsive={false}
+      data-test-subj="user-details-risk-score"
+    >
+      <EuiFlexItem grow={false}>
+        <span
+          css={css`
+            font-weight: ${euiTheme.font.weight.bold};
+            font-size: ${xsFontSize};
+            margin-right: ${euiTheme.size.xs};
+          `}
+        >
+          {i18n.RISK_SCORE}
+          {': '}
+        </span>
+      </EuiFlexItem>
+      {userRiskData ? (
+        <>
+          <EuiFlexItem grow={false}>
+            {Math.round(userRiskData.user.risk.calculated_score_norm)}
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <RiskScore severity={RiskSeverity.high} hideBackgroundColor />
+          </EuiFlexItem>
+        </>
+      ) : (
+        getEmptyTagValue()
+      )}
+    </EuiFlexGroup>
+  );
+};
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/translations.ts b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/translations.ts
new file mode 100644
index 0000000000000..01563fcb94781
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/translations.ts
@@ -0,0 +1,222 @@
+/*
+ * 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 { i18n } from '@kbn/i18n';
+
+export const OBSERVED_BADGE = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.observedBadge',
+  {
+    defaultMessage: 'OBSERVED',
+  }
+);
+
+export const MANAGED_BADGE = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.managedBadge',
+  {
+    defaultMessage: 'MANAGED',
+  }
+);
+
+export const USER = i18n.translate('xpack.securitySolution.timeline.userDetails.userLabel', {
+  defaultMessage: 'User',
+});
+
+export const FAIL_MANAGED_USER = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.failManagedUserDescription',
+  {
+    defaultMessage: 'Failed to run search on user managed data',
+  }
+);
+
+export const MANAGED_DATA_TITLE = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.managedDataTitle',
+  {
+    defaultMessage: 'Managed data',
+  }
+);
+
+export const OBSERVED_DATA_TITLE = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.observedDataTitle',
+  {
+    defaultMessage: 'Observed data',
+  }
+);
+
+export const HIDE_OBSERVED_DATA_BUTTON = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.hideObservedDataButton',
+  {
+    defaultMessage: 'Hide observed data',
+  }
+);
+
+export const SHOW_OBSERVED_DATA_BUTTON = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.showObservedDataButton',
+  {
+    defaultMessage: 'Show observed data',
+  }
+);
+
+export const HIDE_AZURE_DATA_BUTTON = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.hideManagedDataButton',
+  {
+    defaultMessage: 'Hide Azure AD data',
+  }
+);
+
+export const SHOW_AZURE_DATA_BUTTON = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.showManagedDataButton',
+  {
+    defaultMessage: 'Show Azure AD data',
+  }
+);
+
+export const RISK_SCORE = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.riskScoreLabel',
+  {
+    defaultMessage: 'Risk score',
+  }
+);
+
+export const VALUES_COLUMN_TITLE = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.valuesColumnTitle',
+  {
+    defaultMessage: 'Values',
+  }
+);
+
+export const FIELD_COLUMN_TITLE = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.fieldColumnTitle',
+  {
+    defaultMessage: 'Field',
+  }
+);
+
+export const USER_ID = i18n.translate('xpack.securitySolution.timeline.userDetails.userIdLabel', {
+  defaultMessage: 'User ID',
+});
+
+export const MAX_ANOMALY_SCORE_BY_JOB = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.maxAnomalyScoreByJobLabel',
+  {
+    defaultMessage: 'Max anomaly score by job',
+  }
+);
+
+export const FIRST_SEEN = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.firstSeenLabel',
+  {
+    defaultMessage: 'First seen',
+  }
+);
+
+export const LAST_SEEN = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.lastSeenLabel',
+  {
+    defaultMessage: 'Last seen',
+  }
+);
+
+export const OPERATING_SYSTEM_TITLE = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.hostOsNameLabel',
+  {
+    defaultMessage: 'Operating system',
+  }
+);
+
+export const FAMILY = i18n.translate('xpack.securitySolution.timeline.userDetails.familyLabel', {
+  defaultMessage: 'Family',
+});
+
+export const IP_ADDRESSES = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.ipAddressesLabel',
+  {
+    defaultMessage: 'IP addresses',
+  }
+);
+
+export const FULL_NAME = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.fullNameLabel',
+  {
+    defaultMessage: 'Full name',
+  }
+);
+
+export const FIRST_NAME = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.firstNameLabel',
+  {
+    defaultMessage: 'First name',
+  }
+);
+
+export const LAST_NAME = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.lastNameLabel',
+  {
+    defaultMessage: 'Last name',
+  }
+);
+
+export const PHONE = i18n.translate('xpack.securitySolution.timeline.userDetails.phoneLabel', {
+  defaultMessage: 'Phone',
+});
+
+export const NO_ACTIVE_INTEGRATION_TITLE = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.noActiveIntegrationTitle',
+  {
+    defaultMessage: 'You don’t have any active integrations',
+  }
+);
+
+export const NO_ACTIVE_INTEGRATION_TEXT = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.noActiveIntegrationText',
+  {
+    defaultMessage:
+      'External integrations can provide additional metadata and help you manage users.',
+  }
+);
+
+export const ADD_EXTERNAL_INTEGRATION_BUTTON = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.addExternalIntegrationButton',
+  {
+    defaultMessage: 'Add external integrations',
+  }
+);
+
+export const NO_AZURE_DATA_TITLE = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.noAzureDataTitle',
+  {
+    defaultMessage: 'No metadata found for this user',
+  }
+);
+
+export const NO_AZURE_DATA_TEXT = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.noAzureDataText',
+  {
+    defaultMessage:
+      'If you expected to see metadata for this user, make sure you have configured your integrations properly.',
+  }
+);
+
+export const CLOSE_BUTTON = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.closeButton',
+  {
+    defaultMessage: 'close',
+  }
+);
+
+export const OBSERVED_USER_INSPECT_TITLE = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.observedUserInspectTitle',
+  {
+    defaultMessage: 'Observed user',
+  }
+);
+
+export const MANAGED_USER_INSPECT_TITLE = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.managedUserInspectTitle',
+  {
+    defaultMessage: 'Managed user',
+  }
+);
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/types.ts b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/types.ts
new file mode 100644
index 0000000000000..2587d81d09dc5
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/types.ts
@@ -0,0 +1,53 @@
+/*
+ * 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 { EuiBasicTableColumn } from '@elastic/eui';
+import type { UserItem } from '../../../../../common/search_strategy';
+import type { AzureManagedUser } from '../../../../../common/search_strategy/security_solution/users/managed_details';
+import type { AnomalyTableProviderChildrenProps } from '../../../../common/components/ml/anomaly/anomaly_table_provider';
+
+export interface ObservedUserTable {
+  label: string;
+  values: string[] | null | undefined | UserAnomalies;
+  field: string;
+}
+
+export interface ManagedUserTable {
+  label: string;
+  value: string | null | undefined;
+  field?: string;
+}
+
+export type ObservedUsersTableColumns = Array<EuiBasicTableColumn<ObservedUserTable>>;
+export type ManagedUsersTableColumns = Array<EuiBasicTableColumn<ManagedUserTable>>;
+
+export interface ObservedUserData {
+  isLoading: boolean;
+  details: UserItem;
+  firstSeen: FirstLastSeenData;
+  lastSeen: FirstLastSeenData;
+  anomalies: UserAnomalies;
+}
+
+export interface ManagedUserData {
+  isLoading: boolean;
+  details: AzureManagedUser | undefined;
+  isIntegrationEnabled: boolean;
+  firstSeen: FirstLastSeenData;
+  lastSeen: FirstLastSeenData;
+}
+
+export interface FirstLastSeenData {
+  date: string | null | undefined;
+  isLoading: boolean;
+}
+
+export interface UserAnomalies {
+  isLoading: AnomalyTableProviderChildrenProps['isLoadingAnomaliesData'];
+  anomalies: AnomalyTableProviderChildrenProps['anomaliesData'];
+  jobNameById: AnomalyTableProviderChildrenProps['jobNameById'];
+}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/user_details_content.stories.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/user_details_content.stories.tsx
new file mode 100644
index 0000000000000..db17ada4a3b10
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/user_details_content.stories.tsx
@@ -0,0 +1,157 @@
+/*
+ * 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 { storiesOf, addDecorator } from '@storybook/react';
+import { EuiFlyout, EuiFlyoutBody } from '@elastic/eui';
+import { UserDetailsContentComponent } from './user_details_content';
+import { StorybookProviders } from '../../../../common/mock/storybook_providers';
+import { mockManagedUser, mockObservedUser, mockRiskScoreState } from './__mocks__';
+
+addDecorator((storyFn) => (
+  <StorybookProviders>
+    <EuiFlyout size="m" onClose={() => {}}>
+      <EuiFlyoutBody>{storyFn()}</EuiFlyoutBody>
+    </EuiFlyout>
+  </StorybookProviders>
+));
+
+storiesOf('UserDetailsContent', module)
+  .add('default', () => (
+    <UserDetailsContentComponent
+      userName="test"
+      managedUser={mockManagedUser}
+      observedUser={mockObservedUser}
+      riskScoreState={mockRiskScoreState}
+      contextID={'test-user-details'}
+      isDraggable={false}
+    />
+  ))
+  .add('integration disabled', () => (
+    <UserDetailsContentComponent
+      userName="test"
+      managedUser={{
+        details: undefined,
+        isLoading: false,
+        isIntegrationEnabled: false,
+        firstSeen: {
+          isLoading: false,
+          date: undefined,
+        },
+        lastSeen: {
+          isLoading: false,
+          date: undefined,
+        },
+      }}
+      observedUser={mockObservedUser}
+      riskScoreState={mockRiskScoreState}
+      contextID={'test-user-details'}
+      isDraggable={false}
+    />
+  ))
+  .add('no managed data', () => (
+    <UserDetailsContentComponent
+      userName="test"
+      managedUser={{
+        details: undefined,
+        isLoading: false,
+        isIntegrationEnabled: true,
+        firstSeen: {
+          isLoading: false,
+          date: undefined,
+        },
+        lastSeen: {
+          isLoading: false,
+          date: undefined,
+        },
+      }}
+      observedUser={mockObservedUser}
+      riskScoreState={mockRiskScoreState}
+      contextID={'test-user-details'}
+      isDraggable={false}
+    />
+  ))
+  .add('no observed data', () => (
+    <UserDetailsContentComponent
+      userName="test"
+      managedUser={mockManagedUser}
+      observedUser={{
+        details: {
+          user: {
+            id: [],
+            domain: [],
+          },
+          host: {
+            ip: [],
+            os: {
+              name: [],
+              family: [],
+            },
+          },
+        },
+        isLoading: false,
+        firstSeen: {
+          isLoading: false,
+          date: undefined,
+        },
+        lastSeen: {
+          isLoading: false,
+          date: undefined,
+        },
+        anomalies: { isLoading: false, anomalies: null, jobNameById: {} },
+      }}
+      riskScoreState={mockRiskScoreState}
+      contextID={'test-user-details'}
+      isDraggable={false}
+    />
+  ))
+  .add('loading', () => (
+    <UserDetailsContentComponent
+      userName="test"
+      managedUser={{
+        details: undefined,
+        isLoading: true,
+        isIntegrationEnabled: true,
+        firstSeen: {
+          isLoading: true,
+          date: undefined,
+        },
+        lastSeen: {
+          isLoading: true,
+          date: undefined,
+        },
+      }}
+      observedUser={{
+        details: {
+          user: {
+            id: [],
+            domain: [],
+          },
+          host: {
+            ip: [],
+            os: {
+              name: [],
+              family: [],
+            },
+          },
+        },
+        isLoading: true,
+        firstSeen: {
+          isLoading: true,
+          date: undefined,
+        },
+        lastSeen: {
+          isLoading: true,
+          date: undefined,
+        },
+        anomalies: { isLoading: true, anomalies: null, jobNameById: {} },
+      }}
+      riskScoreState={mockRiskScoreState}
+      contextID={'test-user-details'}
+      isDraggable={false}
+    />
+  ));
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/user_details_content.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/user_details_content.test.tsx
new file mode 100644
index 0000000000000..6ac3f1a0975f7
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/user_details_content.test.tsx
@@ -0,0 +1,130 @@
+/*
+ * 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 { render } from '@testing-library/react';
+import React from 'react';
+import { TestProviders } from '../../../../common/mock';
+import { mockManagedUser, mockObservedUser, mockRiskScoreState } from './__mocks__';
+import { UserDetailsContentComponent } from './user_details_content';
+
+const mockProps = {
+  userName: 'test',
+  managedUser: mockManagedUser,
+  observedUser: mockObservedUser,
+  riskScoreState: mockRiskScoreState,
+  contextID: 'test-user-details',
+  isDraggable: false,
+};
+
+describe('UserDetailsContentComponent', () => {
+  it('renders', () => {
+    const { getByTestId } = render(
+      <TestProviders>
+        <UserDetailsContentComponent {...mockProps} />
+      </TestProviders>
+    );
+
+    expect(getByTestId('user-details-content-header')).toBeInTheDocument();
+  });
+
+  it('renders observed user date when it is bigger than managed user date', () => {
+    const futureDay = '2989-03-07T20:00:00.000Z';
+    const { getByTestId } = render(
+      <TestProviders>
+        <UserDetailsContentComponent
+          {...{
+            ...mockProps,
+            observedUser: {
+              ...mockObservedUser,
+              lastSeen: {
+                isLoading: false,
+                date: futureDay,
+              },
+            },
+          }}
+        />
+      </TestProviders>
+    );
+
+    expect(getByTestId('user-details-content-lastSeen').textContent).toContain('Mar 7, 2989');
+  });
+
+  it('renders managed user date when it is bigger than observed user date', () => {
+    const futureDay = '2989-03-07T20:00:00.000Z';
+    const { getByTestId } = render(
+      <TestProviders>
+        <UserDetailsContentComponent
+          {...{
+            ...mockProps,
+            managedUser: {
+              ...mockManagedUser,
+              lastSeen: {
+                isLoading: false,
+                date: futureDay,
+              },
+            },
+          }}
+        />
+      </TestProviders>
+    );
+
+    expect(getByTestId('user-details-content-lastSeen').textContent).toContain('Mar 7, 2989');
+  });
+
+  it('renders observed and managed badges when lastSeen is defined', () => {
+    const { getByTestId } = render(
+      <TestProviders>
+        <UserDetailsContentComponent {...mockProps} />
+      </TestProviders>
+    );
+
+    expect(getByTestId('user-details-content-observed-badge')).toBeInTheDocument();
+    expect(getByTestId('user-details-content-managed-badge')).toBeInTheDocument();
+  });
+
+  it('does not render observed badge when lastSeen date is undefined', () => {
+    const { queryByTestId } = render(
+      <TestProviders>
+        <UserDetailsContentComponent
+          {...{
+            ...mockProps,
+            observedUser: {
+              ...mockObservedUser,
+              lastSeen: {
+                isLoading: false,
+                date: undefined,
+              },
+            },
+          }}
+        />
+      </TestProviders>
+    );
+
+    expect(queryByTestId('user-details-content-observed-badge')).not.toBeInTheDocument();
+  });
+
+  it('does not render managed badge when lastSeen date is undefined', () => {
+    const { queryByTestId } = render(
+      <TestProviders>
+        <UserDetailsContentComponent
+          {...{
+            ...mockProps,
+            managedUser: {
+              ...mockManagedUser,
+              lastSeen: {
+                isLoading: false,
+                date: undefined,
+              },
+            },
+          }}
+        />
+      </TestProviders>
+    );
+
+    expect(queryByTestId('user-details-content-managed-badge')).not.toBeInTheDocument();
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/user_details_content.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/user_details_content.tsx
new file mode 100644
index 0000000000000..baab7d365c99d
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/user_details_content.tsx
@@ -0,0 +1,182 @@
+/*
+ * 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 {
+  EuiSpacer,
+  EuiHorizontalRule,
+  EuiIcon,
+  EuiBadge,
+  EuiText,
+  EuiFlexItem,
+  EuiFlexGroup,
+  useEuiFontSize,
+  useEuiTheme,
+  euiTextBreakWord,
+  EuiProgress,
+} from '@elastic/eui';
+
+import React, { useMemo } from 'react';
+import { css } from '@emotion/react';
+import { max } from 'lodash';
+import * as i18n from './translations';
+
+import { RiskScoreEntity } from '../../../../../common/search_strategy';
+import { UserDetailsLink } from '../../../../common/components/links';
+import { useGlobalTime } from '../../../../common/containers/use_global_time';
+import type { RiskScoreState } from '../../../../explore/containers/risk_score';
+import { useRiskScore } from '../../../../explore/containers/risk_score';
+
+import { useManagedUser, useObservedUser } from './hooks';
+import { AnomalyTableProvider } from '../../../../common/components/ml/anomaly/anomaly_table_provider';
+import { getCriteriaFromUsersType } from '../../../../common/components/ml/criteria/get_criteria_from_users_type';
+import { UsersType } from '../../../../explore/users/store/model';
+import { PreferenceFormattedDate } from '../../../../common/components/formatted_date';
+import type { ManagedUserData, ObservedUserData } from './types';
+import { RiskScoreField } from './risk_score_field';
+import { ObservedUser } from './observed_user';
+import { ManagedUser } from './managed_user';
+
+export const QUERY_ID = 'usersDetailsQuery';
+
+interface UserDetailsContentComponentProps {
+  userName: string;
+  observedUser: ObservedUserData;
+  managedUser: ManagedUserData;
+  riskScoreState: RiskScoreState<RiskScoreEntity.user>;
+  contextID: string;
+  isDraggable: boolean;
+}
+
+/**
+ * This is a visual component. It doesn't access any external Context or API.
+ * It designed for unit testing the UI and previewing changes on storybook.
+ */
+export const UserDetailsContentComponent = ({
+  userName,
+  observedUser,
+  managedUser,
+  riskScoreState,
+  contextID,
+  isDraggable,
+}: UserDetailsContentComponentProps) => {
+  const { euiTheme } = useEuiTheme();
+  const { fontSize: xlFontSize } = useEuiFontSize('xl');
+
+  const lastSeenDate = useMemo(
+    () =>
+      max([observedUser.lastSeen, managedUser.lastSeen].map((el) => el.date && new Date(el.date))),
+    [managedUser.lastSeen, observedUser.lastSeen]
+  );
+
+  return (
+    <>
+      <EuiFlexGroup
+        gutterSize="m"
+        alignItems="center"
+        responsive={false}
+        data-test-subj="user-details-content-header"
+      >
+        <EuiFlexItem grow={false}>
+          <EuiIcon type="user" size="m" />
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>{i18n.USER}</EuiFlexItem>
+
+        <EuiFlexItem grow={false}>
+          {observedUser.lastSeen.date && (
+            <EuiBadge data-test-subj="user-details-content-observed-badge" color="hollow">
+              {i18n.OBSERVED_BADGE}
+            </EuiBadge>
+          )}
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          {managedUser.lastSeen.date && (
+            <EuiBadge data-test-subj="user-details-content-managed-badge" color="hollow">
+              {i18n.MANAGED_BADGE}
+            </EuiBadge>
+          )}
+        </EuiFlexItem>
+      </EuiFlexGroup>
+
+      <EuiSpacer size="m" />
+      {observedUser.lastSeen.isLoading || managedUser.lastSeen.isLoading ? (
+        <EuiProgress size="xs" color="accent" />
+      ) : (
+        <EuiHorizontalRule margin="none" />
+      )}
+      <EuiSpacer size="m" />
+
+      <UserDetailsLink userName={userName}>
+        <span
+          css={css`
+            font-size: ${xlFontSize};
+            font-weight: ${euiTheme.font.weight.bold};
+            ${euiTextBreakWord()}
+          `}
+        >
+          {userName}
+        </span>
+      </UserDetailsLink>
+      <EuiSpacer size="m" />
+      <EuiText size="xs" data-test-subj={'user-details-content-lastSeen'}>
+        {i18n.LAST_SEEN}
+        {': '}
+        {lastSeenDate && <PreferenceFormattedDate value={lastSeenDate} />}
+      </EuiText>
+      <EuiHorizontalRule margin="xs" />
+      <RiskScoreField riskScoreState={riskScoreState} />
+      <EuiHorizontalRule margin="xs" />
+      <EuiSpacer size="xxl" />
+      <ObservedUser observedUser={observedUser} contextID={contextID} isDraggable={isDraggable} />
+      <EuiSpacer />
+      <ManagedUser managedUser={managedUser} contextID={contextID} isDraggable={isDraggable} />
+    </>
+  );
+};
+
+export const UserDetailsContent = ({
+  userName,
+  contextID,
+  isDraggable = false,
+}: {
+  userName: string;
+  contextID: string;
+  isDraggable?: boolean;
+}) => {
+  const { to, from, isInitializing } = useGlobalTime();
+  const riskScoreState = useRiskScore({
+    riskEntity: RiskScoreEntity.user,
+  });
+  const observedUser = useObservedUser(userName);
+  const managedUser = useManagedUser(userName);
+
+  return (
+    <AnomalyTableProvider
+      criteriaFields={getCriteriaFromUsersType(UsersType.details, userName)}
+      startDate={from}
+      endDate={to}
+      skip={isInitializing}
+    >
+      {({ isLoadingAnomaliesData, anomaliesData, jobNameById }) => (
+        <UserDetailsContentComponent
+          userName={userName}
+          managedUser={managedUser}
+          observedUser={{
+            ...observedUser,
+            anomalies: {
+              isLoading: isLoadingAnomaliesData,
+              anomalies: anomaliesData,
+              jobNameById,
+            },
+          }}
+          riskScoreState={riskScoreState}
+          contextID={contextID}
+          isDraggable={isDraggable}
+        />
+      )}
+    </AnomalyTableProvider>
+  );
+};
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/user_details/expandable_user.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/user_details/expandable_user.tsx
index e8554f04dbcaf..f12ea6b0ada14 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/user_details/expandable_user.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/user_details/expandable_user.tsx
@@ -13,7 +13,7 @@ import { useDispatch } from 'react-redux';
 import { InputsModelId } from '../../../../common/store/inputs/constants';
 import { UserDetailsLink } from '../../../../common/components/links';
 import { UserOverview } from '../../../../overview/components/user_overview';
-import { useUserDetails } from '../../../../explore/users/containers/users/details';
+import { useObservedUserDetails } from '../../../../explore/users/containers/users/observed_details';
 import { useGlobalTime } from '../../../../common/containers/use_global_time';
 import { useSourcererDataView } from '../../../../common/containers/sourcerer';
 import { setAbsoluteRangeDatePicker } from '../../../../common/store/inputs/actions';
@@ -61,7 +61,7 @@ export const ExpandableUserDetails = ({
   const { selectedPatterns } = useSourcererDataView();
   const dispatch = useDispatch();
 
-  const [loading, { userDetails }] = useUserDetails({
+  const [loading, { userDetails }] = useObservedUserDetails({
     endDate: to,
     startDate: from,
     userName,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/user_details/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/user_details/index.tsx
index 09380d6874b92..2041b1e00bef4 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/user_details/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/user_details/index.tsx
@@ -6,9 +6,13 @@
  */
 
 import React from 'react';
+import { EuiFlyoutBody, EuiSpacer, EuiButtonIcon } from '@elastic/eui';
+import { css } from '@emotion/react';
 import { UserDetailsFlyout } from './user_details_flyout';
 import { UserDetailsSidePanel } from './user_details_side_panel';
 import type { UserDetailsProps } from './types';
+import { UserDetailsContent } from '../new_user_detail/user_details_content';
+import * as i18n from './translations';
 
 const UserDetailsPanelComponent = ({
   contextID,
@@ -16,7 +20,30 @@ const UserDetailsPanelComponent = ({
   handleOnClose,
   isFlyoutView,
   isDraggable,
+  isNewUserDetailsFlyoutEnable,
 }: UserDetailsProps) => {
+  if (isNewUserDetailsFlyoutEnable) {
+    return isFlyoutView ? (
+      <EuiFlyoutBody>
+        <UserDetailsContent userName={userName} contextID={contextID} isDraggable={isDraggable} />
+      </EuiFlyoutBody>
+    ) : (
+      <div className="eui-yScroll">
+        <EuiSpacer size="m" />
+        <EuiButtonIcon
+          iconType="cross"
+          aria-label={i18n.CLOSE_BUTTON}
+          onClick={handleOnClose}
+          css={css`
+            float: right;
+          `}
+        />
+
+        <UserDetailsContent userName={userName} contextID={contextID} isDraggable={isDraggable} />
+      </div>
+    );
+  }
+
   return isFlyoutView ? (
     <UserDetailsFlyout userName={userName} contextID={contextID} />
   ) : (
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/user_details/translations.ts b/x-pack/plugins/security_solution/public/timelines/components/side_panel/user_details/translations.ts
new file mode 100644
index 0000000000000..3ee0484416e3a
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/user_details/translations.ts
@@ -0,0 +1,15 @@
+/*
+ * 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 { i18n } from '@kbn/i18n';
+
+export const CLOSE_BUTTON = i18n.translate(
+  'xpack.securitySolution.timeline.userDetails.closeButton',
+  {
+    defaultMessage: 'close',
+  }
+);
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/user_details/types.ts b/x-pack/plugins/security_solution/public/timelines/components/side_panel/user_details/types.ts
index d745b89377ac0..4c22322888cc1 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/user_details/types.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/user_details/types.ts
@@ -11,4 +11,5 @@ export interface UserDetailsProps {
   handleOnClose: () => void;
   isFlyoutView?: boolean;
   isDraggable?: boolean;
+  isNewUserDetailsFlyoutEnable?: boolean;
 }
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/last_first_seen/query.first_or_last_seen.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/last_first_seen/query.first_or_last_seen.dsl.ts
index ba2842b78e92b..1270f3f49909d 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/last_first_seen/query.first_or_last_seen.dsl.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/last_first_seen/query.first_or_last_seen.dsl.ts
@@ -6,14 +6,16 @@
  */
 
 import type { FirstLastSeenRequestOptions } from '../../../../../common/search_strategy/security_solution/first_last_seen';
+import { createQueryFilterClauses } from '../../../../utils/build_query';
 
 export const buildFirstOrLastSeenQuery = ({
   field,
   value,
   defaultIndex,
   order,
+  filterQuery,
 }: FirstLastSeenRequestOptions) => {
-  const filter = [{ term: { [field]: value } }];
+  const filter = [...createQueryFilterClauses(filterQuery), { term: { [field]: value } }];
 
   const dslQuery = {
     allow_no_indices: true,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/index.ts
index c936ad85f79e0..2bdc6c6956633 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/all/index.ts
@@ -42,7 +42,6 @@ export const allUsers: SecuritySolutionFactory<UsersQueries.users> = {
     deps?: {
       esClient: IScopedClusterClient;
       spaceId?: string;
-      // endpointContext: EndpointAppContext;
     }
   ): Promise<UsersStrategyResponse> => {
     const { activePage, cursorStart, fakePossibleCount, querySize } = options.pagination;
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/index.ts
index a4f33213f73ab..ea4038e53730d 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/index.ts
@@ -11,12 +11,14 @@ import { UsersQueries } from '../../../../../common/search_strategy/security_sol
 import type { SecuritySolutionFactory } from '../types';
 import { allUsers } from './all';
 import { authentications } from './authentications';
-import { userDetails } from './details';
+import { managedUserDetails } from './managed_details';
 import { usersKpiAuthentications } from './kpi/authentications';
 import { totalUsersKpi } from './kpi/total_users';
+import { observedUserDetails } from './observed_details';
 
 export const usersFactory: Record<UsersQueries, SecuritySolutionFactory<FactoryQueryTypes>> = {
-  [UsersQueries.details]: userDetails,
+  [UsersQueries.observedDetails]: observedUserDetails,
+  [UsersQueries.managedDetails]: managedUserDetails,
   [UsersQueries.kpiTotalUsers]: totalUsersKpi,
   [UsersQueries.users]: allUsers,
   [UsersQueries.authentications]: authentications,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/managed_details/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/managed_details/__snapshots__/index.test.tsx.snap
new file mode 100644
index 0000000000000..73388c583b607
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/managed_details/__snapshots__/index.test.tsx.snap
@@ -0,0 +1,173 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`userDetails search strategy parse should parse data correctly 1`] = `
+Object {
+  "inspect": Object {
+    "dsl": Array [
+      "{
+  \\"allow_no_indices\\": true,
+  \\"index\\": [
+    \\"logs-*\\"
+  ],
+  \\"ignore_unavailable\\": true,
+  \\"track_total_hits\\": false,
+  \\"body\\": {
+    \\"query\\": {
+      \\"bool\\": {
+        \\"filter\\": [
+          {
+            \\"term\\": {
+              \\"user.name\\": \\"test-user-name\\"
+            }
+          },
+          {
+            \\"term\\": {
+              \\"event.kind\\": \\"asset\\"
+            }
+          }
+        ]
+      }
+    },
+    \\"size\\": 1
+  },
+  \\"sort\\": [
+    {
+      \\"@timestamp\\": \\"desc\\"
+    }
+  ]
+}",
+    ],
+  },
+  "isPartial": false,
+  "isRunning": false,
+  "loaded": 21,
+  "rawResponse": Object {
+    "_shards": Object {
+      "failed": 0,
+      "skipped": 1,
+      "successful": 2,
+      "total": 2,
+    },
+    "hits": Object {
+      "hits": Array [
+        Object {
+          "_id": "9AxbIocB-WLv2258YZtS",
+          "_index": ".test",
+          "_score": null,
+          "_source": Object {
+            "@timestamp": "2023-02-23T20:03:17.489Z",
+            "agent": Object {
+              "ephemeral_id": "914fd1fa-aa37-4ab4-b36d-972ab9b19cde",
+              "id": "9528bb69-1511-4631-a5af-1d7e93c02009",
+              "name": "docker-fleet-agent",
+              "type": "filebeat",
+              "version": "8.8.0",
+            },
+            "event": Object {
+              "action": "user-discovered",
+              "agent_id_status": "verified",
+              "dataset": "entityanalytics_azure.users",
+              "ingested": "2023-02-23T20:03:18Z",
+              "kind": "asset",
+              "provider": "Azure AD",
+              "type": Array [
+                "user",
+                "info",
+              ],
+            },
+            "host": Object {
+              "architecture": "x86_64",
+              "hostname": "docker-fleet-agent",
+              "id": "cff3d165179d4aef9596ddbb263e3adb",
+              "ip": Array [
+                "172.26.0.7",
+              ],
+              "mac": Array [
+                "02-42-AC-1A-00-07",
+              ],
+              "name": "docker-fleet-agent",
+              "os": Object {
+                "family": "debian",
+                "kernel": "5.10.47-linuxkit",
+                "name": "Ubuntu",
+                "platform": "ubuntu",
+                "type": "linux",
+                "version": "20.04.5 LTS (Focal Fossa)",
+              },
+            },
+            "user": Object {
+              "email": "tes.user@elastic.co",
+              "first_name": "Taylor",
+              "full_name": "Test user",
+              "id": "39fac578-91fb-47f6-8f7a-fab05ce70d8b",
+              "last_name": "Test last name",
+              "phone": Array [
+                "1235559999",
+              ],
+            },
+          },
+          "sort": Array [
+            1677182597489,
+          ],
+        },
+      ],
+      "max_score": null,
+    },
+    "timed_out": false,
+    "took": 124,
+  },
+  "total": 21,
+  "userDetails": Object {
+    "@timestamp": "2023-02-23T20:03:17.489Z",
+    "agent": Object {
+      "ephemeral_id": "914fd1fa-aa37-4ab4-b36d-972ab9b19cde",
+      "id": "9528bb69-1511-4631-a5af-1d7e93c02009",
+      "name": "docker-fleet-agent",
+      "type": "filebeat",
+      "version": "8.8.0",
+    },
+    "event": Object {
+      "action": "user-discovered",
+      "agent_id_status": "verified",
+      "dataset": "entityanalytics_azure.users",
+      "ingested": "2023-02-23T20:03:18Z",
+      "kind": "asset",
+      "provider": "Azure AD",
+      "type": Array [
+        "user",
+        "info",
+      ],
+    },
+    "host": Object {
+      "architecture": "x86_64",
+      "hostname": "docker-fleet-agent",
+      "id": "cff3d165179d4aef9596ddbb263e3adb",
+      "ip": Array [
+        "172.26.0.7",
+      ],
+      "mac": Array [
+        "02-42-AC-1A-00-07",
+      ],
+      "name": "docker-fleet-agent",
+      "os": Object {
+        "family": "debian",
+        "kernel": "5.10.47-linuxkit",
+        "name": "Ubuntu",
+        "platform": "ubuntu",
+        "type": "linux",
+        "version": "20.04.5 LTS (Focal Fossa)",
+      },
+    },
+    "user": Object {
+      "email": "tes.user@elastic.co",
+      "first_name": "Taylor",
+      "full_name": "Test user",
+      "id": "39fac578-91fb-47f6-8f7a-fab05ce70d8b",
+      "last_name": "Test last name",
+      "phone": Array [
+        "1235559999",
+      ],
+    },
+  },
+}
+`;
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/managed_details/__snapshots__/query.managed_user_details.dsl.test.ts.snap b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/managed_details/__snapshots__/query.managed_user_details.dsl.test.ts.snap
new file mode 100644
index 0000000000000..12f5431941fd5
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/managed_details/__snapshots__/query.managed_user_details.dsl.test.ts.snap
@@ -0,0 +1,36 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`buildManagedUserDetailsQuery build query from options correctly 1`] = `
+Object {
+  "allow_no_indices": true,
+  "body": Object {
+    "query": Object {
+      "bool": Object {
+        "filter": Array [
+          Object {
+            "term": Object {
+              "user.name": "test-user-name",
+            },
+          },
+          Object {
+            "term": Object {
+              "event.kind": "asset",
+            },
+          },
+        ],
+      },
+    },
+    "size": 1,
+  },
+  "ignore_unavailable": true,
+  "index": Array [
+    "logs-*",
+  ],
+  "sort": Array [
+    Object {
+      "@timestamp": "desc",
+    },
+  ],
+  "track_total_hits": false,
+}
+`;
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/managed_details/index.test.tsx b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/managed_details/index.test.tsx
new file mode 100644
index 0000000000000..cbd601efa90fa
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/managed_details/index.test.tsx
@@ -0,0 +1,112 @@
+/*
+ * 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 * as buildQuery from './query.managed_user_details.dsl';
+import { managedUserDetails } from '.';
+import type {
+  AzureManagedUser,
+  ManagedUserDetailsRequestOptions,
+} from '../../../../../../common/search_strategy/security_solution/users/managed_details';
+import type { IEsSearchResponse } from '@kbn/data-plugin/public';
+
+export const mockOptions: ManagedUserDetailsRequestOptions = {
+  defaultIndex: ['logs-*'],
+  userName: 'test-user-name',
+};
+
+export const mockSearchStrategyResponse: IEsSearchResponse<AzureManagedUser> = {
+  isPartial: false,
+  isRunning: false,
+  rawResponse: {
+    took: 124,
+    timed_out: false,
+    _shards: {
+      total: 2,
+      successful: 2,
+      skipped: 1,
+      failed: 0,
+    },
+    hits: {
+      max_score: null,
+      hits: [
+        {
+          _index: '.test',
+          _id: '9AxbIocB-WLv2258YZtS',
+          _score: null,
+          _source: {
+            agent: {
+              name: 'docker-fleet-agent',
+              id: '9528bb69-1511-4631-a5af-1d7e93c02009',
+              type: 'filebeat',
+              ephemeral_id: '914fd1fa-aa37-4ab4-b36d-972ab9b19cde',
+              version: '8.8.0',
+            },
+            '@timestamp': '2023-02-23T20:03:17.489Z',
+            host: {
+              hostname: 'docker-fleet-agent',
+              os: {
+                kernel: '5.10.47-linuxkit',
+                name: 'Ubuntu',
+                type: 'linux',
+                family: 'debian',
+                version: '20.04.5 LTS (Focal Fossa)',
+                platform: 'ubuntu',
+              },
+              ip: ['172.26.0.7'],
+              name: 'docker-fleet-agent',
+              id: 'cff3d165179d4aef9596ddbb263e3adb',
+              mac: ['02-42-AC-1A-00-07'],
+              architecture: 'x86_64',
+            },
+            event: {
+              agent_id_status: 'verified',
+              ingested: '2023-02-23T20:03:18Z',
+              provider: 'Azure AD',
+              kind: 'asset',
+              action: 'user-discovered',
+              type: ['user', 'info'],
+              dataset: 'entityanalytics_azure.users',
+            },
+            user: {
+              full_name: 'Test user',
+              phone: ['1235559999'],
+              last_name: 'Test last name',
+              id: '39fac578-91fb-47f6-8f7a-fab05ce70d8b',
+              first_name: 'Taylor',
+              email: 'tes.user@elastic.co',
+            },
+          },
+          sort: [1677182597489],
+        },
+      ],
+    },
+  },
+  total: 21,
+  loaded: 21,
+};
+
+describe('userDetails search strategy', () => {
+  const buildManagedUserDetailsQuery = jest.spyOn(buildQuery, 'buildManagedUserDetailsQuery');
+
+  afterEach(() => {
+    buildManagedUserDetailsQuery.mockClear();
+  });
+
+  describe('buildDsl', () => {
+    test('should build dsl query', () => {
+      managedUserDetails.buildDsl(mockOptions);
+      expect(buildManagedUserDetailsQuery).toHaveBeenCalledWith(mockOptions);
+    });
+  });
+
+  describe('parse', () => {
+    test('should parse data correctly', async () => {
+      const result = await managedUserDetails.parse(mockOptions, mockSearchStrategyResponse);
+      expect(result).toMatchSnapshot();
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/managed_details/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/managed_details/index.ts
new file mode 100644
index 0000000000000..def73159a4793
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/managed_details/index.ts
@@ -0,0 +1,40 @@
+/*
+ * 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 { IEsSearchResponse } from '@kbn/data-plugin/common';
+
+import { inspectStringifyObject } from '../../../../../utils/build_query';
+import type { SecuritySolutionFactory } from '../../types';
+import { buildManagedUserDetailsQuery } from './query.managed_user_details.dsl';
+
+import type { UsersQueries } from '../../../../../../common/search_strategy/security_solution/users';
+import type {
+  AzureManagedUser,
+  ManagedUserDetailsRequestOptions,
+  ManagedUserDetailsStrategyResponse,
+} from '../../../../../../common/search_strategy/security_solution/users/managed_details';
+
+export const managedUserDetails: SecuritySolutionFactory<UsersQueries.managedDetails> = {
+  buildDsl: (options: ManagedUserDetailsRequestOptions) => buildManagedUserDetailsQuery(options),
+  parse: async (
+    options: ManagedUserDetailsRequestOptions,
+    response: IEsSearchResponse<AzureManagedUser>
+  ): Promise<ManagedUserDetailsStrategyResponse> => {
+    const inspect = {
+      dsl: [inspectStringifyObject(buildManagedUserDetailsQuery(options))],
+    };
+
+    const hits = response.rawResponse.hits.hits;
+    const userDetails = hits.length > 0 ? hits[0]._source : undefined;
+
+    return {
+      ...response,
+      inspect,
+      userDetails,
+    };
+  },
+};
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/managed_details/query.managed_user_details.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/managed_details/query.managed_user_details.dsl.test.ts
new file mode 100644
index 0000000000000..9f29bc98f287f
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/managed_details/query.managed_user_details.dsl.test.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.
+ */
+
+import type { ManagedUserDetailsRequestOptions } from '../../../../../../common/search_strategy/security_solution/users/managed_details';
+import { buildManagedUserDetailsQuery } from './query.managed_user_details.dsl';
+
+export const mockOptions: ManagedUserDetailsRequestOptions = {
+  defaultIndex: ['logs-*'],
+  userName: 'test-user-name',
+};
+
+describe('buildManagedUserDetailsQuery', () => {
+  test('build query from options correctly', () => {
+    expect(buildManagedUserDetailsQuery(mockOptions)).toMatchSnapshot();
+  });
+});
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/managed_details/query.managed_user_details.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/managed_details/query.managed_user_details.dsl.ts
new file mode 100644
index 0000000000000..8af2bbee0aa0a
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/managed_details/query.managed_user_details.dsl.ts
@@ -0,0 +1,31 @@
+/*
+ * 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 { ISearchRequestParams } from '@kbn/data-plugin/common';
+import { EVENT_KIND_ASSET_FILTER } from '../../../../../../common/search_strategy';
+import type { ManagedUserDetailsRequestOptions } from '../../../../../../common/search_strategy/security_solution/users/managed_details';
+
+export const buildManagedUserDetailsQuery = ({
+  userName,
+  defaultIndex,
+}: ManagedUserDetailsRequestOptions): ISearchRequestParams => {
+  const filter = [{ term: { 'user.name': userName } }, EVENT_KIND_ASSET_FILTER];
+
+  const dslQuery = {
+    allow_no_indices: true,
+    index: defaultIndex,
+    ignore_unavailable: true,
+    track_total_hits: false,
+    body: {
+      query: { bool: { filter } },
+      size: 1,
+    },
+    sort: [{ '@timestamp': 'desc' }],
+  };
+
+  return dslQuery;
+};
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/__mocks__/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/__mocks__/index.ts
similarity index 91%
rename from x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/__mocks__/index.ts
rename to x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/__mocks__/index.ts
index 5ec7aeea9e117..9cf6a6089e21e 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/__mocks__/index.ts
@@ -8,11 +8,11 @@
 import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 import { UsersQueries } from '../../../../../../../common/search_strategy/security_solution/users';
 
-import type { UserDetailsRequestOptions } from '../../../../../../../common/search_strategy/security_solution/users/details';
+import type { ObservedUserDetailsRequestOptions } from '../../../../../../../common/search_strategy/security_solution/users/observed_details';
 
-export const mockOptions: UserDetailsRequestOptions = {
+export const mockOptions: ObservedUserDetailsRequestOptions = {
   defaultIndex: ['test_indices*'],
-  factoryQueryType: UsersQueries.details,
+  factoryQueryType: UsersQueries.observedDetails,
   filterQuery:
     '{"bool":{"must":[],"filter":[{"match_all":{}},{"match_phrase":{"user.name":{"query":"test_user"}}}],"should":[],"must_not":[]}}',
   timerange: {
@@ -22,7 +22,7 @@ export const mockOptions: UserDetailsRequestOptions = {
   },
   params: {},
   userName: 'bastion00.siem.estc.dev',
-} as UserDetailsRequestOptions;
+} as ObservedUserDetailsRequestOptions;
 
 export const mockSearchStrategyResponse: IEsSearchResponse<unknown> = {
   rawResponse: {
@@ -125,14 +125,6 @@ export const mockSearchStrategyResponse: IEsSearchResponse<unknown> = {
           },
         ],
       },
-      first_seen: {
-        value: 1644837532000,
-        value_as_string: '2022-02-14T11:18:52.000Z',
-      },
-      last_seen: {
-        value: 1644837532000,
-        value_as_string: '2022-02-14T11:18:52.000Z',
-      },
       user_domain: {
         doc_count_error_upper_bound: 0,
         sum_other_doc_count: 0,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/__snapshots__/index.test.tsx.snap
similarity index 94%
rename from x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/__snapshots__/index.test.tsx.snap
rename to x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/__snapshots__/index.test.tsx.snap
index 2dcdb43bef47c..915b71e05cc3e 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/__snapshots__/index.test.tsx.snap
@@ -116,6 +116,25 @@ Object {
     \\"query\\": {
       \\"bool\\": {
         \\"filter\\": [
+          {
+            \\"bool\\": {
+              \\"must\\": [],
+              \\"filter\\": [
+                {
+                  \\"match_all\\": {}
+                },
+                {
+                  \\"match_phrase\\": {
+                    \\"user.name\\": {
+                      \\"query\\": \\"test_user\\"
+                    }
+                  }
+                }
+              ],
+              \\"should\\": [],
+              \\"must_not\\": []
+            }
+          },
           {
             \\"term\\": {
               \\"user.name\\": \\"bastion00.siem.estc.dev\\"
@@ -149,10 +168,6 @@ Object {
       "total": 2,
     },
     "aggregations": Object {
-      "first_seen": Object {
-        "value": 1644837532000,
-        "value_as_string": "2022-02-14T11:18:52.000Z",
-      },
       "host_ip": Object {
         "buckets": Array [
           Object {
@@ -267,10 +282,6 @@ Object {
         "doc_count_error_upper_bound": 0,
         "sum_other_doc_count": 0,
       },
-      "last_seen": Object {
-        "value": 1644837532000,
-        "value_as_string": "2022-02-14T11:18:52.000Z",
-      },
       "user_domain": Object {
         "buckets": Array [
           Object {
@@ -323,7 +334,6 @@ Object {
   },
   "total": 2,
   "userDetails": Object {
-    "firstSeen": "2022-02-14T11:18:52.000Z",
     "host": Object {
       "ip": Array [
         "11.245.5.152",
@@ -346,7 +356,6 @@ Object {
         ],
       },
     },
-    "lastSeen": "2022-02-14T11:18:52.000Z",
     "user": Object {
       "domain": Array [
         "NT AUTHORITY",
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/__snapshots__/query.user_details.dsl.test.ts.snap b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/__snapshots__/query.observed_user_details.dsl.test.ts.snap
similarity index 85%
rename from x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/__snapshots__/query.user_details.dsl.test.ts.snap
rename to x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/__snapshots__/query.observed_user_details.dsl.test.ts.snap
index 2cbfa200b3d6b..0815b6851c936 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/__snapshots__/query.user_details.dsl.test.ts.snap
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/__snapshots__/query.observed_user_details.dsl.test.ts.snap
@@ -108,6 +108,25 @@ Object {
     "query": Object {
       "bool": Object {
         "filter": Array [
+          Object {
+            "bool": Object {
+              "filter": Array [
+                Object {
+                  "match_all": Object {},
+                },
+                Object {
+                  "match_phrase": Object {
+                    "user.name": Object {
+                      "query": "test_user",
+                    },
+                  },
+                },
+              ],
+              "must": Array [],
+              "must_not": Array [],
+              "should": Array [],
+            },
+          },
           Object {
             "term": Object {
               "user.name": "bastion00.siem.estc.dev",
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/helper.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/helper.test.ts
similarity index 85%
rename from x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/helper.test.ts
rename to x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/helper.test.ts
index b8d6b442483b3..b36e8bc9b1cc8 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/helper.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/helper.test.ts
@@ -24,13 +24,9 @@ describe('helpers', () => {
           },
         ],
       },
-      first_seen: { value_as_string: '123456789' },
-      last_seen: { value_as_string: '987654321' },
     };
 
     expect(formatUserItem(aggregations)).toEqual({
-      firstSeen: '123456789',
-      lastSeen: '987654321',
       user: { id: [userId] },
     });
   });
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/helpers.ts
similarity index 86%
rename from x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/helpers.ts
rename to x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/helpers.ts
index f6c9f1d194215..14ba6c3496290 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/helpers.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/helpers.ts
@@ -25,11 +25,6 @@ export const USER_FIELDS = [
 export const fieldNameToAggField = (fieldName: string) => fieldName.replace(/\./g, '_');
 
 export const formatUserItem = (aggregations: UserAggEsItem): UserItem => {
-  const firstLastSeen = {
-    firstSeen: get('first_seen.value_as_string', aggregations),
-    lastSeen: get('last_seen.value_as_string', aggregations),
-  };
-
   return USER_FIELDS.reduce<UserItem>((flattenedFields, fieldName) => {
     const aggField = fieldNameToAggField(fieldName);
 
@@ -40,5 +35,5 @@ export const formatUserItem = (aggregations: UserAggEsItem): UserItem => {
       return set(fieldName, fieldValue, flattenedFields);
     }
     return flattenedFields;
-  }, firstLastSeen);
+  }, {});
 };
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/index.test.tsx b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/index.test.tsx
similarity index 59%
rename from x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/index.test.tsx
rename to x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/index.test.tsx
index bd23c37ff24f9..9666615297f0d 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/index.test.tsx
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/index.test.tsx
@@ -5,27 +5,27 @@
  * 2.0.
  */
 
-import * as buildQuery from './query.user_details.dsl';
-import { userDetails } from '.';
+import * as buildQuery from './query.observed_user_details.dsl';
+import { observedUserDetails } from '.';
 import { mockOptions, mockSearchStrategyResponse } from './__mocks__';
 
 describe('userDetails search strategy', () => {
-  const buildHostDetailsQuery = jest.spyOn(buildQuery, 'buildUserDetailsQuery');
+  const buildUserDetailsQuery = jest.spyOn(buildQuery, 'buildObservedUserDetailsQuery');
 
   afterEach(() => {
-    buildHostDetailsQuery.mockClear();
+    buildUserDetailsQuery.mockClear();
   });
 
   describe('buildDsl', () => {
     test('should build dsl query', () => {
-      userDetails.buildDsl(mockOptions);
-      expect(buildHostDetailsQuery).toHaveBeenCalledWith(mockOptions);
+      observedUserDetails.buildDsl(mockOptions);
+      expect(buildUserDetailsQuery).toHaveBeenCalledWith(mockOptions);
     });
   });
 
   describe('parse', () => {
     test('should parse data correctly', async () => {
-      const result = await userDetails.parse(mockOptions, mockSearchStrategyResponse);
+      const result = await observedUserDetails.parse(mockOptions, mockSearchStrategyResponse);
       expect(result).toMatchSnapshot();
     });
   });
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/index.ts
similarity index 64%
rename from x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/index.ts
rename to x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/index.ts
index c57c5a21f6c77..7fd64694fc198 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/index.ts
@@ -9,25 +9,25 @@ import type { IEsSearchResponse } from '@kbn/data-plugin/common';
 
 import { inspectStringifyObject } from '../../../../../utils/build_query';
 import type { SecuritySolutionFactory } from '../../types';
-import { buildUserDetailsQuery } from './query.user_details.dsl';
+import { buildObservedUserDetailsQuery } from './query.observed_user_details.dsl';
 
 import type { UsersQueries } from '../../../../../../common/search_strategy/security_solution/users';
 import type {
-  UserDetailsRequestOptions,
-  UserDetailsStrategyResponse,
-} from '../../../../../../common/search_strategy/security_solution/users/details';
+  ObservedUserDetailsRequestOptions,
+  ObservedUserDetailsStrategyResponse,
+} from '../../../../../../common/search_strategy/security_solution/users/observed_details';
 import { formatUserItem } from './helpers';
 
-export const userDetails: SecuritySolutionFactory<UsersQueries.details> = {
-  buildDsl: (options: UserDetailsRequestOptions) => buildUserDetailsQuery(options),
+export const observedUserDetails: SecuritySolutionFactory<UsersQueries.observedDetails> = {
+  buildDsl: (options: ObservedUserDetailsRequestOptions) => buildObservedUserDetailsQuery(options),
   parse: async (
-    options: UserDetailsRequestOptions,
+    options: ObservedUserDetailsRequestOptions,
     response: IEsSearchResponse<unknown>
-  ): Promise<UserDetailsStrategyResponse> => {
+  ): Promise<ObservedUserDetailsStrategyResponse> => {
     const aggregations = response.rawResponse.aggregations;
 
     const inspect = {
-      dsl: [inspectStringifyObject(buildUserDetailsQuery(options))],
+      dsl: [inspectStringifyObject(buildObservedUserDetailsQuery(options))],
     };
 
     if (aggregations == null) {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/query.user_details.dsl.test.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/query.observed_user_details.dsl.test.ts
similarity index 71%
rename from x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/query.user_details.dsl.test.ts
rename to x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/query.observed_user_details.dsl.test.ts
index 394890ad163e1..82943d6257a32 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/query.user_details.dsl.test.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/query.observed_user_details.dsl.test.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { buildUserDetailsQuery } from './query.user_details.dsl';
+import { buildObservedUserDetailsQuery } from './query.observed_user_details.dsl';
 import { mockOptions } from './__mocks__';
 
 describe('buildUserDetailsQuery', () => {
   test('build query from options correctly', () => {
-    expect(buildUserDetailsQuery(mockOptions)).toMatchSnapshot();
+    expect(buildObservedUserDetailsQuery(mockOptions)).toMatchSnapshot();
   });
 });
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/query.user_details.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/query.observed_user_details.dsl.ts
similarity index 65%
rename from x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/query.user_details.dsl.ts
rename to x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/query.observed_user_details.dsl.ts
index 93c3624b8597d..efbf49231486e 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/details/query.user_details.dsl.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/users/observed_details/query.observed_user_details.dsl.ts
@@ -5,17 +5,21 @@
  * 2.0.
  */
 
+import type { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { ISearchRequestParams } from '@kbn/data-plugin/common';
-import type { UserDetailsRequestOptions } from '../../../../../../common/search_strategy/security_solution/users/details';
+import type { ObservedUserDetailsRequestOptions } from '../../../../../../common/search_strategy/security_solution/users/observed_details';
+import { createQueryFilterClauses } from '../../../../../utils/build_query';
 import { buildFieldsTermAggregation } from '../../hosts/details/helpers';
 import { USER_FIELDS } from './helpers';
 
-export const buildUserDetailsQuery = ({
+export const buildObservedUserDetailsQuery = ({
   userName,
   defaultIndex,
   timerange: { from, to },
-}: UserDetailsRequestOptions): ISearchRequestParams => {
-  const filter = [
+  filterQuery,
+}: ObservedUserDetailsRequestOptions): ISearchRequestParams => {
+  const filter: QueryDslQueryContainer[] = [
+    ...createQueryFilterClauses(filterQuery),
     { term: { 'user.name': userName } },
     {
       range: {
diff --git a/x-pack/plugins/security_solution/tsconfig.json b/x-pack/plugins/security_solution/tsconfig.json
index 4d179e84f6dcb..bfc45e92c36a5 100644
--- a/x-pack/plugins/security_solution/tsconfig.json
+++ b/x-pack/plugins/security_solution/tsconfig.json
@@ -152,6 +152,7 @@
     "@kbn/core-analytics-server",
     "@kbn/analytics-client",
     "@kbn/security-solution-side-nav",
-    "@kbn/core-lifecycle-browser"
+    "@kbn/core-lifecycle-browser",
+    "@kbn/ecs",
   ]
 }

From ad2d5adf4347e9323ed318db790f53efd61a0d28 Mon Sep 17 00:00:00 2001
From: Xavier Mouligneau <xavier.mouligneau@elastic.co>
Date: Tue, 18 Apr 2023 11:02:25 -0400
Subject: [PATCH 033/100] [RAM] ResponseOps saved object updates (#152857)

## Summary

This PR is just the first phase for response ops to go through their
saved object attributes. The idea is to comment out all the attributes
that we all agree that we do not need to filter/search/sort/aggregate
on.

After, in a second phase/PR, we will create a new file who will
represent all of attributes in our saved object as a source of truth.
Then, we will generate our SO mappings from this source of truth to
register our saved object.

Phase 3, we will try to generate also our type from our source of truth.

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
---
 .../group2/check_registered_types.test.ts     |  12 +-
 .../actions/server/saved_objects/index.ts     |   9 +-
 .../server/saved_objects/mappings.json        |  74 ----------
 .../actions/server/saved_objects/mappings.ts  |  93 +++++++++++++
 .../alerting/server/saved_objects/mappings.ts | 128 +++++++++---------
 .../saved_objects/rules_settings_mappings.ts  |  58 ++++----
 .../server/saved_objects/index.ts             |   6 +-
 .../server/saved_objects/mappings.json        |  55 --------
 .../server/saved_objects/mappings.ts          |  66 +++++++++
 .../task_manager/task_management.ts           |   6 +-
 10 files changed, 271 insertions(+), 236 deletions(-)
 delete mode 100644 x-pack/plugins/actions/server/saved_objects/mappings.json
 create mode 100644 x-pack/plugins/actions/server/saved_objects/mappings.ts
 delete mode 100644 x-pack/plugins/task_manager/server/saved_objects/mappings.json
 create mode 100644 x-pack/plugins/task_manager/server/saved_objects/mappings.ts

diff --git a/src/core/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts
index 09977e1c272ab..4ef2e37cad8e6 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts
@@ -55,9 +55,9 @@ describe('checking migration metadata changes on all registered SO types', () =>
 
     expect(hashMap).toMatchInlineSnapshot(`
       Object {
-        "action": "6cfc277ed3211639e37546ac625f4a68f2494215",
-        "action_task_params": "5f419caba96dd8c77d0f94013e71d43890e3d5d6",
-        "alert": "7bec97d7775a025ecf36a33baf17386b9e7b4c3c",
+        "action": "12c6b25ef1fffb36d8de893318f8a2bc5d6a46a6",
+        "action_task_params": "c725c37de66135934150465f9b1e76fe349e8a23",
+        "alert": "0cd1f1921014004a9ff5c0a9333ca9bde14bf748",
         "api_key_pending_invalidation": "16e7bcf8e78764102d7f525542d5b616809a21ee",
         "apm-indices": "d19dd7fb51f2d2cbc1f8769481721e0953f9a6d2",
         "apm-server-schema": "1d42f17eff9ec6c16d3a9324d9539e2d123d0a9a",
@@ -77,7 +77,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "cases-user-actions": "8ad74294b71edffa58fad7a40eea2388209477c9",
         "config": "97e16b8f5dc10c404fd3b201ef36bc6c3c63dc80",
         "config-global": "d9791e8f73edee884630e1cb6e4954ae513ce75e",
-        "connector_token": "fb05ff5afdcb6e2f20c9c6513ff7a1ab12b66f36",
+        "connector_token": "aff1aa0ebc0a6b44b570057972af25178b0bca42",
         "core-usage-stats": "b3c04da317c957741ebcdedfea4524049fdc79ff",
         "csp-rule-template": "099c229bf97578d9ca72b3a672d397559b84ee0b",
         "dashboard": "71e3f8dfcffeb5fbd410dec81ce46f5691763c43",
@@ -124,7 +124,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "osquery-pack-asset": "18e08979d46ee7e5538f54c080aec4d8c58516ca",
         "osquery-saved-query": "f5e4e303f65c7607248ea8b2672f1ee30e4fb15e",
         "query": "cfc049e1f0574fb4fdb2d653d7c10bdc970a2610",
-        "rules-settings": "9854495c3b54b16a6625fb250c35e5504da72266",
+        "rules-settings": "eb8d40b7d60aeffe66831f7d5d83de28d85776d8",
         "sample-data-telemetry": "c38daf1a49ed24f2a4fb091e6e1e833fccf19935",
         "search": "ed3a9b1681b57d69560909d51933fdf17576ea68",
         "search-session": "fae0dfc63274d6a3b90ca583802c48cab8760637",
@@ -142,7 +142,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "synthetics-param": "9776c9b571d35f0d0397e8915e035ea1dc026db7",
         "synthetics-privates-locations": "7d032fc788905e32152029ae7ab3d6038c48ae44",
         "tag": "87f21f07df9cc37001b15a26e413c18f50d1fbfe",
-        "task": "ff760534a44c4cfabcf4baf8cfe8283f717cab02",
+        "task": "533ee80c50c47f0505846bfac73fc10962c5bc45",
         "telemetry": "561b329aaed3c15b91aaf2075645be3097247612",
         "ui-metric": "410a8ad28e0f44b161c960ff0ce950c712b17c52",
         "upgrade-assistant-ml-upgrade-operation": "d8816e5ce32649e7a3a43e2c406c632319ff84bb",
diff --git a/x-pack/plugins/actions/server/saved_objects/index.ts b/x-pack/plugins/actions/server/saved_objects/index.ts
index 27850b6945a21..a110320586750 100644
--- a/x-pack/plugins/actions/server/saved_objects/index.ts
+++ b/x-pack/plugins/actions/server/saved_objects/index.ts
@@ -9,11 +9,10 @@ import type {
   SavedObject,
   SavedObjectsExportTransformContext,
   SavedObjectsServiceSetup,
-  SavedObjectsTypeMappingDefinition,
 } from '@kbn/core/server';
 import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
 import { getOldestIdleActionTask } from '@kbn/task-manager-plugin/server';
-import mappings from './mappings.json';
+import { actionMappings, actionTaskParamsMappings, connectorTokenMappings } from './mappings';
 import { getActionsMigrations } from './actions_migrations';
 import { getActionTaskParamsMigrations } from './action_task_params_migrations';
 import { PreConfiguredAction, RawAction } from '../types';
@@ -38,7 +37,7 @@ export function setupSavedObjects(
     hidden: true,
     namespaceType: 'multiple-isolated',
     convertToMultiNamespaceTypeVersion: '8.0.0',
-    mappings: mappings.action as SavedObjectsTypeMappingDefinition,
+    mappings: actionMappings,
     migrations: getActionsMigrations(encryptedSavedObjects),
     management: {
       displayName: 'connector',
@@ -76,7 +75,7 @@ export function setupSavedObjects(
     hidden: true,
     namespaceType: 'multiple-isolated',
     convertToMultiNamespaceTypeVersion: '8.0.0',
-    mappings: mappings.action_task_params as SavedObjectsTypeMappingDefinition,
+    mappings: actionTaskParamsMappings,
     migrations: getActionTaskParamsMigrations(encryptedSavedObjects, preconfiguredActions),
     excludeOnUpgrade: async ({ readonlyEsClient }) => {
       const oldestIdleActionTask = await getOldestIdleActionTask(
@@ -102,7 +101,7 @@ export function setupSavedObjects(
     name: CONNECTOR_TOKEN_SAVED_OBJECT_TYPE,
     hidden: true,
     namespaceType: 'agnostic',
-    mappings: mappings.connector_token as SavedObjectsTypeMappingDefinition,
+    mappings: connectorTokenMappings,
     management: {
       importableAndExportable: false,
     },
diff --git a/x-pack/plugins/actions/server/saved_objects/mappings.json b/x-pack/plugins/actions/server/saved_objects/mappings.json
deleted file mode 100644
index be0a691f852b2..0000000000000
--- a/x-pack/plugins/actions/server/saved_objects/mappings.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "action": {
-    "properties": {
-      "name": {
-        "type": "text",
-        "fields": {
-          "keyword": {
-            "type": "keyword"
-          }
-        }
-      },
-      "actionTypeId": {
-        "type": "keyword"
-      },
-      "isMissingSecrets": {
-        "type": "boolean"
-      },
-      "config": {
-        "enabled": false,
-        "type": "object"
-      },
-      "secrets": {
-        "type": "binary"
-      }
-    }
-  },
-  "action_task_params": {
-    "dynamic": false,
-    "properties": {
-      "actionId": {
-        "type": "keyword"
-      },
-      "consumer": {
-        "type": "keyword"
-      },
-      "params": {
-        "enabled": false,
-        "type": "object"
-      },
-      "apiKey": {
-        "type": "binary"
-      },
-      "executionId": {
-        "type": "keyword"
-      },
-      "relatedSavedObjects": {
-        "enabled": false,
-        "type": "object"
-      }
-    }
-  },
-  "connector_token": {
-    "properties": {
-      "connectorId": {
-        "type": "keyword"
-      },
-      "tokenType": {
-        "type": "keyword"
-      },
-      "token": {
-        "type": "binary"
-      },
-      "expiresAt": {
-        "type": "date"
-      },
-      "createdAt": {
-        "type": "date"
-      },
-      "updatedAt": {
-        "type": "date"
-      }
-    }
-  }
-}
diff --git a/x-pack/plugins/actions/server/saved_objects/mappings.ts b/x-pack/plugins/actions/server/saved_objects/mappings.ts
new file mode 100644
index 0000000000000..70e3e7447a6a0
--- /dev/null
+++ b/x-pack/plugins/actions/server/saved_objects/mappings.ts
@@ -0,0 +1,93 @@
+/*
+ * 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 { SavedObjectsTypeMappingDefinition } from '@kbn/core/server';
+
+export const actionMappings: SavedObjectsTypeMappingDefinition = {
+  dynamic: false,
+  properties: {
+    name: {
+      type: 'text',
+      fields: {
+        keyword: {
+          type: 'keyword',
+        },
+      },
+    },
+    actionTypeId: {
+      type: 'keyword',
+    },
+    // NO NEED TO BE INDEXED
+    // isMissingSecrets: {
+    //   type: 'boolean',
+    // },
+    // NO NEED TO BE INDEXED
+    // config: {
+    //   enabled: false,
+    //   type: 'object',
+    // },
+    // NEED TO CHECK WITH KIBANA SECURITY
+    // secrets: {
+    //   type: 'binary',
+    // },
+  },
+};
+
+export const actionTaskParamsMappings: SavedObjectsTypeMappingDefinition = {
+  dynamic: false,
+  properties: {
+    // NO NEED TO BE INDEXED
+    // actionId: {
+    //   type: 'keyword',
+    // },
+    // consumer: {
+    //   type: 'keyword',
+    // },
+    // params: {
+    //   enabled: false,
+    //   type: 'object',
+    // },
+    // apiKey: {
+    //   type: 'binary',
+    // },
+    // executionId: {
+    //   type: 'keyword',
+    // },
+    // relatedSavedObjects: {
+    //   enabled: false,
+    //   type: 'object',
+    // },
+    // source: {
+    //   type: 'keyword'
+    // }
+  },
+};
+
+export const connectorTokenMappings: SavedObjectsTypeMappingDefinition = {
+  dynamic: false,
+  properties: {
+    connectorId: {
+      type: 'keyword',
+    },
+    tokenType: {
+      type: 'keyword',
+    },
+    // NO NEED TO BE INDEXED
+    // token: {
+    //   type: 'binary',
+    // },
+    // expiresAt: {
+    //   type: 'date',
+    // },
+    // createdAt: {
+    //   type: 'date',
+    // },
+    // updatedAt: {
+    //   type: 'date',
+    // },
+  },
+};
diff --git a/x-pack/plugins/alerting/server/saved_objects/mappings.ts b/x-pack/plugins/alerting/server/saved_objects/mappings.ts
index 9ee204bb53896..2cec5bdd449e6 100644
--- a/x-pack/plugins/alerting/server/saved_objects/mappings.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/mappings.ts
@@ -6,7 +6,6 @@
  */
 
 import { SavedObjectsTypeMappingDefinition } from '@kbn/core/server';
-import { rRuleMappingsField } from './rrule_mappings_field';
 
 export const alertMappings: SavedObjectsTypeMappingDefinition = {
   dynamic: false,
@@ -55,26 +54,27 @@ export const alertMappings: SavedObjectsTypeMappingDefinition = {
         actionTypeId: {
           type: 'keyword',
         },
-        params: {
-          dynamic: false,
-          properties: {},
-        },
-        frequency: {
-          properties: {
-            summary: {
-              index: false,
-              type: 'boolean',
-            },
-            notifyWhen: {
-              index: false,
-              type: 'keyword',
-            },
-            throttle: {
-              index: false,
-              type: 'keyword',
-            },
-          },
-        },
+        // NO NEED TO BE INDEXED
+        // params: {
+        //   dynamic: false,
+        //   properties: {},
+        // },
+        // frequency: {
+        //   properties: {
+        //     summary: {
+        //       index: false,
+        //       type: 'boolean',
+        //     },
+        //     notifyWhen: {
+        //       index: false,
+        //       type: 'keyword',
+        //     },
+        //     throttle: {
+        //       index: false,
+        //       type: 'keyword',
+        //     },
+        //   },
+        // },
       },
     },
     params: {
@@ -106,12 +106,14 @@ export const alertMappings: SavedObjectsTypeMappingDefinition = {
     updatedAt: {
       type: 'date',
     },
-    apiKey: {
-      type: 'binary',
-    },
-    apiKeyOwner: {
-      type: 'keyword',
-    },
+    // NEED TO CHECK WITH KIBANA SECURITY
+    // apiKey: {
+    //   type: 'binary',
+    // },
+    // NO NEED TO BE INDEXED
+    // apiKeyOwner: {
+    //   type: 'keyword',
+    // },
     throttle: {
       type: 'keyword',
     },
@@ -124,33 +126,34 @@ export const alertMappings: SavedObjectsTypeMappingDefinition = {
     mutedInstanceIds: {
       type: 'keyword',
     },
-    meta: {
-      properties: {
-        versionApiKeyLastmodified: {
-          type: 'keyword',
-        },
-      },
-    },
+    // NO NEED TO BE INDEXED
+    // meta: {
+    //   properties: {
+    //     versionApiKeyLastmodified: {
+    //       type: 'keyword',
+    //     },
+    //   },
+    // },
     monitoring: {
       properties: {
         run: {
           properties: {
-            history: {
-              properties: {
-                duration: {
-                  type: 'long',
-                },
-                success: {
-                  type: 'boolean',
-                },
-                timestamp: {
-                  type: 'date',
-                },
-                outcome: {
-                  type: 'keyword',
-                },
-              },
-            },
+            // history: {
+            //   properties: {
+            //     duration: {
+            //       type: 'long',
+            //     },
+            //     success: {
+            //       type: 'boolean',
+            //     },
+            //     timestamp: {
+            //       type: 'date',
+            //     },
+            //     outcome: {
+            //       type: 'keyword',
+            //     },
+            //   },
+            // },
             calculated_metrics: {
               properties: {
                 p50: {
@@ -200,8 +203,8 @@ export const alertMappings: SavedObjectsTypeMappingDefinition = {
         },
       },
     },
+    // There is need to query for a rule by a specific revision
     revision: {
-      index: true, // Explicitly setting to `true` as there is need to query for a rule by a specific revision
       type: 'long',
     },
     snoozeSchedule: {
@@ -217,12 +220,14 @@ export const alertMappings: SavedObjectsTypeMappingDefinition = {
           type: 'date',
           format: 'strict_date_time',
         },
-        rRule: rRuleMappingsField,
+        // NO NEED TO BE INDEXED
+        // rRule: rRuleMappingsField,
       },
     },
-    nextRun: {
-      type: 'date',
-    },
+    // NO NEED TO BE INDEXED
+    // nextRun: {
+    //   type: 'date',
+    // },
     // Deprecated, if you need to add new property please do it in `last_run`
     executionStatus: {
       properties: {
@@ -268,12 +273,13 @@ export const alertMappings: SavedObjectsTypeMappingDefinition = {
         outcomeOrder: {
           type: 'float',
         },
-        warning: {
-          type: 'text',
-        },
-        outcomeMsg: {
-          type: 'text',
-        },
+        // NO NEED TO BE INDEXED
+        // warning: {
+        //   type: 'text',
+        // },
+        // outcomeMsg: {
+        //   type: 'text',
+        // },
         alertsCount: {
           properties: {
             active: {
diff --git a/x-pack/plugins/alerting/server/saved_objects/rules_settings_mappings.ts b/x-pack/plugins/alerting/server/saved_objects/rules_settings_mappings.ts
index d20567edc2832..3f363a39e35fa 100644
--- a/x-pack/plugins/alerting/server/saved_objects/rules_settings_mappings.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/rules_settings_mappings.ts
@@ -8,37 +8,39 @@
 import { SavedObjectsTypeMappingDefinition } from '@kbn/core/server';
 
 export const rulesSettingsMappings: SavedObjectsTypeMappingDefinition = {
+  dynamic: false,
   properties: {
     flapping: {
       properties: {
-        enabled: {
-          type: 'boolean',
-          index: false,
-        },
-        lookBackWindow: {
-          type: 'long',
-          index: false,
-        },
-        statusChangeThreshold: {
-          type: 'long',
-          index: false,
-        },
-        createdBy: {
-          type: 'keyword',
-          index: false,
-        },
-        updatedBy: {
-          type: 'keyword',
-          index: false,
-        },
-        createdAt: {
-          type: 'date',
-          index: false,
-        },
-        updatedAt: {
-          type: 'date',
-          index: false,
-        },
+        // NO NEED TO BE INDEXED
+        // enabled: {
+        //   type: 'boolean',
+        //   index: false,
+        // },
+        // lookBackWindow: {
+        //   type: 'long',
+        //   index: false,
+        // },
+        // statusChangeThreshold: {
+        //   type: 'long',
+        //   index: false,
+        // },
+        // createdBy: {
+        //   type: 'keyword',
+        //   index: false,
+        // },
+        // updatedBy: {
+        //   type: 'keyword',
+        //   index: false,
+        // },
+        // createdAt: {
+        //   type: 'date',
+        //   index: false,
+        // },
+        // updatedAt: {
+        //   type: 'date',
+        //   index: false,
+        // },
       },
     },
   },
diff --git a/x-pack/plugins/task_manager/server/saved_objects/index.ts b/x-pack/plugins/task_manager/server/saved_objects/index.ts
index 2418346234a29..53d09d4baf131 100644
--- a/x-pack/plugins/task_manager/server/saved_objects/index.ts
+++ b/x-pack/plugins/task_manager/server/saved_objects/index.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import type { SavedObjectsServiceSetup, SavedObjectsTypeMappingDefinition } from '@kbn/core/server';
+import type { SavedObjectsServiceSetup } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import mappings from './mappings.json';
+import { taskMappings } from './mappings';
 import { getMigrations } from './migrations';
 import { TaskManagerConfig } from '../config';
 import { getOldestIdleActionTask } from '../queries/oldest_idle_action_task';
@@ -22,7 +22,7 @@ export function setupSavedObjects(
     namespaceType: 'agnostic',
     hidden: true,
     convertToAliasScript: `ctx._id = ctx._source.type + ':' + ctx._id; ctx._source.remove("kibana")`,
-    mappings: mappings.task as SavedObjectsTypeMappingDefinition,
+    mappings: taskMappings,
     migrations: getMigrations(),
     indexPattern: TASK_MANAGER_INDEX,
     excludeOnUpgrade: async ({ readonlyEsClient }) => {
diff --git a/x-pack/plugins/task_manager/server/saved_objects/mappings.json b/x-pack/plugins/task_manager/server/saved_objects/mappings.json
deleted file mode 100644
index 00129ac1bcdd4..0000000000000
--- a/x-pack/plugins/task_manager/server/saved_objects/mappings.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "task": {
-    "properties": {
-      "taskType": {
-        "type": "keyword"
-      },
-      "scheduledAt": {
-        "type": "date"
-      },
-      "runAt": {
-        "type": "date"
-      },
-      "startedAt": {
-        "type": "date"
-      },
-      "retryAt": {
-        "type": "date"
-      },
-      "enabled": {
-        "type": "boolean"
-      },
-      "schedule": {
-        "properties": {
-          "interval": {
-            "type": "keyword"
-          }
-        }
-      },
-      "attempts": {
-        "type": "integer"
-      },
-      "status": {
-        "type": "keyword"
-      },
-      "traceparent": {
-        "type": "text"
-      },
-      "params": {
-        "type": "text"
-      },
-      "state": {
-        "type": "text"
-      },
-      "user": {
-        "type": "keyword"
-      },
-      "scope": {
-        "type": "keyword"
-      },
-      "ownerId": {
-        "type": "keyword"
-      }
-    }
-  }
-}
diff --git a/x-pack/plugins/task_manager/server/saved_objects/mappings.ts b/x-pack/plugins/task_manager/server/saved_objects/mappings.ts
new file mode 100644
index 0000000000000..df38c78309e39
--- /dev/null
+++ b/x-pack/plugins/task_manager/server/saved_objects/mappings.ts
@@ -0,0 +1,66 @@
+/*
+ * 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 { SavedObjectsTypeMappingDefinition } from '@kbn/core/server';
+
+export const taskMappings: SavedObjectsTypeMappingDefinition = {
+  dynamic: false,
+  properties: {
+    taskType: {
+      type: 'keyword',
+    },
+    scheduledAt: {
+      type: 'date',
+    },
+    runAt: {
+      type: 'date',
+    },
+    // NO NEED TO BE INDEXED
+    // startedAt: {
+    //   type: 'date',
+    // },
+    retryAt: {
+      type: 'date',
+    },
+    enabled: {
+      type: 'boolean',
+    },
+    schedule: {
+      properties: {
+        interval: {
+          type: 'keyword',
+        },
+      },
+    },
+    attempts: {
+      type: 'integer',
+    },
+    status: {
+      type: 'keyword',
+    },
+    // NO NEED TO BE INDEXED
+    // traceparent: {
+    //   type: 'text',
+    // },
+    // params: {
+    //   type: 'text',
+    // },
+    // state: {
+    //   type: 'text',
+    // },
+    // NO NEED TO BE INDEXED
+    // user: {
+    //   type: 'keyword',
+    // },
+    scope: {
+      type: 'keyword',
+    },
+    ownerId: {
+      type: 'keyword',
+    },
+  },
+};
diff --git a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management.ts b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management.ts
index 987a498d420d2..f897e0fa05035 100644
--- a/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/task_manager/task_management.ts
@@ -9,13 +9,11 @@ import moment from 'moment';
 import { random } from 'lodash';
 import expect from '@kbn/expect';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import TaskManagerMapping from '@kbn/task-manager-plugin/server/saved_objects/mappings.json';
+import { taskMappings as TaskManagerMapping } from '@kbn/task-manager-plugin/server/saved_objects/mappings';
 import { ConcreteTaskInstance, BulkUpdateTaskResult } from '@kbn/task-manager-plugin/server';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
-const {
-  task: { properties: taskManagerIndexMapping },
-} = TaskManagerMapping;
+const { properties: taskManagerIndexMapping } = TaskManagerMapping;
 
 export interface RawDoc {
   _id: string;

From 7172905d632e8d7c695725043a7bc91887309e31 Mon Sep 17 00:00:00 2001
From: Ioana Tagirta <ioanatia@users.noreply.github.com>
Date: Tue, 18 Apr 2023 17:08:08 +0200
Subject: [PATCH 034/100] Exclude metadata fields from schema page (#155147)

Excludes metadata fields from schema page.

Given a mapping with 2 fields:
```
{
  "books": {
    "mappings": {
      "properties": {
        "author": {
          "type": "text",
          "fields": {
            "keyword": {
              "type": "keyword",
              "ignore_above": 256
            }
          }
        },
        "title": {
          "type": "text",
          "fields": {
            "keyword": {
              "type": "keyword",
              "ignore_above": 256
            }
          }
        }
      }
    }
  }
}
```

before:
<img width="1275" alt="Screenshot 2023-04-18 at 14 25 42"
src="https://user-images.githubusercontent.com/16032709/232776695-7027d3aa-0d68-4c1e-a787-906a6c6dbff6.png">

after:
<img width="1287" alt="Screenshot 2023-04-18 at 14 13 25"
src="https://user-images.githubusercontent.com/16032709/232776508-9a428350-40a8-43c3-a602-94aad49d8d97.png">
---
 .../server/lib/engines/field_capabilities.test.ts                | 1 +
 .../enterprise_search/server/lib/engines/field_capabilities.ts   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/x-pack/plugins/enterprise_search/server/lib/engines/field_capabilities.test.ts b/x-pack/plugins/enterprise_search/server/lib/engines/field_capabilities.test.ts
index d01c5bd9f0d79..f69d08b250af9 100644
--- a/x-pack/plugins/enterprise_search/server/lib/engines/field_capabilities.test.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/engines/field_capabilities.test.ts
@@ -72,6 +72,7 @@ describe('engines field_capabilities', () => {
         fields: '*',
         include_unmapped: true,
         index: ['index-001'],
+        filters: '-metadata',
       });
     });
   });
diff --git a/x-pack/plugins/enterprise_search/server/lib/engines/field_capabilities.ts b/x-pack/plugins/enterprise_search/server/lib/engines/field_capabilities.ts
index fd1fb28aa23ca..2494004919714 100644
--- a/x-pack/plugins/enterprise_search/server/lib/engines/field_capabilities.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/engines/field_capabilities.ts
@@ -23,6 +23,7 @@ export const fetchEngineFieldCapabilities = async (
     fields: '*',
     include_unmapped: true,
     index: indices,
+    filters: '-metadata',
   });
   const fields = parseFieldsCapabilities(fieldCapabilities);
   return {

From a7c988026346e0dbbc4ffed5815a0bd491f7c78b Mon Sep 17 00:00:00 2001
From: Navarone Feekery <13634519+navarone-feekery@users.noreply.github.com>
Date: Tue, 18 Apr 2023 17:29:05 +0200
Subject: [PATCH 035/100] [Enterprise Search] Add connector configurable field
 dependencies (#155039)

This PR hides a configurable field if its dependencies (document field
`depends_on`) are not satisfied.
Fields that have one or many dependencies also have some styling
changes.
---
 .../common/connectors/native_connectors.ts    | 14 ++++++++
 .../common/types/connectors.ts                | 12 +++++--
 .../__mocks__/search_indices.mock.ts          |  2 ++
 .../__mocks__/view_index.mock.ts              |  2 ++
 .../connector_configuration_form.tsx          | 31 +++++++++++++++--
 .../connector_configuration_logic.test.ts     | 23 +++++++++++++
 .../connector_configuration_logic.ts          | 34 ++++++++++++++-----
 7 files changed, 104 insertions(+), 14 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/common/connectors/native_connectors.ts b/x-pack/plugins/enterprise_search/common/connectors/native_connectors.ts
index 10c336540d9fa..aab72dce47f76 100644
--- a/x-pack/plugins/enterprise_search/common/connectors/native_connectors.ts
+++ b/x-pack/plugins/enterprise_search/common/connectors/native_connectors.ts
@@ -13,6 +13,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
   mongodb: {
     configuration: {
       host: {
+        depends_on: [],
         display: 'textbox',
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mongodb.configuration.hostLabel',
@@ -27,6 +28,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         value: '',
       },
       user: {
+        depends_on: [],
         display: 'textbox',
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mongodb.configuration.usernameLabel',
@@ -41,6 +43,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         value: '',
       },
       password: {
+        depends_on: [],
         display: 'textbox',
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mongodb.configuration.passwordLabel',
@@ -55,6 +58,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         value: '',
       },
       database: {
+        depends_on: [],
         display: 'textbox',
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mongodb.configuration.databaseLabel',
@@ -69,6 +73,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         value: '',
       },
       collection: {
+        depends_on: [],
         display: 'textbox',
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mongodb.configuration.collectionLabel',
@@ -83,6 +88,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         value: '',
       },
       direct_connection: {
+        depends_on: [],
         display: 'toggle',
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mongodb.configuration.directConnectionLabel',
@@ -113,6 +119,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
   mysql: {
     configuration: {
       host: {
+        depends_on: [],
         display: 'textbox',
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mysql.configuration.hostLabel',
@@ -127,6 +134,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         value: '',
       },
       port: {
+        depends_on: [],
         display: 'numeric',
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mysql.configuration.portLabel',
@@ -141,6 +149,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         value: '',
       },
       user: {
+        depends_on: [],
         display: 'textbox',
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mysql.configuration.usernameLabel',
@@ -155,6 +164,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         value: '',
       },
       password: {
+        depends_on: [],
         display: 'textbox',
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mysql.configuration.passwordLabel',
@@ -169,6 +179,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         value: '',
       },
       database: {
+        depends_on: [],
         display: 'textbox',
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mysql.configuration.databaseLabel',
@@ -183,6 +194,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         value: '',
       },
       tables: {
+        depends_on: [],
         display: 'textarea',
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mysql.configuration.tablesLabel',
@@ -197,6 +209,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         value: '',
       },
       ssl_enabled: {
+        depends_on: [],
         display: 'toggle',
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mysql.configuration.sslEnabledLabel',
@@ -211,6 +224,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         value: false,
       },
       ssl_ca: {
+        depends_on: [{ field: 'ssl_enabled', value: true }],
         display: 'textbox',
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mysql.configuration.sslCertificateLabel',
diff --git a/x-pack/plugins/enterprise_search/common/types/connectors.ts b/x-pack/plugins/enterprise_search/common/types/connectors.ts
index 554d871ae8181..ad312c41a2df2 100644
--- a/x-pack/plugins/enterprise_search/common/types/connectors.ts
+++ b/x-pack/plugins/enterprise_search/common/types/connectors.ts
@@ -5,15 +5,23 @@
  * 2.0.
  */
 
-export interface SelectOptions {
+export interface SelectOption {
   label: string;
   value: string;
 }
 
+export interface Dependency {
+  field: string;
+  value: string | number | boolean | null;
+}
+
+export type DependencyLookup = Record<string, string | number | boolean | null>;
+
 export interface ConnectorConfigProperties {
+  depends_on: Dependency[];
   display: string;
   label: string;
-  options: SelectOptions[];
+  options: SelectOption[];
   order?: number | null;
   required: boolean;
   sensitive: boolean;
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/search_indices.mock.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/search_indices.mock.ts
index 6de267dca4b2f..0ae7543eadd45 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/search_indices.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/search_indices.mock.ts
@@ -34,6 +34,7 @@ export const indices: ElasticsearchIndexWithIngestion[] = [
       api_key_id: null,
       configuration: {
         foo: {
+          depends_on: [],
           display: 'textbox',
           key: 'foo',
           label: 'bar',
@@ -141,6 +142,7 @@ export const indices: ElasticsearchIndexWithIngestion[] = [
       api_key_id: null,
       configuration: {
         foo: {
+          depends_on: [],
           display: 'textbox',
           key: 'foo',
           label: 'bar',
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/view_index.mock.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/view_index.mock.ts
index 3a799497993ba..517bad3746bc6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/view_index.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/view_index.mock.ts
@@ -44,6 +44,7 @@ export const connectorIndex: ConnectorViewIndex = {
     api_key_id: null,
     configuration: {
       foo: {
+        depends_on: [],
         display: 'textbox',
         key: 'foo',
         label: 'bar',
@@ -155,6 +156,7 @@ export const crawlerIndex: CrawlerViewIndex = {
     api_key_id: null,
     configuration: {
       foo: {
+        depends_on: [],
         display: 'textbox',
         key: 'foo',
         label: 'bar',
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_form.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_form.tsx
index 2ba55dc45c9a3..991e58a672016 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_form.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_form.tsx
@@ -16,16 +16,22 @@ import {
   EuiFlexItem,
   EuiButton,
   EuiButtonEmpty,
+  EuiPanel,
 } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 
 import { Status } from '../../../../../../common/types/api';
+import { DependencyLookup } from '../../../../../../common/types/connectors';
 
 import { ConnectorConfigurationApiLogic } from '../../../api/connector/update_connector_configuration_api_logic';
 
 import { ConnectorConfigurationField } from './connector_configuration_field';
-import { ConnectorConfigurationLogic } from './connector_configuration_logic';
+import {
+  ConfigEntry,
+  ConnectorConfigurationLogic,
+  dependenciesSatisfied,
+} from './connector_configuration_logic';
 
 export const ConnectorConfigurationForm = () => {
   const { status } = useValues(ConnectorConfigurationApiLogic);
@@ -33,6 +39,14 @@ export const ConnectorConfigurationForm = () => {
   const { localConfigView } = useValues(ConnectorConfigurationLogic);
   const { saveConfig, setIsEditing } = useActions(ConnectorConfigurationLogic);
 
+  const dependencyLookup: DependencyLookup = localConfigView.reduce(
+    (prev: Record<string, string | number | boolean | null>, configEntry: ConfigEntry) => ({
+      ...prev,
+      [configEntry.key]: configEntry.value,
+    }),
+    {}
+  );
+
   return (
     <EuiForm
       onSubmit={(event) => {
@@ -42,9 +56,20 @@ export const ConnectorConfigurationForm = () => {
       component="form"
     >
       {localConfigView.map((configEntry) => {
-        const { key, label } = configEntry;
+        const { depends_on: dependencies, key, label } = configEntry;
+        const hasDependencies = dependencies.length > 0;
 
-        return (
+        return hasDependencies ? (
+          dependenciesSatisfied(dependencies, dependencyLookup) ? (
+            <EuiPanel color="subdued" borderRadius="none">
+              <EuiFormRow label={label ?? ''} key={key}>
+                <ConnectorConfigurationField configEntry={configEntry} />
+              </EuiFormRow>
+            </EuiPanel>
+          ) : (
+            <></>
+          )
+        ) : (
           <EuiFormRow label={label ?? ''} key={key}>
             <ConnectorConfigurationField configEntry={configEntry} />
           </EuiFormRow>
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_logic.test.ts
index 13cbf2bc0a983..ebb173a3c42ca 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_logic.test.ts
@@ -52,6 +52,7 @@ describe('ConnectorConfigurationLogic', () => {
       ConnectorConfigurationApiLogic.actions.apiSuccess({
         configuration: {
           foo: {
+            depends_on: [],
             display: 'textbox',
             label: 'newBar',
             options: [],
@@ -67,6 +68,7 @@ describe('ConnectorConfigurationLogic', () => {
         ...DEFAULT_VALUES,
         configState: {
           foo: {
+            depends_on: [],
             display: 'textbox',
             label: 'newBar',
             options: [],
@@ -78,6 +80,7 @@ describe('ConnectorConfigurationLogic', () => {
         },
         configView: [
           {
+            depends_on: [],
             display: 'textbox',
             key: 'foo',
             label: 'newBar',
@@ -93,6 +96,7 @@ describe('ConnectorConfigurationLogic', () => {
     it('should set config on setConfigState', () => {
       ConnectorConfigurationLogic.actions.setConfigState({
         foo: {
+          depends_on: [],
           display: 'textbox',
           label: 'thirdBar',
           options: [],
@@ -106,6 +110,7 @@ describe('ConnectorConfigurationLogic', () => {
         ...DEFAULT_VALUES,
         configState: {
           foo: {
+            depends_on: [],
             display: 'textbox',
             label: 'thirdBar',
             options: [],
@@ -117,6 +122,7 @@ describe('ConnectorConfigurationLogic', () => {
         },
         configView: [
           {
+            depends_on: [],
             display: 'textbox',
             key: 'foo',
             label: 'thirdBar',
@@ -133,6 +139,7 @@ describe('ConnectorConfigurationLogic', () => {
       it('should set local config entry and sort keys', () => {
         ConnectorConfigurationLogic.actions.setConfigState({
           bar: {
+            depends_on: [],
             display: 'textbox',
             label: 'foo',
             options: [],
@@ -142,6 +149,7 @@ describe('ConnectorConfigurationLogic', () => {
             value: 'foofoo',
           },
           password: {
+            depends_on: [],
             display: 'textbox',
             label: 'thirdBar',
             options: [],
@@ -153,6 +161,7 @@ describe('ConnectorConfigurationLogic', () => {
         });
         ConnectorConfigurationLogic.actions.setLocalConfigState({
           bar: {
+            depends_on: [],
             display: 'textbox',
             label: 'foo',
             options: [],
@@ -162,6 +171,7 @@ describe('ConnectorConfigurationLogic', () => {
             value: 'foofoo',
           },
           password: {
+            depends_on: [],
             display: 'textbox',
             label: 'thirdBar',
             options: [],
@@ -172,6 +182,7 @@ describe('ConnectorConfigurationLogic', () => {
           },
         });
         ConnectorConfigurationLogic.actions.setLocalConfigEntry({
+          depends_on: [],
           display: 'textbox',
           key: 'bar',
           label: 'foo',
@@ -185,6 +196,7 @@ describe('ConnectorConfigurationLogic', () => {
           ...DEFAULT_VALUES,
           configState: {
             bar: {
+              depends_on: [],
               display: 'textbox',
               label: 'foo',
               options: [],
@@ -194,6 +206,7 @@ describe('ConnectorConfigurationLogic', () => {
               value: 'foofoo',
             },
             password: {
+              depends_on: [],
               display: 'textbox',
               label: 'thirdBar',
               options: [],
@@ -205,6 +218,7 @@ describe('ConnectorConfigurationLogic', () => {
           },
           configView: [
             {
+              depends_on: [],
               display: 'textbox',
               key: 'bar',
               label: 'foo',
@@ -215,6 +229,7 @@ describe('ConnectorConfigurationLogic', () => {
               value: 'foofoo',
             },
             {
+              depends_on: [],
               display: 'textbox',
               key: 'password',
               label: 'thirdBar',
@@ -227,6 +242,7 @@ describe('ConnectorConfigurationLogic', () => {
           ],
           localConfigState: {
             bar: {
+              depends_on: [],
               display: 'textbox',
               label: 'foo',
               options: [],
@@ -236,6 +252,7 @@ describe('ConnectorConfigurationLogic', () => {
               value: 'fafa',
             },
             password: {
+              depends_on: [],
               display: 'textbox',
               label: 'thirdBar',
               options: [],
@@ -247,6 +264,7 @@ describe('ConnectorConfigurationLogic', () => {
           },
           localConfigView: [
             {
+              depends_on: [],
               display: 'textbox',
               key: 'bar',
               label: 'foo',
@@ -257,6 +275,7 @@ describe('ConnectorConfigurationLogic', () => {
               value: 'fafa',
             },
             {
+              depends_on: [],
               display: 'textbox',
               key: 'password',
               label: 'thirdBar',
@@ -278,6 +297,7 @@ describe('ConnectorConfigurationLogic', () => {
           configState: connectorIndex.connector.configuration,
           configView: [
             {
+              depends_on: [],
               display: 'textbox',
               key: 'foo',
               label: 'bar',
@@ -311,6 +331,7 @@ describe('ConnectorConfigurationLogic', () => {
           configState: connectorIndex.connector.configuration,
           configView: [
             {
+              depends_on: [],
               display: 'textbox',
               key: 'foo',
               label: 'bar',
@@ -329,6 +350,7 @@ describe('ConnectorConfigurationLogic', () => {
           localConfigState: connectorIndex.connector.configuration,
           localConfigView: [
             {
+              depends_on: [],
               display: 'textbox',
               key: 'foo',
               label: 'bar',
@@ -349,6 +371,7 @@ describe('ConnectorConfigurationLogic', () => {
         ConnectorConfigurationLogic.actions.fetchIndexApiSuccess(connectorIndex);
         ConnectorConfigurationLogic.actions.setLocalConfigState({
           foo: {
+            depends_on: [],
             display: 'textbox',
             label: 'bar',
             options: [],
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_logic.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_logic.ts
index d0416ca843c67..fee9496b3c069 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_logic.ts
@@ -7,7 +7,13 @@
 
 import { kea, MakeLogicType } from 'kea';
 
-import { ConnectorConfiguration, ConnectorStatus } from '../../../../../../common/types/connectors';
+import {
+  ConnectorConfiguration,
+  ConnectorStatus,
+  Dependency,
+  DependencyLookup,
+  SelectOption,
+} from '../../../../../../common/types/connectors';
 import { isNotNullish } from '../../../../../../common/utils/is_not_nullish';
 
 import {
@@ -48,16 +54,12 @@ interface ConnectorConfigurationValues {
   shouldStartInEditMode: boolean;
 }
 
-interface SelectOptions {
-  label: string;
-  value: string;
-}
-
 export interface ConfigEntry {
+  depends_on: Dependency[];
   display: string;
   key: string;
   label: string;
-  options: SelectOptions[];
+  options: SelectOption[];
   order?: number;
   required: boolean;
   sensitive: boolean;
@@ -107,6 +109,19 @@ export function ensureBooleanType(value: string | number | boolean | null): bool
   return Boolean(value);
 }
 
+export function dependenciesSatisfied(
+  dependencies: Dependency[],
+  dependencyLookup: DependencyLookup
+): boolean {
+  for (const dependency of dependencies) {
+    if (dependency.value !== dependencyLookup[dependency.field]) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
 export const ConnectorConfigurationLogic = kea<
   MakeLogicType<ConnectorConfigurationValues, ConnectorConfigurationActions>
 >({
@@ -214,10 +229,11 @@ export const ConnectorConfigurationLogic = kea<
       {
         setLocalConfigEntry: (
           configState,
-          { key, display, label, options, order, required, sensitive, value }
+          // eslint-disable-next-line @typescript-eslint/naming-convention
+          { key, depends_on, display, label, options, order, required, sensitive, value }
         ) => ({
           ...configState,
-          [key]: { display, label, options, order, required, sensitive, value },
+          [key]: { depends_on, display, label, options, order, required, sensitive, value },
         }),
         setLocalConfigState: (_, { configState }) => configState,
       },

From 136876091aae97db5031e712aeafaa293b27e4ae Mon Sep 17 00:00:00 2001
From: Kyle Pollich <kyle.pollich@elastic.co>
Date: Tue, 18 Apr 2023 12:17:06 -0400
Subject: [PATCH 036/100] [Fleet] Fix policy editor error when
 `validationResults.inputs` is `null` (#155079)

Improve various typings and remove non-null assertions to ensure the
policy editor doesn't break when rendering a policy template without
`vars` or `streams` in its inputs.

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


![image](https://user-images.githubusercontent.com/6766512/232572327-df4ee721-722a-4d10-8eba-5ff048f5536b.png)

---------

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../services/validate_package_policy.test.ts  |  8 +++---
 .../services/validate_package_policy.ts       |  4 +--
 .../steps/step_configure_package.test.tsx     | 27 +++++++++++++++----
 .../steps/step_configure_package.tsx          |  6 ++---
 .../steps/step_define_package_policy.tsx      |  6 ++---
 .../components/page_steps/add_integration.tsx |  4 +--
 .../single_page_layout/index.tsx              |  4 +--
 .../edit_package_policy_page/index.tsx        |  4 +--
 .../all_assets/0.2.0/manifest.yml             |  4 +--
 .../0.1.0/docs/README.md                      |  3 +++
 .../0.1.0/img/logo_overrides_64_color.svg     |  7 +++++
 .../0.1.0/manifest.yml                        | 24 +++++++++++++++++
 .../apis/package_policy/create.ts             | 25 +++++++++++++++++
 13 files changed, 101 insertions(+), 25 deletions(-)
 create mode 100644 x-pack/test/fleet_api_integration/apis/fixtures/test_packages/single_input_no_streams/0.1.0/docs/README.md
 create mode 100644 x-pack/test/fleet_api_integration/apis/fixtures/test_packages/single_input_no_streams/0.1.0/img/logo_overrides_64_color.svg
 create mode 100644 x-pack/test/fleet_api_integration/apis/fixtures/test_packages/single_input_no_streams/0.1.0/manifest.yml

diff --git a/x-pack/plugins/fleet/common/services/validate_package_policy.test.ts b/x-pack/plugins/fleet/common/services/validate_package_policy.test.ts
index 13410561e497e..35c1e8184c931 100644
--- a/x-pack/plugins/fleet/common/services/validate_package_policy.test.ts
+++ b/x-pack/plugins/fleet/common/services/validate_package_policy.test.ts
@@ -512,7 +512,7 @@ describe('Fleet - validatePackagePolicy()', () => {
         name: null,
         description: null,
         namespace: null,
-        inputs: null,
+        inputs: {},
         vars: {},
       });
       expect(
@@ -528,7 +528,7 @@ describe('Fleet - validatePackagePolicy()', () => {
         name: null,
         description: null,
         namespace: null,
-        inputs: null,
+        inputs: {},
         vars: {},
       });
     });
@@ -547,7 +547,7 @@ describe('Fleet - validatePackagePolicy()', () => {
         name: null,
         description: null,
         namespace: null,
-        inputs: null,
+        inputs: {},
         vars: {},
       });
       expect(
@@ -563,7 +563,7 @@ describe('Fleet - validatePackagePolicy()', () => {
         name: null,
         description: null,
         namespace: null,
-        inputs: null,
+        inputs: {},
         vars: {},
       });
     });
diff --git a/x-pack/plugins/fleet/common/services/validate_package_policy.ts b/x-pack/plugins/fleet/common/services/validate_package_policy.ts
index 0af746ad2453e..49a59f1e64eb8 100644
--- a/x-pack/plugins/fleet/common/services/validate_package_policy.ts
+++ b/x-pack/plugins/fleet/common/services/validate_package_policy.ts
@@ -101,7 +101,7 @@ export const validatePackagePolicy = (
         (policyTemplate.inputs && policyTemplate.inputs.length > 0)
     )
   ) {
-    validationResults.inputs = null;
+    validationResults.inputs = {};
     return validationResults;
   }
 
@@ -199,7 +199,7 @@ export const validatePackagePolicy = (
   });
 
   if (Object.entries(validationResults.inputs!).length === 0) {
-    validationResults.inputs = null;
+    validationResults.inputs = {};
   }
 
   return validationResults;
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_configure_package.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_configure_package.test.tsx
index 776ee1957eaf9..6cff24d6ba091 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_configure_package.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_configure_package.test.tsx
@@ -7,11 +7,14 @@
 
 import React from 'react';
 import { act, fireEvent, waitFor } from '@testing-library/react';
+import { safeLoad } from 'js-yaml';
 
 import type { TestRenderer } from '../../../../../../../mock';
 import { createFleetTestRendererMock } from '../../../../../../../mock';
 import type { NewPackagePolicy, PackageInfo } from '../../../../../types';
 
+import { validatePackagePolicy } from '../../services';
+
 import { StepConfigurePackagePolicy } from './step_configure_package';
 
 describe('StepConfigurePackage', () => {
@@ -24,12 +27,12 @@ describe('StepConfigurePackage', () => {
     };
   });
 
-  const validationResults = { name: null, description: null, namespace: null, inputs: {} };
-
   let testRenderer: TestRenderer;
   let renderResult: ReturnType<typeof testRenderer.render>;
-  const render = () =>
-    (renderResult = testRenderer.render(
+  const render = () => {
+    const validationResults = validatePackagePolicy(packagePolicy, packageInfo, safeLoad);
+
+    renderResult = testRenderer.render(
       <StepConfigurePackagePolicy
         packageInfo={packageInfo}
         packagePolicy={packagePolicy}
@@ -37,7 +40,8 @@ describe('StepConfigurePackage', () => {
         validationResults={validationResults}
         submitAttempted={false}
       />
-    ));
+    );
+  };
 
   beforeEach(() => {
     packageInfo = {
@@ -150,4 +154,17 @@ describe('StepConfigurePackage', () => {
     });
     expect(mockUpdatePackagePolicy.mock.calls[0][0].inputs[0].enabled).toEqual(false);
   });
+
+  it('should render without data streams or vars', async () => {
+    packageInfo.data_streams = [];
+    packagePolicy.inputs[0].streams = [];
+
+    render();
+
+    await waitFor(async () => {
+      expect(
+        await renderResult.findByText('Collect logs from Nginx instances')
+      ).toBeInTheDocument();
+    });
+  });
 });
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_configure_package.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_configure_package.tsx
index edcea931b5535..5fc13bd223800 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_configure_package.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_configure_package.tsx
@@ -34,7 +34,7 @@ export const StepConfigurePackagePolicy: React.FunctionComponent<{
   showOnlyIntegration?: string;
   packagePolicy: NewPackagePolicy;
   updatePackagePolicy: (fields: Partial<NewPackagePolicy>) => void;
-  validationResults: PackagePolicyValidationResults;
+  validationResults: PackagePolicyValidationResults | undefined;
   submitAttempted: boolean;
   noTopRule?: boolean;
   isEditPage?: boolean;
@@ -104,11 +104,11 @@ export const StepConfigurePackagePolicy: React.FunctionComponent<{
                       });
                     }}
                     inputValidationResults={
-                      validationResults!.inputs![
+                      validationResults?.inputs?.[
                         hasIntegrations
                           ? `${policyTemplate.name}-${packagePolicyInput.type}`
                           : packagePolicyInput.type
-                      ]
+                      ] ?? {}
                     }
                     forceShowErrors={submitAttempted}
                     isEditPage={isEditPage}
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_define_package_policy.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_define_package_policy.tsx
index e9efc93d1d9b3..a9c3f7a70a58c 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_define_package_policy.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_define_package_policy.tsx
@@ -52,7 +52,7 @@ export const StepDefinePackagePolicy: React.FunctionComponent<{
   packageInfo: PackageInfo;
   packagePolicy: NewPackagePolicy;
   updatePackagePolicy: (fields: Partial<NewPackagePolicy>) => void;
-  validationResults: PackagePolicyValidationResults;
+  validationResults: PackagePolicyValidationResults | undefined;
   submitAttempted: boolean;
   isEditPage?: boolean;
   noAdvancedToggle?: boolean;
@@ -201,7 +201,7 @@ export const StepDefinePackagePolicy: React.FunctionComponent<{
                         },
                       });
                     }}
-                    errors={validationResults.vars![varName]}
+                    errors={validationResults?.vars?.[varName] ?? []}
                     forceShowErrors={submitAttempted}
                   />
                 </EuiFlexItem>
@@ -350,7 +350,7 @@ export const StepDefinePackagePolicy: React.FunctionComponent<{
                               },
                             });
                           }}
-                          errors={validationResults.vars![varName]}
+                          errors={validationResults?.vars?.[varName] ?? []}
                           forceShowErrors={submitAttempted}
                         />
                       </EuiFlexItem>
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/multi_page_layout/components/page_steps/add_integration.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/multi_page_layout/components/page_steps/add_integration.tsx
index f84d3fbfc2988..417b516c57932 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/multi_page_layout/components/page_steps/add_integration.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/multi_page_layout/components/page_steps/add_integration.tsx
@@ -238,7 +238,7 @@ export const AddIntegrationPageStep: React.FC<MultiPageStepLayoutProps> = (props
             showOnlyIntegration={integrationInfo?.name}
             packagePolicy={packagePolicy}
             updatePackagePolicy={updatePackagePolicy}
-            validationResults={validationResults!}
+            validationResults={validationResults}
             submitAttempted={formState === 'INVALID'}
             noTopRule={true}
           />
@@ -248,7 +248,7 @@ export const AddIntegrationPageStep: React.FC<MultiPageStepLayoutProps> = (props
                 packageInfo={packageInfo}
                 packagePolicy={packagePolicy}
                 updatePackagePolicy={updatePackagePolicy}
-                validationResults={validationResults!}
+                validationResults={validationResults}
                 submitAttempted={formState === 'INVALID'}
                 noAdvancedToggle={true}
               />
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.tsx
index a13d0ea31a33d..9940f17d11492 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.tsx
@@ -307,7 +307,7 @@ export const CreatePackagePolicySinglePage: CreatePackagePolicyParams = ({
             packageInfo={packageInfo}
             packagePolicy={packagePolicy}
             updatePackagePolicy={updatePackagePolicy}
-            validationResults={validationResults!}
+            validationResults={validationResults}
             submitAttempted={formState === 'INVALID'}
           />
 
@@ -318,7 +318,7 @@ export const CreatePackagePolicySinglePage: CreatePackagePolicyParams = ({
               showOnlyIntegration={integrationInfo?.name}
               packagePolicy={packagePolicy}
               updatePackagePolicy={updatePackagePolicy}
-              validationResults={validationResults!}
+              validationResults={validationResults}
               submitAttempted={formState === 'INVALID'}
             />
           )}
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
index 8b87f64d7b6c0..433bb278a581d 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
@@ -293,7 +293,7 @@ export const EditPackagePolicyForm = memo<{
               packageInfo={packageInfo}
               packagePolicy={packagePolicy}
               updatePackagePolicy={updatePackagePolicy}
-              validationResults={validationResults!}
+              validationResults={validationResults}
               submitAttempted={formState === 'INVALID'}
               isEditPage={true}
             />
@@ -305,7 +305,7 @@ export const EditPackagePolicyForm = memo<{
               packageInfo={packageInfo}
               packagePolicy={packagePolicy}
               updatePackagePolicy={updatePackagePolicy}
-              validationResults={validationResults!}
+              validationResults={validationResults}
               submitAttempted={formState === 'INVALID'}
               isEditPage={true}
             />
diff --git a/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/manifest.yml b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/manifest.yml
index 33c7c020b4c49..4359fc17f0c28 100644
--- a/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/manifest.yml
+++ b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/all_assets/0.2.0/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 1.0.0
-name: all_assets 
+name: all_assets
 title: All Assets Updated
-description: tests that all assets are updated 
+description: tests that all assets are updated
 version: 0.2.0
 categories: []
 release: beta
diff --git a/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/single_input_no_streams/0.1.0/docs/README.md b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/single_input_no_streams/0.1.0/docs/README.md
new file mode 100644
index 0000000000000..76889e6aa836c
--- /dev/null
+++ b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/single_input_no_streams/0.1.0/docs/README.md
@@ -0,0 +1,3 @@
+# Test package
+
+Test package with a single input and no defined data streams
diff --git a/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/single_input_no_streams/0.1.0/img/logo_overrides_64_color.svg b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/single_input_no_streams/0.1.0/img/logo_overrides_64_color.svg
new file mode 100644
index 0000000000000..b03007a76ffcc
--- /dev/null
+++ b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/single_input_no_streams/0.1.0/img/logo_overrides_64_color.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#F04E98" d="M29,32.0001 L15.935,9.4321 C13.48,5.1941 7,6.9351 7,11.8321 L7,52.1681 C7,57.0651 13.48,58.8061 15.935,54.5671 L29,32.0001 Z"/>
+    <path fill="#FA744E" d="M34.7773,32.0001 L33.3273,34.5051 L20.2613,57.0731 C19.8473,57.7871 19.3533,58.4271 18.8023,59.0001 L34.9273,59.0001 C38.7073,59.0001 42.2213,57.0601 44.2363,53.8611 L58.0003,32.0001 L34.7773,32.0001 Z"/>
+    <path fill="#343741" d="M44.2363,10.1392 C42.2213,6.9402 38.7073,5.0002 34.9273,5.0002 L18.8023,5.0002 C19.3533,5.5732 19.8473,6.2122 20.2613,6.9272 L33.3273,29.4942 L34.7773,32.0002 L58.0003,32.0002 L44.2363,10.1392 Z"/>
+  </g>
+</svg>
diff --git a/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/single_input_no_streams/0.1.0/manifest.yml b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/single_input_no_streams/0.1.0/manifest.yml
new file mode 100644
index 0000000000000..0f7c477c97d02
--- /dev/null
+++ b/x-pack/test/fleet_api_integration/apis/fixtures/test_packages/single_input_no_streams/0.1.0/manifest.yml
@@ -0,0 +1,24 @@
+format_version: 1.1.0
+name: single_input_no_streams
+title: Single input, no stream
+description: Test package with a single input and no streams
+version: 0.1.0
+categories: []
+conditions:
+  kibana.version: ^8.8.0
+  elastic.subscription: basic
+policy_templates:
+  - name: Single Input
+    title: Single Input
+    description: Single Input
+    inputs:
+      - title: Single Input
+        description: Single input
+        type: single_input
+type: integration
+owner:
+  github: elastic/fleet
+icons:
+  - src: '/img/logo_overrides_64_color.svg'
+    size: '16x16'
+    type: 'image/svg+xml'
diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/create.ts b/x-pack/test/fleet_api_integration/apis/package_policy/create.ts
index 82777e41eb5e1..ca8ac94656402 100644
--- a/x-pack/test/fleet_api_integration/apis/package_policy/create.ts
+++ b/x-pack/test/fleet_api_integration/apis/package_policy/create.ts
@@ -446,6 +446,31 @@ export default function (providerContext: FtrProviderContext) {
       expect(policy.name).to.equal(nameWithWhitespace.trim());
     });
 
+    it('should return a 200 when a package has no variables or data streams', async function () {
+      await supertest
+        .post('/api/fleet/package_policies')
+        .set('kbn-xsrf', 'xxxx')
+        .send({
+          name: 'no-variables-or-data-streams',
+          description: '',
+          namespace: 'default',
+          policy_id: agentPolicyId,
+          enabled: true,
+          inputs: [
+            {
+              enabled: true,
+              streams: [],
+              type: 'single_input',
+            },
+          ],
+          package: {
+            name: 'single_input_no_streams',
+            version: '0.1.0',
+          },
+        })
+        .expect(200);
+    });
+
     describe('input only packages', () => {
       it('should default dataset if not provided for input only pkg', async function () {
         await supertest

From 42effff78d63257c40f4c919e461d5fdba30c0bf Mon Sep 17 00:00:00 2001
From: Christos Nasikas <christos.nasikas@elastic.co>
Date: Tue, 18 Apr 2023 19:20:59 +0300
Subject: [PATCH 037/100] [Cases] Remove case id from alerts when deleting a
 case (#154829)

## Summary

This PR removes the case id from all alerts attached to a case when
deleting a case. It also removes any alert authorization when removing
alerts from a case.

### 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

### For maintainers

- [x] 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)
---
 .../cases/server/client/alerts/types.ts       |   2 +-
 .../server/client/attachments/delete.test.ts  |  13 --
 .../cases/server/client/attachments/delete.ts |   1 -
 .../cases/server/client/cases/delete.test.ts  |  32 ++-
 .../cases/server/client/cases/delete.ts       |   3 +-
 .../server/services/alerts/index.test.ts      |  42 ++++
 .../cases/server/services/alerts/index.ts     |  32 ++-
 x-pack/plugins/cases/server/services/mocks.ts |   4 +-
 .../alert_data_client/alerts_client.mock.ts   |   1 +
 .../server/alert_data_client/alerts_client.ts |  80 +++++--
 .../tests/remove_alerts_from_case.test.ts     | 109 ---------
 .../tests/remove_cases_from_alerts.test.ts    | 179 +++++++++++++++
 .../common/lib/alerts.ts                      | 134 +++++++++--
 .../tests/common/cases/delete_cases.ts        | 209 ++++++++++++++++++
 .../tests/common/comments/delete_comment.ts   |  12 +-
 .../tests/common/comments/delete_comments.ts  |   9 +-
 16 files changed, 682 insertions(+), 180 deletions(-)
 delete mode 100644 x-pack/plugins/rule_registry/server/alert_data_client/tests/remove_alerts_from_case.test.ts
 create mode 100644 x-pack/plugins/rule_registry/server/alert_data_client/tests/remove_cases_from_alerts.test.ts

diff --git a/x-pack/plugins/cases/server/client/alerts/types.ts b/x-pack/plugins/cases/server/client/alerts/types.ts
index a1317106e6fe7..4ceba5e500d9b 100644
--- a/x-pack/plugins/cases/server/client/alerts/types.ts
+++ b/x-pack/plugins/cases/server/client/alerts/types.ts
@@ -43,7 +43,7 @@ export interface UpdateAlertCasesRequest {
   caseIds: string[];
 }
 
-export interface RemoveAlertsFromCaseRequest {
+export interface RemoveCaseIdFromAlertsRequest {
   alerts: AlertInfo[];
   caseId: string;
 }
diff --git a/x-pack/plugins/cases/server/client/attachments/delete.test.ts b/x-pack/plugins/cases/server/client/attachments/delete.test.ts
index d484515f4eeaf..475c7e5006b15 100644
--- a/x-pack/plugins/cases/server/client/attachments/delete.test.ts
+++ b/x-pack/plugins/cases/server/client/attachments/delete.test.ts
@@ -25,10 +25,6 @@ describe('delete', () => {
       it('delete alerts correctly', async () => {
         await deleteComment({ caseID: 'mock-id-4', attachmentID: 'mock-comment-4' }, clientArgs);
 
-        expect(clientArgs.services.alertsService.ensureAlertsAuthorized).toHaveBeenCalledWith({
-          alerts: [{ id: 'test-id', index: 'test-index' }],
-        });
-
         expect(clientArgs.services.alertsService.removeCaseIdFromAlerts).toHaveBeenCalledWith({
           alerts: [{ id: 'test-id', index: 'test-index' }],
           caseId: 'mock-id-4',
@@ -39,7 +35,6 @@ describe('delete', () => {
         clientArgs.services.attachmentService.getter.get.mockResolvedValue(commentSO);
         await deleteComment({ caseID: 'mock-id-1', attachmentID: 'mock-comment-1' }, clientArgs);
 
-        expect(clientArgs.services.alertsService.ensureAlertsAuthorized).not.toHaveBeenCalledWith();
         expect(clientArgs.services.alertsService.removeCaseIdFromAlerts).not.toHaveBeenCalledWith();
       });
     });
@@ -66,14 +61,6 @@ describe('delete', () => {
       it('delete alerts correctly', async () => {
         await deleteAll({ caseID: 'mock-id-4' }, clientArgs);
 
-        expect(clientArgs.services.alertsService.ensureAlertsAuthorized).toHaveBeenCalledWith({
-          alerts: [
-            { id: 'test-id', index: 'test-index' },
-            { id: 'test-id-2', index: 'test-index-2' },
-            { id: 'test-id-3', index: 'test-index-3' },
-          ],
-        });
-
         expect(clientArgs.services.alertsService.removeCaseIdFromAlerts).toHaveBeenCalledWith({
           alerts: [
             { id: 'test-id', index: 'test-index' },
diff --git a/x-pack/plugins/cases/server/client/attachments/delete.ts b/x-pack/plugins/cases/server/client/attachments/delete.ts
index 07d3091e8d348..718ff4eb7e56c 100644
--- a/x-pack/plugins/cases/server/client/attachments/delete.ts
+++ b/x-pack/plugins/cases/server/client/attachments/delete.ts
@@ -151,6 +151,5 @@ const handleAlerts = async ({ alertsService, attachments, caseId }: HandleAlerts
   }
 
   const alerts = getAlertInfoFromComments(alertAttachments);
-  await alertsService.ensureAlertsAuthorized({ alerts });
   await alertsService.removeCaseIdFromAlerts({ alerts, caseId });
 };
diff --git a/x-pack/plugins/cases/server/client/cases/delete.test.ts b/x-pack/plugins/cases/server/client/cases/delete.test.ts
index 043b08733dd3f..ebe64da0c2baf 100644
--- a/x-pack/plugins/cases/server/client/cases/delete.test.ts
+++ b/x-pack/plugins/cases/server/client/cases/delete.test.ts
@@ -10,11 +10,14 @@ import { createFileServiceMock } from '@kbn/files-plugin/server/mocks';
 import type { FileJSON } from '@kbn/shared-ux-file-types';
 import type { CaseFileMetadataForDeletion } from '../../../common/files';
 import { constructFileKindIdByOwner } from '../../../common/files';
-import { getFileEntities } from './delete';
+import { getFileEntities, deleteCases } from './delete';
+import { createCasesClientMockArgs } from '../mocks';
+import { mockCases } from '../../mocks';
 
 const getCaseIds = (numIds: number) => {
   return Array.from(Array(numIds).keys()).map((key) => key.toString());
 };
+
 describe('delete', () => {
   describe('getFileEntities', () => {
     const numCaseIds = 1000;
@@ -66,6 +69,33 @@ describe('delete', () => {
       expect(entities).toEqual(expectedEntities);
     });
   });
+
+  describe('deleteCases', () => {
+    const clientArgs = createCasesClientMockArgs();
+    clientArgs.fileService.find.mockResolvedValue({ files: [], total: 0 });
+
+    clientArgs.services.caseService.getCases.mockResolvedValue({
+      saved_objects: [mockCases[0], mockCases[1]],
+    });
+
+    clientArgs.services.attachmentService.getter.getAttachmentIdsForCases.mockResolvedValue([]);
+    clientArgs.services.userActionService.getUserActionIdsForCases.mockResolvedValue([]);
+
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    describe('alerts', () => {
+      const caseIds = ['mock-id-1', 'mock-id-2'];
+
+      it('removes the case ids from all alerts', async () => {
+        await deleteCases(caseIds, clientArgs);
+        expect(clientArgs.services.alertsService.removeCaseIdsFromAllAlerts).toHaveBeenCalledWith({
+          caseIds,
+        });
+      });
+    });
+  });
 });
 
 const createMockFileJSON = (): FileJSON => {
diff --git a/x-pack/plugins/cases/server/client/cases/delete.ts b/x-pack/plugins/cases/server/client/cases/delete.ts
index a81e0db4dcf66..a9479e2ab171a 100644
--- a/x-pack/plugins/cases/server/client/cases/delete.ts
+++ b/x-pack/plugins/cases/server/client/cases/delete.ts
@@ -28,7 +28,7 @@ import { createFileEntities, deleteFiles } from '../files';
  */
 export async function deleteCases(ids: string[], clientArgs: CasesClientArgs): Promise<void> {
   const {
-    services: { caseService, attachmentService, userActionService },
+    services: { caseService, attachmentService, userActionService, alertsService },
     logger,
     authorization,
     fileService,
@@ -75,6 +75,7 @@ export async function deleteCases(ids: string[], clientArgs: CasesClientArgs): P
         entities: bulkDeleteEntities,
         options: { refresh: 'wait_for' },
       }),
+      alertsService.removeCaseIdsFromAllAlerts({ caseIds: ids }),
     ]);
 
     await userActionService.creator.bulkAuditLogCaseDeletion(
diff --git a/x-pack/plugins/cases/server/services/alerts/index.test.ts b/x-pack/plugins/cases/server/services/alerts/index.test.ts
index 5cc5e6de9650d..970494ce2140f 100644
--- a/x-pack/plugins/cases/server/services/alerts/index.test.ts
+++ b/x-pack/plugins/cases/server/services/alerts/index.test.ts
@@ -423,5 +423,47 @@ describe('updateAlertsStatus', () => {
 
       expect(alertsClient.removeCaseIdFromAlerts).not.toHaveBeenCalled();
     });
+
+    it('should not throw an error and log it', async () => {
+      alertsClient.removeCaseIdFromAlerts.mockRejectedValueOnce('An error');
+
+      await expect(
+        alertService.removeCaseIdFromAlerts({ alerts, caseId })
+      ).resolves.not.toThrowError();
+
+      expect(logger.error).toHaveBeenCalledWith(
+        'Failed removing case test-case from alerts: An error'
+      );
+    });
+  });
+
+  describe('removeCaseIdsFromAllAlerts', () => {
+    const caseIds = ['test-case-1', 'test-case-2'];
+
+    it('remove all case ids from alerts', async () => {
+      await alertService.removeCaseIdsFromAllAlerts({ caseIds });
+
+      expect(alertsClient.removeCaseIdsFromAllAlerts).toBeCalledWith({ caseIds });
+    });
+
+    it('does not call the alerts client with no case ids', async () => {
+      await alertService.removeCaseIdsFromAllAlerts({
+        caseIds: [],
+      });
+
+      expect(alertsClient.removeCaseIdsFromAllAlerts).not.toHaveBeenCalled();
+    });
+
+    it('should not throw an error and log it', async () => {
+      alertsClient.removeCaseIdsFromAllAlerts.mockRejectedValueOnce('An error');
+
+      await expect(
+        alertService.removeCaseIdsFromAllAlerts({ caseIds })
+      ).resolves.not.toThrowError();
+
+      expect(logger.error).toHaveBeenCalledWith(
+        'Failed removing cases test-case-1,test-case-2 for all alerts: An error'
+      );
+    });
   });
 });
diff --git a/x-pack/plugins/cases/server/services/alerts/index.ts b/x-pack/plugins/cases/server/services/alerts/index.ts
index 9ce651dce105d..d078508969b1e 100644
--- a/x-pack/plugins/cases/server/services/alerts/index.ts
+++ b/x-pack/plugins/cases/server/services/alerts/index.ts
@@ -19,7 +19,7 @@ import { MAX_ALERTS_PER_CASE, MAX_CONCURRENT_SEARCHES } from '../../../common/co
 import { createCaseError } from '../../common/error';
 import type { AlertInfo } from '../../common/types';
 import type {
-  RemoveAlertsFromCaseRequest,
+  RemoveCaseIdFromAlertsRequest,
   UpdateAlertCasesRequest,
   UpdateAlertStatusRequest,
 } from '../../client/alerts/types';
@@ -237,7 +237,7 @@ export class AlertService {
   public async removeCaseIdFromAlerts({
     alerts,
     caseId,
-  }: RemoveAlertsFromCaseRequest): Promise<void> {
+  }: RemoveCaseIdFromAlertsRequest): Promise<void> {
     try {
       const nonEmptyAlerts = this.getNonEmptyAlerts(alerts);
 
@@ -250,11 +250,31 @@ export class AlertService {
         caseId,
       });
     } catch (error) {
-      throw createCaseError({
-        message: `Failed to remove case ${caseId} from alerts: ${error}`,
-        error,
-        logger: this.logger,
+      /**
+       * We intentionally do not throw an error.
+       * Users should be able to remove alerts from a case even
+       * in the event of an error produced by the alerts client
+       */
+      this.logger.error(`Failed removing case ${caseId} from alerts: ${error}`);
+    }
+  }
+
+  public async removeCaseIdsFromAllAlerts({ caseIds }: { caseIds: string[] }): Promise<void> {
+    try {
+      if (caseIds.length <= 0) {
+        return;
+      }
+
+      await this.alertsClient.removeCaseIdsFromAllAlerts({
+        caseIds,
       });
+    } catch (error) {
+      /**
+       * We intentionally do not throw an error.
+       * Users should be able to remove alerts from cases even
+       * in the event of an error produced by the alerts client
+       */
+      this.logger.error(`Failed removing cases ${caseIds} for all alerts: ${error}`);
     }
   }
 
diff --git a/x-pack/plugins/cases/server/services/mocks.ts b/x-pack/plugins/cases/server/services/mocks.ts
index 57a81e9afc94e..402d682300b7a 100644
--- a/x-pack/plugins/cases/server/services/mocks.ts
+++ b/x-pack/plugins/cases/server/services/mocks.ts
@@ -45,7 +45,7 @@ export type LicensingServiceMock = jest.Mocked<LicensingService>;
 export type NotificationServiceMock = jest.Mocked<EmailNotificationService>;
 
 export const createCaseServiceMock = (): CaseServiceMock => {
-  const service = {
+  const service: PublicMethodsOf<CaseServiceMock> = {
     deleteCase: jest.fn(),
     findCases: jest.fn(),
     getAllCaseComments: jest.fn(),
@@ -61,6 +61,7 @@ export const createCaseServiceMock = (): CaseServiceMock => {
     findCasesGroupedByID: jest.fn(),
     getCaseStatusStats: jest.fn(),
     executeAggregations: jest.fn(),
+    bulkDeleteCaseEntities: jest.fn(),
   };
 
   // the cast here is required because jest.Mocked tries to include private members and would throw an error
@@ -140,6 +141,7 @@ export const createAlertServiceMock = (): AlertServiceMock => {
     bulkUpdateCases: jest.fn(),
     ensureAlertsAuthorized: jest.fn(),
     removeCaseIdFromAlerts: jest.fn(),
+    removeCaseIdsFromAllAlerts: jest.fn(),
   };
 
   // the cast here is required because jest.Mocked tries to include private members and would throw an error
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.mock.ts b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.mock.ts
index a0c903ca7b4e1..e0acdfc0e40a2 100644
--- a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.mock.ts
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.mock.ts
@@ -24,6 +24,7 @@ const createAlertsClientMock = () => {
     getAlertSummary: jest.fn(),
     ensureAllAlertsAuthorizedRead: jest.fn(),
     removeCaseIdFromAlerts: jest.fn(),
+    removeCaseIdsFromAllAlerts: jest.fn(),
   };
   return mocked;
 };
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts
index 08b4dd5738791..9e66facd9d160 100644
--- a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts
@@ -105,7 +105,7 @@ export interface BulkUpdateCasesOptions {
   caseIds: string[];
 }
 
-export interface RemoveAlertsFromCaseOptions {
+export interface RemoveCaseIdFromAlertsOptions {
   alerts: MgetAndAuditAlert[];
   caseId: string;
 }
@@ -851,33 +851,33 @@ export class AlertsClient {
     });
   }
 
-  public async removeCaseIdFromAlerts({ caseId, alerts }: RemoveAlertsFromCaseOptions) {
+  public async removeCaseIdFromAlerts({ caseId, alerts }: RemoveCaseIdFromAlertsOptions) {
+    /**
+     * We intentionally do not perform any authorization
+     * on the alerts. Users should be able to remove
+     * cases from alerts when deleting a case or an
+     * attachment
+     */
     try {
       if (alerts.length === 0) {
         return;
       }
 
-      const mgetRes = await this.ensureAllAlertsAuthorized({
-        alerts,
-        operation: ReadOperations.Get,
-      });
-
       const painlessScript = `if (ctx._source['${ALERT_CASE_IDS}'] != null) {
-        for (int i=0; i < ctx._source['${ALERT_CASE_IDS}'].length; i++) {
-            if (ctx._source['${ALERT_CASE_IDS}'][i].equals('${caseId}')) {
-                ctx._source['${ALERT_CASE_IDS}'].remove(i);
-            }
+        if (ctx._source['${ALERT_CASE_IDS}'].contains('${caseId}')) {
+          int index = ctx._source['${ALERT_CASE_IDS}'].indexOf('${caseId}');
+          ctx._source['${ALERT_CASE_IDS}'].remove(index);
         }
       }`;
 
       const bulkUpdateRequest = [];
 
-      for (const doc of mgetRes.docs) {
+      for (const alert of alerts) {
         bulkUpdateRequest.push(
           {
             update: {
-              _index: doc._index,
-              _id: doc._id,
+              _index: alert.index,
+              _id: alert.id,
             },
           },
           {
@@ -891,11 +891,61 @@ export class AlertsClient {
         body: bulkUpdateRequest,
       });
     } catch (error) {
-      this.logger.error(`Error to remove case ${caseId} from alerts: ${error}`);
+      this.logger.error(`Error removing case ${caseId} from alerts: ${error}`);
       throw error;
     }
   }
 
+  public async removeCaseIdsFromAllAlerts({ caseIds }: { caseIds: string[] }) {
+    /**
+     * We intentionally do not perform any authorization
+     * on the alerts. Users should be able to remove
+     * cases from alerts when deleting a case or an
+     * attachment
+     */
+    try {
+      if (caseIds.length === 0) {
+        return;
+      }
+
+      const index = `${this.ruleDataService.getResourcePrefix()}-*`;
+      const query = `${ALERT_CASE_IDS}: (${caseIds.join(' or ')})`;
+      const esQuery = buildEsQuery(undefined, { query, language: 'kuery' }, []);
+
+      const SCRIPT_PARAMS_ID = 'caseIds';
+
+      const painlessScript = `if (ctx._source['${ALERT_CASE_IDS}'] != null && ctx._source['${ALERT_CASE_IDS}'].length > 0 && params['${SCRIPT_PARAMS_ID}'] != null && params['${SCRIPT_PARAMS_ID}'].length > 0) {
+        List storedCaseIds = ctx._source['${ALERT_CASE_IDS}'];
+        List caseIdsToRemove = params['${SCRIPT_PARAMS_ID}'];
+
+        for (int i=0; i < caseIdsToRemove.length; i++) {
+          if (storedCaseIds.contains(caseIdsToRemove[i])) {
+            int index = storedCaseIds.indexOf(caseIdsToRemove[i]);
+            storedCaseIds.remove(index);
+          }
+        }
+      }`;
+
+      await this.esClient.updateByQuery({
+        index,
+        conflicts: 'proceed',
+        refresh: true,
+        body: {
+          script: {
+            source: painlessScript,
+            lang: 'painless',
+            params: { caseIds },
+          } as InlineScript,
+          query: esQuery,
+        },
+        ignore_unavailable: true,
+      });
+    } catch (err) {
+      this.logger.error(`Failed removing ${caseIds} from all alerts: ${err}`);
+      throw err;
+    }
+  }
+
   public async find<Params extends RuleTypeParams = never>({
     aggs,
     featureIds,
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/tests/remove_alerts_from_case.test.ts b/x-pack/plugins/rule_registry/server/alert_data_client/tests/remove_alerts_from_case.test.ts
deleted file mode 100644
index c938dd8d592fb..0000000000000
--- a/x-pack/plugins/rule_registry/server/alert_data_client/tests/remove_alerts_from_case.test.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * 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 { loggingSystemMock } from '@kbn/core/server/mocks';
-import { elasticsearchClientMock } from '@kbn/core-elasticsearch-client-server-mocks';
-import { alertingAuthorizationMock } from '@kbn/alerting-plugin/server/authorization/alerting_authorization.mock';
-import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
-import { ALERT_CASE_IDS, ALERT_RULE_CONSUMER, ALERT_RULE_TYPE_ID } from '@kbn/rule-data-utils';
-import { AlertsClient, ConstructorOptions } from '../alerts_client';
-import { ruleDataServiceMock } from '../../rule_data_plugin_service/rule_data_plugin_service.mock';
-
-describe('removeCaseIdFromAlerts', () => {
-  const alertingAuthMock = alertingAuthorizationMock.create();
-  const esClientMock = elasticsearchClientMock.createElasticsearchClient();
-  const auditLogger = auditLoggerMock.create();
-  const caseId = 'test-case';
-  const alerts = [
-    {
-      id: 'alert-id',
-      index: 'alert-index',
-    },
-  ];
-
-  const alertsClientParams: jest.Mocked<ConstructorOptions> = {
-    logger: loggingSystemMock.create().get(),
-    authorization: alertingAuthMock,
-    esClient: esClientMock,
-    auditLogger,
-    ruleDataService: ruleDataServiceMock.create(),
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-
-    esClientMock.mget.mockResponseOnce({
-      docs: [
-        {
-          found: true,
-          _id: 'alert-id',
-          _index: 'alert-index',
-          _source: {
-            [ALERT_RULE_TYPE_ID]: 'apm.error_rate',
-            [ALERT_RULE_CONSUMER]: 'apm',
-            [ALERT_CASE_IDS]: [caseId],
-          },
-        },
-      ],
-    });
-  });
-
-  it('removes alerts from a case', async () => {
-    const alertsClient = new AlertsClient(alertsClientParams);
-    await alertsClient.removeCaseIdFromAlerts({ caseId, alerts });
-
-    expect(esClientMock.mget).toHaveBeenCalledWith({
-      docs: [{ _id: 'alert-id', _index: 'alert-index' }],
-    });
-
-    expect(esClientMock.bulk.mock.calls[0][0]).toMatchInlineSnapshot(`
-      Object {
-        "body": Array [
-          Object {
-            "update": Object {
-              "_id": "alert-id",
-              "_index": "alert-index",
-            },
-          },
-          Object {
-            "script": Object {
-              "lang": "painless",
-              "source": "if (ctx._source['kibana.alert.case_ids'] != null) {
-              for (int i=0; i < ctx._source['kibana.alert.case_ids'].length; i++) {
-                  if (ctx._source['kibana.alert.case_ids'][i].equals('test-case')) {
-                      ctx._source['kibana.alert.case_ids'].remove(i);
-                  }
-              }
-            }",
-            },
-          },
-        ],
-        "refresh": "wait_for",
-      }
-    `);
-  });
-
-  it('calls ensureAllAlertsAuthorized correctly', async () => {
-    const alertsClient = new AlertsClient(alertsClientParams);
-    await alertsClient.removeCaseIdFromAlerts({ caseId, alerts });
-
-    expect(alertingAuthMock.ensureAuthorized).toHaveBeenCalledWith({
-      consumer: 'apm',
-      entity: 'alert',
-      operation: 'get',
-      ruleTypeId: 'apm.error_rate',
-    });
-  });
-
-  it('does not do any calls if there are no alerts', async () => {
-    const alertsClient = new AlertsClient(alertsClientParams);
-    await alertsClient.removeCaseIdFromAlerts({ caseId, alerts: [] });
-
-    expect(alertingAuthMock.ensureAuthorized).not.toHaveBeenCalled();
-    expect(esClientMock.bulk).not.toHaveBeenCalled();
-  });
-});
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/tests/remove_cases_from_alerts.test.ts b/x-pack/plugins/rule_registry/server/alert_data_client/tests/remove_cases_from_alerts.test.ts
new file mode 100644
index 0000000000000..8b6f075edfab4
--- /dev/null
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/tests/remove_cases_from_alerts.test.ts
@@ -0,0 +1,179 @@
+/*
+ * 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 { loggingSystemMock } from '@kbn/core/server/mocks';
+import { elasticsearchClientMock } from '@kbn/core-elasticsearch-client-server-mocks';
+import { alertingAuthorizationMock } from '@kbn/alerting-plugin/server/authorization/alerting_authorization.mock';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
+import { AlertsClient, ConstructorOptions } from '../alerts_client';
+import { ruleDataServiceMock } from '../../rule_data_plugin_service/rule_data_plugin_service.mock';
+
+describe('remove cases from alerts', () => {
+  describe('removeCaseIdFromAlerts', () => {
+    const alertingAuthMock = alertingAuthorizationMock.create();
+    const esClientMock = elasticsearchClientMock.createElasticsearchClient();
+    const auditLogger = auditLoggerMock.create();
+    const caseId = 'test-case';
+    const alerts = [
+      {
+        id: 'alert-id',
+        index: 'alert-index',
+      },
+    ];
+
+    const alertsClientParams: jest.Mocked<ConstructorOptions> = {
+      logger: loggingSystemMock.create().get(),
+      authorization: alertingAuthMock,
+      esClient: esClientMock,
+      auditLogger,
+      ruleDataService: ruleDataServiceMock.create(),
+    };
+
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it('removes alerts from a case', async () => {
+      const alertsClient = new AlertsClient(alertsClientParams);
+      await alertsClient.removeCaseIdFromAlerts({ caseId, alerts });
+
+      expect(esClientMock.bulk.mock.calls[0][0]).toMatchInlineSnapshot(`
+        Object {
+          "body": Array [
+            Object {
+              "update": Object {
+                "_id": "alert-id",
+                "_index": "alert-index",
+              },
+            },
+            Object {
+              "script": Object {
+                "lang": "painless",
+                "source": "if (ctx._source['kibana.alert.case_ids'] != null) {
+                if (ctx._source['kibana.alert.case_ids'].contains('test-case')) {
+                  int index = ctx._source['kibana.alert.case_ids'].indexOf('test-case');
+                  ctx._source['kibana.alert.case_ids'].remove(index);
+                }
+              }",
+              },
+            },
+          ],
+          "refresh": "wait_for",
+        }
+      `);
+    });
+
+    it('does not do any calls if there are no alerts', async () => {
+      const alertsClient = new AlertsClient(alertsClientParams);
+      await alertsClient.removeCaseIdFromAlerts({ caseId, alerts: [] });
+
+      expect(esClientMock.bulk).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('removeCaseIdsFromAllAlerts', () => {
+    const alertingAuthMock = alertingAuthorizationMock.create();
+    const esClientMock = elasticsearchClientMock.createElasticsearchClient();
+    const auditLogger = auditLoggerMock.create();
+    const caseIds = ['test-case-1', 'test-case-2'];
+
+    const alertsClientParams: jest.Mocked<ConstructorOptions> = {
+      logger: loggingSystemMock.create().get(),
+      authorization: alertingAuthMock,
+      esClient: esClientMock,
+      auditLogger,
+      ruleDataService: ruleDataServiceMock.create(),
+    };
+
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it('removes alerts from a case', async () => {
+      const alertsClient = new AlertsClient(alertsClientParams);
+      await alertsClient.removeCaseIdsFromAllAlerts({ caseIds });
+
+      expect(esClientMock.updateByQuery.mock.calls[0][0]).toMatchInlineSnapshot(`
+        Object {
+          "body": Object {
+            "query": Object {
+              "bool": Object {
+                "filter": Array [
+                  Object {
+                    "bool": Object {
+                      "minimum_should_match": 1,
+                      "should": Array [
+                        Object {
+                          "bool": Object {
+                            "minimum_should_match": 1,
+                            "should": Array [
+                              Object {
+                                "match": Object {
+                                  "kibana.alert.case_ids": "test-case-1",
+                                },
+                              },
+                            ],
+                          },
+                        },
+                        Object {
+                          "bool": Object {
+                            "minimum_should_match": 1,
+                            "should": Array [
+                              Object {
+                                "match": Object {
+                                  "kibana.alert.case_ids": "test-case-2",
+                                },
+                              },
+                            ],
+                          },
+                        },
+                      ],
+                    },
+                  },
+                ],
+                "must": Array [],
+                "must_not": Array [],
+                "should": Array [],
+              },
+            },
+            "script": Object {
+              "lang": "painless",
+              "params": Object {
+                "caseIds": Array [
+                  "test-case-1",
+                  "test-case-2",
+                ],
+              },
+              "source": "if (ctx._source['kibana.alert.case_ids'] != null && ctx._source['kibana.alert.case_ids'].length > 0 && params['caseIds'] != null && params['caseIds'].length > 0) {
+                List storedCaseIds = ctx._source['kibana.alert.case_ids'];
+                List caseIdsToRemove = params['caseIds'];
+
+                for (int i=0; i < caseIdsToRemove.length; i++) {
+                  if (storedCaseIds.contains(caseIdsToRemove[i])) {
+                    int index = storedCaseIds.indexOf(caseIdsToRemove[i]);
+                    storedCaseIds.remove(index);
+                  }
+                }
+              }",
+            },
+          },
+          "conflicts": "proceed",
+          "ignore_unavailable": true,
+          "index": "undefined-*",
+          "refresh": true,
+        }
+      `);
+    });
+
+    it('does not do any calls if there are no cases', async () => {
+      const alertsClient = new AlertsClient(alertsClientParams);
+      await alertsClient.removeCaseIdsFromAllAlerts({ caseIds: [] });
+
+      expect(esClientMock.updateByQuery).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/x-pack/test/cases_api_integration/common/lib/alerts.ts b/x-pack/test/cases_api_integration/common/lib/alerts.ts
index 08da41280f9be..418c9f3c81bda 100644
--- a/x-pack/test/cases_api_integration/common/lib/alerts.ts
+++ b/x-pack/test/cases_api_integration/common/lib/alerts.ts
@@ -12,7 +12,7 @@ import { ToolingLog } from '@kbn/tooling-log';
 import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '@kbn/security-solution-plugin/common/constants';
 import { DetectionAlert } from '@kbn/security-solution-plugin/common/detection_engine/schemas/alerts';
 import { RiskEnrichmentFields } from '@kbn/security-solution-plugin/server/lib/detection_engine/rule_types/utils/enrichments/types';
-import { CommentType } from '@kbn/cases-plugin/common';
+import { CaseResponse, CommentType } from '@kbn/cases-plugin/common';
 import { ALERT_CASE_IDS } from '@kbn/rule-data-utils';
 import {
   getRuleForSignalTesting,
@@ -25,7 +25,7 @@ import {
 import { superUser } from './authentication/users';
 import { User } from './authentication/types';
 import { getSpaceUrlPrefix } from './api/helpers';
-import { createCase } from './api/case';
+import { createCase, deleteCases } from './api/case';
 import { createComment, deleteAllComments } from './api';
 import { postCaseReq } from './mock';
 
@@ -102,6 +102,100 @@ export const createCaseAttachAlertAndDeleteAlert = async ({
   alerts: Alerts;
   getAlerts: (alerts: Alerts) => Promise<Array<Record<string, unknown>>>;
 }) => {
+  const updatedCases = await createCaseAndAttachAlert({
+    supertest,
+    totalCases,
+    owner,
+    alerts,
+    getAlerts,
+  });
+
+  const caseToDelete = updatedCases[indexOfCaseToDelete];
+
+  await deleteAllComments({
+    supertest,
+    caseId: caseToDelete.id,
+    expectedHttpCode,
+    auth: deleteCommentAuth,
+  });
+
+  const alertAfterDeletion = await getAlerts(alerts);
+  const caseIdsWithoutRemovedCase = getCaseIdsWithoutRemovedCases({
+    expectedHttpCode,
+    updatedCases,
+    caseIdsToDelete: [caseToDelete.id],
+  });
+
+  for (const alert of alertAfterDeletion) {
+    expect(alert[ALERT_CASE_IDS]).eql(caseIdsWithoutRemovedCase);
+  }
+};
+
+export const createCaseAttachAlertAndDeleteCase = async ({
+  supertest,
+  totalCases,
+  indicesOfCaseToDelete,
+  owner,
+  expectedHttpCode = 204,
+  deleteCaseAuth = { user: superUser, space: 'space1' },
+  alerts,
+  getAlerts,
+}: {
+  supertest: SuperTest.SuperTest<SuperTest.Test>;
+  totalCases: number;
+  indicesOfCaseToDelete: number[];
+  owner: string;
+  expectedHttpCode?: number;
+  deleteCaseAuth?: { user: User; space: string | null };
+  alerts: Alerts;
+  getAlerts: (alerts: Alerts) => Promise<Array<Record<string, unknown>>>;
+}) => {
+  const updatedCases = await createCaseAndAttachAlert({
+    supertest,
+    totalCases,
+    owner,
+    alerts,
+    getAlerts,
+  });
+
+  const casesToDelete = updatedCases.filter((_, filterIndex) =>
+    indicesOfCaseToDelete.some((indexToDelete) => indexToDelete === filterIndex)
+  );
+
+  const caseIdsToDelete = casesToDelete.map((theCase) => theCase.id);
+
+  await deleteCases({
+    supertest,
+    caseIDs: caseIdsToDelete,
+    expectedHttpCode,
+    auth: deleteCaseAuth,
+  });
+
+  const alertAfterDeletion = await getAlerts(alerts);
+  const caseIdsWithoutRemovedCase = getCaseIdsWithoutRemovedCases({
+    expectedHttpCode,
+    updatedCases,
+    caseIdsToDelete,
+  });
+
+  for (const alert of alertAfterDeletion) {
+    expect(alert[ALERT_CASE_IDS]).eql(caseIdsWithoutRemovedCase);
+  }
+};
+
+export const createCaseAndAttachAlert = async ({
+  supertest,
+  totalCases,
+  owner,
+  alerts,
+  getAlerts,
+}: {
+  supertest: SuperTest.SuperTest<SuperTest.Test>;
+  totalCases: number;
+  owner: string;
+  alerts: Alerts;
+  getAlerts: (alerts: Alerts) => Promise<Array<Record<string, unknown>>>;
+}): Promise<CaseResponse[]> => {
   const cases = await Promise.all(
     [...Array(totalCases).keys()].map((index) =>
       createCase(
@@ -147,25 +241,21 @@ export const createCaseAttachAlertAndDeleteAlert = async ({
     expect(alert[ALERT_CASE_IDS]).eql(caseIds);
   }
 
-  const caseToDelete = updatedCases[indexOfCaseToDelete];
-
-  await deleteAllComments({
-    supertest,
-    caseId: caseToDelete.id,
-    expectedHttpCode,
-    auth: deleteCommentAuth,
-  });
-
-  const alertAfterDeletion = await getAlerts(alerts);
-
-  const caseIdsWithoutRemovedCase =
-    expectedHttpCode === 204
-      ? updatedCases
-          .filter((theCase) => theCase.id !== caseToDelete.id)
-          .map((theCase) => theCase.id)
-      : updatedCases.map((theCase) => theCase.id);
+  return updatedCases;
+};
 
-  for (const alert of alertAfterDeletion) {
-    expect(alert[ALERT_CASE_IDS]).eql(caseIdsWithoutRemovedCase);
-  }
+export const getCaseIdsWithoutRemovedCases = ({
+  updatedCases,
+  caseIdsToDelete,
+  expectedHttpCode,
+}: {
+  expectedHttpCode: number;
+  updatedCases: Array<{ id: string }>;
+  caseIdsToDelete: string[];
+}) => {
+  return expectedHttpCode === 204
+    ? updatedCases
+        .filter((theCase) => !caseIdsToDelete.some((id) => theCase.id === id))
+        .map((theCase) => theCase.id)
+    : updatedCases.map((theCase) => theCase.id);
 };
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/delete_cases.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/delete_cases.ts
index 981a368019e8f..b1df6d69afe3a 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/delete_cases.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/delete_cases.ts
@@ -8,6 +8,13 @@
 import expect from '@kbn/expect';
 import type SuperTest from 'supertest';
 import { MAX_DOCS_PER_PAGE } from '@kbn/cases-plugin/common/constants';
+import {
+  Alerts,
+  createCaseAttachAlertAndDeleteCase,
+  createSecuritySolutionAlerts,
+  getAlertById,
+  getSecuritySolutionAlerts,
+} from '../../../../common/lib/alerts';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
 import {
@@ -39,6 +46,10 @@ import {
   noKibanaPrivileges,
   obsOnly,
   superUser,
+  obsOnlyReadAlerts,
+  obsSec,
+  secSolutionOnlyReadNoIndexAlerts,
+  secOnlyReadAlerts,
 } from '../../../../common/lib/authentication/users';
 import {
   secAllUser,
@@ -51,12 +62,19 @@ import {
   SECURITY_SOLUTION_FILE_KIND,
 } from '../../../../common/lib/constants';
 import { User } from '../../../../common/lib/authentication/types';
+import {
+  createSignalsIndex,
+  deleteAllRules,
+  deleteSignalsIndex,
+} from '../../../../../detection_engine_api_integration/utils';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
   const supertestWithoutAuth = getService('supertestWithoutAuth');
   const supertest = getService('supertest');
   const es = getService('es');
+  const esArchiver = getService('esArchiver');
+  const log = getService('log');
 
   describe('delete_cases', () => {
     afterEach(async () => {
@@ -209,6 +227,197 @@ export default ({ getService }: FtrProviderContext): void => {
       });
     });
 
+    describe('alerts', () => {
+      describe('security_solution', () => {
+        let alerts: Alerts = [];
+
+        const getAlerts = async (_alerts: Alerts) => {
+          await es.indices.refresh({ index: _alerts.map((alert) => alert._index) });
+          const updatedAlerts = await getSecuritySolutionAlerts(
+            supertest,
+            alerts.map((alert) => alert._id)
+          );
+
+          return updatedAlerts.hits.hits.map((alert) => ({ ...alert._source }));
+        };
+
+        beforeEach(async () => {
+          await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
+          await createSignalsIndex(supertest, log);
+          const signals = await createSecuritySolutionAlerts(supertest, log);
+          alerts = [signals.hits.hits[0], signals.hits.hits[1]];
+        });
+
+        afterEach(async () => {
+          await deleteSignalsIndex(supertest, log);
+          await deleteAllRules(supertest, log);
+          await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
+        });
+
+        it('removes a case from the alert schema when deleting a case', async () => {
+          await createCaseAttachAlertAndDeleteCase({
+            supertest: supertestWithoutAuth,
+            totalCases: 1,
+            indicesOfCaseToDelete: [0],
+            owner: 'securitySolutionFixture',
+            alerts,
+            getAlerts,
+          });
+        });
+
+        it('removes multiple cases from the alert schema when deleting all cases', async () => {
+          await createCaseAttachAlertAndDeleteCase({
+            supertest: supertestWithoutAuth,
+            totalCases: 2,
+            indicesOfCaseToDelete: [0, 1],
+            owner: 'securitySolutionFixture',
+            alerts,
+            getAlerts,
+          });
+        });
+
+        it('removes multiple cases from the alert schema when deleting multiple cases', async () => {
+          await createCaseAttachAlertAndDeleteCase({
+            supertest: supertestWithoutAuth,
+            totalCases: 4,
+            indicesOfCaseToDelete: [0, 2],
+            owner: 'securitySolutionFixture',
+            alerts,
+            getAlerts,
+          });
+        });
+
+        it('should delete case ID from the alert schema when the user has read access only', async () => {
+          await createCaseAttachAlertAndDeleteCase({
+            supertest: supertestWithoutAuth,
+            totalCases: 1,
+            indicesOfCaseToDelete: [0],
+            expectedHttpCode: 204,
+            owner: 'securitySolutionFixture',
+            alerts,
+            getAlerts,
+            deleteCaseAuth: { user: secOnlyReadAlerts, space: 'space1' },
+          });
+        });
+
+        it('should delete case ID from the alert schema when the user does NOT have access to the alert', async () => {
+          await createCaseAttachAlertAndDeleteCase({
+            supertest: supertestWithoutAuth,
+            totalCases: 1,
+            indicesOfCaseToDelete: [0],
+            expectedHttpCode: 204,
+            owner: 'securitySolutionFixture',
+            alerts,
+            getAlerts,
+            deleteCaseAuth: { user: obsSec, space: 'space1' },
+          });
+        });
+
+        it('should delete the case ID from the alert schema when the user has read access to the kibana feature but no read access to the ES index', async () => {
+          await createCaseAttachAlertAndDeleteCase({
+            supertest: supertestWithoutAuth,
+            totalCases: 1,
+            indicesOfCaseToDelete: [0],
+            owner: 'securitySolutionFixture',
+            alerts,
+            getAlerts,
+            expectedHttpCode: 204,
+            deleteCaseAuth: { user: secSolutionOnlyReadNoIndexAlerts, space: 'space1' },
+          });
+        });
+      });
+
+      describe('observability', () => {
+        const alerts = [
+          { _id: 'NoxgpHkBqbdrfX07MqXV', _index: '.alerts-observability.apm.alerts' },
+          { _id: 'space1alert', _index: '.alerts-observability.apm.alerts' },
+        ];
+
+        const getAlerts = async (_alerts: Alerts) => {
+          await es.indices.refresh({ index: '.alerts-observability.apm.alerts' });
+          const updatedAlerts = await Promise.all(
+            _alerts.map((alert) =>
+              getAlertById({
+                supertest: supertestWithoutAuth,
+                id: alert._id,
+                index: alert._index,
+                auth: { user: superUser, space: 'space1' },
+              })
+            )
+          );
+
+          return updatedAlerts as Array<Record<string, unknown>>;
+        };
+
+        beforeEach(async () => {
+          await esArchiver.load('x-pack/test/functional/es_archives/rule_registry/alerts');
+        });
+
+        afterEach(async () => {
+          await esArchiver.unload('x-pack/test/functional/es_archives/rule_registry/alerts');
+        });
+
+        it('removes a case from the alert schema when deleting a case', async () => {
+          await createCaseAttachAlertAndDeleteCase({
+            supertest: supertestWithoutAuth,
+            totalCases: 1,
+            indicesOfCaseToDelete: [0],
+            owner: 'observabilityFixture',
+            alerts,
+            getAlerts,
+          });
+        });
+
+        it('removes multiple cases from the alert schema when deleting all cases', async () => {
+          await createCaseAttachAlertAndDeleteCase({
+            supertest: supertestWithoutAuth,
+            totalCases: 2,
+            indicesOfCaseToDelete: [0, 1],
+            owner: 'observabilityFixture',
+            alerts,
+            getAlerts,
+          });
+        });
+
+        it('removes multiple cases from the alert schema when deleting multiple cases', async () => {
+          await createCaseAttachAlertAndDeleteCase({
+            supertest: supertestWithoutAuth,
+            totalCases: 4,
+            indicesOfCaseToDelete: [0, 2],
+            owner: 'observabilityFixture',
+            alerts,
+            getAlerts,
+          });
+        });
+
+        it('should delete case ID from the alert schema when the user has read access only', async () => {
+          await createCaseAttachAlertAndDeleteCase({
+            supertest: supertestWithoutAuth,
+            totalCases: 1,
+            indicesOfCaseToDelete: [0],
+            expectedHttpCode: 204,
+            owner: 'observabilityFixture',
+            alerts,
+            getAlerts,
+            deleteCaseAuth: { user: obsOnlyReadAlerts, space: 'space1' },
+          });
+        });
+
+        it('should delete case ID from the alert schema when the user does NOT have access to the alert', async () => {
+          await createCaseAttachAlertAndDeleteCase({
+            supertest: supertestWithoutAuth,
+            totalCases: 1,
+            indicesOfCaseToDelete: [0],
+            expectedHttpCode: 204,
+            owner: 'observabilityFixture',
+            alerts,
+            getAlerts,
+            deleteCaseAuth: { user: obsSec, space: 'space1' },
+          });
+        });
+      });
+    });
+
     describe('rbac', () => {
       describe('files', () => {
         // we need api_int_users and roles because they have authorization for the actual plugins (not the fixtures). This
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/delete_comment.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/delete_comment.ts
index 317bd2797245b..e9ca52d903b5b 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/delete_comment.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/delete_comment.ts
@@ -7,6 +7,7 @@
 
 import expect from '@kbn/expect';
 import {
+  Alerts,
   createCaseAttachAlertAndDeleteAlert,
   createSecuritySolutionAlerts,
   getAlertById,
@@ -109,8 +110,6 @@ export default ({ getService }: FtrProviderContext): void => {
     });
 
     describe('alerts', () => {
-      type Alerts = Array<{ _id: string; _index: string }>;
-
       describe('security_solution', () => {
         let alerts: Alerts = [];
 
@@ -172,7 +171,7 @@ export default ({ getService }: FtrProviderContext): void => {
           });
         });
 
-        it('should NOT delete case ID from the alert schema when the user does NOT have access to the alert', async () => {
+        it('should delete case ID from the alert schema when the user does NOT have access to the alert', async () => {
           await createCaseAttachAlertAndDeleteAlert({
             supertest: supertestWithoutAuth,
             totalCases: 1,
@@ -180,7 +179,7 @@ export default ({ getService }: FtrProviderContext): void => {
             owner: 'securitySolutionFixture',
             alerts,
             getAlerts,
-            expectedHttpCode: 403,
+            expectedHttpCode: 204,
             deleteCommentAuth: { user: obsSec, space: 'space1' },
           });
         });
@@ -206,6 +205,7 @@ export default ({ getService }: FtrProviderContext): void => {
         ];
 
         const getAlerts = async (_alerts: Alerts) => {
+          await es.indices.refresh({ index: '.alerts-observability.apm.alerts' });
           const updatedAlerts = await Promise.all(
             _alerts.map((alert) =>
               getAlertById({
@@ -263,12 +263,12 @@ export default ({ getService }: FtrProviderContext): void => {
           });
         });
 
-        it('should NOT delete case ID from the alert schema when the user does NOT have access to the alert', async () => {
+        it('should delete case ID from the alert schema when the user does NOT have access to the alert', async () => {
           await createCaseAttachAlertAndDeleteAlert({
             supertest: supertestWithoutAuth,
             totalCases: 1,
             indexOfCaseToDelete: 0,
-            expectedHttpCode: 403,
+            expectedHttpCode: 204,
             owner: 'observabilityFixture',
             alerts,
             getAlerts,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/delete_comments.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/delete_comments.ts
index 7ac1cc4f9de77..3557e50464666 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/delete_comments.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/comments/delete_comments.ts
@@ -214,7 +214,7 @@ export default ({ getService }: FtrProviderContext): void => {
           });
         });
 
-        it('should NOT delete case ID from the alert schema when the user does NOT have access to the alert', async () => {
+        it('should delete case ID from the alert schema when the user does NOT have access to the alert', async () => {
           await createCaseAttachAlertAndDeleteAlert({
             supertest: supertestWithoutAuth,
             totalCases: 1,
@@ -222,7 +222,7 @@ export default ({ getService }: FtrProviderContext): void => {
             owner: 'securitySolutionFixture',
             alerts,
             getAlerts,
-            expectedHttpCode: 403,
+            expectedHttpCode: 204,
             deleteCommentAuth: { user: obsSec, space: 'space1' },
           });
         });
@@ -248,6 +248,7 @@ export default ({ getService }: FtrProviderContext): void => {
         ];
 
         const getAlerts = async (_alerts: Alerts) => {
+          await es.indices.refresh({ index: '.alerts-observability.apm.alerts' });
           const updatedAlerts = await Promise.all(
             _alerts.map((alert) =>
               getAlertById({
@@ -346,12 +347,12 @@ export default ({ getService }: FtrProviderContext): void => {
           });
         });
 
-        it('should NOT delete case ID from the alert schema when the user does NOT have access to the alert', async () => {
+        it('should delete case ID from the alert schema when the user does NOT have access to the alert', async () => {
           await createCaseAttachAlertAndDeleteAlert({
             supertest: supertestWithoutAuth,
             totalCases: 1,
             indexOfCaseToDelete: 0,
-            expectedHttpCode: 403,
+            expectedHttpCode: 204,
             owner: 'observabilityFixture',
             alerts,
             getAlerts,

From f843932593b1be973cd1a3daff0697fca090fad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?=
 <alejandro.haro@elastic.co>
Date: Tue, 18 Apr 2023 18:37:23 +0200
Subject: [PATCH 038/100] [Telemetry] Saved Objects fields cleanup (#155165)

---
 .../group2/check_registered_types.test.ts     |  2 +-
 .../register_telemetry_saved_object.ts        | 28 ++-----------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/src/core/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts
index 4ef2e37cad8e6..a6428387f65f3 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts
@@ -143,7 +143,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "synthetics-privates-locations": "7d032fc788905e32152029ae7ab3d6038c48ae44",
         "tag": "87f21f07df9cc37001b15a26e413c18f50d1fbfe",
         "task": "533ee80c50c47f0505846bfac73fc10962c5bc45",
-        "telemetry": "561b329aaed3c15b91aaf2075645be3097247612",
+        "telemetry": "3b3b89cf411a2a2e60487cef6ccdbc5df691aeb9",
         "ui-metric": "410a8ad28e0f44b161c960ff0ce950c712b17c52",
         "upgrade-assistant-ml-upgrade-operation": "d8816e5ce32649e7a3a43e2c406c632319ff84bb",
         "upgrade-assistant-reindex-operation": "09ac8ed9c9acf7e8ece8eafe47d7019ea1472144",
diff --git a/src/plugins/telemetry/server/saved_objects/register_telemetry_saved_object.ts b/src/plugins/telemetry/server/saved_objects/register_telemetry_saved_object.ts
index 20b2ab6093514..17cae888c58dd 100644
--- a/src/plugins/telemetry/server/saved_objects/register_telemetry_saved_object.ts
+++ b/src/plugins/telemetry/server/saved_objects/register_telemetry_saved_object.ts
@@ -17,32 +17,8 @@ export function registerTelemetrySavedObject(
     hidden: true,
     namespaceType: 'agnostic',
     mappings: {
-      properties: {
-        enabled: {
-          type: 'boolean',
-        },
-        sendUsageFrom: {
-          type: 'keyword',
-        },
-        lastReported: {
-          type: 'date',
-        },
-        lastVersionChecked: {
-          type: 'keyword',
-        },
-        userHasSeenNotice: {
-          type: 'boolean',
-        },
-        reportFailureCount: {
-          type: 'integer',
-        },
-        reportFailureVersion: {
-          type: 'keyword',
-        },
-        allowChangingOptInStatus: {
-          type: 'boolean',
-        },
-      },
+      dynamic: false,
+      properties: {},
     },
   });
 }

From 5af2fd42f1879a6eb63755eac99f32d8dc14e683 Mon Sep 17 00:00:00 2001
From: Justin Kambic <jk@elastic.co>
Date: Tue, 18 Apr 2023 12:58:53 -0400
Subject: [PATCH 039/100] [Synthetics] Apply faster backoff for non-`test-now`
 screenshot results (#152874)

## Summary

Resolves #152754.

It was noted in #152754 that we're getting some negative side effects
from the exponential backoff we added to the getter for journey
screenshots. When a screenshot is legitimately not available for an
older journey (as opposed to not yet fully indexed for a fresh journey),
the backoff will cause the screenshot never to render.

## Testing

Follow a flow similar to what's illustrated in the GIF below.

1. Create a monitor with some screenshots that show up.
2. Delete the screenshot data stream. A good way is to use the Index
Management > Data Streams view in Kibana.
3. Refresh your monitor's detail page when new photos are coming in. It
should give up on finding the images very fast, and as they aren't
there, you should see the missing image placeholder.
4. Start creating a new monitor. Make it have multiple steps.
5. Ensure that you aren't seeing any "infinite" loading states across
the screenshot UIs.


![20230308110103](https://user-images.githubusercontent.com/18429259/223766486-eaca4295-9e4f-4490-8717-c1b915382ec7.gif)
---
 .../browser_steps_list.tsx                    |  1 +
 .../use_retrieve_step_image.ts                | 76 +++++++++++--------
 .../common/screenshot/empty_thumbnail.tsx     | 19 +++--
 .../screenshot/journey_screenshot_dialog.tsx  |  4 +-
 ...journey_step_screenshot_container.test.tsx | 18 +----
 .../journey_step_screenshot_container.tsx     |  5 +-
 .../state/browser_journey/api.test.ts         |  8 +-
 .../synthetics/state/browser_journey/api.ts   | 24 +++++-
 8 files changed, 95 insertions(+), 60 deletions(-)

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 508b9d29c04a9..ccec4c1e8f60d 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
@@ -155,6 +155,7 @@ export const BrowserStepsList = ({
           allStepsLoaded={!loading}
           retryFetchOnRevisit={true}
           size={screenshotImageSize}
+          testNowMode={testNowMode}
           timestamp={timestamp}
         />
       ),
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/monitor_test_result/use_retrieve_step_image.ts b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/monitor_test_result/use_retrieve_step_image.ts
index 589b45c2c1c49..9f22bd9eb77f6 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/monitor_test_result/use_retrieve_step_image.ts
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/monitor_test_result/use_retrieve_step_image.ts
@@ -6,15 +6,13 @@
  */
 
 import { useEffect, useMemo, useState } from 'react';
-import { useFetcher } from '@kbn/observability-plugin/public';
-import moment from 'moment';
 import {
   ScreenshotImageBlob,
   ScreenshotRefImageData,
   isScreenshotRef,
 } from '../../../../../../common/runtime_types';
 import { useComposeImageFromRef } from '../../../hooks/use_composite_image';
-import { getJourneyScreenshot } from '../../../state';
+import { BackoffOptions, getJourneyScreenshot } from '../../../state';
 
 type ImageResponse = ScreenshotImageBlob | ScreenshotRefImageData | null;
 interface ImageDataResult {
@@ -34,6 +32,7 @@ export const useRetrieveStepImage = ({
   stepStatus,
   hasIntersected,
   imgPath,
+  testNowMode,
   retryFetchOnRevisit,
 }: {
   timestamp?: string;
@@ -42,6 +41,8 @@ export const useRetrieveStepImage = ({
   stepStatus?: string;
   hasIntersected: boolean;
 
+  testNowMode?: boolean;
+
   /**
    * Whether to retry screenshot image fetch on revisit (when intersection change triggers).
    * Will only re-fetch if an image fetch wasn't successful in previous attempts.
@@ -53,39 +54,54 @@ export const useRetrieveStepImage = ({
   const [imgState, setImgState] = useState<ImageDataResult>({});
   const skippedStep = stepStatus === 'skipped';
 
-  const dataResult = useGetStepScreenshotUrls(checkGroup, imgPath, imgState);
-  const isImageUrlAvailable = dataResult?.[imgPath]?.url ?? false;
-
-  useFetcher(() => {
-    const is5MinutesOld = timestamp
-      ? moment(timestamp).isBefore(moment().subtract(5, 'minutes'))
-      : false;
-    const retrieveAttemptedBefore = (imgState[imgPath]?.attempts ?? 0) > 0;
-    const shouldRetry = retryFetchOnRevisit || !retrieveAttemptedBefore;
+  const imageResult = useGetStepScreenshotUrls(checkGroup, imgPath, imgState);
+  const isImageUrlAvailable = imageResult?.[imgPath]?.url ?? false;
+
+  const shouldFetch = useMemo(() => {
+    const shouldRetry = retryFetchOnRevisit || !(imgState[imgPath]?.attempts ?? 0 > 0);
+    return !skippedStep && hasIntersected && !isImageUrlAvailable && shouldRetry && checkGroup;
+  }, [
+    checkGroup,
+    hasIntersected,
+    imgPath,
+    imgState,
+    isImageUrlAvailable,
+    retryFetchOnRevisit,
+    skippedStep,
+  ]);
 
-    if (!skippedStep && hasIntersected && !isImageUrlAvailable && shouldRetry && checkGroup) {
-      setImgState((prevState) => {
-        return getUpdatedState({ prevState, imgPath, increment: true, loading: true });
-      });
-      return getJourneyScreenshot(imgPath, !is5MinutesOld)
-        .then((data) => {
-          setImgState((prevState) => {
-            return getUpdatedState({ prevState, imgPath, increment: false, data, loading: false });
-          });
-
-          return data;
-        })
-        .catch(() => {
+  useEffect(() => {
+    async function run() {
+      if (shouldFetch) {
+        setImgState((prevState) => {
+          return getUpdatedState({ prevState, imgPath, increment: true, loading: true });
+        });
+        const backoffOptions: Partial<BackoffOptions> | undefined = !testNowMode
+          ? { shouldBackoff: false }
+          : undefined;
+        try {
+          getJourneyScreenshot(imgPath, backoffOptions).then((data) =>
+            setImgState((prevState) =>
+              getUpdatedState({
+                prevState,
+                imgPath,
+                increment: false,
+                data,
+                loading: false,
+              })
+            )
+          );
+        } catch (e: unknown) {
           setImgState((prevState) => {
             return getUpdatedState({ prevState, imgPath, increment: false, loading: false });
           });
-        });
-    } else {
-      return new Promise<ImageResponse>((resolve) => resolve(null));
+        }
+      }
     }
-  }, [skippedStep, hasIntersected, imgPath, retryFetchOnRevisit, timestamp]);
+    run();
+  }, [imgPath, shouldFetch, testNowMode]);
 
-  return dataResult;
+  return imageResult;
 };
 
 /**
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/screenshot/empty_thumbnail.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/screenshot/empty_thumbnail.tsx
index 9602bf83b330a..7309d54aa08da 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/screenshot/empty_thumbnail.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/screenshot/empty_thumbnail.tsx
@@ -11,8 +11,8 @@ import {
   useEuiTheme,
   useEuiBackgroundColor,
   EuiIcon,
-  EuiLoadingContent,
   EuiText,
+  EuiSkeletonRectangle,
 } from '@elastic/eui';
 
 import {
@@ -63,14 +63,23 @@ export const EmptyThumbnail = ({
         ...(borderRadius ? { borderRadius } : {}),
       }}
     >
-      {isLoading ? (
-        <EuiLoadingContent
+      {isLoading && animateLoading ? (
+        <EuiSkeletonRectangle
+          data-test-subj="stepScreenshotPlaceholderLoading"
+          isLoading={isLoading}
+          height={height}
+          width={width}
+        >
+          {/* `children` is required by this component, even though we'll replace it. */}
+          <span />
+        </EuiSkeletonRectangle>
+      ) : // when we're loading and `animateLoading` is false we simply render an un-animated div to fill the space
+      isLoading ? (
+        <div
           data-test-subj="stepScreenshotPlaceholderLoading"
           style={{
             width: '100%',
-            transform: `scale(1, ${animateLoading ? '100' : '0'})`, // To create a skeleton loading effect when animateLoading is true
           }}
-          lines={1}
         />
       ) : (
         <div
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/screenshot/journey_screenshot_dialog.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/screenshot/journey_screenshot_dialog.tsx
index f24ba4d5e9f4a..05295781aa7c3 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/screenshot/journey_screenshot_dialog.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/screenshot/journey_screenshot_dialog.tsx
@@ -123,7 +123,7 @@ export const JourneyScreenshotDialog = ({
           <ScreenshotImage
             label={stepCountLabel}
             imgSrc={imgSrc}
-            isLoading={loading ?? false}
+            isLoading={!!loading}
             animateLoading={false}
             hasBorder={false}
             size={'full'}
@@ -143,7 +143,7 @@ export const JourneyScreenshotDialog = ({
             // we don't want this to be captured by row click which leads to step list page
             evt.stopPropagation();
           }}
-          onKeyDown={(evt) => {
+          onKeyDown={(_evt) => {
             // Just to satisfy ESLint
           }}
         >
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/screenshot/journey_step_screenshot_container.test.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/screenshot/journey_step_screenshot_container.test.tsx
index 9f5e313b78dd3..70037635c4445 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/screenshot/journey_step_screenshot_container.test.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/screenshot/journey_step_screenshot_container.test.tsx
@@ -9,7 +9,6 @@ import React from 'react';
 import { fireEvent, waitFor, waitForElementToBeRemoved } from '@testing-library/react';
 import { JourneyStepScreenshotContainer } from './journey_step_screenshot_container';
 import { render } from '../../../utils/testing';
-import * as observabilityPublic from '@kbn/observability-plugin/public';
 import * as retrieveHooks from '../monitor_test_result/use_retrieve_step_image';
 import { getScreenshotUrl } from './journey_screenshot_dialog';
 
@@ -39,8 +38,8 @@ const testImageDataResult = {
 };
 
 describe('JourneyStepScreenshotContainer', () => {
+  afterEach(() => jest.clearAllMocks());
   let checkGroup: string;
-  const { FETCH_STATUS } = observabilityPublic;
 
   beforeAll(() => {
     checkGroup = 'test-check-group';
@@ -50,21 +49,8 @@ describe('JourneyStepScreenshotContainer', () => {
     jest.clearAllMocks();
   });
 
-  it.each([[FETCH_STATUS.PENDING], [FETCH_STATUS.LOADING]])(
-    'displays spinner when loading step image',
-    (fetchStatus) => {
-      jest
-        .spyOn(observabilityPublic, 'useFetcher')
-        .mockReturnValue({ status: fetchStatus, data: null, refetch: () => null, loading: true });
-      const { getByTestId } = render(<JourneyStepScreenshotContainer checkGroup={checkGroup} />);
-      expect(getByTestId('stepScreenshotPlaceholderLoading')).toBeInTheDocument();
-    }
-  );
-
   it('displays no image available when img src is unavailable and fetch status is successful', () => {
-    jest
-      .spyOn(observabilityPublic, 'useFetcher')
-      .mockReturnValue({ status: FETCH_STATUS.SUCCESS, data: null, refetch: () => null });
+    jest.spyOn(retrieveHooks, 'useRetrieveStepImage').mockReturnValue(undefined);
     const { getByTestId } = render(
       <JourneyStepScreenshotContainer checkGroup={checkGroup} allStepsLoaded={true} />
     );
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/screenshot/journey_step_screenshot_container.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/screenshot/journey_step_screenshot_container.tsx
index f4fd7470545e7..174efc41dfe08 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/screenshot/journey_step_screenshot_container.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/screenshot/journey_step_screenshot_container.tsx
@@ -23,17 +23,19 @@ interface Props {
   allStepsLoaded?: boolean;
   retryFetchOnRevisit?: boolean; // Set to `true` for "Run Once" / "Test Now" modes
   size?: ScreenshotImageSize;
+  testNowMode?: boolean;
   unavailableMessage?: string;
   borderRadius?: number | string;
 }
 
 export const JourneyStepScreenshotContainer = ({
+  allStepsLoaded,
   timestamp,
   checkGroup,
   stepStatus,
-  allStepsLoaded,
   initialStepNumber = 1,
   retryFetchOnRevisit = false,
+  testNowMode,
   size = THUMBNAIL_SCREENSHOT_SIZE,
   unavailableMessage,
   borderRadius,
@@ -58,6 +60,7 @@ export const JourneyStepScreenshotContainer = ({
     imgPath,
     retryFetchOnRevisit,
     checkGroup,
+    testNowMode,
     timestamp,
   });
 
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/state/browser_journey/api.test.ts b/x-pack/plugins/synthetics/public/apps/synthetics/state/browser_journey/api.test.ts
index 7e5fd5aa8de05..35503455e4a8a 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/state/browser_journey/api.test.ts
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/state/browser_journey/api.test.ts
@@ -81,7 +81,7 @@ describe('getJourneyScreenshot', () => {
     const mockFetch = jest.fn().mockResolvedValue(mockResponse);
     global.fetch = mockFetch;
 
-    const result = await getJourneyScreenshot(url, false);
+    const result = await getJourneyScreenshot(url, { shouldBackoff: false });
     expect(result).toBeNull();
     expect(mockFetch).toHaveBeenCalledTimes(1);
   });
@@ -146,7 +146,11 @@ describe('getJourneyScreenshot', () => {
     const mockFetch = jest.fn().mockReturnValue(mockResponse);
     global.fetch = mockFetch;
 
-    const result = await getJourneyScreenshot(url, true, maxRetry, initialBackoff);
+    const result = await getJourneyScreenshot(url, {
+      shouldBackoff: true,
+      maxRetry,
+      initialBackoff,
+    });
     expect(result).toBeNull();
     expect(mockFetch).toBeCalledTimes(maxRetry + 1);
   });
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/state/browser_journey/api.ts b/x-pack/plugins/synthetics/public/apps/synthetics/state/browser_journey/api.ts
index b4b352d388768..86b604e0f8f6b 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/state/browser_journey/api.ts
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/state/browser_journey/api.ts
@@ -75,12 +75,24 @@ export async function fetchLastSuccessfulCheck({
   );
 }
 
+export interface BackoffOptions {
+  shouldBackoff?: boolean;
+  maxRetry?: number;
+  initialBackoff?: number;
+}
+
+const DEFAULT_SHOULD_BACKOFF = true;
+const DEFAULT_MAX_RETRY = 8;
+const DEFAULT_INITIAL_BACKOFF = 100;
+
 export async function getJourneyScreenshot(
   imgSrc: string,
-  shouldBackoff = true,
-  maxRetry = 15,
-  initialBackoff = 100
+  options?: Partial<BackoffOptions>
 ): Promise<ScreenshotImageBlob | ScreenshotRefImageData | null> {
+  const shouldBackoff = options?.shouldBackoff ?? DEFAULT_SHOULD_BACKOFF;
+  const maxRetry = options?.maxRetry ?? DEFAULT_MAX_RETRY;
+  const initialBackoff = options?.initialBackoff ?? DEFAULT_INITIAL_BACKOFF;
+
   try {
     let retryCount = 0;
 
@@ -89,8 +101,12 @@ export async function getJourneyScreenshot(
     while (response?.status !== 200) {
       const imgRequest = new Request(imgSrc);
 
+      if (retryCount > maxRetry) break;
+
       response = await fetch(imgRequest);
-      if (!shouldBackoff || retryCount >= maxRetry || response.status !== 404) break;
+
+      if (!shouldBackoff || response.status !== 404) break;
+
       await new Promise((r) => setTimeout(r, (backoff *= 2)));
       retryCount++;
     }

From 66f68d4123a333f4651662f70eb2465ade7e9081 Mon Sep 17 00:00:00 2001
From: Devon Thomson <devon.thomson@elastic.co>
Date: Tue, 18 Apr 2023 13:04:26 -0400
Subject: [PATCH 040/100] [Controls] Add Expensive Queries Fallback (#155082)

## Summary
If the user has no permission to check for the value of `allow_expensive_queries`, it will now default to true instead of false.
---
 .../options_list_cluster_settings_route.ts           | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/plugins/controls/server/options_list/options_list_cluster_settings_route.ts b/src/plugins/controls/server/options_list/options_list_cluster_settings_route.ts
index 3da1585405305..f3b4ea598b886 100644
--- a/src/plugins/controls/server/options_list/options_list_cluster_settings_route.ts
+++ b/src/plugins/controls/server/options_list/options_list_cluster_settings_route.ts
@@ -8,6 +8,7 @@
 
 import { getKbnServerError, reportServerError } from '@kbn/kibana-utils-plugin/server';
 import { CoreSetup } from '@kbn/core/server';
+import { errors } from '@elastic/elasticsearch';
 
 export const setupOptionsListClusterSettingsRoute = ({ http }: CoreSetup) => {
   const router = http.createRouter();
@@ -39,6 +40,17 @@ export const setupOptionsListClusterSettingsRoute = ({ http }: CoreSetup) => {
           },
         });
       } catch (e) {
+        if (e instanceof errors.ResponseError && e.body.error.type === 'security_exception') {
+          /**
+           * in cases where the user does not have the 'monitor' permission this check will fail. In these cases, we will
+           * fall back to assume that the allowExpensiveQueries setting is on, because it defaults to true.
+           */
+          return response.ok({
+            body: {
+              allowExpensiveQueries: true,
+            },
+          });
+        }
         const kbnErr = getKbnServerError(e);
         return reportServerError(response, kbnErr);
       }

From 17c4185fd7a21fea8be36d7c150accadf74d757a Mon Sep 17 00:00:00 2001
From: Kfir Peled <61654899+kfirpeled@users.noreply.github.com>
Date: Tue, 18 Apr 2023 13:10:46 -0600
Subject: [PATCH 041/100] [Cloud Security] Update vulnerability management
 retention policy to 3 days (#155080)

---
 .../create_transforms/latest_vulnerabilities_transforms.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/plugins/cloud_security_posture/server/create_transforms/latest_vulnerabilities_transforms.ts b/x-pack/plugins/cloud_security_posture/server/create_transforms/latest_vulnerabilities_transforms.ts
index 8fff7e910d471..9af2d91a2b730 100644
--- a/x-pack/plugins/cloud_security_posture/server/create_transforms/latest_vulnerabilities_transforms.ts
+++ b/x-pack/plugins/cloud_security_posture/server/create_transforms/latest_vulnerabilities_transforms.ts
@@ -32,7 +32,7 @@ export const latestVulnerabilitiesTransform: TransformPutTransformRequest = {
   retention_policy: {
     time: {
       field: '@timestamp',
-      max_age: '50h',
+      max_age: '3d',
     },
   },
   latest: {

From 613619bee2c67b1db4a92166a9576d083fa34381 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?=
 <alejandro.haro@elastic.co>
Date: Tue, 18 Apr 2023 21:38:18 +0200
Subject: [PATCH 042/100] [Telemetry] Use `soClient` in FTRs (#155175)

---
 test/api_integration/apis/telemetry/index.ts  |   2 +-
 test/api_integration/apis/telemetry/opt_in.ts |  65 ++++-----
 .../apis/telemetry/telemetry_config.ts        |   2 +-
 .../apis/telemetry/telemetry_last_reported.ts |  33 +++--
 .../telemetry/telemetry_optin_notice_seen.ts  |  22 ++-
 .../api_integration/apis/telemetry/index.ts   |   2 -
 .../api_integration/apis/telemetry/opt_in.ts  | 125 ------------------
 .../telemetry/telemetry_optin_notice_seen.ts  |  35 -----
 8 files changed, 59 insertions(+), 227 deletions(-)
 delete mode 100644 x-pack/test/api_integration/apis/telemetry/opt_in.ts
 delete mode 100644 x-pack/test/api_integration/apis/telemetry/telemetry_optin_notice_seen.ts

diff --git a/test/api_integration/apis/telemetry/index.ts b/test/api_integration/apis/telemetry/index.ts
index 3afe1ef304b27..a92ae4e1b8481 100644
--- a/test/api_integration/apis/telemetry/index.ts
+++ b/test/api_integration/apis/telemetry/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from '../../ftr_provider_context';
+import type { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('Telemetry', () => {
diff --git a/test/api_integration/apis/telemetry/opt_in.ts b/test/api_integration/apis/telemetry/opt_in.ts
index 8d0fb6725bacf..943d7534acc0a 100644
--- a/test/api_integration/apis/telemetry/opt_in.ts
+++ b/test/api_integration/apis/telemetry/opt_in.ts
@@ -7,17 +7,16 @@
  */
 
 import expect from '@kbn/expect';
-import { Client } from '@elastic/elasticsearch';
 
-import { TelemetrySavedObjectAttributes } from '@kbn/telemetry-plugin/server/saved_objects';
 import SuperTest from 'supertest';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import type { KbnClient } from '@kbn/test';
+import type { TelemetrySavedObjectAttributes } from '@kbn/telemetry-plugin/server/saved_objects';
+import type { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function optInTest({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const kibanaServer = getService('kibanaServer');
   const esArchiver = getService('esArchiver');
-  const esClient: Client = getService('es');
 
   describe('/api/telemetry/v2/optIn API', () => {
     let defaultAttributes: TelemetrySavedObjectAttributes;
@@ -26,39 +25,39 @@ export default function optInTest({ getService }: FtrProviderContext) {
       await esArchiver.emptyKibanaIndex();
       const kibanaVersionAccessor = kibanaServer.version;
       kibanaVersion = await kibanaVersionAccessor.get();
-      defaultAttributes = await getSavedObjectAttributes(esClient);
+      defaultAttributes = await getSavedObjectAttributes(kibanaServer);
 
       expect(typeof kibanaVersion).to.eql('string');
       expect(kibanaVersion.length).to.be.greaterThan(0);
     });
 
     afterEach(async () => {
-      await updateSavedObjectAttributes(esClient, defaultAttributes);
+      await updateSavedObjectAttributes(kibanaServer, defaultAttributes);
     });
 
     it('should support sending false with allowChangingOptInStatus true', async () => {
-      await updateSavedObjectAttributes(esClient, {
+      await updateSavedObjectAttributes(kibanaServer, {
         allowChangingOptInStatus: true,
       });
       await postTelemetryV2OptIn(supertest, false, 200);
-      const { enabled, lastVersionChecked } = await getSavedObjectAttributes(esClient);
+      const { enabled, lastVersionChecked } = await getSavedObjectAttributes(kibanaServer);
       expect(enabled).to.be(false);
       expect(lastVersionChecked).to.be(kibanaVersion);
     });
 
     it('should support sending true with allowChangingOptInStatus true', async () => {
-      await updateSavedObjectAttributes(esClient, {
+      await updateSavedObjectAttributes(kibanaServer, {
         ...defaultAttributes,
         allowChangingOptInStatus: true,
       });
       await postTelemetryV2OptIn(supertest, true, 200);
-      const { enabled, lastVersionChecked } = await getSavedObjectAttributes(esClient);
+      const { enabled, lastVersionChecked } = await getSavedObjectAttributes(kibanaServer);
       expect(enabled).to.be(true);
       expect(lastVersionChecked).to.be(kibanaVersion);
     });
 
     it('should not support sending false with allowChangingOptInStatus false', async () => {
-      await updateSavedObjectAttributes(esClient, {
+      await updateSavedObjectAttributes(kibanaServer, {
         ...defaultAttributes,
         allowChangingOptInStatus: false,
       });
@@ -66,7 +65,7 @@ export default function optInTest({ getService }: FtrProviderContext) {
     });
 
     it('should not support sending true with allowChangingOptInStatus false', async () => {
-      await updateSavedObjectAttributes(esClient, {
+      await updateSavedObjectAttributes(kibanaServer, {
         ...defaultAttributes,
         allowChangingOptInStatus: false,
       });
@@ -98,29 +97,31 @@ async function postTelemetryV2OptIn(
 }
 
 async function updateSavedObjectAttributes(
-  es: Client,
+  client: KbnClient,
   attributes: TelemetrySavedObjectAttributes
 ): Promise<void> {
-  // Directly writing to the `.kibana` index because the SO type now is hidden, meaning it's not exposed via the SO HTTP API
-  await es.update({
-    index: '.kibana',
-    id: 'telemetry:telemetry',
-    doc: {
-      telemetry: attributes,
-      // there are many missing fields in the SO, hopefully it doesn't break Kibana
-    },
-    doc_as_upsert: true,
+  await client.savedObjects.create({
+    type: 'telemetry',
+    id: 'telemetry',
+    overwrite: true,
+    attributes,
   });
 }
 
-async function getSavedObjectAttributes(es: Client): Promise<TelemetrySavedObjectAttributes> {
-  // Directly writing to the `.kibana` index because the SO type now is hidden, meaning it's not exposed via the SO HTTP API
-  const { _source: body } = await es.get<{ telemetry: TelemetrySavedObjectAttributes }>(
-    {
-      index: '.kibana',
-      id: 'telemetry:telemetry',
-    },
-    { ignore: [404] }
-  );
-  return body?.telemetry || {};
+async function getSavedObjectAttributes(
+  client: KbnClient
+): Promise<TelemetrySavedObjectAttributes> {
+  try {
+    const body = await client.savedObjects.get<TelemetrySavedObjectAttributes>({
+      type: 'telemetry',
+      id: 'telemetry',
+    });
+
+    return body.attributes;
+  } catch (err) {
+    if (err.response?.status === 404) {
+      return {};
+    }
+    throw err;
+  }
 }
diff --git a/test/api_integration/apis/telemetry/telemetry_config.ts b/test/api_integration/apis/telemetry/telemetry_config.ts
index 7a03600a35647..f6dd12b0c2a9d 100644
--- a/test/api_integration/apis/telemetry/telemetry_config.ts
+++ b/test/api_integration/apis/telemetry/telemetry_config.ts
@@ -7,7 +7,7 @@
  */
 
 import { AxiosError } from 'axios';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import type { FtrProviderContext } from '../../ftr_provider_context';
 
 const TELEMETRY_SO_TYPE = 'telemetry';
 const TELEMETRY_SO_ID = 'telemetry';
diff --git a/test/api_integration/apis/telemetry/telemetry_last_reported.ts b/test/api_integration/apis/telemetry/telemetry_last_reported.ts
index 37097c4cbf2f5..e553fa0218aa1 100644
--- a/test/api_integration/apis/telemetry/telemetry_last_reported.ts
+++ b/test/api_integration/apis/telemetry/telemetry_last_reported.ts
@@ -7,21 +7,15 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import type { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function optInTest({ getService }: FtrProviderContext) {
-  const client = getService('es');
+  const client = getService('kibanaServer');
   const supertest = getService('supertest');
 
   describe('/api/telemetry/v2/last_reported API Telemetry lastReported', () => {
     before(async () => {
-      await client.delete(
-        {
-          index: '.kibana',
-          id: 'telemetry:telemetry',
-        },
-        { ignore: [404] }
-      );
+      await client.savedObjects.delete({ type: 'telemetry', id: 'telemetry' });
     });
 
     it('GET should return undefined when there is no stored telemetry.lastReported value', async () => {
@@ -31,22 +25,25 @@ export default function optInTest({ getService }: FtrProviderContext) {
     it('PUT should update telemetry.lastReported to now', async () => {
       await supertest.put('/api/telemetry/v2/last_reported').set('kbn-xsrf', 'xxx').expect(200);
 
-      const { _source } = await client.get<{ telemetry: { lastReported: number } }>({
-        index: '.kibana',
-        id: 'telemetry:telemetry',
+      const {
+        attributes: { lastReported },
+      } = await client.savedObjects.get<{ lastReported: number }>({
+        type: 'telemetry',
+        id: 'telemetry',
       });
 
-      expect(_source?.telemetry.lastReported).to.be.a('number');
+      expect(lastReported).to.be.a('number');
     });
 
     it('GET should return the previously stored lastReported value', async () => {
-      const { _source } = await client.get<{ telemetry: { lastReported: number } }>({
-        index: '.kibana',
-        id: 'telemetry:telemetry',
+      const {
+        attributes: { lastReported },
+      } = await client.savedObjects.get<{ lastReported: number }>({
+        type: 'telemetry',
+        id: 'telemetry',
       });
 
-      expect(_source?.telemetry.lastReported).to.be.a('number');
-      const lastReported = _source?.telemetry.lastReported;
+      expect(lastReported).to.be.a('number');
 
       await supertest
         .get('/api/telemetry/v2/last_reported')
diff --git a/test/api_integration/apis/telemetry/telemetry_optin_notice_seen.ts b/test/api_integration/apis/telemetry/telemetry_optin_notice_seen.ts
index a2c48996069b2..53b0d2cadca64 100644
--- a/test/api_integration/apis/telemetry/telemetry_optin_notice_seen.ts
+++ b/test/api_integration/apis/telemetry/telemetry_optin_notice_seen.ts
@@ -7,30 +7,26 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import type { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function optInTest({ getService }: FtrProviderContext) {
-  const client = getService('es');
+  const client = getService('kibanaServer');
   const supertest = getService('supertest');
 
   describe('/api/telemetry/v2/userHasSeenNotice API Telemetry User has seen OptIn Notice', () => {
     it('should update telemetry setting field via PUT', async () => {
-      await client.delete(
-        {
-          index: '.kibana',
-          id: 'telemetry:telemetry',
-        },
-        { ignore: [404] }
-      );
+      await client.savedObjects.delete({ type: 'telemetry', id: 'telemetry' });
 
       await supertest.put('/api/telemetry/v2/userHasSeenNotice').set('kbn-xsrf', 'xxx').expect(200);
 
-      const { _source } = await client.get<{ telemetry: { userHasSeenNotice: boolean } }>({
-        index: '.kibana',
-        id: 'telemetry:telemetry',
+      const {
+        attributes: { userHasSeenNotice },
+      } = await client.savedObjects.get<{ userHasSeenNotice: boolean }>({
+        type: 'telemetry',
+        id: 'telemetry',
       });
 
-      expect(_source?.telemetry.userHasSeenNotice).to.be(true);
+      expect(userHasSeenNotice).to.be(true);
     });
   });
 }
diff --git a/x-pack/test/api_integration/apis/telemetry/index.ts b/x-pack/test/api_integration/apis/telemetry/index.ts
index 9fc67a35e6b19..e7e03d70aea72 100644
--- a/x-pack/test/api_integration/apis/telemetry/index.ts
+++ b/x-pack/test/api_integration/apis/telemetry/index.ts
@@ -11,7 +11,5 @@ export default function ({ loadTestFile }: FtrProviderContext) {
   describe('Telemetry', () => {
     loadTestFile(require.resolve('./telemetry'));
     loadTestFile(require.resolve('./telemetry_local'));
-    loadTestFile(require.resolve('./opt_in'));
-    loadTestFile(require.resolve('./telemetry_optin_notice_seen'));
   });
 }
diff --git a/x-pack/test/api_integration/apis/telemetry/opt_in.ts b/x-pack/test/api_integration/apis/telemetry/opt_in.ts
deleted file mode 100644
index 33e977b118100..0000000000000
--- a/x-pack/test/api_integration/apis/telemetry/opt_in.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * 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 { Client } from '@elastic/elasticsearch';
-
-import { TelemetrySavedObjectAttributes } from '@kbn/telemetry-plugin/server/saved_objects';
-import SuperTest from 'supertest';
-import { FtrProviderContext } from '../../ftr_provider_context';
-
-export default function optInTest({ getService }: FtrProviderContext) {
-  const supertest = getService('supertest');
-  const kibanaServer = getService('kibanaServer');
-  const esArchiver = getService('esArchiver');
-  const esClient: Client = getService('es');
-
-  describe('/api/telemetry/v2/optIn API', () => {
-    let defaultAttributes: TelemetrySavedObjectAttributes;
-    let kibanaVersion: string;
-    before(async () => {
-      await esArchiver.emptyKibanaIndex();
-      const kibanaVersionAccessor = kibanaServer.version;
-      kibanaVersion = await kibanaVersionAccessor.get();
-      defaultAttributes = await getSavedObjectAttributes(esClient);
-
-      expect(typeof kibanaVersion).to.eql('string');
-      expect(kibanaVersion.length).to.be.greaterThan(0);
-    });
-
-    afterEach(async () => {
-      await updateSavedObjectAttributes(esClient, defaultAttributes);
-    });
-
-    it('should support sending false with allowChangingOptInStatus true', async () => {
-      await updateSavedObjectAttributes(esClient, {
-        allowChangingOptInStatus: true,
-      });
-      await postTelemetryV2OptIn(supertest, false, 200);
-      const { enabled, lastVersionChecked } = await getSavedObjectAttributes(esClient);
-      expect(enabled).to.be(false);
-      expect(lastVersionChecked).to.be(kibanaVersion);
-    });
-
-    it('should support sending true with allowChangingOptInStatus true', async () => {
-      await updateSavedObjectAttributes(esClient, {
-        ...defaultAttributes,
-        allowChangingOptInStatus: true,
-      });
-      await postTelemetryV2OptIn(supertest, true, 200);
-      const { enabled, lastVersionChecked } = await getSavedObjectAttributes(esClient);
-      expect(enabled).to.be(true);
-      expect(lastVersionChecked).to.be(kibanaVersion);
-    });
-
-    it('should not support sending false with allowChangingOptInStatus false', async () => {
-      await updateSavedObjectAttributes(esClient, {
-        ...defaultAttributes,
-        allowChangingOptInStatus: false,
-      });
-      await postTelemetryV2OptIn(supertest, false, 400);
-    });
-
-    it('should not support sending true with allowChangingOptInStatus false', async () => {
-      await updateSavedObjectAttributes(esClient, {
-        ...defaultAttributes,
-        allowChangingOptInStatus: false,
-      });
-      await postTelemetryV2OptIn(supertest, true, 400);
-    });
-
-    it('should not support sending null', async () => {
-      await postTelemetryV2OptIn(supertest, null, 400);
-    });
-
-    it('should not support sending junk', async () => {
-      await postTelemetryV2OptIn(supertest, 42, 400);
-    });
-  });
-}
-
-async function postTelemetryV2OptIn(
-  supertest: SuperTest.SuperTest<SuperTest.Test>,
-  value: unknown,
-  statusCode: number
-): Promise<any> {
-  const { body } = await supertest
-    .post('/api/telemetry/v2/optIn')
-    .set('kbn-xsrf', 'xxx')
-    .send({ enabled: value })
-    .expect(statusCode);
-
-  return body;
-}
-
-async function updateSavedObjectAttributes(
-  es: Client,
-  attributes: TelemetrySavedObjectAttributes
-): Promise<void> {
-  // Directly writing to the `.kibana` index because the SO type now is hidden, meaning it's not exposed via the SO HTTP API
-  await es.update({
-    index: '.kibana',
-    id: 'telemetry:telemetry',
-    doc: {
-      telemetry: attributes,
-      // there are many missing fields in the SO, hopefully it doesn't break Kibana
-    },
-    doc_as_upsert: true,
-  });
-}
-
-async function getSavedObjectAttributes(es: Client): Promise<TelemetrySavedObjectAttributes> {
-  // Directly writing to the `.kibana` index because the SO type now is hidden, meaning it's not exposed via the SO HTTP API
-  const { _source: body } = await es.get<{ telemetry: TelemetrySavedObjectAttributes }>(
-    {
-      index: '.kibana',
-      id: 'telemetry:telemetry',
-    },
-    { ignore: [404] }
-  );
-  return body?.telemetry || {};
-}
diff --git a/x-pack/test/api_integration/apis/telemetry/telemetry_optin_notice_seen.ts b/x-pack/test/api_integration/apis/telemetry/telemetry_optin_notice_seen.ts
deleted file mode 100644
index 2a4725739e73f..0000000000000
--- a/x-pack/test/api_integration/apis/telemetry/telemetry_optin_notice_seen.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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 '../../ftr_provider_context';
-
-export default function optInTest({ getService }: FtrProviderContext) {
-  const client = getService('es');
-  const supertest = getService('supertest');
-
-  describe('/api/telemetry/v2/userHasSeenNotice API Telemetry User has seen OptIn Notice', () => {
-    it('should update telemetry setting field via PUT', async () => {
-      await client.delete(
-        {
-          index: '.kibana',
-          id: 'telemetry:telemetry',
-        },
-        { ignore: [404] }
-      );
-
-      await supertest.put('/api/telemetry/v2/userHasSeenNotice').set('kbn-xsrf', 'xxx').expect(200);
-
-      const { _source } = await client.get<{ telemetry: { userHasSeenNotice: boolean } }>({
-        index: '.kibana',
-        id: 'telemetry:telemetry',
-      });
-
-      expect(_source?.telemetry.userHasSeenNotice).to.be(true);
-    });
-  });
-}

From 98843eeef49a2446db79b3dcc592a0b2c7f91b8d Mon Sep 17 00:00:00 2001
From: Nick Peihl <nick.peihl@elastic.co>
Date: Tue, 18 Apr 2023 16:22:49 -0400
Subject: [PATCH 043/100] [Maps] Use PageObject service methods to fix flaky
 test (#155161)

Fixes #154913

## Summary

Changes functional test to use the maps PageObject methods for entering
and exiting fullscreen. These methods provide better retry handling.
---
 x-pack/test/accessibility/apps/maps.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/x-pack/test/accessibility/apps/maps.ts b/x-pack/test/accessibility/apps/maps.ts
index 5a315260a0b2d..af74466fb8f24 100644
--- a/x-pack/test/accessibility/apps/maps.ts
+++ b/x-pack/test/accessibility/apps/maps.ts
@@ -14,8 +14,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const inspector = getService('inspector');
   const PageObjects = getPageObjects(['common', 'settings', 'header', 'home', 'maps']);
 
-  // Failing: See https://github.com/elastic/kibana/issues/154913
-  describe.skip('Maps app Accessibility', () => {
+  describe('Maps app Accessibility', () => {
     before(async () => {
       await PageObjects.common.navigateToUrl('home', '/tutorial_directory/sampleData', {
         useActualUrl: true,
@@ -79,12 +78,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     it('full screen button should exist', async () => {
-      await testSubjects.click('mapsFullScreenMode');
+      await PageObjects.maps.existFullScreen();
       await a11y.testAppSnapshot();
     });
 
     it('displays exit full screen logo button', async () => {
-      await testSubjects.click('exitFullScreenModeButton');
+      await PageObjects.maps.enterFullScreen();
       await a11y.testAppSnapshot();
     });
 

From 3259647b00e24507ca1600e6b7ac7a4532ed7b9d Mon Sep 17 00:00:00 2001
From: Bree Hall <40739624+breehall@users.noreply.github.com>
Date: Tue, 18 Apr 2023 16:51:39 -0400
Subject: [PATCH 044/100] Upgrade EUI to v77.1.1 (#154838)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

EUI `77.0.0` ➡️ `77.1.1`

## [`77.1.0`](https://github.com/elastic/eui/tree/v77.1.0)

- Updated `EuiDatePicker` to display a warning icon and correctly set
`aria-invalid` when `isInvalid` is passed
([#6677](https://github.com/elastic/eui/pull/6677))
- Updated `EuiFilePicker` to display an alert icon when `isInvalid`
([#6678](https://github.com/elastic/eui/pull/6678))
- Updated `EuiTextArea` to display an alert icon when `isInvalid`
([#6679](https://github.com/elastic/eui/pull/6679))
- Updated `EuiTextArea` to support the `isLoading` prop
([#6679](https://github.com/elastic/eui/pull/6679))
- Updated `EuiComboBox` to display a warning icon and correctly set
`aria-invalid` when `isInvalid` is passed
([#6680](https://github.com/elastic/eui/pull/6680))

**Bug fixes**

- Fixed `EuiAccordion` to not set an `aria-expanded` attribute on
non-interactive `buttonElement`s
([#6694](https://github.com/elastic/eui/pull/6694))
- Fixed an `EuiPopoverFooter` bug causing nested popovers within
popovers (note: not a recommended use-case) to unintentionally override
its panel padding size inherited from context
([#6698](https://github.com/elastic/eui/pull/6698))
- Fixed `EuiComboBox` to only delete the last selected item on backspace
if the input caret is present
([#6699](https://github.com/elastic/eui/pull/6699))

---------

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: Jon <jon@elastic.co>
---
 package.json                                  |  2 +-
 .../__snapshots__/index.test.tsx.snap         | 24 ++++++++++++-------
 .../src/field_value_match/index.test.tsx      |  6 +----
 .../src/field_value_match_any/index.test.tsx  |  6 +----
 .../src/field_value_wildcard/index.test.tsx   |  6 +----
 .../__snapshots__/list_header.test.tsx.snap   | 24 ++++++++++++-------
 .../__snapshots__/edit_modal.test.tsx.snap    | 24 ++++++++++++-------
 src/dev/license_checker/config.ts             |  2 +-
 .../eql_query_bar/eql_query_bar.test.tsx      |  2 +-
 .../email/email_params.test.tsx               |  2 +-
 .../server_log/server_log_params.test.tsx     |  2 +-
 .../__snapshots__/wrapper.test.tsx.snap       |  3 ++-
 .../field_selector.test.tsx.snap              | 12 ++++++----
 yarn.lock                                     |  8 +++----
 14 files changed, 70 insertions(+), 53 deletions(-)

diff --git a/package.json b/package.json
index e439f886118ee..d36fc1284122b 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "@elastic/datemath": "5.0.3",
     "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@8.6.0-canary.3",
     "@elastic/ems-client": "8.4.0",
-    "@elastic/eui": "77.0.0",
+    "@elastic/eui": "77.1.1",
     "@elastic/filesaver": "1.1.2",
     "@elastic/node-crypto": "1.2.1",
     "@elastic/numeral": "^2.5.1",
diff --git a/packages/kbn-securitysolution-autocomplete/src/field/__tests__/__snapshots__/index.test.tsx.snap b/packages/kbn-securitysolution-autocomplete/src/field/__tests__/__snapshots__/index.test.tsx.snap
index daaf9c66c453f..23a56e38ba458 100644
--- a/packages/kbn-securitysolution-autocomplete/src/field/__tests__/__snapshots__/index.test.tsx.snap
+++ b/packages/kbn-securitysolution-autocomplete/src/field/__tests__/__snapshots__/index.test.tsx.snap
@@ -16,7 +16,7 @@ Object {
             class="euiFormControlLayout__childrenWrapper"
           >
             <div
-              class="euiComboBox__inputWrap euiComboBox__inputWrap--fullWidth euiComboBox__inputWrap--noWrap euiComboBox__inputWrap-isClearable"
+              class="euiComboBox__inputWrap euiFormControlLayout--2icons euiComboBox__inputWrap--fullWidth euiComboBox__inputWrap--noWrap"
               data-test-subj="comboBoxInput"
               tabindex="-1"
             >
@@ -33,6 +33,7 @@ Object {
                   aria-autocomplete="list"
                   aria-controls=""
                   aria-expanded="false"
+                  aria-invalid="false"
                   data-test-subj="comboBoxSearchInput"
                   id="generated-id__eui-combobox-id"
                   role="combobox"
@@ -89,7 +90,7 @@ Object {
           class="euiFormControlLayout__childrenWrapper"
         >
           <div
-            class="euiComboBox__inputWrap euiComboBox__inputWrap--fullWidth euiComboBox__inputWrap--noWrap euiComboBox__inputWrap-isClearable"
+            class="euiComboBox__inputWrap euiFormControlLayout--2icons euiComboBox__inputWrap--fullWidth euiComboBox__inputWrap--noWrap"
             data-test-subj="comboBoxInput"
             tabindex="-1"
           >
@@ -106,6 +107,7 @@ Object {
                 aria-autocomplete="list"
                 aria-controls=""
                 aria-expanded="false"
+                aria-invalid="false"
                 data-test-subj="comboBoxSearchInput"
                 id="generated-id__eui-combobox-id"
                 role="combobox"
@@ -219,7 +221,7 @@ Object {
             class="euiFormControlLayout__childrenWrapper"
           >
             <div
-              class="euiComboBox__inputWrap euiComboBox__inputWrap--fullWidth euiComboBox__inputWrap--noWrap"
+              class="euiComboBox__inputWrap euiFormControlLayout--1icons euiComboBox__inputWrap--fullWidth euiComboBox__inputWrap--noWrap"
               data-test-subj="comboBoxInput"
               tabindex="-1"
             >
@@ -236,6 +238,7 @@ Object {
                   aria-autocomplete="list"
                   aria-controls=""
                   aria-expanded="false"
+                  aria-invalid="false"
                   data-test-subj="comboBoxSearchInput"
                   disabled=""
                   id="generated-id__eui-combobox-id"
@@ -283,7 +286,7 @@ Object {
           class="euiFormControlLayout__childrenWrapper"
         >
           <div
-            class="euiComboBox__inputWrap euiComboBox__inputWrap--fullWidth euiComboBox__inputWrap--noWrap"
+            class="euiComboBox__inputWrap euiFormControlLayout--1icons euiComboBox__inputWrap--fullWidth euiComboBox__inputWrap--noWrap"
             data-test-subj="comboBoxInput"
             tabindex="-1"
           >
@@ -300,6 +303,7 @@ Object {
                 aria-autocomplete="list"
                 aria-controls=""
                 aria-expanded="false"
+                aria-invalid="false"
                 data-test-subj="comboBoxSearchInput"
                 disabled=""
                 id="generated-id__eui-combobox-id"
@@ -404,7 +408,7 @@ Object {
             class="euiFormControlLayout__childrenWrapper"
           >
             <div
-              class="euiComboBox__inputWrap euiComboBox__inputWrap--fullWidth euiComboBox__inputWrap--noWrap"
+              class="euiComboBox__inputWrap euiFormControlLayout--1icons euiComboBox__inputWrap--fullWidth euiComboBox__inputWrap--noWrap"
               data-test-subj="comboBoxInput"
               tabindex="-1"
             >
@@ -421,6 +425,7 @@ Object {
                   aria-autocomplete="list"
                   aria-controls=""
                   aria-expanded="false"
+                  aria-invalid="false"
                   data-test-subj="comboBoxSearchInput"
                   id="generated-id__eui-combobox-id"
                   role="combobox"
@@ -466,7 +471,7 @@ Object {
           class="euiFormControlLayout__childrenWrapper"
         >
           <div
-            class="euiComboBox__inputWrap euiComboBox__inputWrap--fullWidth euiComboBox__inputWrap--noWrap"
+            class="euiComboBox__inputWrap euiFormControlLayout--1icons euiComboBox__inputWrap--fullWidth euiComboBox__inputWrap--noWrap"
             data-test-subj="comboBoxInput"
             tabindex="-1"
           >
@@ -483,6 +488,7 @@ Object {
                 aria-autocomplete="list"
                 aria-controls=""
                 aria-expanded="false"
+                aria-invalid="false"
                 data-test-subj="comboBoxSearchInput"
                 id="generated-id__eui-combobox-id"
                 role="combobox"
@@ -585,7 +591,7 @@ Object {
             class="euiFormControlLayout__childrenWrapper"
           >
             <div
-              class="euiComboBox__inputWrap euiComboBox__inputWrap--fullWidth euiComboBox__inputWrap--noWrap euiComboBox__inputWrap-isLoading"
+              class="euiComboBox__inputWrap euiFormControlLayout--2icons euiComboBox__inputWrap--fullWidth euiComboBox__inputWrap--noWrap"
               data-test-subj="comboBoxInput"
               tabindex="-1"
             >
@@ -602,6 +608,7 @@ Object {
                   aria-autocomplete="list"
                   aria-controls=""
                   aria-expanded="false"
+                  aria-invalid="false"
                   data-test-subj="comboBoxSearchInput"
                   disabled=""
                   id="generated-id__eui-combobox-id"
@@ -654,7 +661,7 @@ Object {
           class="euiFormControlLayout__childrenWrapper"
         >
           <div
-            class="euiComboBox__inputWrap euiComboBox__inputWrap--fullWidth euiComboBox__inputWrap--noWrap euiComboBox__inputWrap-isLoading"
+            class="euiComboBox__inputWrap euiFormControlLayout--2icons euiComboBox__inputWrap--fullWidth euiComboBox__inputWrap--noWrap"
             data-test-subj="comboBoxInput"
             tabindex="-1"
           >
@@ -671,6 +678,7 @@ Object {
                 aria-autocomplete="list"
                 aria-controls=""
                 aria-expanded="false"
+                aria-invalid="false"
                 data-test-subj="comboBoxSearchInput"
                 disabled=""
                 id="generated-id__eui-combobox-id"
diff --git a/packages/kbn-securitysolution-autocomplete/src/field_value_match/index.test.tsx b/packages/kbn-securitysolution-autocomplete/src/field_value_match/index.test.tsx
index 8fd88fe6a910b..24bb72c3058ac 100644
--- a/packages/kbn-securitysolution-autocomplete/src/field_value_match/index.test.tsx
+++ b/packages/kbn-securitysolution-autocomplete/src/field_value_match/index.test.tsx
@@ -142,11 +142,7 @@ describe('AutocompleteFieldMatchComponent', () => {
       />
     );
 
-    expect(
-      wrapper
-        .find('[data-test-subj="comboBoxInput"]')
-        .hasClass('euiComboBox__inputWrap-isClearable')
-    ).toBeTruthy();
+    expect(wrapper.find(`[data-test-subj="comboBoxClearButton"]`)).toBeTruthy();
   });
 
   test('it correctly displays selected value', () => {
diff --git a/packages/kbn-securitysolution-autocomplete/src/field_value_match_any/index.test.tsx b/packages/kbn-securitysolution-autocomplete/src/field_value_match_any/index.test.tsx
index bfa4aa6de4d24..2fa8446bfa8b9 100644
--- a/packages/kbn-securitysolution-autocomplete/src/field_value_match_any/index.test.tsx
+++ b/packages/kbn-securitysolution-autocomplete/src/field_value_match_any/index.test.tsx
@@ -131,11 +131,7 @@ describe('AutocompleteFieldMatchAnyComponent', () => {
       />
     );
 
-    expect(
-      wrapper
-        .find(`[data-test-subj="comboBoxInput"]`)
-        .hasClass('euiComboBox__inputWrap-isClearable')
-    ).toBeTruthy();
+    expect(wrapper.find(`[data-test-subj="comboBoxClearButton"]`)).toBeTruthy();
   });
 
   test('it correctly displays selected value', () => {
diff --git a/packages/kbn-securitysolution-autocomplete/src/field_value_wildcard/index.test.tsx b/packages/kbn-securitysolution-autocomplete/src/field_value_wildcard/index.test.tsx
index bad9f619b4994..f0b5931e54436 100644
--- a/packages/kbn-securitysolution-autocomplete/src/field_value_wildcard/index.test.tsx
+++ b/packages/kbn-securitysolution-autocomplete/src/field_value_wildcard/index.test.tsx
@@ -143,11 +143,7 @@ describe('AutocompleteFieldWildcardComponent', () => {
       />
     );
 
-    expect(
-      wrapper
-        .find('[data-test-subj="comboBoxInput"]')
-        .hasClass('euiComboBox__inputWrap-isClearable')
-    ).toBeTruthy();
+    expect(wrapper.find(`[data-test-subj="comboBoxClearButton"]`)).toBeTruthy();
   });
 
   test('it correctly displays selected value', () => {
diff --git a/packages/kbn-securitysolution-exception-list-components/src/list_header/__snapshots__/list_header.test.tsx.snap b/packages/kbn-securitysolution-exception-list-components/src/list_header/__snapshots__/list_header.test.tsx.snap
index 976401785f88a..871e3ea311cd6 100644
--- a/packages/kbn-securitysolution-exception-list-components/src/list_header/__snapshots__/list_header.test.tsx.snap
+++ b/packages/kbn-securitysolution-exception-list-components/src/list_header/__snapshots__/list_header.test.tsx.snap
@@ -331,15 +331,23 @@ Object {
                   <div
                     class="euiFormRow__fieldWrapper"
                   >
-                    <textarea
-                      class="euiTextArea euiTextArea--resizeVertical euiTextArea--fullWidth"
-                      data-test-subj="editModalDescriptionTextField"
-                      id="generated-id"
-                      name="description"
-                      rows="6"
+                    <div
+                      class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--euiTextArea"
                     >
-                      List description
-                    </textarea>
+                      <div
+                        class="euiFormControlLayout__childrenWrapper"
+                      >
+                        <textarea
+                          class="euiTextArea euiTextArea--resizeVertical euiTextArea--fullWidth"
+                          data-test-subj="editModalDescriptionTextField"
+                          id="generated-id"
+                          name="description"
+                          rows="6"
+                        >
+                          List description
+                        </textarea>
+                      </div>
+                    </div>
                   </div>
                 </div>
               </form>
diff --git a/packages/kbn-securitysolution-exception-list-components/src/list_header/edit_modal/__snapshots__/edit_modal.test.tsx.snap b/packages/kbn-securitysolution-exception-list-components/src/list_header/edit_modal/__snapshots__/edit_modal.test.tsx.snap
index ed991c34d8870..4ab6fed810c0a 100644
--- a/packages/kbn-securitysolution-exception-list-components/src/list_header/edit_modal/__snapshots__/edit_modal.test.tsx.snap
+++ b/packages/kbn-securitysolution-exception-list-components/src/list_header/edit_modal/__snapshots__/edit_modal.test.tsx.snap
@@ -107,15 +107,23 @@ Object {
                   <div
                     class="euiFormRow__fieldWrapper"
                   >
-                    <textarea
-                      class="euiTextArea euiTextArea--resizeVertical euiTextArea--fullWidth"
-                      data-test-subj="editModalDescriptionTextField"
-                      id="generated-id"
-                      name="description"
-                      rows="6"
+                    <div
+                      class="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--euiTextArea"
                     >
-                      list description
-                    </textarea>
+                      <div
+                        class="euiFormControlLayout__childrenWrapper"
+                      >
+                        <textarea
+                          class="euiTextArea euiTextArea--resizeVertical euiTextArea--fullWidth"
+                          data-test-subj="editModalDescriptionTextField"
+                          id="generated-id"
+                          name="description"
+                          rows="6"
+                        >
+                          list description
+                        </textarea>
+                      </div>
+                    </div>
                   </div>
                 </div>
               </form>
diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts
index 28c22aad734d5..75a12b0884f8a 100644
--- a/src/dev/license_checker/config.ts
+++ b/src/dev/license_checker/config.ts
@@ -85,6 +85,6 @@ export const LICENSE_OVERRIDES = {
   'jsts@1.6.2': ['Eclipse Distribution License - v 1.0'], // cf. https://github.com/bjornharrtell/jsts
   '@mapbox/jsonlint-lines-primitives@2.0.2': ['MIT'], // license in readme https://github.com/tmcw/jsonlint
   '@elastic/ems-client@8.4.0': ['Elastic License 2.0'],
-  '@elastic/eui@77.0.0': ['SSPL-1.0 OR Elastic License 2.0'],
+  '@elastic/eui@77.1.1': ['SSPL-1.0 OR Elastic License 2.0'],
   'language-subtag-registry@0.3.21': ['CC-BY-4.0'], // retired ODC‑By license https://github.com/mattcg/language-subtag-registry
 };
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/eql_query_bar/eql_query_bar.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/eql_query_bar/eql_query_bar.test.tsx
index 51e1e0683d766..e07eacc363c92 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/eql_query_bar/eql_query_bar.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/eql_query_bar/eql_query_bar.test.tsx
@@ -67,7 +67,7 @@ describe('EqlQueryBar', () => {
 
     wrapper
       .find('[data-test-subj="eqlQueryBarTextInput"]')
-      .first()
+      .last()
       .simulate('change', { target: { value: 'newQuery' } });
 
     const expected = {
diff --git a/x-pack/plugins/stack_connectors/public/connector_types/email/email_params.test.tsx b/x-pack/plugins/stack_connectors/public/connector_types/email/email_params.test.tsx
index 7626606a0bf60..a0a41a57a8331 100644
--- a/x-pack/plugins/stack_connectors/public/connector_types/email/email_params.test.tsx
+++ b/x-pack/plugins/stack_connectors/public/connector_types/email/email_params.test.tsx
@@ -111,7 +111,7 @@ describe('EmailParamsFields renders', () => {
     const valueToSimulate = 'some new value';
     wrapper
       .find('[data-test-subj="messageTextArea"]')
-      .first()
+      .last()
       .simulate('change', { target: { value: valueToSimulate } });
     expect(editAction).toHaveBeenCalledWith('message', valueToSimulate, 0);
     wrapper.setProps({
diff --git a/x-pack/plugins/stack_connectors/public/connector_types/server_log/server_log_params.test.tsx b/x-pack/plugins/stack_connectors/public/connector_types/server_log/server_log_params.test.tsx
index 6a5426d952897..e54ec5e9e5cb2 100644
--- a/x-pack/plugins/stack_connectors/public/connector_types/server_log/server_log_params.test.tsx
+++ b/x-pack/plugins/stack_connectors/public/connector_types/server_log/server_log_params.test.tsx
@@ -119,7 +119,7 @@ describe('ServerLogParamsFields renders', () => {
     const valueToSimulate = 'some new value';
     wrapper
       .find('[data-test-subj="messageTextArea"]')
-      .first()
+      .last()
       .simulate('change', { target: { value: valueToSimulate } });
     expect(editAction).toHaveBeenCalledWith('message', valueToSimulate, 0);
     wrapper.setProps({
diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/barchart/__snapshots__/wrapper.test.tsx.snap b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/barchart/__snapshots__/wrapper.test.tsx.snap
index 91ca6c96a9f33..a5e92c9e90097 100644
--- a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/barchart/__snapshots__/wrapper.test.tsx.snap
+++ b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/barchart/__snapshots__/wrapper.test.tsx.snap
@@ -37,7 +37,7 @@ exports[`<IndicatorsBarChartWrapper /> when not loading or refetching should ren
               class="euiFormControlLayout__childrenWrapper"
             >
               <div
-                class="euiComboBox__inputWrap euiComboBox__inputWrap--noWrap euiComboBox__inputWrap--inGroup"
+                class="euiComboBox__inputWrap euiFormControlLayout--1icons euiComboBox__inputWrap--noWrap euiComboBox__inputWrap--inGroup"
                 data-test-subj="comboBoxInput"
                 tabindex="-1"
               >
@@ -54,6 +54,7 @@ exports[`<IndicatorsBarChartWrapper /> when not loading or refetching should ren
                     aria-autocomplete="list"
                     aria-controls=""
                     aria-expanded="false"
+                    aria-invalid="false"
                     data-test-subj="comboBoxSearchInput"
                     id="generated-id__eui-combobox-id"
                     role="combobox"
diff --git a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/barchart/field_selector/__snapshots__/field_selector.test.tsx.snap b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/barchart/field_selector/__snapshots__/field_selector.test.tsx.snap
index 9346a739b9dae..161894eaa1182 100644
--- a/x-pack/plugins/threat_intelligence/public/modules/indicators/components/barchart/field_selector/__snapshots__/field_selector.test.tsx.snap
+++ b/x-pack/plugins/threat_intelligence/public/modules/indicators/components/barchart/field_selector/__snapshots__/field_selector.test.tsx.snap
@@ -22,7 +22,7 @@ Object {
             class="euiFormControlLayout__childrenWrapper"
           >
             <div
-              class="euiComboBox__inputWrap euiComboBox__inputWrap--noWrap euiComboBox__inputWrap--inGroup"
+              class="euiComboBox__inputWrap euiFormControlLayout--1icons euiComboBox__inputWrap--noWrap euiComboBox__inputWrap--inGroup"
               data-test-subj="comboBoxInput"
               tabindex="-1"
             >
@@ -39,6 +39,7 @@ Object {
                   aria-autocomplete="list"
                   aria-controls=""
                   aria-expanded="false"
+                  aria-invalid="false"
                   data-test-subj="comboBoxSearchInput"
                   id="generated-id__eui-combobox-id"
                   role="combobox"
@@ -90,7 +91,7 @@ Object {
           class="euiFormControlLayout__childrenWrapper"
         >
           <div
-            class="euiComboBox__inputWrap euiComboBox__inputWrap--noWrap euiComboBox__inputWrap--inGroup"
+            class="euiComboBox__inputWrap euiFormControlLayout--1icons euiComboBox__inputWrap--noWrap euiComboBox__inputWrap--inGroup"
             data-test-subj="comboBoxInput"
             tabindex="-1"
           >
@@ -107,6 +108,7 @@ Object {
                 aria-autocomplete="list"
                 aria-controls=""
                 aria-expanded="false"
+                aria-invalid="false"
                 data-test-subj="comboBoxSearchInput"
                 id="generated-id__eui-combobox-id"
                 role="combobox"
@@ -215,7 +217,7 @@ Object {
             class="euiFormControlLayout__childrenWrapper"
           >
             <div
-              class="euiComboBox__inputWrap euiComboBox__inputWrap--noWrap euiComboBox__inputWrap--inGroup"
+              class="euiComboBox__inputWrap euiFormControlLayout--1icons euiComboBox__inputWrap--noWrap euiComboBox__inputWrap--inGroup"
               data-test-subj="comboBoxInput"
               tabindex="-1"
             >
@@ -232,6 +234,7 @@ Object {
                   aria-autocomplete="list"
                   aria-controls=""
                   aria-expanded="false"
+                  aria-invalid="false"
                   data-test-subj="comboBoxSearchInput"
                   id="generated-id__eui-combobox-id"
                   role="combobox"
@@ -283,7 +286,7 @@ Object {
           class="euiFormControlLayout__childrenWrapper"
         >
           <div
-            class="euiComboBox__inputWrap euiComboBox__inputWrap--noWrap euiComboBox__inputWrap--inGroup"
+            class="euiComboBox__inputWrap euiFormControlLayout--1icons euiComboBox__inputWrap--noWrap euiComboBox__inputWrap--inGroup"
             data-test-subj="comboBoxInput"
             tabindex="-1"
           >
@@ -300,6 +303,7 @@ Object {
                 aria-autocomplete="list"
                 aria-controls=""
                 aria-expanded="false"
+                aria-invalid="false"
                 data-test-subj="comboBoxSearchInput"
                 id="generated-id__eui-combobox-id"
                 role="combobox"
diff --git a/yarn.lock b/yarn.lock
index 2776f05861c0c..bd8668fa91fc1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1543,10 +1543,10 @@
   resolved "https://registry.yarnpkg.com/@elastic/eslint-plugin-eui/-/eslint-plugin-eui-0.0.2.tgz#56b9ef03984a05cc213772ae3713ea8ef47b0314"
   integrity sha512-IoxURM5zraoQ7C8f+mJb9HYSENiZGgRVcG4tLQxE61yHNNRDXtGDWTZh8N1KIHcsqN1CEPETjuzBXkJYF/fDiQ==
 
-"@elastic/eui@77.0.0":
-  version "77.0.0"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-77.0.0.tgz#931bb7f8a109b571dedefe481ccf41a9229a6286"
-  integrity sha512-4RV6GxSFFWGEZtUkLpZWQrwTdEVMq/hmicSZiCpvJUnilLmhfnNEGqCn5Qu8g/OOb5AL3XayfytWMiiaJ9Yw+g==
+"@elastic/eui@77.1.1":
+  version "77.1.1"
+  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-77.1.1.tgz#82f4294bf3239d5d825c1d939c49d125bfdbeb72"
+  integrity sha512-guJmHoGDbvKh/738taKDZGSdNk+OXMse513oPaPf4NoXpQUeYvl3gLT50mX5J4nwILS1LFKNGrbU2Es77HM1cQ==
   dependencies:
     "@types/chroma-js" "^2.0.0"
     "@types/lodash" "^4.14.160"

From f4af1e0b744f37caf2f4175b66c561cd72ec6d67 Mon Sep 17 00:00:00 2001
From: Cee Chen <549407+cee-chen@users.noreply.github.com>
Date: Tue, 18 Apr 2023 14:07:18 -0700
Subject: [PATCH 045/100] Update references to EUI team name (#155196)

## Summary

The EUI team recently changed its GitHub team name to @elastic/eui-team.
We're updating all references in Kibana's CODEOWNERS as a result.

### Checklist

N/A, CODEOWNERS change only
---
 .github/CODEOWNERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 80515067f7294..270c2ce5d2b48 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1221,8 +1221,8 @@ x-pack/test/threat_intelligence_cypress @elastic/protections-experience
 # Logstash
 #CC# /x-pack/plugins/logstash/ @elastic/logstash
 
-# EUI design
-/src/plugins/kibana_react/public/page_template/ @elastic/eui-design @elastic/appex-sharedux
+# EUI team
+/src/plugins/kibana_react/public/page_template/ @elastic/eui-team @elastic/appex-sharedux
 
 # Landing page for guided onboarding in Home plugin
 /src/plugins/home/public/application/components/guided_onboarding @elastic/platform-onboarding

From d694a0d75fde6f216e9e38045835aed254af8eee Mon Sep 17 00:00:00 2001
From: Saarika Bhasi <55930906+saarikabhasi@users.noreply.github.com>
Date: Tue, 18 Apr 2023 17:22:48 -0400
Subject: [PATCH 046/100] [ML Inference] Filter ELSER pipelines from existing
 pipelines list (#155085)

## Summary
Remove ELSER pipeline from existing pipelines list in configuration screen.

### Screen Recording


https://user-images.githubusercontent.com/55930906/232590535-5628d04b-a352-4888-a1c5-00226356ed3c.mov


### Checklist

Delete any items that are not applicable to this PR.

- [ ] [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
---
 .../ml_inference/ml_inference_logic.test.ts   | 71 +++++++++++++++++++
 .../ml_inference/ml_inference_logic.ts        | 10 ++-
 2 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/ml_inference_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/ml_inference_logic.test.ts
index 1c38c99bd5c93..a4562d66349cc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/ml_inference_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/ml_inference_logic.test.ts
@@ -314,6 +314,77 @@ describe('MlInferenceLogic', () => {
           },
         ]);
       });
+      it('filter text expansion model from existing pipelines list', () => {
+        MLModelsApiLogic.actions.apiSuccess([
+          {
+            inference_config: {
+              text_expansion: {},
+            },
+            input: {
+              field_names: ['text_field'],
+            },
+            model_id: 'text-expansion-mocked-model',
+            model_type: 'pytorch',
+            tags: [],
+            version: '1',
+          },
+          {
+            inference_config: {
+              classification: {},
+            },
+            input: {
+              field_names: ['text_field'],
+            },
+            model_id: 'classification-mocked-model',
+            model_type: 'lang_ident',
+            tags: [],
+            version: '1',
+          },
+        ]);
+
+        FetchMlInferencePipelinesApiLogic.actions.apiSuccess({
+          'unit-test-1': {
+            processors: [
+              {
+                inference: {
+                  field_map: {
+                    body: 'text_field',
+                  },
+                  model_id: 'text-expansion-mocked-model',
+                  target_field: 'ml.inference.test-field',
+                },
+              },
+            ],
+            version: 1,
+          },
+          'unit-test-2': {
+            processors: [
+              {
+                inference: {
+                  field_map: {
+                    body: 'text_field',
+                  },
+                  model_id: 'classification-mocked-model',
+                  target_field: 'ml.inference.test-field',
+                },
+              },
+            ],
+            version: 1,
+          },
+        });
+
+        expect(MLInferenceLogic.values.existingInferencePipelines).toEqual([
+          {
+            destinationField: 'test-field',
+            disabled: false,
+            disabledReason: undefined,
+            pipelineName: 'unit-test-2',
+            modelType: 'lang_ident',
+            modelId: 'classification-mocked-model',
+            sourceField: 'body',
+          },
+        ]);
+      });
     });
     describe('mlInferencePipeline', () => {
       it('returns undefined when configuration is invalid', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/ml_inference_logic.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/ml_inference_logic.ts
index 98bcaa6671495..516d65df089b5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/ml_inference_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/ml_inference_logic.ts
@@ -9,6 +9,8 @@ import { kea, MakeLogicType } from 'kea';
 
 import { IndicesGetMappingIndexMappingRecord } from '@elastic/elasticsearch/lib/api/types';
 
+import { SUPPORTED_PYTORCH_TASKS } from '@kbn/ml-trained-models-utils';
+
 import {
   FieldMapping,
   formatPipelineName,
@@ -84,6 +86,10 @@ export const EMPTY_PIPELINE_CONFIGURATION: InferencePipelineConfiguration = {
   sourceField: '',
 };
 
+const isNotTextExpansionModel = (model: MLInferencePipelineOption): boolean => {
+  return model.modelType !== SUPPORTED_PYTORCH_TASKS.TEXT_EXPANSION;
+};
+
 const API_REQUEST_COMPLETE_STATUSES = [Status.SUCCESS, Status.ERROR];
 const DEFAULT_CONNECTOR_FIELDS = ['body', 'title', 'id', 'type', 'url'];
 
@@ -537,7 +543,9 @@ export const MLInferenceLogic = kea<
               sourceField,
             };
           })
-          .filter((p): p is MLInferencePipelineOption => p !== undefined);
+          .filter(
+            (p): p is MLInferencePipelineOption => p !== undefined && isNotTextExpansionModel(p)
+          );
 
         return existingPipelines;
       },

From 88f4f8082aafd5a81ac60b527e19ba6ac1ed9df4 Mon Sep 17 00:00:00 2001
From: Coen Warmer <coen.warmer@gmail.com>
Date: Wed, 19 Apr 2023 00:00:15 +0200
Subject: [PATCH 047/100] [Synthetics][Ux][Uptime] Use Observability Page
 Template from Observability Shared (#154774)

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: Shahzad <shahzad31comp@gmail.com>
---
 .../exploratory_view_example/public/app.tsx   |  2 +-
 x-pack/plugins/exploratory_view/kibana.jsonc  |  3 +-
 .../embeddable/embeddable.tsx                 |  2 +-
 .../exploratory_view/embeddable/index.tsx     |  2 +-
 .../embeddable/use_app_data_view.ts           |  2 +-
 .../embeddable/use_local_data_view.ts         |  2 +-
 .../header/add_to_case_action.tsx             |  5 +-
 .../exploratory_view/hooks/use_add_to_case.ts |  2 +-
 .../hooks/use_lens_formula_helper.ts          |  2 +-
 .../shared/exploratory_view/index.tsx         |  6 +-
 .../columns/chart_type_select.tsx             |  2 +-
 .../series_editor/columns/chart_types.tsx     |  2 +-
 .../public/components/shared/index.tsx        |  2 +-
 .../public/hooks/use_kibana_space.tsx         |  2 +-
 .../plugins/exploratory_view/public/plugin.ts |  9 +-
 x-pack/plugins/exploratory_view/tsconfig.json |  2 +-
 x-pack/plugins/observability/kibana.jsonc     | 28 ++----
 .../public/application/index.tsx              |  2 +-
 x-pack/plugins/observability/public/plugin.ts | 42 +++------
 x-pack/plugins/observability/tsconfig.json    |  4 +-
 .../public/hooks/use_track_metric.tsx         | 91 +++++++++++++++++++
 .../observability_shared/public/index.ts      |  9 +-
 .../observability_shared/tsconfig.json        |  2 +
 .../profiling_app_page_template/index.tsx     |  4 +-
 .../public/routing/router_error_boundary.tsx  |  4 +-
 x-pack/plugins/profiling/public/types.ts      |  6 +-
 x-pack/plugins/synthetics/kibana.jsonc        | 16 +---
 .../common/components/stderr_logs.tsx         |  4 +-
 .../synthetics_page_template.tsx              |  6 +-
 .../public/apps/synthetics/routes.tsx         |  2 +-
 .../public/apps/synthetics/synthetics_app.tsx |  1 +
 .../synthetics/utils/testing/rtl_helpers.tsx  |  9 ++
 .../public/legacy_uptime/app/uptime_app.tsx   |  1 +
 .../app/uptime_page_template.tsx              |  4 +-
 .../legacy_uptime/lib/helper/rtl_helpers.tsx  |  8 ++
 .../public/legacy_uptime/routes.tsx           |  2 +-
 x-pack/plugins/synthetics/public/plugin.ts    |  8 +-
 x-pack/plugins/synthetics/tsconfig.json       |  1 +
 x-pack/plugins/ux/kibana.jsonc                |  1 +
 .../plugins/ux/public/application/ux_app.tsx  |  2 +
 .../components/app/rum_dashboard/rum_home.tsx |  4 +-
 x-pack/plugins/ux/public/plugin.ts            |  8 +-
 x-pack/plugins/ux/tsconfig.json               |  1 +
 43 files changed, 209 insertions(+), 108 deletions(-)
 create mode 100644 x-pack/plugins/observability_shared/public/hooks/use_track_metric.tsx

diff --git a/x-pack/examples/exploratory_view_example/public/app.tsx b/x-pack/examples/exploratory_view_example/public/app.tsx
index 96e44f62d2ab5..268f070b40d16 100644
--- a/x-pack/examples/exploratory_view_example/public/app.tsx
+++ b/x-pack/examples/exploratory_view_example/public/app.tsx
@@ -28,7 +28,7 @@ export const App = (props: {
   plugins: StartDependencies;
   defaultIndexPattern: DataView | null;
 }) => {
-  const ExploratoryViewComponent = props.plugins.observability.ExploratoryViewEmbeddable;
+  const ExploratoryViewComponent = props.plugins.exploratoryView.ExploratoryViewEmbeddable;
 
   const seriesList: AllSeries = [
     {
diff --git a/x-pack/plugins/exploratory_view/kibana.jsonc b/x-pack/plugins/exploratory_view/kibana.jsonc
index 7ef4c044dbc4c..c381b9492a961 100644
--- a/x-pack/plugins/exploratory_view/kibana.jsonc
+++ b/x-pack/plugins/exploratory_view/kibana.jsonc
@@ -18,7 +18,7 @@
       "guidedOnboarding",
       "inspector",
       "lens",
-      "observability",
+      "observabilityShared",
       "security",
       "share",
       "triggersActionsUi",
@@ -32,7 +32,6 @@
       "kibanaReact",
       "kibanaUtils",
       "lens",
-      "observability",
       "unifiedSearch",
       "visualizations"
     ],
diff --git a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/embeddable.tsx b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/embeddable.tsx
index 864e95affed61..4642e7fbec524 100644
--- a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/embeddable.tsx
+++ b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/embeddable.tsx
@@ -15,7 +15,7 @@ import {
   XYState,
 } from '@kbn/lens-plugin/public';
 import { ViewMode } from '@kbn/embeddable-plugin/common';
-import { observabilityFeatureId } from '@kbn/observability-plugin/public';
+import { observabilityFeatureId } from '@kbn/observability-shared-plugin/public';
 import styled from 'styled-components';
 import { useKibanaSpace } from '../../../../hooks/use_kibana_space';
 import { HeatMapLensAttributes } from '../configurations/lens_attributes/heatmap_attributes';
diff --git a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/index.tsx b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/index.tsx
index 2311c016fc8b4..98e9d61e512a6 100644
--- a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/index.tsx
+++ b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/index.tsx
@@ -11,11 +11,11 @@ import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import type { CoreStart } from '@kbn/core/public';
 import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { EuiErrorBoundary } from '@elastic/eui';
-import { useFetcher } from '@kbn/observability-plugin/public';
 import styled from 'styled-components';
 import { DataView } from '@kbn/data-views-plugin/common';
 import { FormulaPublicApi } from '@kbn/lens-plugin/public';
 import { i18n } from '@kbn/i18n';
+import { useFetcher } from '../../../../hooks/use_fetcher';
 import { useAppDataView } from './use_app_data_view';
 import type { ExploratoryViewPublicPluginsStart } from '../../../..';
 import type { ExploratoryEmbeddableProps, ExploratoryEmbeddableComponentProps } from './embeddable';
diff --git a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/use_app_data_view.ts b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/use_app_data_view.ts
index ca2b44f74c30a..ab1ca8827c58a 100644
--- a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/use_app_data_view.ts
+++ b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/use_app_data_view.ts
@@ -7,7 +7,7 @@
 
 import { useState } from 'react';
 import { DataView } from '@kbn/data-views-plugin/common';
-import { useFetcher } from '@kbn/observability-plugin/public';
+import { useFetcher } from '../../../../hooks/use_fetcher';
 import { useLocalDataView } from './use_local_data_view';
 import { ExploratoryEmbeddableProps, ExploratoryViewPublicPluginsStart } from '../../../..';
 import type { DataViewState } from '../hooks/use_app_data_view';
diff --git a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/use_local_data_view.ts b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/use_local_data_view.ts
index a02620e43feda..de92ec1420236 100644
--- a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/use_local_data_view.ts
+++ b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/use_local_data_view.ts
@@ -7,7 +7,7 @@
 
 import { useEffect } from 'react';
 import useLocalStorage from 'react-use/lib/useLocalStorage';
-import { useFetcher } from '@kbn/observability-plugin/public';
+import { useFetcher } from '../../../../hooks/use_fetcher';
 import { getDataTypeIndices } from '../../../../utils/observability_data_views';
 import { AppDataType } from '../types';
 import { ExploratoryEmbeddableProps } from '../../../..';
diff --git a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/header/add_to_case_action.tsx b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/header/add_to_case_action.tsx
index 2b0f2a4ffc190..c374beee658c3 100644
--- a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/header/add_to_case_action.tsx
+++ b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/header/add_to_case_action.tsx
@@ -15,7 +15,10 @@ import {
   GetAllCasesSelectorModalProps,
 } from '@kbn/cases-plugin/public';
 import { TypedLensByValueInput } from '@kbn/lens-plugin/public';
-import { observabilityFeatureId, observabilityAppId } from '@kbn/observability-plugin/public';
+import {
+  observabilityFeatureId,
+  observabilityAppId,
+} from '@kbn/observability-shared-plugin/public';
 import { useGetUserCasesPermissions } from '../../../../hooks/use_get_user_cases_permissions';
 import { ObservabilityAppServices } from '../../../../application/types';
 import { useAddToCase } from '../hooks/use_add_to_case';
diff --git a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/hooks/use_add_to_case.ts b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/hooks/use_add_to_case.ts
index 0d2b9dd724077..67f79242a9376 100644
--- a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/hooks/use_add_to_case.ts
+++ b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/hooks/use_add_to_case.ts
@@ -11,7 +11,7 @@ import { HttpSetup, MountPoint } from '@kbn/core/public';
 import { Case } from '@kbn/cases-plugin/common';
 import { TypedLensByValueInput } from '@kbn/lens-plugin/public';
 import { CasesDeepLinkId, DRAFT_COMMENT_STORAGE_ID } from '@kbn/cases-plugin/public';
-import { observabilityFeatureId } from '@kbn/observability-plugin/public';
+import { observabilityFeatureId } from '@kbn/observability-shared-plugin/public';
 import { useKibana } from '../../../../utils/kibana_react';
 import { AddToCaseProps } from '../header/add_to_case_action';
 
diff --git a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/hooks/use_lens_formula_helper.ts b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/hooks/use_lens_formula_helper.ts
index 9a2b7c115051c..cad011de0e3c1 100644
--- a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/hooks/use_lens_formula_helper.ts
+++ b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/hooks/use_lens_formula_helper.ts
@@ -7,7 +7,7 @@
 
 import { useMemo } from 'react';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
-import { useFetcher } from '@kbn/observability-plugin/public';
+import { useFetcher } from '../../../../hooks/use_fetcher';
 import { ExploratoryViewPublicPluginsStart } from '../../../..';
 
 export const useLensFormulaHelper = () => {
diff --git a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/index.tsx b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/index.tsx
index 9e6ac7d0394e3..fb333939722bb 100644
--- a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/index.tsx
+++ b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/index.tsx
@@ -15,7 +15,7 @@ import {
   createSessionStorageStateStorage,
 } from '@kbn/kibana-utils-plugin/public';
 import { TypedLensByValueInput } from '@kbn/lens-plugin/public';
-import { useTrackPageview } from '@kbn/observability-plugin/public';
+import { useTrackPageview } from '../../../hooks/use_track_metric';
 import { ExploratoryView } from './exploratory_view';
 import { ExploratoryViewPublicPluginsStart } from '../../../plugin';
 import { useBreadcrumbs } from '../../../hooks/use_breadcrumbs';
@@ -39,12 +39,12 @@ export function ExploratoryViewPage({
   useSessionStorage = false,
 }: ExploratoryViewPageProps) {
   const {
-    services: { uiSettings, notifications, observability },
+    services: { uiSettings, notifications, observabilityShared },
   } = useKibana<ExploratoryViewPublicPluginsStart>();
 
   const history = useHistory();
 
-  const ObservabilityPageTemplate = observability.navigation.PageTemplate;
+  const ObservabilityPageTemplate = observabilityShared.navigation.PageTemplate;
 
   useTrackPageview({ app: 'observability-overview', path: 'exploratory-view' });
   useTrackPageview({
diff --git a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/series_editor/columns/chart_type_select.tsx b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/series_editor/columns/chart_type_select.tsx
index 1fd75d47846ab..2ec37b2a60609 100644
--- a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/series_editor/columns/chart_type_select.tsx
+++ b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/series_editor/columns/chart_type_select.tsx
@@ -9,7 +9,7 @@ import React, { useState } from 'react';
 import { EuiPopover, EuiToolTip, EuiButtonEmpty, EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
-import { useFetcher } from '@kbn/observability-plugin/public';
+import { useFetcher } from '../../../../../hooks/use_fetcher';
 import { ExploratoryViewPublicPluginsStart } from '../../../../../plugin';
 import { SeriesUrl } from '../../../../..';
 import { SeriesConfig } from '../../types';
diff --git a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/series_editor/columns/chart_types.tsx b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/series_editor/columns/chart_types.tsx
index 68ccd782e4536..1eb5de5552aee 100644
--- a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/series_editor/columns/chart_types.tsx
+++ b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/series_editor/columns/chart_types.tsx
@@ -10,7 +10,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiFormRow, EuiIcon, EuiSuperSelect } from '
 import { i18n } from '@kbn/i18n';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { SeriesType } from '@kbn/lens-plugin/public';
-import { useFetcher } from '@kbn/observability-plugin/public';
+import { useFetcher } from '../../../../../hooks/use_fetcher';
 import { ExploratoryViewPublicPluginsStart } from '../../../../../plugin';
 import { SeriesUrl } from '../../../../..';
 import { useSeriesStorage } from '../../hooks/use_series_storage';
diff --git a/x-pack/plugins/exploratory_view/public/components/shared/index.tsx b/x-pack/plugins/exploratory_view/public/components/shared/index.tsx
index 0ca2b301c4ab4..1b685134bfb71 100644
--- a/x-pack/plugins/exploratory_view/public/components/shared/index.tsx
+++ b/x-pack/plugins/exploratory_view/public/components/shared/index.tsx
@@ -17,7 +17,7 @@ import type { DatePickerProps } from './date_picker';
 import type { FilterValueLabelProps } from './filter_value_label/filter_value_label';
 import type { SelectableUrlListProps } from './exploratory_view/components/url_search/selectable_url_list';
 import type { ExploratoryViewPageProps } from './exploratory_view';
-export type { LazyObservabilityPageTemplateProps } from '@kbn/observability-plugin/public';
+export type { LazyObservabilityPageTemplateProps } from '@kbn/observability-shared-plugin/public';
 
 const CoreVitalsLazy = lazy(() => import('./core_web_vitals'));
 
diff --git a/x-pack/plugins/exploratory_view/public/hooks/use_kibana_space.tsx b/x-pack/plugins/exploratory_view/public/hooks/use_kibana_space.tsx
index d09cea114c144..2a1459611cc0a 100644
--- a/x-pack/plugins/exploratory_view/public/hooks/use_kibana_space.tsx
+++ b/x-pack/plugins/exploratory_view/public/hooks/use_kibana_space.tsx
@@ -6,7 +6,7 @@
  */
 import type { Space } from '@kbn/spaces-plugin/common';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
-import { useFetcher } from '@kbn/observability-plugin/public';
+import { useFetcher } from './use_fetcher';
 import { ExploratoryViewPublicPluginsStart } from '..';
 
 export const useKibanaSpace = () => {
diff --git a/x-pack/plugins/exploratory_view/public/plugin.ts b/x-pack/plugins/exploratory_view/public/plugin.ts
index 3f4c949f1cc71..99b811c69d8c9 100644
--- a/x-pack/plugins/exploratory_view/public/plugin.ts
+++ b/x-pack/plugins/exploratory_view/public/plugin.ts
@@ -18,6 +18,7 @@ import {
   Plugin as PluginClass,
   PluginInitializerContext,
 } from '@kbn/core/public';
+import type { ObservabilitySharedPluginStart } from '@kbn/observability-shared-plugin/public';
 import type { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
 import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import type { DiscoverStart } from '@kbn/discover-plugin/public';
@@ -36,10 +37,6 @@ import { GuidedOnboardingPluginStart } from '@kbn/guided-onboarding-plugin/publi
 import { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 import { LicensingPluginStart } from '@kbn/licensing-plugin/public';
 import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
-import {
-  ObservabilityPublicSetup,
-  ObservabilityPublicStart,
-} from '@kbn/observability-plugin/public';
 import { getExploratoryViewEmbeddable } from './components/shared/exploratory_view/embeddable';
 import { createExploratoryViewUrl } from './components/shared/exploratory_view/configurations/exploratory_view_url';
 import getAppDataView from './utils/observability_data_views/get_app_data_view';
@@ -48,7 +45,6 @@ import { APP_ROUTE } from './constants';
 
 export interface ExploratoryViewPublicPluginsSetup {
   data: DataPublicPluginSetup;
-  observability: ObservabilityPublicSetup;
   share: SharePluginSetup;
   triggersActionsUi: TriggersAndActionsUIPublicPluginSetup;
   usageCollection: UsageCollectionSetup;
@@ -62,10 +58,11 @@ export interface ExploratoryViewPublicPluginsStart {
   dataViews: DataViewsPublicPluginStart;
   discover: DiscoverStart;
   embeddable: EmbeddableStart;
+
   guidedOnboarding: GuidedOnboardingPluginStart;
   lens: LensPublicStart;
   licensing: LicensingPluginStart;
-  observability: ObservabilityPublicStart;
+  observabilityShared: ObservabilitySharedPluginStart;
   security: SecurityPluginStart;
   share: SharePluginStart;
   spaces?: SpacesPluginStart;
diff --git a/x-pack/plugins/exploratory_view/tsconfig.json b/x-pack/plugins/exploratory_view/tsconfig.json
index 6b740c0ea3e4c..5b8fd3df1a227 100644
--- a/x-pack/plugins/exploratory_view/tsconfig.json
+++ b/x-pack/plugins/exploratory_view/tsconfig.json
@@ -55,7 +55,7 @@
     "@kbn/charts-plugin",
     "@kbn/shared-ux-router",
     "@kbn/core-application-browser",
-    "@kbn/observability-plugin"
+    "@kbn/observability-shared-plugin"
   ],
   "exclude": ["target/**/*"]
 }
diff --git a/x-pack/plugins/observability/kibana.jsonc b/x-pack/plugins/observability/kibana.jsonc
index de3927c6cb729..070638c42f1ce 100644
--- a/x-pack/plugins/observability/kibana.jsonc
+++ b/x-pack/plugins/observability/kibana.jsonc
@@ -13,36 +13,22 @@
       "charts",
       "data",
       "dataViews",
+      "embeddable",
       "features",
       "files",
+      "guidedOnboarding",
       "inspector",
+      "lens",
+      "observabilityShared",
       "ruleRegistry",
       "triggersActionsUi",
-      "inspector",
-      "unifiedSearch",
       "security",
-      "guidedOnboarding",
-      "share"
-    ],
-    "optionalPlugins": [
-      "discover",
-      "embeddable",
-      "home",
-      "lens",
-      "licensing",
-      "spaces",
-      "usageCollection"
-    ],
-    "requiredBundles": [
+      "share",
       "unifiedSearch",
-      "data",
-      "dataViews",
-      "embeddable",
-      "kibanaReact",
-      "kibanaUtils",
-      "lens",
       "visualizations"
     ],
+    "optionalPlugins": ["discover", "home", "licensing", "spaces", "usageCollection"],
+    "requiredBundles": ["data", "kibanaReact", "kibanaUtils", "unifiedSearch"],
     "extraPublicDirs": ["common"]
   }
 }
diff --git a/x-pack/plugins/observability/public/application/index.tsx b/x-pack/plugins/observability/public/application/index.tsx
index 20ca530d1a3c8..a82a5a1dce2dc 100644
--- a/x-pack/plugins/observability/public/application/index.tsx
+++ b/x-pack/plugins/observability/public/application/index.tsx
@@ -14,6 +14,7 @@ import { i18n } from '@kbn/i18n';
 import { Route } from '@kbn/shared-ux-router';
 import { AppMountParameters, APP_WRAPPER_CLASS, CoreStart } from '@kbn/core/public';
 import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
+import type { LazyObservabilityPageTemplateProps } from '@kbn/observability-shared-plugin/public';
 import {
   KibanaContextProvider,
   KibanaThemeProvider,
@@ -21,7 +22,6 @@ import {
 } from '@kbn/kibana-react-plugin/public';
 import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
-import type { LazyObservabilityPageTemplateProps } from '../components/shared/page_template/lazy_page_template';
 import { HasDataContextProvider } from '../context/has_data_context';
 import { PluginContext } from '../context/plugin_context';
 import { ConfigSchema, ObservabilityPublicPluginsStart } from '../plugin';
diff --git a/x-pack/plugins/observability/public/plugin.ts b/x-pack/plugins/observability/public/plugin.ts
index d497e02d533e1..6c2874f39b6d8 100644
--- a/x-pack/plugins/observability/public/plugin.ts
+++ b/x-pack/plugins/observability/public/plugin.ts
@@ -24,8 +24,14 @@ import type { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plu
 import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import type { DiscoverStart } from '@kbn/discover-plugin/public';
 import type { EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import type { ExploratoryViewPublicPluginsStart } from '@kbn/exploratory-view-plugin/public';
 import type { HomePublicPluginSetup, HomePublicPluginStart } from '@kbn/home-plugin/public';
 import type { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import type {
+  ObservabilitySharedPluginSetup,
+  ObservabilitySharedPluginStart,
+  NavigationEntry,
+} from '@kbn/observability-shared-plugin/public';
 import { CasesDeepLinkId, CasesUiStart, getCasesDeepLinks } from '@kbn/cases-plugin/public';
 import type { LensPublicStart } from '@kbn/lens-plugin/public';
 import {
@@ -45,19 +51,13 @@ import { LicensingPluginStart } from '@kbn/licensing-plugin/public';
 import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import { RuleDetailsLocatorDefinition } from './locators/rule_details';
 import { observabilityAppId, observabilityFeatureId, casesPath } from '../common';
-import { createLazyObservabilityPageTemplate } from './components/shared';
 import { registerDataHandler } from './data_handler';
 import {
   createObservabilityRuleTypeRegistry,
   ObservabilityRuleTypeRegistry,
 } from './rules/create_observability_rule_type_registry';
 import { createCallObservabilityApi } from './services/call_observability_api';
-import { createNavigationRegistry, NavigationEntry } from './services/navigation_registry';
-import { updateGlobalNavigation } from './update_global_navigation';
-import { getExploratoryViewEmbeddable } from './components/shared/exploratory_view/embeddable';
-import { createExploratoryViewUrl } from './components/shared/exploratory_view/configurations/exploratory_view_url';
 import { createUseRulesLink } from './hooks/create_use_rules_link';
-import getAppDataView from './utils/observability_data_views/get_app_data_view';
 import { registerObservabilityRuleTypes } from './rules/register_observability_rule_types';
 
 export interface ConfigSchema {
@@ -79,6 +79,7 @@ export type ObservabilityPublicSetup = ReturnType<Plugin['setup']>;
 
 export interface ObservabilityPublicPluginsSetup {
   data: DataPublicPluginSetup;
+  observabilityShared: ObservabilitySharedPluginSetup;
   share: SharePluginSetup;
   triggersActionsUi: TriggersAndActionsUIPublicPluginSetup;
   home?: HomePublicPluginSetup;
@@ -93,9 +94,11 @@ export interface ObservabilityPublicPluginsStart {
   dataViews: DataViewsPublicPluginStart;
   discover: DiscoverStart;
   embeddable: EmbeddableStart;
+  exploratoryView: ExploratoryViewPublicPluginsStart;
   guidedOnboarding: GuidedOnboardingPluginStart;
   lens: LensPublicStart;
   licensing: LicensingPluginStart;
+  observabilityShared: ObservabilitySharedPluginStart;
   ruleTypeRegistry: RuleTypeRegistryContract;
   security: SecurityPluginStart;
   share: SharePluginStart;
@@ -118,7 +121,6 @@ export class Plugin
     >
 {
   private readonly appUpdater$ = new BehaviorSubject<AppUpdater>(() => ({}));
-  private readonly navigationRegistry = createNavigationRegistry();
   private observabilityRuleTypeRegistry: ObservabilityRuleTypeRegistry =
     {} as ObservabilityRuleTypeRegistry;
 
@@ -194,7 +196,7 @@ export class Plugin
       // Load application bundle
       const { renderApp } = await import('./application');
       // Get start services
-      const [coreStart, pluginsStart, { navigation }] = await coreSetup.getStartServices();
+      const [coreStart, pluginsStart] = await coreSetup.getStartServices();
 
       const { ruleTypeRegistry, actionTypeRegistry } = pluginsStart.triggersActionsUi;
 
@@ -204,7 +206,7 @@ export class Plugin
         plugins: { ...pluginsStart, ruleTypeRegistry, actionTypeRegistry },
         appMountParameters: params,
         observabilityRuleTypeRegistry: this.observabilityRuleTypeRegistry,
-        ObservabilityPageTemplate: navigation.PageTemplate,
+        ObservabilityPageTemplate: pluginsStart.observabilityShared.navigation.PageTemplate,
         usageCollection: pluginsSetup.usageCollection,
         isDev: this.initContext.env.mode.dev,
         kibanaVersion,
@@ -260,7 +262,7 @@ export class Plugin
       });
     }
 
-    this.navigationRegistry.registerSections(
+    pluginsSetup.observabilityShared.navigation.registerSections(
       from(appUpdater$).pipe(
         map((value) => {
           const deepLinks = value(app)?.deepLinks ?? [];
@@ -307,9 +309,6 @@ export class Plugin
     return {
       dashboard: { register: registerDataHandler },
       observabilityRuleTypeRegistry: this.observabilityRuleTypeRegistry,
-      navigation: {
-        registerSections: this.navigationRegistry.registerSections,
-      },
       useRulesLink: createUseRulesLink(),
     };
   }
@@ -318,21 +317,12 @@ export class Plugin
     const { application } = coreStart;
     const config = this.initContext.config.get();
 
-    updateGlobalNavigation({
+    pluginsStart.observabilityShared.updateGlobalNavigation({
       capabilities: application.capabilities,
       deepLinks: this.deepLinks,
       updater$: this.appUpdater$,
     });
 
-    const PageTemplate = createLazyObservabilityPageTemplate({
-      currentAppId$: application.currentAppId$,
-      getUrlForApp: application.getUrlForApp,
-      navigateToApp: application.navigateToApp,
-      navigationSections$: this.navigationRegistry.sections$,
-      guidedOnboardingApi: pluginsStart.guidedOnboarding.guidedOnboardingApi,
-      getPageTemplateServices: () => ({ coreStart }),
-    });
-
     const getAsyncO11yAlertsTableConfiguration = async () => {
       const { getAlertsTableConfiguration } = await import(
         './components/alerts_table/get_alerts_table_configuration'
@@ -348,12 +338,6 @@ export class Plugin
 
     return {
       observabilityRuleTypeRegistry: this.observabilityRuleTypeRegistry,
-      navigation: {
-        PageTemplate,
-      },
-      createExploratoryViewUrl,
-      getAppDataView: getAppDataView(pluginsStart.dataViews),
-      ExploratoryViewEmbeddable: getExploratoryViewEmbeddable({ ...coreStart, ...pluginsStart }),
       useRulesLink: createUseRulesLink(),
     };
   }
diff --git a/x-pack/plugins/observability/tsconfig.json b/x-pack/plugins/observability/tsconfig.json
index a4f56eea4f135..d4bddba180e7a 100644
--- a/x-pack/plugins/observability/tsconfig.json
+++ b/x-pack/plugins/observability/tsconfig.json
@@ -74,7 +74,9 @@
     "@kbn/core-application-browser",
     "@kbn/files-plugin",
     "@kbn/core-theme-browser",
-    "@kbn/core-elasticsearch-server"
+    "@kbn/core-elasticsearch-server",
+    "@kbn/observability-shared-plugin",
+    "@kbn/exploratory-view-plugin"
   ],
   "exclude": ["target/**/*"]
 }
diff --git a/x-pack/plugins/observability_shared/public/hooks/use_track_metric.tsx b/x-pack/plugins/observability_shared/public/hooks/use_track_metric.tsx
new file mode 100644
index 0000000000000..7138c20ef6aa6
--- /dev/null
+++ b/x-pack/plugins/observability_shared/public/hooks/use_track_metric.tsx
@@ -0,0 +1,91 @@
+/*
+ * 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 { useEffect, useMemo } from 'react';
+import { METRIC_TYPE, UiCounterMetricType } from '@kbn/analytics';
+import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { ObservabilityApp } from '../../typings/common';
+
+/**
+ * Note: The usage_collection plugin will take care of sending this data to the telemetry server.
+ * You can find the metrics that are collected by these hooks in Stack Telemetry.
+ * Search the index `kibana-ui-counter`. You can filter for `eventName` and/or `appName`.
+ */
+
+interface TrackOptions {
+  app?: ObservabilityApp;
+  metricType?: UiCounterMetricType;
+  delay?: number; // in ms
+}
+type EffectDeps = unknown[];
+
+interface ServiceDeps {
+  usageCollection: UsageCollectionSetup; // TODO: This should really be start. Looking into it.
+}
+
+export type TrackMetricOptions = TrackOptions & { metric: string };
+export type UiTracker = ReturnType<typeof useUiTracker>;
+export type TrackEvent = (options: TrackMetricOptions) => void;
+
+export { METRIC_TYPE };
+
+export function useUiTracker<Services extends ServiceDeps>({
+  app: defaultApp,
+}: { app?: ObservabilityApp } = {}): TrackEvent {
+  const reportUiCounter = useKibana<Services>().services?.usageCollection?.reportUiCounter;
+  const trackEvent = useMemo(() => {
+    return ({ app = defaultApp, metric, metricType = METRIC_TYPE.COUNT }: TrackMetricOptions) => {
+      if (reportUiCounter) {
+        reportUiCounter(app as string, metricType, metric);
+      }
+    };
+  }, [defaultApp, reportUiCounter]);
+  return trackEvent;
+}
+
+export function useTrackMetric<Services extends ServiceDeps>(
+  { app, metric, metricType = METRIC_TYPE.COUNT, delay = 0 }: TrackMetricOptions,
+  effectDependencies: EffectDeps = []
+) {
+  const reportUiCounter = useKibana<Services>().services?.usageCollection?.reportUiCounter;
+
+  useEffect(() => {
+    if (!reportUiCounter) {
+      // eslint-disable-next-line no-console
+      console.log(
+        'usageCollection.reportUiCounter is unavailable. Ensure this is setup via <KibanaContextProvider />.'
+      );
+    } else {
+      let decoratedMetric = metric;
+      if (delay > 0) {
+        decoratedMetric += `__delayed_${delay}ms`;
+      }
+      const id = setTimeout(
+        () => reportUiCounter(app as string, metricType, decoratedMetric),
+        Math.max(delay, 0)
+      );
+      return () => clearTimeout(id);
+    }
+    // the dependencies are managed externally
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, effectDependencies);
+}
+
+/**
+ * useTrackPageview is a convenience wrapper for tracking a pageview
+ * Its metrics will be found at:
+ * stack_stats.kibana.plugins.ui_metric.{app}.pageview__{path}(__delayed_{n}ms)?
+ */
+type TrackPageviewProps = TrackOptions & { path: string };
+
+export function useTrackPageview<Services extends ServiceDeps>(
+  { path, ...rest }: TrackPageviewProps,
+  effectDependencies: EffectDeps = []
+) {
+  useTrackMetric<Services>({ ...rest, metric: `pageview__${path}` }, effectDependencies);
+}
diff --git a/x-pack/plugins/observability_shared/public/index.ts b/x-pack/plugins/observability_shared/public/index.ts
index ecb2095e4eb6f..83cafa04bd2b5 100644
--- a/x-pack/plugins/observability_shared/public/index.ts
+++ b/x-pack/plugins/observability_shared/public/index.ts
@@ -19,8 +19,15 @@ export type {
 
 export type { NavigationEntry } from './components/page_template/page_template';
 
+export { useObservabilityTourContext } from './components/tour';
+
 export const plugin = () => {
   return new ObservabilitySharedPlugin();
 };
 
-export { observabilityFeatureId, casesFeatureId, sloFeatureId } from '../common';
+export {
+  observabilityFeatureId,
+  observabilityAppId,
+  casesFeatureId,
+  sloFeatureId,
+} from '../common';
diff --git a/x-pack/plugins/observability_shared/tsconfig.json b/x-pack/plugins/observability_shared/tsconfig.json
index fba33ee93d5f4..58d99188c9216 100644
--- a/x-pack/plugins/observability_shared/tsconfig.json
+++ b/x-pack/plugins/observability_shared/tsconfig.json
@@ -20,6 +20,8 @@
     "@kbn/shared-ux-page-kibana-template",
     "@kbn/i18n-react",
     "@kbn/shared-ux-page-kibana-template-mocks",
+    "@kbn/analytics",
+    "@kbn/usage-collection-plugin",
   ],
   "exclude": ["target/**/*"]
 }
diff --git a/x-pack/plugins/profiling/public/components/profiling_app_page_template/index.tsx b/x-pack/plugins/profiling/public/components/profiling_app_page_template/index.tsx
index 4114082efe9e5..2a353f3b4db61 100644
--- a/x-pack/plugins/profiling/public/components/profiling_app_page_template/index.tsx
+++ b/x-pack/plugins/profiling/public/components/profiling_app_page_template/index.tsx
@@ -39,10 +39,10 @@ export function ProfilingAppPageTemplate({
   pageTitle?: React.ReactNode;
 }) {
   const {
-    start: { observability },
+    start: { observabilityShared },
   } = useProfilingDependencies();
 
-  const { PageTemplate: ObservabilityPageTemplate } = observability.navigation;
+  const { PageTemplate: ObservabilityPageTemplate } = observabilityShared.navigation;
 
   const history = useHistory();
 
diff --git a/x-pack/plugins/profiling/public/routing/router_error_boundary.tsx b/x-pack/plugins/profiling/public/routing/router_error_boundary.tsx
index 355ee1bd42f79..0134f70ab1ec0 100644
--- a/x-pack/plugins/profiling/public/routing/router_error_boundary.tsx
+++ b/x-pack/plugins/profiling/public/routing/router_error_boundary.tsx
@@ -44,9 +44,9 @@ const pageHeader = {
 
 function ErrorWithTemplate({ error }: { error: Error }) {
   const { services } = useKibana<ProfilingPluginPublicStartDeps>();
-  const { observability } = services;
+  const { observabilityShared } = services;
 
-  const ObservabilityPageTemplate = observability.navigation.PageTemplate;
+  const ObservabilityPageTemplate = observabilityShared.navigation.PageTemplate;
 
   if (error instanceof NotFoundRouteException) {
     return (
diff --git a/x-pack/plugins/profiling/public/types.ts b/x-pack/plugins/profiling/public/types.ts
index da0bc65f02d34..7db396acd5e3b 100644
--- a/x-pack/plugins/profiling/public/types.ts
+++ b/x-pack/plugins/profiling/public/types.ts
@@ -13,7 +13,10 @@ import type {
   ObservabilityPublicSetup,
   ObservabilityPublicStart,
 } from '@kbn/observability-plugin/public';
-import { ObservabilitySharedPluginSetup } from '@kbn/observability-shared-plugin/public/plugin';
+import {
+  ObservabilitySharedPluginSetup,
+  ObservabilitySharedPluginStart,
+} from '@kbn/observability-shared-plugin/public/plugin';
 import { ChartsPluginSetup, ChartsPluginStart } from '@kbn/charts-plugin/public';
 import { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
 
@@ -28,6 +31,7 @@ export interface ProfilingPluginPublicSetupDeps {
 
 export interface ProfilingPluginPublicStartDeps {
   observability: ObservabilityPublicStart;
+  observabilityShared: ObservabilitySharedPluginStart;
   dataViews: DataViewsPublicPluginStart;
   data: DataPublicPluginStart;
   charts: ChartsPluginStart;
diff --git a/x-pack/plugins/synthetics/kibana.jsonc b/x-pack/plugins/synthetics/kibana.jsonc
index 79e31899b3dac..a70202e3126a1 100644
--- a/x-pack/plugins/synthetics/kibana.jsonc
+++ b/x-pack/plugins/synthetics/kibana.jsonc
@@ -7,10 +7,7 @@
     "id": "synthetics",
     "server": true,
     "browser": true,
-    "configPath": [
-      "xpack",
-      "uptime"
-    ],
+    "configPath": ["xpack", "uptime"],
     "requiredPlugins": [
       "actions",
       "alerting",
@@ -24,6 +21,7 @@
       "inspector",
       "licensing",
       "observability",
+      "observabilityShared",
       "ruleRegistry",
       "security",
       "share",
@@ -33,15 +31,7 @@
       "unifiedSearch",
       "bfetch"
     ],
-    "optionalPlugins": [
-      "cloud",
-      "data",
-      "fleet",
-      "home",
-      "ml",
-      "spaces",
-      "telemetry"
-    ],
+    "optionalPlugins": ["cloud", "data", "fleet", "home", "ml", "spaces", "telemetry"],
     "requiredBundles": [
       "data",
       "unifiedSearch",
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/components/stderr_logs.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/components/stderr_logs.tsx
index 3093c2e8534cd..6c5e80c9f28e4 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/components/stderr_logs.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/components/stderr_logs.tsx
@@ -68,10 +68,10 @@ export const StdErrorLogs = ({
 
   const { items, loading } = useStdErrorLogs({ monitorId, checkGroup });
 
-  const { discover, observability } = useKibana<ClientPluginsStart>().services;
+  const { discover, exploratoryView } = useKibana<ClientPluginsStart>().services;
 
   const { data: discoverLink } = useFetcher(async () => {
-    const dataView = await observability.getAppDataView('synthetics', SYNTHETICS_INDEX_PATTERN);
+    const dataView = await exploratoryView.getAppDataView('synthetics', SYNTHETICS_INDEX_PATTERN);
     return discover.locator?.getUrl({
       query: { language: 'kuery', query: `monitor.check_group: ${checkGroup}` },
       indexPatternId: dataView?.id,
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/page_template/synthetics_page_template.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/page_template/synthetics_page_template.tsx
index b9ce0e722f24e..9647e7592a0b9 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/page_template/synthetics_page_template.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/page_template/synthetics_page_template.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LazyObservabilityPageTemplateProps } from '@kbn/observability-plugin/public';
+import { LazyObservabilityPageTemplateProps } from '@kbn/observability-shared-plugin/public';
 import React from 'react';
 import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
@@ -13,8 +13,8 @@ import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ClientPluginsStart } from '../../../../../plugin';
 
 export const WrappedPageTemplate = (props: LazyObservabilityPageTemplateProps) => {
-  const { observability } = useKibana<ClientPluginsStart>().services;
-  const PageTemplateComponent = observability.navigation.PageTemplate;
+  const { observabilityShared } = useKibana<ClientPluginsStart>().services;
+  const PageTemplateComponent = observabilityShared.navigation.PageTemplate;
 
   return <PageTemplateComponent {...props} />;
 };
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/routes.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/routes.tsx
index 487e82e5538d9..e082a318fe568 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/routes.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/routes.tsx
@@ -16,7 +16,7 @@ import { i18n } from '@kbn/i18n';
 import { NotFoundPrompt } from '@kbn/shared-ux-prompt-not-found';
 import { APP_WRAPPER_CLASS } from '@kbn/core/public';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
-import type { LazyObservabilityPageTemplateProps } from '@kbn/observability-plugin/public';
+import type { LazyObservabilityPageTemplateProps } from '@kbn/observability-shared-plugin/public';
 import { useInspectorContext } from '@kbn/observability-plugin/public';
 import { useSyntheticsPrivileges } from './hooks/use_synthetics_priviliges';
 import { ClientPluginsStart } from '../../plugin';
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/synthetics_app.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/synthetics_app.tsx
index 1b67c882869c7..8cb9c8b3364fc 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/synthetics_app.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/synthetics_app.tsx
@@ -91,6 +91,7 @@ const Application = (props: SyntheticsAppProps) => {
                 inspector: startPlugins.inspector,
                 triggersActionsUi: startPlugins.triggersActionsUi,
                 observability: startPlugins.observability,
+                observabilityShared: startPlugins.observabilityShared,
                 exploratoryView: startPlugins.exploratoryView,
                 cases: startPlugins.cases,
                 spaces: startPlugins.spaces,
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/utils/testing/rtl_helpers.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/utils/testing/rtl_helpers.tsx
index ad79d6f293a45..59fd849d2e3f4 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/utils/testing/rtl_helpers.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/utils/testing/rtl_helpers.tsx
@@ -135,8 +135,16 @@ export const mockCore: () => Partial<CoreStart> = () => {
     triggersActionsUi: triggersActionsUiMock.createStart(),
     storage: createMockStore(),
     data: dataPluginMock.createStartContract(),
+    // @ts-ignore
     observability: {
       useRulesLink: () => ({ href: 'newRuleLink' }),
+      observabilityRuleTypeRegistry: {
+        register: jest.fn(),
+        getFormatter: jest.fn(),
+        list: jest.fn(),
+      },
+    },
+    observabilityShared: {
       navigation: {
         // @ts-ignore
         PageTemplate: EuiPageTemplate,
@@ -168,6 +176,7 @@ export function MockKibanaProvider<ExtraCore>({
         <SyntheticsStartupPluginsContextProvider
           data={(coreOptions as any).data}
           observability={(coreOptions as any).observability}
+          observabilityShared={(coreOptions as any).observabilityShared}
           exploratoryView={(coreOptions as any).exploratoryView}
         >
           <EuiThemeProvider darkMode={false}>
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/app/uptime_app.tsx b/x-pack/plugins/synthetics/public/legacy_uptime/app/uptime_app.tsx
index df6f287f8ab03..83f05eefa2577 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/app/uptime_app.tsx
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/app/uptime_app.tsx
@@ -124,6 +124,7 @@ const Application = (props: UptimeAppProps) => {
                 inspector: startPlugins.inspector,
                 triggersActionsUi: startPlugins.triggersActionsUi,
                 observability: startPlugins.observability,
+                observabilityShared: startPlugins.observabilityShared,
                 exploratoryView: startPlugins.exploratoryView,
                 cases: startPlugins.cases,
               }}
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/app/uptime_page_template.tsx b/x-pack/plugins/synthetics/public/legacy_uptime/app/uptime_page_template.tsx
index c1003f969586c..ed294cca26f7d 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/app/uptime_page_template.tsx
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/app/uptime_page_template.tsx
@@ -28,10 +28,10 @@ export const UptimePageTemplateComponent: React.FC<Props & EuiPageTemplateProps>
   ...pageTemplateProps
 }) => {
   const {
-    services: { observability },
+    services: { observabilityShared },
   } = useKibana<ClientPluginsStart>();
 
-  const PageTemplateComponent = observability.navigation.PageTemplate;
+  const PageTemplateComponent = observabilityShared.navigation.PageTemplate;
 
   const noDataConfig = useNoDataConfig();
 
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/lib/helper/rtl_helpers.tsx b/x-pack/plugins/synthetics/public/legacy_uptime/lib/helper/rtl_helpers.tsx
index 6908ebb4677e3..5aab33986d0e6 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/lib/helper/rtl_helpers.tsx
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/lib/helper/rtl_helpers.tsx
@@ -133,8 +133,16 @@ export const mockCore: () => Partial<CoreStart> = () => {
     triggersActionsUi: triggersActionsUiMock.createStart(),
     storage: createMockStore(),
     data: dataPluginMock.createStartContract(),
+    // @ts-ignore
     observability: {
       useRulesLink: () => ({ href: 'newRuleLink' }),
+      observabilityRuleTypeRegistry: {
+        register: jest.fn(),
+        getFormatter: jest.fn(),
+        list: jest.fn(),
+      },
+    },
+    observabilityShared: {
       navigation: {
         // @ts-ignore
         PageTemplate: EuiPageTemplate,
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/routes.tsx b/x-pack/plugins/synthetics/public/legacy_uptime/routes.tsx
index c4032142c55d9..ad1f536bb2921 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/routes.tsx
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/routes.tsx
@@ -13,7 +13,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { APP_WRAPPER_CLASS } from '@kbn/core/public';
 import { useInspectorContext } from '@kbn/observability-plugin/public';
-import type { LazyObservabilityPageTemplateProps } from '@kbn/observability-plugin/public';
+import type { LazyObservabilityPageTemplateProps } from '@kbn/observability-shared-plugin/public';
 import {
   CERTIFICATES_ROUTE,
   MAPPING_ERROR_ROUTE,
diff --git a/x-pack/plugins/synthetics/public/plugin.ts b/x-pack/plugins/synthetics/public/plugin.ts
index cdc32a32b0951..370dd2e802bdf 100644
--- a/x-pack/plugins/synthetics/public/plugin.ts
+++ b/x-pack/plugins/synthetics/public/plugin.ts
@@ -46,6 +46,10 @@ import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 import type { DocLinksStart } from '@kbn/core-doc-links-browser';
 import type { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
+import type {
+  ObservabilitySharedPluginSetup,
+  ObservabilitySharedPluginStart,
+} from '@kbn/observability-shared-plugin/public';
 import { PLUGIN } from '../common/constants/plugin';
 import { OVERVIEW_ROUTE } from '../common/constants/ui';
 import {
@@ -66,6 +70,7 @@ export interface ClientPluginsSetup {
   data: DataPublicPluginSetup;
   exploratoryView: ExploratoryViewPublicSetup;
   observability: ObservabilityPublicSetup;
+  observabilityShared: ObservabilitySharedPluginSetup;
   share: SharePluginSetup;
   triggersActionsUi: TriggersAndActionsUIPublicPluginSetup;
   cloud?: CloudSetup;
@@ -80,6 +85,7 @@ export interface ClientPluginsStart {
   embeddable: EmbeddableStart;
   exploratoryView: ExploratoryViewPublicStart;
   observability: ObservabilityPublicStart;
+  observabilityShared: ObservabilitySharedPluginStart;
   share: SharePluginStart;
   triggersActionsUi: TriggersAndActionsUIPublicPluginStart;
   cases: CasesUiStart;
@@ -273,7 +279,7 @@ function registerUptimeRoutesWithNavigation(
   core: CoreSetup<ClientPluginsStart, unknown>,
   plugins: ClientPluginsSetup
 ) {
-  plugins.observability.navigation.registerSections(
+  plugins.observabilityShared.navigation.registerSections(
     from(core.getStartServices()).pipe(
       map(([coreStart]) => {
         if (coreStart.application.capabilities.uptime.show) {
diff --git a/x-pack/plugins/synthetics/tsconfig.json b/x-pack/plugins/synthetics/tsconfig.json
index 1809306e08b7e..a02e14d577b35 100644
--- a/x-pack/plugins/synthetics/tsconfig.json
+++ b/x-pack/plugins/synthetics/tsconfig.json
@@ -77,6 +77,7 @@
     "@kbn/shared-ux-router",
     "@kbn/alerts-as-data-utils",
     "@kbn/exploratory-view-plugin",
+    "@kbn/observability-shared-plugin",
   ],
   "exclude": [
     "target/**/*",
diff --git a/x-pack/plugins/ux/kibana.jsonc b/x-pack/plugins/ux/kibana.jsonc
index c9b02848460bd..341d9d8fcc1f8 100644
--- a/x-pack/plugins/ux/kibana.jsonc
+++ b/x-pack/plugins/ux/kibana.jsonc
@@ -14,6 +14,7 @@
       "exploratoryView",
       "licensing",
       "triggersActionsUi",
+      "observabilityShared",
       "embeddable",
       "infra",
       "inspector",
diff --git a/x-pack/plugins/ux/public/application/ux_app.tsx b/x-pack/plugins/ux/public/application/ux_app.tsx
index 7d6957f0abade..42e7d8109f8ed 100644
--- a/x-pack/plugins/ux/public/application/ux_app.tsx
+++ b/x-pack/plugins/ux/public/application/ux_app.tsx
@@ -110,6 +110,7 @@ export function UXAppRoot({
     inspector,
     maps,
     observability,
+    observabilityShared,
     exploratoryView,
     data,
     dataViews,
@@ -138,6 +139,7 @@ export function UXAppRoot({
           ...plugins,
           inspector,
           observability,
+          observabilityShared,
           embeddable,
           exploratoryView,
           data,
diff --git a/x-pack/plugins/ux/public/components/app/rum_dashboard/rum_home.tsx b/x-pack/plugins/ux/public/components/app/rum_dashboard/rum_home.tsx
index 00c4c2be6d3e0..36844867be4f5 100644
--- a/x-pack/plugins/ux/public/components/app/rum_dashboard/rum_home.tsx
+++ b/x-pack/plugins/ux/public/components/app/rum_dashboard/rum_home.tsx
@@ -25,9 +25,9 @@ export const DASHBOARD_LABEL = i18n.translate('xpack.ux.title', {
 });
 
 export function RumHome() {
-  const { docLinks, http, observability } = useKibanaServices();
+  const { docLinks, http, observabilityShared } = useKibanaServices();
 
-  const PageTemplateComponent = observability.navigation.PageTemplate;
+  const PageTemplateComponent = observabilityShared.navigation.PageTemplate;
 
   const { hasData, loading: isLoading } = useHasRumData();
 
diff --git a/x-pack/plugins/ux/public/plugin.ts b/x-pack/plugins/ux/public/plugin.ts
index d5246fca56108..a578b6aca0b79 100644
--- a/x-pack/plugins/ux/public/plugin.ts
+++ b/x-pack/plugins/ux/public/plugin.ts
@@ -38,6 +38,10 @@ import { MapsStartApi } from '@kbn/maps-plugin/public';
 import { Start as InspectorPluginStart } from '@kbn/inspector-plugin/public';
 import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import { LensPublicStart } from '@kbn/lens-plugin/public';
+import {
+  ObservabilitySharedPluginSetup,
+  ObservabilitySharedPluginStart,
+} from '@kbn/observability-shared-plugin/public';
 
 export type UxPluginSetup = void;
 export type UxPluginStart = void;
@@ -49,6 +53,7 @@ export interface ApmPluginSetupDeps {
   home?: HomePublicPluginSetup;
   licensing: LicensingPluginSetup;
   observability: ObservabilityPublicSetup;
+  observabilityShared: ObservabilitySharedPluginSetup;
 }
 
 export interface ApmPluginStartDeps {
@@ -59,6 +64,7 @@ export interface ApmPluginStartDeps {
   maps?: MapsStartApi;
   inspector: InspectorPluginStart;
   observability: ObservabilityPublicStart;
+  observabilityShared: ObservabilitySharedPluginStart;
   exploratoryView: ExploratoryViewPublicStart;
   dataViews: DataViewsPublicPluginStart;
   lens: LensPublicStart;
@@ -126,7 +132,7 @@ export class UxPlugin implements Plugin<UxPluginSetup, UxPluginStart> {
     }
 
     // register observability nav if user has access to plugin
-    plugins.observability.navigation.registerSections(
+    plugins.observabilityShared.navigation.registerSections(
       from(core.getStartServices()).pipe(
         map(([coreStart]) => {
           // checking apm capability, since ux for now doesn't have it's
diff --git a/x-pack/plugins/ux/tsconfig.json b/x-pack/plugins/ux/tsconfig.json
index 336dbf9b94e5d..b1406ed25aa9c 100644
--- a/x-pack/plugins/ux/tsconfig.json
+++ b/x-pack/plugins/ux/tsconfig.json
@@ -37,6 +37,7 @@
     "@kbn/i18n-react",
     "@kbn/es-query",
     "@kbn/exploratory-view-plugin",
+    "@kbn/observability-shared-plugin",
   ],
   "exclude": [
     "target/**/*",

From 065fdf9a4985f5dc39758bfb05a484861099631a Mon Sep 17 00:00:00 2001
From: GitStart <1501599+gitstart@users.noreply.github.com>
Date: Wed, 19 Apr 2023 01:44:01 +0300
Subject: [PATCH 048/100] Space switcher not visible when sidebar is expanded
 (Accessibility) (#154622)

Space switcher not visible when sidebar is expanded (Accessibility)

Resolves https://github.com/elastic/kibana/issues/153464

### Loom video/Screenshot
#### BEFORE

![image](https://user-images.githubusercontent.com/50892465/227374824-0d8d08b7-d542-4572-870a-4d5b0f8fd98e.png)

#### AFTER

![image](https://user-images.githubusercontent.com/50892465/227374655-ddf208c9-959c-4251-ac4d-4a70848999f7.png)

---
This code was written and reviewed by GitStart Community. Growing future
engineers, one PR at a time.

---------

Co-authored-by: KlingerMatheus <klinger.matheus@gitstart.dev>
Co-authored-by: gitstart_bot <gitstart_bot@users.noreply.github.com>
Co-authored-by: Klinger Matheus <50892465+KlingerMatheus@users.noreply.github.com>
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../nav_control_popover.test.tsx.snap         | 210 ++++++++++++++----
 .../nav_control/nav_control_popover.tsx       |  16 +-
 2 files changed, 175 insertions(+), 51 deletions(-)

diff --git a/x-pack/plugins/spaces/public/nav_control/__snapshots__/nav_control_popover.test.tsx.snap b/x-pack/plugins/spaces/public/nav_control/__snapshots__/nav_control_popover.test.tsx.snap
index ea194bafa3d3c..e89342884cc2d 100644
--- a/x-pack/plugins/spaces/public/nav_control/__snapshots__/nav_control_popover.test.tsx.snap
+++ b/x-pack/plugins/spaces/public/nav_control/__snapshots__/nav_control_popover.test.tsx.snap
@@ -1,55 +1,169 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`NavControlPopover renders without crashing 1`] = `
-<EuiPopover
+<NavControlPopoverUI
   anchorPosition="downRight"
-  button={
-    <EuiHeaderSectionItemButton
-      aria-controls="headerSpacesMenuContent"
-      aria-describedby="spacesNavDetails"
-      aria-expanded={false}
-      aria-haspopup="true"
-      aria-label="Spaces navigation"
-      data-test-subj="spacesNavSelector"
-      onClick={[Function]}
-      title="loading spaces navigation"
-    >
-      <EuiLoadingSpinner
-        className="eui-alignMiddle"
-        size="m"
-      />
-      <p
-        hidden={true}
-        id="spacesNavDetails"
-      >
-        loading spaces navigation is the currently selected space. Click this button to open a popover that allows you to select the active space.
-      </p>
-    </EuiHeaderSectionItemButton>
+  capabilities={
+    Object {
+      "catalogue": Object {},
+      "management": Object {},
+      "navLinks": Object {},
+      "spaces": Object {
+        "manage": true,
+      },
+    }
+  }
+  navigateToApp={[MockFunction]}
+  navigateToUrl={[MockFunction]}
+  serverBasePath="/server-base-path"
+  spacesManager={
+    Object {
+      "copySavedObjects": [MockFunction],
+      "createSpace": [MockFunction],
+      "deleteSpace": [MockFunction],
+      "disableLegacyUrlAliases": [MockFunction],
+      "getActiveSpace": [MockFunction],
+      "getShareSavedObjectPermissions": [MockFunction],
+      "getShareableReferences": [MockFunction],
+      "getSpace": [MockFunction],
+      "getSpaces": [MockFunction],
+      "onActiveSpaceChange$": Observable {
+        "_subscribe": [Function],
+      },
+      "redirectToSpaceSelector": [MockFunction],
+      "resolveCopySavedObjectsErrors": [MockFunction],
+      "updateSavedObjectsSpaces": [MockFunction],
+      "updateSpace": [MockFunction],
+    }
   }
-  closePopover={[Function]}
-  display="inline-block"
-  hasArrow={true}
-  id="spcMenuPopover"
-  isOpen={false}
-  ownFocus={true}
-  panelPaddingSize="none"
-  repositionOnScroll={true}
->
-  <SpacesDescription
-    capabilities={
-      Object {
-        "catalogue": Object {},
-        "management": Object {},
-        "navLinks": Object {},
-        "spaces": Object {
-          "manage": true,
-        },
-      }
+  theme={
+    Object {
+      "colorMode": "LIGHT",
+      "euiTheme": Object {
+        "animation": Object {
+          "bounce": "cubic-bezier(.34, 1.61, .7, 1)",
+          "extraFast": "90ms",
+          "extraSlow": "500ms",
+          "fast": "150ms",
+          "normal": "250ms",
+          "resistance": "cubic-bezier(.694, .0482, .335, 1)",
+          "slow": "350ms",
+        },
+        "base": 16,
+        "border": Object {
+          "color": "#D3DAE6",
+          "editable": "2px dotted #D3DAE6",
+          "radius": Object {
+            "medium": "6px",
+            "small": "4px",
+          },
+          "thick": "2px solid #D3DAE6",
+          "thin": "1px solid #D3DAE6",
+          "width": Object {
+            "thick": "2px",
+            "thin": "1px",
+          },
+        },
+        "breakpoint": Object {
+          "l": 992,
+          "m": 768,
+          "s": 575,
+          "xl": 1200,
+          "xs": 0,
+        },
+        "colors": Object {
+          "accent": "#F04E98",
+          "accentText": "#ba3d76",
+          "body": "#f7f8fc",
+          "danger": "#BD271E",
+          "dangerText": "#bd271e",
+          "darkShade": "#69707D",
+          "darkestShade": "#343741",
+          "disabled": "#ABB4C4",
+          "disabledText": "#a2abba",
+          "emptyShade": "#FFF",
+          "fullShade": "#000",
+          "ghost": "#FFF",
+          "highlight": "#fff9e8",
+          "ink": "#000",
+          "lightShade": "#D3DAE6",
+          "lightestShade": "#F1F4FA",
+          "link": "#006bb8",
+          "mediumShade": "#98A2B3",
+          "primary": "#07C",
+          "primaryText": "#006bb8",
+          "shadow": "#000",
+          "subduedText": "#646a77",
+          "success": "#00BFB3",
+          "successText": "#007871",
+          "text": "#343741",
+          "title": "#1a1c21",
+          "warning": "#FEC514",
+          "warningText": "#83650a",
+        },
+        "focus": Object {
+          "color": "currentColor",
+          "width": "2px",
+        },
+        "font": Object {
+          "baseline": 4,
+          "body": Object {
+            "scale": "s",
+            "weight": "regular",
+          },
+          "family": "'Inter', BlinkMacSystemFont, Helvetica, Arial, sans-serif",
+          "familyCode": "'Roboto Mono', Menlo, Courier, monospace",
+          "familySerif": "Georgia, Times, Times New Roman, serif",
+          "featureSettings": "'calt' 1, 'kern' 1, 'liga' 1",
+          "lineHeightMultiplier": 1.5,
+          "scale": Object {
+            "l": 1.375,
+            "m": 1,
+            "s": 0.875,
+            "xl": 1.6875,
+            "xs": 0.75,
+            "xxl": 2.125,
+            "xxs": 0.6875,
+            "xxxs": 0.5625,
+          },
+          "title": Object {
+            "weight": "bold",
+          },
+          "weight": Object {
+            "bold": 700,
+            "light": 300,
+            "medium": 500,
+            "regular": 400,
+            "semiBold": 600,
+          },
+        },
+        "levels": Object {
+          "content": 0,
+          "flyout": 1000,
+          "header": 1000,
+          "mask": 6000,
+          "maskBelowHeader": 1000,
+          "menu": 2000,
+          "modal": 8000,
+          "navigation": 6000,
+          "toast": 9000,
+        },
+        "size": Object {
+          "base": "16px",
+          "l": "24px",
+          "m": "12px",
+          "s": "8px",
+          "xl": "32px",
+          "xs": "4px",
+          "xxl": "40px",
+          "xxs": "2px",
+          "xxxl": "48px",
+          "xxxxl": "64px",
+        },
+        "themeName": "EUI_THEME_AMSTERDAM",
+      },
+      "modifications": Object {},
     }
-    id="headerSpacesMenuContent"
-    isLoading={false}
-    navigateToApp={[MockFunction]}
-    toggleSpaceSelector={[Function]}
-  />
-</EuiPopover>
+  }
+/>
 `;
diff --git a/x-pack/plugins/spaces/public/nav_control/nav_control_popover.tsx b/x-pack/plugins/spaces/public/nav_control/nav_control_popover.tsx
index 1e75bd0ae0f65..45a6c21c86f04 100644
--- a/x-pack/plugins/spaces/public/nav_control/nav_control_popover.tsx
+++ b/x-pack/plugins/spaces/public/nav_control/nav_control_popover.tsx
@@ -5,8 +5,13 @@
  * 2.0.
  */
 
-import type { PopoverAnchorPosition } from '@elastic/eui';
-import { EuiHeaderSectionItemButton, EuiLoadingSpinner, EuiPopover } from '@elastic/eui';
+import type { PopoverAnchorPosition, WithEuiThemeProps } from '@elastic/eui';
+import {
+  EuiHeaderSectionItemButton,
+  EuiLoadingSpinner,
+  EuiPopover,
+  withEuiTheme,
+} from '@elastic/eui';
 import React, { Component, lazy, Suspense } from 'react';
 import type { Subscription } from 'rxjs';
 
@@ -31,6 +36,7 @@ interface Props {
   navigateToApp: ApplicationStart['navigateToApp'];
   navigateToUrl: ApplicationStart['navigateToUrl'];
   serverBasePath: string;
+  theme: WithEuiThemeProps['theme'];
 }
 
 interface State {
@@ -42,7 +48,7 @@ interface State {
 
 const popoutContentId = 'headerSpacesMenuContent';
 
-export class NavControlPopover extends Component<Props, State> {
+class NavControlPopoverUI extends Component<Props, State> {
   private activeSpace$?: Subscription;
 
   constructor(props: Props) {
@@ -73,6 +79,7 @@ export class NavControlPopover extends Component<Props, State> {
 
   public render() {
     const button = this.getActiveSpaceButton();
+    const { theme } = this.props;
 
     let element: React.ReactNode;
     if (this.state.loading || this.state.spaces.length < 2) {
@@ -110,6 +117,7 @@ export class NavControlPopover extends Component<Props, State> {
         panelPaddingSize="none"
         repositionOnScroll
         ownFocus
+        zIndex={Number(theme.euiTheme.levels.navigation) + 1} // it needs to sit above the collapsible nav menu
       >
         {element}
       </EuiPopover>
@@ -199,3 +207,5 @@ export class NavControlPopover extends Component<Props, State> {
     });
   };
 }
+
+export const NavControlPopover = withEuiTheme(NavControlPopoverUI);

From 904ed92c3358feacf3bdebf4f4aa9f169915627b Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Wed, 19 Apr 2023 00:58:14 -0400
Subject: [PATCH 049/100] [api-docs] 2023-04-19 Daily api_docs build (#155217)

Generated by
https://buildkite.com/elastic/kibana-api-docs-daily/builds/312
---
 api_docs/actions.mdx                          |   2 +-
 api_docs/advanced_settings.mdx                |   2 +-
 api_docs/aiops.mdx                            |   2 +-
 api_docs/alerting.mdx                         |   2 +-
 api_docs/apm.mdx                              |   2 +-
 api_docs/asset_manager.mdx                    |   2 +-
 api_docs/banners.mdx                          |   2 +-
 api_docs/bfetch.mdx                           |   2 +-
 api_docs/canvas.mdx                           |   2 +-
 api_docs/cases.devdocs.json                   |  24 ++++
 api_docs/cases.mdx                            |   2 +-
 api_docs/charts.mdx                           |   2 +-
 api_docs/cloud.mdx                            |   2 +-
 api_docs/cloud_chat.mdx                       |   2 +-
 api_docs/cloud_data_migration.mdx             |   2 +-
 api_docs/cloud_defend.mdx                     |   2 +-
 api_docs/cloud_experiments.mdx                |   2 +-
 api_docs/cloud_security_posture.mdx           |   2 +-
 api_docs/console.mdx                          |   2 +-
 api_docs/content_management.mdx               |   2 +-
 api_docs/controls.mdx                         |   2 +-
 api_docs/custom_integrations.mdx              |   2 +-
 api_docs/dashboard.mdx                        |   2 +-
 api_docs/dashboard_enhanced.mdx               |   2 +-
 api_docs/data.devdocs.json                    |  64 ++++-----
 api_docs/data.mdx                             |   2 +-
 api_docs/data_query.mdx                       |   2 +-
 api_docs/data_search.mdx                      |   2 +-
 api_docs/data_view_editor.mdx                 |   2 +-
 api_docs/data_view_field_editor.mdx           |   2 +-
 api_docs/data_view_management.mdx             |   2 +-
 api_docs/data_views.devdocs.json              |  96 +++++++-------
 api_docs/data_views.mdx                       |   2 +-
 api_docs/data_visualizer.mdx                  |   2 +-
 api_docs/deprecations_by_api.mdx              |  14 +-
 api_docs/deprecations_by_plugin.mdx           |   2 +-
 api_docs/deprecations_by_team.mdx             |   2 +-
 api_docs/dev_tools.mdx                        |   2 +-
 api_docs/discover.devdocs.json                |   8 +-
 api_docs/discover.mdx                         |   2 +-
 api_docs/discover_enhanced.mdx                |   2 +-
 api_docs/ecs_data_quality_dashboard.mdx       |   2 +-
 api_docs/embeddable.mdx                       |   2 +-
 api_docs/embeddable_enhanced.mdx              |   2 +-
 api_docs/encrypted_saved_objects.mdx          |   2 +-
 api_docs/enterprise_search.mdx                |   2 +-
 api_docs/es_ui_shared.mdx                     |   2 +-
 api_docs/event_annotation.mdx                 |   2 +-
 api_docs/event_log.mdx                        |   2 +-
 api_docs/exploratory_view.devdocs.json        | 124 +++---------------
 api_docs/exploratory_view.mdx                 |   4 +-
 api_docs/expression_error.mdx                 |   2 +-
 api_docs/expression_gauge.mdx                 |   2 +-
 api_docs/expression_heatmap.mdx               |   2 +-
 api_docs/expression_image.mdx                 |   2 +-
 api_docs/expression_legacy_metric_vis.mdx     |   2 +-
 api_docs/expression_metric.mdx                |   2 +-
 api_docs/expression_metric_vis.mdx            |   2 +-
 api_docs/expression_partition_vis.mdx         |   2 +-
 api_docs/expression_repeat_image.mdx          |   2 +-
 api_docs/expression_reveal_image.mdx          |   2 +-
 api_docs/expression_shape.mdx                 |   2 +-
 api_docs/expression_tagcloud.mdx              |   2 +-
 api_docs/expression_x_y.mdx                   |   2 +-
 api_docs/expressions.mdx                      |   2 +-
 api_docs/features.mdx                         |   2 +-
 api_docs/field_formats.mdx                    |   2 +-
 api_docs/file_upload.mdx                      |   2 +-
 api_docs/files.devdocs.json                   |  24 ++++
 api_docs/files.mdx                            |   2 +-
 api_docs/files_management.mdx                 |   2 +-
 api_docs/fleet.devdocs.json                   |  45 ++++++-
 api_docs/fleet.mdx                            |   4 +-
 api_docs/global_search.mdx                    |   2 +-
 api_docs/guided_onboarding.mdx                |   2 +-
 api_docs/home.mdx                             |   2 +-
 api_docs/image_embeddable.mdx                 |   2 +-
 api_docs/index_lifecycle_management.mdx       |   2 +-
 api_docs/index_management.mdx                 |   2 +-
 api_docs/infra.mdx                            |   2 +-
 api_docs/inspector.mdx                        |   2 +-
 api_docs/interactive_setup.mdx                |   2 +-
 api_docs/kbn_ace.mdx                          |   2 +-
 api_docs/kbn_aiops_components.mdx             |   2 +-
 api_docs/kbn_aiops_utils.mdx                  |   2 +-
 api_docs/kbn_alerting_state_types.mdx         |   2 +-
 api_docs/kbn_alerts.mdx                       |   2 +-
 api_docs/kbn_alerts_as_data_utils.mdx         |   2 +-
 api_docs/kbn_alerts_ui_shared.mdx             |   2 +-
 api_docs/kbn_analytics.mdx                    |   2 +-
 api_docs/kbn_analytics_client.mdx             |   2 +-
 ..._analytics_shippers_elastic_v3_browser.mdx |   2 +-
 ...n_analytics_shippers_elastic_v3_common.mdx |   2 +-
 ...n_analytics_shippers_elastic_v3_server.mdx |   2 +-
 api_docs/kbn_analytics_shippers_fullstory.mdx |   2 +-
 api_docs/kbn_analytics_shippers_gainsight.mdx |   2 +-
 api_docs/kbn_apm_config_loader.mdx            |   2 +-
 api_docs/kbn_apm_synthtrace.mdx               |   2 +-
 api_docs/kbn_apm_synthtrace_client.mdx        |   2 +-
 api_docs/kbn_apm_utils.mdx                    |   2 +-
 api_docs/kbn_axe_config.mdx                   |   2 +-
 api_docs/kbn_cases_components.mdx             |   2 +-
 api_docs/kbn_cell_actions.mdx                 |   2 +-
 api_docs/kbn_chart_expressions_common.mdx     |   2 +-
 api_docs/kbn_chart_icons.mdx                  |   2 +-
 api_docs/kbn_ci_stats_core.mdx                |   2 +-
 api_docs/kbn_ci_stats_performance_metrics.mdx |   2 +-
 api_docs/kbn_ci_stats_reporter.mdx            |   2 +-
 api_docs/kbn_cli_dev_mode.mdx                 |   2 +-
 api_docs/kbn_code_editor.mdx                  |   2 +-
 api_docs/kbn_code_editor_mocks.mdx            |   2 +-
 api_docs/kbn_coloring.mdx                     |   2 +-
 api_docs/kbn_config.mdx                       |   2 +-
 api_docs/kbn_config_mocks.mdx                 |   2 +-
 api_docs/kbn_config_schema.mdx                |   2 +-
 .../kbn_content_management_content_editor.mdx |   2 +-
 .../kbn_content_management_table_list.mdx     |   2 +-
 api_docs/kbn_core_analytics_browser.mdx       |   2 +-
 .../kbn_core_analytics_browser_internal.mdx   |   2 +-
 api_docs/kbn_core_analytics_browser_mocks.mdx |   2 +-
 api_docs/kbn_core_analytics_server.mdx        |   2 +-
 .../kbn_core_analytics_server_internal.mdx    |   2 +-
 api_docs/kbn_core_analytics_server_mocks.mdx  |   2 +-
 api_docs/kbn_core_application_browser.mdx     |   2 +-
 .../kbn_core_application_browser_internal.mdx |   2 +-
 .../kbn_core_application_browser_mocks.mdx    |   2 +-
 api_docs/kbn_core_application_common.mdx      |   2 +-
 api_docs/kbn_core_apps_browser_internal.mdx   |   2 +-
 api_docs/kbn_core_apps_browser_mocks.mdx      |   2 +-
 api_docs/kbn_core_apps_server_internal.mdx    |   2 +-
 api_docs/kbn_core_base_browser_mocks.mdx      |   2 +-
 api_docs/kbn_core_base_common.mdx             |   2 +-
 api_docs/kbn_core_base_server_internal.mdx    |   2 +-
 api_docs/kbn_core_base_server_mocks.mdx       |   2 +-
 .../kbn_core_capabilities_browser_mocks.mdx   |   2 +-
 api_docs/kbn_core_capabilities_common.mdx     |   2 +-
 api_docs/kbn_core_capabilities_server.mdx     |   2 +-
 .../kbn_core_capabilities_server_mocks.mdx    |   2 +-
 api_docs/kbn_core_chrome_browser.mdx          |   2 +-
 api_docs/kbn_core_chrome_browser_mocks.mdx    |   2 +-
 api_docs/kbn_core_config_server_internal.mdx  |   2 +-
 api_docs/kbn_core_custom_branding_browser.mdx |   2 +-
 ..._core_custom_branding_browser_internal.mdx |   2 +-
 ...kbn_core_custom_branding_browser_mocks.mdx |   2 +-
 api_docs/kbn_core_custom_branding_common.mdx  |   2 +-
 api_docs/kbn_core_custom_branding_server.mdx  |   2 +-
 ...n_core_custom_branding_server_internal.mdx |   2 +-
 .../kbn_core_custom_branding_server_mocks.mdx |   2 +-
 api_docs/kbn_core_deprecations_browser.mdx    |   2 +-
 ...kbn_core_deprecations_browser_internal.mdx |   2 +-
 .../kbn_core_deprecations_browser_mocks.mdx   |   2 +-
 api_docs/kbn_core_deprecations_common.mdx     |   2 +-
 api_docs/kbn_core_deprecations_server.mdx     |   2 +-
 .../kbn_core_deprecations_server_internal.mdx |   2 +-
 .../kbn_core_deprecations_server_mocks.mdx    |   2 +-
 api_docs/kbn_core_doc_links_browser.mdx       |   2 +-
 api_docs/kbn_core_doc_links_browser_mocks.mdx |   2 +-
 api_docs/kbn_core_doc_links_server.mdx        |   2 +-
 api_docs/kbn_core_doc_links_server_mocks.mdx  |   2 +-
 ...e_elasticsearch_client_server_internal.mdx |   2 +-
 ...core_elasticsearch_client_server_mocks.mdx |   2 +-
 api_docs/kbn_core_elasticsearch_server.mdx    |   2 +-
 ...kbn_core_elasticsearch_server_internal.mdx |   2 +-
 .../kbn_core_elasticsearch_server_mocks.mdx   |   2 +-
 .../kbn_core_environment_server_internal.mdx  |   2 +-
 .../kbn_core_environment_server_mocks.mdx     |   2 +-
 .../kbn_core_execution_context_browser.mdx    |   2 +-
 ...ore_execution_context_browser_internal.mdx |   2 +-
 ...n_core_execution_context_browser_mocks.mdx |   2 +-
 .../kbn_core_execution_context_common.mdx     |   2 +-
 .../kbn_core_execution_context_server.mdx     |   2 +-
 ...core_execution_context_server_internal.mdx |   2 +-
 ...bn_core_execution_context_server_mocks.mdx |   2 +-
 api_docs/kbn_core_fatal_errors_browser.mdx    |   2 +-
 .../kbn_core_fatal_errors_browser_mocks.mdx   |   2 +-
 api_docs/kbn_core_http_browser.mdx            |   2 +-
 api_docs/kbn_core_http_browser_internal.mdx   |   2 +-
 api_docs/kbn_core_http_browser_mocks.mdx      |   2 +-
 api_docs/kbn_core_http_common.mdx             |   2 +-
 .../kbn_core_http_context_server_mocks.mdx    |   2 +-
 ...re_http_request_handler_context_server.mdx |   2 +-
 api_docs/kbn_core_http_resources_server.mdx   |   2 +-
 ...bn_core_http_resources_server_internal.mdx |   2 +-
 .../kbn_core_http_resources_server_mocks.mdx  |   2 +-
 .../kbn_core_http_router_server_internal.mdx  |   2 +-
 .../kbn_core_http_router_server_mocks.mdx     |   2 +-
 api_docs/kbn_core_http_server.mdx             |   2 +-
 api_docs/kbn_core_http_server_internal.mdx    |   2 +-
 api_docs/kbn_core_http_server_mocks.mdx       |   2 +-
 api_docs/kbn_core_i18n_browser.mdx            |   2 +-
 api_docs/kbn_core_i18n_browser_mocks.mdx      |   2 +-
 api_docs/kbn_core_i18n_server.mdx             |   2 +-
 api_docs/kbn_core_i18n_server_internal.mdx    |   2 +-
 api_docs/kbn_core_i18n_server_mocks.mdx       |   2 +-
 ...n_core_injected_metadata_browser_mocks.mdx |   2 +-
 ...kbn_core_integrations_browser_internal.mdx |   2 +-
 .../kbn_core_integrations_browser_mocks.mdx   |   2 +-
 api_docs/kbn_core_lifecycle_browser.mdx       |   2 +-
 api_docs/kbn_core_lifecycle_browser_mocks.mdx |   2 +-
 api_docs/kbn_core_lifecycle_server.mdx        |   2 +-
 api_docs/kbn_core_lifecycle_server_mocks.mdx  |   2 +-
 api_docs/kbn_core_logging_browser_mocks.mdx   |   2 +-
 api_docs/kbn_core_logging_common_internal.mdx |   2 +-
 api_docs/kbn_core_logging_server.mdx          |   2 +-
 api_docs/kbn_core_logging_server_internal.mdx |   2 +-
 api_docs/kbn_core_logging_server_mocks.mdx    |   2 +-
 ...ore_metrics_collectors_server_internal.mdx |   2 +-
 ...n_core_metrics_collectors_server_mocks.mdx |   2 +-
 api_docs/kbn_core_metrics_server.mdx          |   2 +-
 api_docs/kbn_core_metrics_server_internal.mdx |   2 +-
 api_docs/kbn_core_metrics_server_mocks.mdx    |   2 +-
 api_docs/kbn_core_mount_utils_browser.mdx     |   2 +-
 api_docs/kbn_core_node_server.mdx             |   2 +-
 api_docs/kbn_core_node_server_internal.mdx    |   2 +-
 api_docs/kbn_core_node_server_mocks.mdx       |   2 +-
 api_docs/kbn_core_notifications_browser.mdx   |   2 +-
 ...bn_core_notifications_browser_internal.mdx |   2 +-
 .../kbn_core_notifications_browser_mocks.mdx  |   2 +-
 api_docs/kbn_core_overlays_browser.mdx        |   2 +-
 .../kbn_core_overlays_browser_internal.mdx    |   2 +-
 api_docs/kbn_core_overlays_browser_mocks.mdx  |   2 +-
 api_docs/kbn_core_plugins_browser.mdx         |   2 +-
 api_docs/kbn_core_plugins_browser_mocks.mdx   |   2 +-
 api_docs/kbn_core_plugins_server.mdx          |   2 +-
 api_docs/kbn_core_plugins_server_mocks.mdx    |   2 +-
 api_docs/kbn_core_preboot_server.mdx          |   2 +-
 api_docs/kbn_core_preboot_server_mocks.mdx    |   2 +-
 api_docs/kbn_core_rendering_browser_mocks.mdx |   2 +-
 .../kbn_core_rendering_server_internal.mdx    |   2 +-
 api_docs/kbn_core_rendering_server_mocks.mdx  |   2 +-
 api_docs/kbn_core_root_server_internal.mdx    |   2 +-
 .../kbn_core_saved_objects_api_browser.mdx    |   2 +-
 .../kbn_core_saved_objects_api_server.mdx     |   2 +-
 ...core_saved_objects_api_server_internal.mdx |   2 +-
 ...bn_core_saved_objects_api_server_mocks.mdx |   2 +-
 ...ore_saved_objects_base_server_internal.mdx |   2 +-
 ...n_core_saved_objects_base_server_mocks.mdx |   2 +-
 ...bn_core_saved_objects_browser.devdocs.json |  16 +--
 api_docs/kbn_core_saved_objects_browser.mdx   |   2 +-
 ...bn_core_saved_objects_browser_internal.mdx |   2 +-
 .../kbn_core_saved_objects_browser_mocks.mdx  |   2 +-
 api_docs/kbn_core_saved_objects_common.mdx    |   2 +-
 ..._objects_import_export_server_internal.mdx |   2 +-
 ...ved_objects_import_export_server_mocks.mdx |   2 +-
 ...aved_objects_migration_server_internal.mdx |   2 +-
 ...e_saved_objects_migration_server_mocks.mdx |   2 +-
 api_docs/kbn_core_saved_objects_server.mdx    |   2 +-
 ...kbn_core_saved_objects_server_internal.mdx |   2 +-
 .../kbn_core_saved_objects_server_mocks.mdx   |   2 +-
 .../kbn_core_saved_objects_utils_server.mdx   |   2 +-
 api_docs/kbn_core_status_common.mdx           |   2 +-
 api_docs/kbn_core_status_common_internal.mdx  |   2 +-
 api_docs/kbn_core_status_server.mdx           |   2 +-
 api_docs/kbn_core_status_server_internal.mdx  |   2 +-
 api_docs/kbn_core_status_server_mocks.mdx     |   2 +-
 ...core_test_helpers_deprecations_getters.mdx |   2 +-
 ...n_core_test_helpers_http_setup_browser.mdx |   2 +-
 api_docs/kbn_core_test_helpers_kbn_server.mdx |   2 +-
 ...n_core_test_helpers_so_type_serializer.mdx |   2 +-
 api_docs/kbn_core_test_helpers_test_utils.mdx |   2 +-
 api_docs/kbn_core_theme_browser.mdx           |   2 +-
 api_docs/kbn_core_theme_browser_internal.mdx  |   2 +-
 api_docs/kbn_core_theme_browser_mocks.mdx     |   2 +-
 api_docs/kbn_core_ui_settings_browser.mdx     |   2 +-
 .../kbn_core_ui_settings_browser_internal.mdx |   2 +-
 .../kbn_core_ui_settings_browser_mocks.mdx    |   2 +-
 api_docs/kbn_core_ui_settings_common.mdx      |   2 +-
 api_docs/kbn_core_ui_settings_server.mdx      |   2 +-
 .../kbn_core_ui_settings_server_internal.mdx  |   2 +-
 .../kbn_core_ui_settings_server_mocks.mdx     |   2 +-
 api_docs/kbn_core_usage_data_server.mdx       |   2 +-
 .../kbn_core_usage_data_server_internal.mdx   |   2 +-
 api_docs/kbn_core_usage_data_server_mocks.mdx |   2 +-
 api_docs/kbn_crypto.mdx                       |   2 +-
 api_docs/kbn_crypto_browser.mdx               |   2 +-
 api_docs/kbn_cypress_config.mdx               |   2 +-
 api_docs/kbn_datemath.mdx                     |   2 +-
 api_docs/kbn_dev_cli_errors.mdx               |   2 +-
 api_docs/kbn_dev_cli_runner.mdx               |   2 +-
 api_docs/kbn_dev_proc_runner.mdx              |   2 +-
 api_docs/kbn_dev_utils.mdx                    |   2 +-
 api_docs/kbn_doc_links.mdx                    |   2 +-
 api_docs/kbn_docs_utils.mdx                   |   2 +-
 api_docs/kbn_dom_drag_drop.mdx                |   2 +-
 api_docs/kbn_ebt_tools.mdx                    |   2 +-
 api_docs/kbn_ecs.mdx                          |   2 +-
 api_docs/kbn_ecs_data_quality_dashboard.mdx   |   2 +-
 api_docs/kbn_es.mdx                           |   2 +-
 api_docs/kbn_es_archiver.mdx                  |   2 +-
 api_docs/kbn_es_errors.mdx                    |   2 +-
 api_docs/kbn_es_query.mdx                     |   2 +-
 api_docs/kbn_es_types.mdx                     |   2 +-
 api_docs/kbn_eslint_plugin_imports.mdx        |   2 +-
 api_docs/kbn_expandable_flyout.mdx            |   2 +-
 api_docs/kbn_field_types.mdx                  |   2 +-
 api_docs/kbn_find_used_node_modules.mdx       |   2 +-
 .../kbn_ftr_common_functional_services.mdx    |   2 +-
 api_docs/kbn_generate.mdx                     |   2 +-
 api_docs/kbn_generate_csv.mdx                 |   2 +-
 api_docs/kbn_generate_csv_types.mdx           |   2 +-
 api_docs/kbn_guided_onboarding.mdx            |   2 +-
 api_docs/kbn_handlebars.mdx                   |   2 +-
 api_docs/kbn_hapi_mocks.mdx                   |   2 +-
 api_docs/kbn_health_gateway_server.mdx        |   2 +-
 api_docs/kbn_home_sample_data_card.mdx        |   2 +-
 api_docs/kbn_home_sample_data_tab.mdx         |   2 +-
 api_docs/kbn_i18n.mdx                         |   2 +-
 api_docs/kbn_i18n_react.mdx                   |   2 +-
 api_docs/kbn_import_resolver.mdx              |   2 +-
 api_docs/kbn_interpreter.mdx                  |   2 +-
 api_docs/kbn_io_ts_utils.mdx                  |   2 +-
 api_docs/kbn_jest_serializers.mdx             |   2 +-
 api_docs/kbn_journeys.mdx                     |   2 +-
 api_docs/kbn_json_ast.mdx                     |   2 +-
 api_docs/kbn_kibana_manifest_schema.mdx       |   2 +-
 .../kbn_language_documentation_popover.mdx    |   2 +-
 api_docs/kbn_logging.mdx                      |   2 +-
 api_docs/kbn_logging_mocks.mdx                |   2 +-
 api_docs/kbn_managed_vscode_config.mdx        |   2 +-
 api_docs/kbn_mapbox_gl.mdx                    |   2 +-
 api_docs/kbn_ml_agg_utils.mdx                 |   2 +-
 api_docs/kbn_ml_date_picker.mdx               |   2 +-
 api_docs/kbn_ml_is_defined.mdx                |   2 +-
 api_docs/kbn_ml_is_populated_object.mdx       |   2 +-
 api_docs/kbn_ml_local_storage.mdx             |   2 +-
 api_docs/kbn_ml_nested_property.mdx           |   2 +-
 api_docs/kbn_ml_number_utils.mdx              |   2 +-
 api_docs/kbn_ml_query_utils.mdx               |   2 +-
 api_docs/kbn_ml_random_sampler_utils.mdx      |   2 +-
 api_docs/kbn_ml_route_utils.mdx               |   2 +-
 api_docs/kbn_ml_string_hash.mdx               |   2 +-
 api_docs/kbn_ml_trained_models_utils.mdx      |   2 +-
 api_docs/kbn_ml_url_state.mdx                 |   2 +-
 api_docs/kbn_monaco.mdx                       |   2 +-
 api_docs/kbn_object_versioning.mdx            |   2 +-
 api_docs/kbn_observability_alert_details.mdx  |   2 +-
 api_docs/kbn_optimizer.mdx                    |   2 +-
 api_docs/kbn_optimizer_webpack_helpers.mdx    |   2 +-
 api_docs/kbn_osquery_io_ts_types.mdx          |   2 +-
 ..._performance_testing_dataset_extractor.mdx |   2 +-
 api_docs/kbn_plugin_generator.mdx             |   2 +-
 api_docs/kbn_plugin_helpers.mdx               |   2 +-
 api_docs/kbn_react_field.mdx                  |   2 +-
 api_docs/kbn_repo_file_maps.mdx               |   2 +-
 api_docs/kbn_repo_linter.mdx                  |   2 +-
 api_docs/kbn_repo_path.mdx                    |   2 +-
 api_docs/kbn_repo_source_classifier.mdx       |   2 +-
 api_docs/kbn_reporting_common.mdx             |   2 +-
 api_docs/kbn_rison.mdx                        |   2 +-
 api_docs/kbn_rule_data_utils.mdx              |   2 +-
 api_docs/kbn_saved_objects_settings.mdx       |   2 +-
 api_docs/kbn_security_solution_side_nav.mdx   |   2 +-
 ...kbn_security_solution_storybook_config.mdx |   2 +-
 .../kbn_securitysolution_autocomplete.mdx     |   2 +-
 api_docs/kbn_securitysolution_data_table.mdx  |   2 +-
 api_docs/kbn_securitysolution_ecs.mdx         |   2 +-
 api_docs/kbn_securitysolution_es_utils.mdx    |   2 +-
 ...ritysolution_exception_list_components.mdx |   2 +-
 api_docs/kbn_securitysolution_grouping.mdx    |   2 +-
 api_docs/kbn_securitysolution_hook_utils.mdx  |   2 +-
 ..._securitysolution_io_ts_alerting_types.mdx |   2 +-
 .../kbn_securitysolution_io_ts_list_types.mdx |   2 +-
 api_docs/kbn_securitysolution_io_ts_types.mdx |   2 +-
 api_docs/kbn_securitysolution_io_ts_utils.mdx |   2 +-
 api_docs/kbn_securitysolution_list_api.mdx    |   2 +-
 .../kbn_securitysolution_list_constants.mdx   |   2 +-
 api_docs/kbn_securitysolution_list_hooks.mdx  |   2 +-
 api_docs/kbn_securitysolution_list_utils.mdx  |   2 +-
 api_docs/kbn_securitysolution_rules.mdx       |   2 +-
 api_docs/kbn_securitysolution_t_grid.mdx      |   2 +-
 api_docs/kbn_securitysolution_utils.mdx       |   2 +-
 api_docs/kbn_server_http_tools.mdx            |   2 +-
 api_docs/kbn_server_route_repository.mdx      |   2 +-
 api_docs/kbn_shared_svg.mdx                   |   2 +-
 api_docs/kbn_shared_ux_avatar_solution.mdx    |   2 +-
 ...ared_ux_avatar_user_profile_components.mdx |   2 +-
 .../kbn_shared_ux_button_exit_full_screen.mdx |   2 +-
 ...hared_ux_button_exit_full_screen_mocks.mdx |   2 +-
 api_docs/kbn_shared_ux_button_toolbar.mdx     |   2 +-
 api_docs/kbn_shared_ux_card_no_data.mdx       |   2 +-
 api_docs/kbn_shared_ux_card_no_data_mocks.mdx |   2 +-
 api_docs/kbn_shared_ux_file_context.mdx       |   2 +-
 api_docs/kbn_shared_ux_file_image.mdx         |   2 +-
 api_docs/kbn_shared_ux_file_image_mocks.mdx   |   2 +-
 api_docs/kbn_shared_ux_file_mocks.mdx         |   2 +-
 api_docs/kbn_shared_ux_file_picker.mdx        |   2 +-
 api_docs/kbn_shared_ux_file_types.mdx         |   2 +-
 api_docs/kbn_shared_ux_file_upload.mdx        |   2 +-
 api_docs/kbn_shared_ux_file_util.mdx          |   2 +-
 api_docs/kbn_shared_ux_link_redirect_app.mdx  |   2 +-
 .../kbn_shared_ux_link_redirect_app_mocks.mdx |   2 +-
 api_docs/kbn_shared_ux_markdown.mdx           |   2 +-
 api_docs/kbn_shared_ux_markdown_mocks.mdx     |   2 +-
 .../kbn_shared_ux_page_analytics_no_data.mdx  |   2 +-
 ...shared_ux_page_analytics_no_data_mocks.mdx |   2 +-
 .../kbn_shared_ux_page_kibana_no_data.mdx     |   2 +-
 ...bn_shared_ux_page_kibana_no_data_mocks.mdx |   2 +-
 .../kbn_shared_ux_page_kibana_template.mdx    |   2 +-
 ...n_shared_ux_page_kibana_template_mocks.mdx |   2 +-
 api_docs/kbn_shared_ux_page_no_data.mdx       |   2 +-
 .../kbn_shared_ux_page_no_data_config.mdx     |   2 +-
 ...bn_shared_ux_page_no_data_config_mocks.mdx |   2 +-
 api_docs/kbn_shared_ux_page_no_data_mocks.mdx |   2 +-
 api_docs/kbn_shared_ux_page_solution_nav.mdx  |   2 +-
 .../kbn_shared_ux_prompt_no_data_views.mdx    |   2 +-
 ...n_shared_ux_prompt_no_data_views_mocks.mdx |   2 +-
 api_docs/kbn_shared_ux_prompt_not_found.mdx   |   2 +-
 api_docs/kbn_shared_ux_router.mdx             |   2 +-
 api_docs/kbn_shared_ux_router_mocks.mdx       |   2 +-
 api_docs/kbn_shared_ux_storybook_config.mdx   |   2 +-
 api_docs/kbn_shared_ux_storybook_mock.mdx     |   2 +-
 api_docs/kbn_shared_ux_utility.mdx            |   2 +-
 api_docs/kbn_slo_schema.mdx                   |   2 +-
 api_docs/kbn_some_dev_log.mdx                 |   2 +-
 api_docs/kbn_std.mdx                          |   2 +-
 api_docs/kbn_stdio_dev_helpers.mdx            |   2 +-
 api_docs/kbn_storybook.mdx                    |   2 +-
 api_docs/kbn_telemetry_tools.mdx              |   2 +-
 api_docs/kbn_test.mdx                         |   2 +-
 api_docs/kbn_test_jest_helpers.mdx            |   2 +-
 api_docs/kbn_test_subj_selector.mdx           |   2 +-
 api_docs/kbn_tooling_log.mdx                  |   2 +-
 api_docs/kbn_ts_projects.mdx                  |   2 +-
 api_docs/kbn_typed_react_router_config.mdx    |   2 +-
 api_docs/kbn_ui_actions_browser.mdx           |   2 +-
 api_docs/kbn_ui_shared_deps_src.mdx           |   2 +-
 api_docs/kbn_ui_theme.mdx                     |   2 +-
 api_docs/kbn_user_profile_components.mdx      |   2 +-
 api_docs/kbn_utility_types.mdx                |   2 +-
 api_docs/kbn_utility_types_jest.mdx           |   2 +-
 api_docs/kbn_utils.mdx                        |   2 +-
 api_docs/kbn_yarn_lock_validator.mdx          |   2 +-
 api_docs/kibana_overview.mdx                  |   2 +-
 api_docs/kibana_react.devdocs.json            |  24 ++--
 api_docs/kibana_react.mdx                     |   2 +-
 api_docs/kibana_utils.mdx                     |   2 +-
 api_docs/kubernetes_security.mdx              |   2 +-
 api_docs/lens.devdocs.json                    |  44 ++++++-
 api_docs/lens.mdx                             |   4 +-
 api_docs/license_api_guard.mdx                |   2 +-
 api_docs/license_management.mdx               |   2 +-
 api_docs/licensing.mdx                        |   2 +-
 api_docs/lists.mdx                            |   2 +-
 api_docs/management.mdx                       |   2 +-
 api_docs/maps.devdocs.json                    |   4 +-
 api_docs/maps.mdx                             |   2 +-
 api_docs/maps_ems.mdx                         |   2 +-
 api_docs/ml.mdx                               |   2 +-
 api_docs/monitoring.mdx                       |   2 +-
 api_docs/monitoring_collection.mdx            |   2 +-
 api_docs/navigation.mdx                       |   2 +-
 api_docs/newsfeed.mdx                         |   2 +-
 api_docs/notifications.mdx                    |   2 +-
 api_docs/observability.devdocs.json           | 116 ++++++++++------
 api_docs/observability.mdx                    |   4 +-
 api_docs/observability_shared.devdocs.json    |  36 ++++-
 api_docs/observability_shared.mdx             |   7 +-
 api_docs/osquery.mdx                          |   2 +-
 api_docs/plugin_directory.mdx                 |  16 +--
 api_docs/presentation_util.mdx                |   2 +-
 api_docs/profiling.mdx                        |   2 +-
 api_docs/remote_clusters.mdx                  |   2 +-
 api_docs/reporting.mdx                        |   2 +-
 api_docs/rollup.mdx                           |   2 +-
 api_docs/rule_registry.devdocs.json           |  48 ++++++-
 api_docs/rule_registry.mdx                    |   4 +-
 api_docs/runtime_fields.mdx                   |   2 +-
 api_docs/saved_objects.mdx                    |   2 +-
 api_docs/saved_objects_finder.mdx             |   2 +-
 api_docs/saved_objects_management.mdx         |   2 +-
 api_docs/saved_objects_tagging.mdx            |   2 +-
 api_docs/saved_objects_tagging_oss.mdx        |   2 +-
 api_docs/saved_search.mdx                     |   2 +-
 api_docs/screenshot_mode.mdx                  |   2 +-
 api_docs/screenshotting.mdx                   |   2 +-
 api_docs/security.mdx                         |   2 +-
 api_docs/security_solution.devdocs.json       |   2 +-
 api_docs/security_solution.mdx                |   2 +-
 api_docs/session_view.mdx                     |   2 +-
 api_docs/share.mdx                            |   2 +-
 api_docs/snapshot_restore.mdx                 |   2 +-
 api_docs/spaces.mdx                           |   2 +-
 api_docs/stack_alerts.mdx                     |   2 +-
 api_docs/stack_connectors.mdx                 |   2 +-
 api_docs/task_manager.mdx                     |   2 +-
 api_docs/telemetry.mdx                        |   2 +-
 api_docs/telemetry_collection_manager.mdx     |   2 +-
 api_docs/telemetry_collection_xpack.mdx       |   2 +-
 api_docs/telemetry_management_section.mdx     |   2 +-
 api_docs/threat_intelligence.mdx              |   2 +-
 api_docs/timelines.mdx                        |   2 +-
 api_docs/transform.mdx                        |   2 +-
 api_docs/triggers_actions_ui.mdx              |   2 +-
 api_docs/ui_actions.mdx                       |   2 +-
 api_docs/ui_actions_enhanced.mdx              |   2 +-
 api_docs/unified_field_list.mdx               |   2 +-
 api_docs/unified_histogram.mdx                |   2 +-
 api_docs/unified_search.mdx                   |   2 +-
 api_docs/unified_search_autocomplete.mdx      |   2 +-
 api_docs/url_forwarding.mdx                   |   2 +-
 api_docs/usage_collection.mdx                 |   2 +-
 api_docs/ux.mdx                               |   2 +-
 api_docs/vis_default_editor.mdx               |   2 +-
 api_docs/vis_type_gauge.mdx                   |   2 +-
 api_docs/vis_type_heatmap.mdx                 |   2 +-
 api_docs/vis_type_pie.mdx                     |   2 +-
 api_docs/vis_type_table.mdx                   |   2 +-
 api_docs/vis_type_timelion.mdx                |   2 +-
 api_docs/vis_type_timeseries.mdx              |   2 +-
 api_docs/vis_type_vega.mdx                    |   2 +-
 api_docs/vis_type_vislib.mdx                  |   2 +-
 api_docs/vis_type_xy.mdx                      |   2 +-
 api_docs/visualizations.mdx                   |   2 +-
 513 files changed, 930 insertions(+), 782 deletions(-)

diff --git a/api_docs/actions.mdx b/api_docs/actions.mdx
index 0811555cbf3dc..139f36cb6eeff 100644
--- a/api_docs/actions.mdx
+++ b/api_docs/actions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/actions
 title: "actions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the actions plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
 ---
 import actionsObj from './actions.devdocs.json';
diff --git a/api_docs/advanced_settings.mdx b/api_docs/advanced_settings.mdx
index 04cd347c6770b..ef559a0a5d7d7 100644
--- a/api_docs/advanced_settings.mdx
+++ b/api_docs/advanced_settings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/advancedSettings
 title: "advancedSettings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the advancedSettings plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
 ---
 import advancedSettingsObj from './advanced_settings.devdocs.json';
diff --git a/api_docs/aiops.mdx b/api_docs/aiops.mdx
index ea3fcfd19787f..06179f373550e 100644
--- a/api_docs/aiops.mdx
+++ b/api_docs/aiops.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiops
 title: "aiops"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the aiops plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
 ---
 import aiopsObj from './aiops.devdocs.json';
diff --git a/api_docs/alerting.mdx b/api_docs/alerting.mdx
index 644fb8c1b3f4f..45d873622cc86 100644
--- a/api_docs/alerting.mdx
+++ b/api_docs/alerting.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/alerting
 title: "alerting"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the alerting plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'alerting']
 ---
 import alertingObj from './alerting.devdocs.json';
diff --git a/api_docs/apm.mdx b/api_docs/apm.mdx
index 3f389b67d3199..e5bbbe4962403 100644
--- a/api_docs/apm.mdx
+++ b/api_docs/apm.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/apm
 title: "apm"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the apm plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apm']
 ---
 import apmObj from './apm.devdocs.json';
diff --git a/api_docs/asset_manager.mdx b/api_docs/asset_manager.mdx
index 5c7743d5b59f4..3ac0fced2b457 100644
--- a/api_docs/asset_manager.mdx
+++ b/api_docs/asset_manager.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/assetManager
 title: "assetManager"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the assetManager plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'assetManager']
 ---
 import assetManagerObj from './asset_manager.devdocs.json';
diff --git a/api_docs/banners.mdx b/api_docs/banners.mdx
index 47119b7dbf18e..f6f092e5107d3 100644
--- a/api_docs/banners.mdx
+++ b/api_docs/banners.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/banners
 title: "banners"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the banners plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'banners']
 ---
 import bannersObj from './banners.devdocs.json';
diff --git a/api_docs/bfetch.mdx b/api_docs/bfetch.mdx
index 8113d67e3d175..c414bab498ebb 100644
--- a/api_docs/bfetch.mdx
+++ b/api_docs/bfetch.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/bfetch
 title: "bfetch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the bfetch plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'bfetch']
 ---
 import bfetchObj from './bfetch.devdocs.json';
diff --git a/api_docs/canvas.mdx b/api_docs/canvas.mdx
index 69e7e654ce7f1..92e14941438e6 100644
--- a/api_docs/canvas.mdx
+++ b/api_docs/canvas.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/canvas
 title: "canvas"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the canvas plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'canvas']
 ---
 import canvasObj from './canvas.devdocs.json';
diff --git a/api_docs/cases.devdocs.json b/api_docs/cases.devdocs.json
index 638d5dffb0c7d..890144e0b538d 100644
--- a/api_docs/cases.devdocs.json
+++ b/api_docs/cases.devdocs.json
@@ -794,6 +794,30 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
+          ".externalReference; owner: string; } | { externalReferenceId: string; externalReferenceStorage: { type: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.ExternalReferenceStorageType",
+            "text": "ExternalReferenceStorageType"
+          },
+          ".savedObject; soType: string; }; externalReferenceAttachmentTypeId: string; externalReferenceMetadata: { [x: string]: ",
+          {
+            "pluginId": "@kbn/utility-types",
+            "scope": "common",
+            "docId": "kibKbnUtilityTypesPluginApi",
+            "section": "def-common.JsonValue",
+            "text": "JsonValue"
+          },
+          "; } | null; type: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.CommentType",
+            "text": "CommentType"
+          },
           ".externalReference; owner: string; } | { type: ",
           {
             "pluginId": "cases",
diff --git a/api_docs/cases.mdx b/api_docs/cases.mdx
index ec6e6659e6d9e..0d6a40ab12ce6 100644
--- a/api_docs/cases.mdx
+++ b/api_docs/cases.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cases
 title: "cases"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cases plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cases']
 ---
 import casesObj from './cases.devdocs.json';
diff --git a/api_docs/charts.mdx b/api_docs/charts.mdx
index 4fef26eee2b88..3eeb9afd99e19 100644
--- a/api_docs/charts.mdx
+++ b/api_docs/charts.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/charts
 title: "charts"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the charts plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'charts']
 ---
 import chartsObj from './charts.devdocs.json';
diff --git a/api_docs/cloud.mdx b/api_docs/cloud.mdx
index 599523319184f..c06de42b2b643 100644
--- a/api_docs/cloud.mdx
+++ b/api_docs/cloud.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloud
 title: "cloud"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloud plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloud']
 ---
 import cloudObj from './cloud.devdocs.json';
diff --git a/api_docs/cloud_chat.mdx b/api_docs/cloud_chat.mdx
index 9ef4e7334aee7..58149b8a1328b 100644
--- a/api_docs/cloud_chat.mdx
+++ b/api_docs/cloud_chat.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudChat
 title: "cloudChat"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudChat plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudChat']
 ---
 import cloudChatObj from './cloud_chat.devdocs.json';
diff --git a/api_docs/cloud_data_migration.mdx b/api_docs/cloud_data_migration.mdx
index 04c2ffb06b560..cfb98e4160b23 100644
--- a/api_docs/cloud_data_migration.mdx
+++ b/api_docs/cloud_data_migration.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudDataMigration
 title: "cloudDataMigration"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudDataMigration plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudDataMigration']
 ---
 import cloudDataMigrationObj from './cloud_data_migration.devdocs.json';
diff --git a/api_docs/cloud_defend.mdx b/api_docs/cloud_defend.mdx
index 5a4286d8b7f58..3ea5f9b64d1cd 100644
--- a/api_docs/cloud_defend.mdx
+++ b/api_docs/cloud_defend.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudDefend
 title: "cloudDefend"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudDefend plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudDefend']
 ---
 import cloudDefendObj from './cloud_defend.devdocs.json';
diff --git a/api_docs/cloud_experiments.mdx b/api_docs/cloud_experiments.mdx
index 30e04d9f7e252..19c8ac364cca9 100644
--- a/api_docs/cloud_experiments.mdx
+++ b/api_docs/cloud_experiments.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudExperiments
 title: "cloudExperiments"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudExperiments plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudExperiments']
 ---
 import cloudExperimentsObj from './cloud_experiments.devdocs.json';
diff --git a/api_docs/cloud_security_posture.mdx b/api_docs/cloud_security_posture.mdx
index 7841b498ed166..bb4a888ea42b7 100644
--- a/api_docs/cloud_security_posture.mdx
+++ b/api_docs/cloud_security_posture.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudSecurityPosture
 title: "cloudSecurityPosture"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudSecurityPosture plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudSecurityPosture']
 ---
 import cloudSecurityPostureObj from './cloud_security_posture.devdocs.json';
diff --git a/api_docs/console.mdx b/api_docs/console.mdx
index 9ae830f51efd2..57dff11f3c70c 100644
--- a/api_docs/console.mdx
+++ b/api_docs/console.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/console
 title: "console"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the console plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'console']
 ---
 import consoleObj from './console.devdocs.json';
diff --git a/api_docs/content_management.mdx b/api_docs/content_management.mdx
index 12bf411f06b8f..86adcb31a05df 100644
--- a/api_docs/content_management.mdx
+++ b/api_docs/content_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/contentManagement
 title: "contentManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the contentManagement plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'contentManagement']
 ---
 import contentManagementObj from './content_management.devdocs.json';
diff --git a/api_docs/controls.mdx b/api_docs/controls.mdx
index b6800d6e4309f..3288f1d17baab 100644
--- a/api_docs/controls.mdx
+++ b/api_docs/controls.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/controls
 title: "controls"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the controls plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'controls']
 ---
 import controlsObj from './controls.devdocs.json';
diff --git a/api_docs/custom_integrations.mdx b/api_docs/custom_integrations.mdx
index 15fc539467e67..e13ca8288243b 100644
--- a/api_docs/custom_integrations.mdx
+++ b/api_docs/custom_integrations.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/customIntegrations
 title: "customIntegrations"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the customIntegrations plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'customIntegrations']
 ---
 import customIntegrationsObj from './custom_integrations.devdocs.json';
diff --git a/api_docs/dashboard.mdx b/api_docs/dashboard.mdx
index 29addf383b79c..1cf38f45d5ed3 100644
--- a/api_docs/dashboard.mdx
+++ b/api_docs/dashboard.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dashboard
 title: "dashboard"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dashboard plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dashboard']
 ---
 import dashboardObj from './dashboard.devdocs.json';
diff --git a/api_docs/dashboard_enhanced.mdx b/api_docs/dashboard_enhanced.mdx
index 5ebd9bcf8f56f..30a849b2cd99a 100644
--- a/api_docs/dashboard_enhanced.mdx
+++ b/api_docs/dashboard_enhanced.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dashboardEnhanced
 title: "dashboardEnhanced"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dashboardEnhanced plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dashboardEnhanced']
 ---
 import dashboardEnhancedObj from './dashboard_enhanced.devdocs.json';
diff --git a/api_docs/data.devdocs.json b/api_docs/data.devdocs.json
index c51c052cb9caa..db375b8cd5665 100644
--- a/api_docs/data.devdocs.json
+++ b/api_docs/data.devdocs.json
@@ -13821,22 +13821,6 @@
                 "plugin": "apm",
                 "path": "x-pack/plugins/apm/server/routes/data_view/create_static_data_view.ts"
               },
-              {
-                "plugin": "observability",
-                "path": "x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.ts"
-              },
-              {
-                "plugin": "observability",
-                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/report_definition_field.tsx"
-              },
-              {
-                "plugin": "observability",
-                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/use_filter_values.ts"
-              },
-              {
-                "plugin": "observability",
-                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.tsx"
-              },
               {
                 "plugin": "exploratoryView",
                 "path": "x-pack/plugins/exploratory_view/public/utils/observability_data_views/observability_data_views.ts"
@@ -13853,6 +13837,22 @@
                 "plugin": "exploratoryView",
                 "path": "x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.tsx"
               },
+              {
+                "plugin": "observability",
+                "path": "x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.ts"
+              },
+              {
+                "plugin": "observability",
+                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/report_definition_field.tsx"
+              },
+              {
+                "plugin": "observability",
+                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/use_filter_values.ts"
+              },
+              {
+                "plugin": "observability",
+                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.tsx"
+              },
               {
                 "plugin": "dataVisualizer",
                 "path": "x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_data_visualizer_grid_data.ts"
@@ -21451,22 +21451,6 @@
                 "plugin": "apm",
                 "path": "x-pack/plugins/apm/server/routes/data_view/create_static_data_view.ts"
               },
-              {
-                "plugin": "observability",
-                "path": "x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.ts"
-              },
-              {
-                "plugin": "observability",
-                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/report_definition_field.tsx"
-              },
-              {
-                "plugin": "observability",
-                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/use_filter_values.ts"
-              },
-              {
-                "plugin": "observability",
-                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.tsx"
-              },
               {
                 "plugin": "exploratoryView",
                 "path": "x-pack/plugins/exploratory_view/public/utils/observability_data_views/observability_data_views.ts"
@@ -21483,6 +21467,22 @@
                 "plugin": "exploratoryView",
                 "path": "x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.tsx"
               },
+              {
+                "plugin": "observability",
+                "path": "x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.ts"
+              },
+              {
+                "plugin": "observability",
+                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/report_definition_field.tsx"
+              },
+              {
+                "plugin": "observability",
+                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/use_filter_values.ts"
+              },
+              {
+                "plugin": "observability",
+                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.tsx"
+              },
               {
                 "plugin": "dataVisualizer",
                 "path": "x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_data_visualizer_grid_data.ts"
diff --git a/api_docs/data.mdx b/api_docs/data.mdx
index db8730d065cbe..6d7ecdba213c3 100644
--- a/api_docs/data.mdx
+++ b/api_docs/data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/data
 title: "data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the data plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'data']
 ---
 import dataObj from './data.devdocs.json';
diff --git a/api_docs/data_query.mdx b/api_docs/data_query.mdx
index 601219b420239..89f562f1f76aa 100644
--- a/api_docs/data_query.mdx
+++ b/api_docs/data_query.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/data-query
 title: "data.query"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the data.query plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'data.query']
 ---
 import dataQueryObj from './data_query.devdocs.json';
diff --git a/api_docs/data_search.mdx b/api_docs/data_search.mdx
index d1df7dcccc874..e134bb5db798f 100644
--- a/api_docs/data_search.mdx
+++ b/api_docs/data_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/data-search
 title: "data.search"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the data.search plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'data.search']
 ---
 import dataSearchObj from './data_search.devdocs.json';
diff --git a/api_docs/data_view_editor.mdx b/api_docs/data_view_editor.mdx
index 5cae668f7fdfa..aaa7085b8fc33 100644
--- a/api_docs/data_view_editor.mdx
+++ b/api_docs/data_view_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViewEditor
 title: "dataViewEditor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataViewEditor plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViewEditor']
 ---
 import dataViewEditorObj from './data_view_editor.devdocs.json';
diff --git a/api_docs/data_view_field_editor.mdx b/api_docs/data_view_field_editor.mdx
index 157b97bbfe74b..fa2bd9ba306da 100644
--- a/api_docs/data_view_field_editor.mdx
+++ b/api_docs/data_view_field_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViewFieldEditor
 title: "dataViewFieldEditor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataViewFieldEditor plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViewFieldEditor']
 ---
 import dataViewFieldEditorObj from './data_view_field_editor.devdocs.json';
diff --git a/api_docs/data_view_management.mdx b/api_docs/data_view_management.mdx
index 58241023b4a1d..d70538091beeb 100644
--- a/api_docs/data_view_management.mdx
+++ b/api_docs/data_view_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViewManagement
 title: "dataViewManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataViewManagement plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViewManagement']
 ---
 import dataViewManagementObj from './data_view_management.devdocs.json';
diff --git a/api_docs/data_views.devdocs.json b/api_docs/data_views.devdocs.json
index c4b78d31c56ca..7d419403e8ded 100644
--- a/api_docs/data_views.devdocs.json
+++ b/api_docs/data_views.devdocs.json
@@ -379,22 +379,6 @@
                 "plugin": "apm",
                 "path": "x-pack/plugins/apm/server/routes/data_view/create_static_data_view.ts"
               },
-              {
-                "plugin": "observability",
-                "path": "x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.ts"
-              },
-              {
-                "plugin": "observability",
-                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/report_definition_field.tsx"
-              },
-              {
-                "plugin": "observability",
-                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/use_filter_values.ts"
-              },
-              {
-                "plugin": "observability",
-                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.tsx"
-              },
               {
                 "plugin": "exploratoryView",
                 "path": "x-pack/plugins/exploratory_view/public/utils/observability_data_views/observability_data_views.ts"
@@ -411,6 +395,22 @@
                 "plugin": "exploratoryView",
                 "path": "x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.tsx"
               },
+              {
+                "plugin": "observability",
+                "path": "x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.ts"
+              },
+              {
+                "plugin": "observability",
+                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/report_definition_field.tsx"
+              },
+              {
+                "plugin": "observability",
+                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/use_filter_values.ts"
+              },
+              {
+                "plugin": "observability",
+                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.tsx"
+              },
               {
                 "plugin": "dataVisualizer",
                 "path": "x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_data_visualizer_grid_data.ts"
@@ -8636,22 +8636,6 @@
                 "plugin": "apm",
                 "path": "x-pack/plugins/apm/server/routes/data_view/create_static_data_view.ts"
               },
-              {
-                "plugin": "observability",
-                "path": "x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.ts"
-              },
-              {
-                "plugin": "observability",
-                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/report_definition_field.tsx"
-              },
-              {
-                "plugin": "observability",
-                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/use_filter_values.ts"
-              },
-              {
-                "plugin": "observability",
-                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.tsx"
-              },
               {
                 "plugin": "exploratoryView",
                 "path": "x-pack/plugins/exploratory_view/public/utils/observability_data_views/observability_data_views.ts"
@@ -8668,6 +8652,22 @@
                 "plugin": "exploratoryView",
                 "path": "x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.tsx"
               },
+              {
+                "plugin": "observability",
+                "path": "x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.ts"
+              },
+              {
+                "plugin": "observability",
+                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/report_definition_field.tsx"
+              },
+              {
+                "plugin": "observability",
+                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/use_filter_values.ts"
+              },
+              {
+                "plugin": "observability",
+                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.tsx"
+              },
               {
                 "plugin": "dataVisualizer",
                 "path": "x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_data_visualizer_grid_data.ts"
@@ -15950,22 +15950,6 @@
                 "plugin": "apm",
                 "path": "x-pack/plugins/apm/server/routes/data_view/create_static_data_view.ts"
               },
-              {
-                "plugin": "observability",
-                "path": "x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.ts"
-              },
-              {
-                "plugin": "observability",
-                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/report_definition_field.tsx"
-              },
-              {
-                "plugin": "observability",
-                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/use_filter_values.ts"
-              },
-              {
-                "plugin": "observability",
-                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.tsx"
-              },
               {
                 "plugin": "exploratoryView",
                 "path": "x-pack/plugins/exploratory_view/public/utils/observability_data_views/observability_data_views.ts"
@@ -15982,6 +15966,22 @@
                 "plugin": "exploratoryView",
                 "path": "x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.tsx"
               },
+              {
+                "plugin": "observability",
+                "path": "x-pack/plugins/observability/public/utils/observability_data_views/observability_data_views.ts"
+              },
+              {
+                "plugin": "observability",
+                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/report_definition_field.tsx"
+              },
+              {
+                "plugin": "observability",
+                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/use_filter_values.ts"
+              },
+              {
+                "plugin": "observability",
+                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.tsx"
+              },
               {
                 "plugin": "dataVisualizer",
                 "path": "x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_data_visualizer_grid_data.ts"
diff --git a/api_docs/data_views.mdx b/api_docs/data_views.mdx
index c49c1f554773f..c7a761b939ded 100644
--- a/api_docs/data_views.mdx
+++ b/api_docs/data_views.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViews
 title: "dataViews"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataViews plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViews']
 ---
 import dataViewsObj from './data_views.devdocs.json';
diff --git a/api_docs/data_visualizer.mdx b/api_docs/data_visualizer.mdx
index 0d531ef7a344a..c62fc0e0da847 100644
--- a/api_docs/data_visualizer.mdx
+++ b/api_docs/data_visualizer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataVisualizer
 title: "dataVisualizer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataVisualizer plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataVisualizer']
 ---
 import dataVisualizerObj from './data_visualizer.devdocs.json';
diff --git a/api_docs/deprecations_by_api.mdx b/api_docs/deprecations_by_api.mdx
index fb0d3e1744199..36b1791990c4b 100644
--- a/api_docs/deprecations_by_api.mdx
+++ b/api_docs/deprecations_by_api.mdx
@@ -7,7 +7,7 @@ id: kibDevDocsDeprecationsByApi
 slug: /kibana-dev-docs/api-meta/deprecated-api-list-by-api
 title: Deprecated API usage by API
 description: A list of deprecated APIs, which plugins are still referencing them, and when they need to be removed by.
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana']
 ---
 
@@ -17,10 +17,10 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | Deprecated API | Referencing plugin(s) | Remove By |
 | ---------------|-----------|-----------|
 | <DocLink id="kibAlertingPluginApi" section="def-public.PluginSetupContract.registerNavigation" text="registerNavigation"/> | ml, stackAlerts | - |
-| <DocLink id="kibDataPluginApi" section="def-common.DataView.title" text="title"/> | @kbn/es-query, securitySolution, timelines, lists, threatIntelligence, dataViews, savedObjectsManagement, unifiedSearch, controls, unifiedFieldList, lens, triggersActionsUi, aiops, ml, infra, visTypeTimeseries, apm, observability, exploratoryView, dataVisualizer, fleet, canvas, graph, stackAlerts, synthetics, transform, upgradeAssistant, ux, maps, dataViewManagement, inputControlVis, visDefaultEditor, presentationUtil, visTypeTimelion, visTypeVega, discover, data | - |
-| <DocLink id="kibDataPluginApi" section="def-server.DataView.title" text="title"/> | @kbn/es-query, securitySolution, timelines, lists, threatIntelligence, dataViews, savedObjectsManagement, unifiedSearch, controls, unifiedFieldList, lens, triggersActionsUi, aiops, ml, infra, visTypeTimeseries, apm, observability, exploratoryView, dataVisualizer, fleet, canvas, graph, stackAlerts, synthetics, transform, upgradeAssistant, ux, maps, dataViewManagement, inputControlVis, visDefaultEditor, presentationUtil, visTypeTimelion, visTypeVega, discover, data | - |
-| <DocLink id="kibDataViewsPluginApi" section="def-public.DataView.title" text="title"/> | @kbn/es-query, securitySolution, timelines, lists, threatIntelligence, data, savedObjectsManagement, unifiedSearch, controls, unifiedFieldList, lens, triggersActionsUi, aiops, ml, infra, visTypeTimeseries, apm, observability, exploratoryView, dataVisualizer, fleet, canvas, graph, stackAlerts, synthetics, transform, upgradeAssistant, ux, maps, dataViewManagement, inputControlVis, visDefaultEditor, presentationUtil, visTypeTimelion, visTypeVega, discover | - |
-| <DocLink id="kibKibanaReactPluginApi" section="def-public.RedirectAppLinks" text="RedirectAppLinks"/> | home, data, esUiShared, spaces, savedObjectsManagement, observability, exploratoryView, fleet, ml, apm, enterpriseSearch, indexLifecycleManagement, synthetics, upgradeAssistant, ux, kibanaOverview | - |
+| <DocLink id="kibDataPluginApi" section="def-common.DataView.title" text="title"/> | @kbn/es-query, securitySolution, timelines, lists, threatIntelligence, dataViews, savedObjectsManagement, unifiedSearch, controls, unifiedFieldList, lens, triggersActionsUi, aiops, ml, infra, visTypeTimeseries, apm, exploratoryView, observability, dataVisualizer, fleet, canvas, graph, stackAlerts, synthetics, transform, upgradeAssistant, ux, maps, dataViewManagement, inputControlVis, visDefaultEditor, presentationUtil, visTypeTimelion, visTypeVega, discover, data | - |
+| <DocLink id="kibDataPluginApi" section="def-server.DataView.title" text="title"/> | @kbn/es-query, securitySolution, timelines, lists, threatIntelligence, dataViews, savedObjectsManagement, unifiedSearch, controls, unifiedFieldList, lens, triggersActionsUi, aiops, ml, infra, visTypeTimeseries, apm, exploratoryView, observability, dataVisualizer, fleet, canvas, graph, stackAlerts, synthetics, transform, upgradeAssistant, ux, maps, dataViewManagement, inputControlVis, visDefaultEditor, presentationUtil, visTypeTimelion, visTypeVega, discover, data | - |
+| <DocLink id="kibDataViewsPluginApi" section="def-public.DataView.title" text="title"/> | @kbn/es-query, securitySolution, timelines, lists, threatIntelligence, data, savedObjectsManagement, unifiedSearch, controls, unifiedFieldList, lens, triggersActionsUi, aiops, ml, infra, visTypeTimeseries, apm, exploratoryView, observability, dataVisualizer, fleet, canvas, graph, stackAlerts, synthetics, transform, upgradeAssistant, ux, maps, dataViewManagement, inputControlVis, visDefaultEditor, presentationUtil, visTypeTimelion, visTypeVega, discover | - |
+| <DocLink id="kibKibanaReactPluginApi" section="def-public.RedirectAppLinks" text="RedirectAppLinks"/> | home, data, esUiShared, spaces, savedObjectsManagement, exploratoryView, fleet, observability, ml, apm, enterpriseSearch, indexLifecycleManagement, synthetics, upgradeAssistant, ux, kibanaOverview | - |
 | <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginSetup.authc" text="authc"/> | encryptedSavedObjects, actions, data, ml, logstash, securitySolution, cloudChat | - |
 | <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginSetup.authz" text="authz"/> | actions, ml, savedObjectsTagging, enterpriseSearch | - |
 | <DocLink id="kibKbnCoreLifecycleBrowserPluginApi" section="def-common.CoreStart.savedObjects" text="savedObjects"/> | @kbn/core-plugins-browser-internal, @kbn/core-root-browser-internal, dataViews, home, data, savedObjects, unifiedSearch, presentationUtil, visualizations, dashboard, lens, discover, fileUpload, ml, infra, fleet, canvas, dashboardEnhanced, graph, monitoring, synthetics, transform, dataVisualizer, cloudSecurityPosture, securitySolution | - |
@@ -83,7 +83,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnCoreSavedObjectsApiBrowserPluginApi" section="def-common.SavedObjectsBulkCreateOptions" text="SavedObjectsBulkCreateOptions"/> | @kbn/core-saved-objects-browser-internal, @kbn/core | - |
 | <DocLink id="kibKbnCoreSavedObjectsApiBrowserPluginApi" section="def-common.SavedObjectsBulkCreateObject" text="SavedObjectsBulkCreateObject"/> | @kbn/core-saved-objects-browser-internal, @kbn/core | - |
 | <DocLink id="kibKbnCoreSavedObjectsApiBrowserPluginApi" section="def-common.SavedObjectsBulkDeleteResponse" text="SavedObjectsBulkDeleteResponse"/> | @kbn/core-saved-objects-browser-internal | - |
-| <DocLink id="kibKbnCoreSavedObjectsBrowserPluginApi" section="def-common.SavedObjectsStart" text="SavedObjectsStart"/> | @kbn/core-lifecycle-browser, @kbn/core-saved-objects-browser-internal, @kbn/core, savedSearch, visualizations, dashboard, lens, observability, exploratoryView, canvas, transform, @kbn/core-saved-objects-browser-mocks | - |
+| <DocLink id="kibKbnCoreSavedObjectsBrowserPluginApi" section="def-common.SavedObjectsStart" text="SavedObjectsStart"/> | @kbn/core-lifecycle-browser, @kbn/core-saved-objects-browser-internal, @kbn/core, savedSearch, visualizations, dashboard, lens, exploratoryView, observability, canvas, transform, @kbn/core-saved-objects-browser-mocks | - |
 | <DocLink id="kibKbnCoreSavedObjectsApiBrowserPluginApi" section="def-common.SavedObjectsBulkUpdateOptions" text="SavedObjectsBulkUpdateOptions"/> | @kbn/core | - |
 | <DocLink id="kibKbnCoreSavedObjectsApiBrowserPluginApi" section="def-common.SavedObjectsBulkResolveResponse" text="SavedObjectsBulkResolveResponse"/> | @kbn/core | - |
 | <DocLink id="kibKbnCoreSavedObjectsBrowserMocksPluginApi" section="def-common.simpleSavedObjectMock" text="simpleSavedObjectMock"/> | @kbn/core, lens, savedObjects, visualizations | - |
@@ -98,7 +98,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibDataPluginApi" section="def-server.DataView.removeScriptedField" text="removeScriptedField"/> | dataViewManagement, dataViews | - |
 | <DocLink id="kibDataPluginApi" section="def-server.DataView.getNonScriptedFields" text="getNonScriptedFields"/> | visTypeTimeseries, graph, dataViewManagement, dataViews | - |
 | <DocLink id="kibDataPluginApi" section="def-server.DataView.getScriptedFields" text="getScriptedFields"/> | dataViews, dataViewManagement | - |
-| <DocLink id="kibDiscoverPluginApi" section="def-common.DiscoverAppLocatorParams.indexPatternId" text="indexPatternId"/> | observability, exploratoryView, dataVisualizer, fleet, cloudSecurityPosture, discoverEnhanced, osquery, synthetics | - |
+| <DocLink id="kibDiscoverPluginApi" section="def-common.DiscoverAppLocatorParams.indexPatternId" text="indexPatternId"/> | exploratoryView, observability, dataVisualizer, fleet, cloudSecurityPosture, discoverEnhanced, osquery, synthetics | - |
 | <DocLink id="kibKbnCoreSavedObjectsApiServerPluginApi" section="def-common.SavedObjectsBulkCreateObject.migrationVersion" text="migrationVersion"/> | @kbn/core-saved-objects-api-server-internal, fleet | - |
 | <DocLink id="kibExpressionsPluginApi" section="def-public.ExpressionFunctionDefinition.context" text="context"/> | canvas | - |
 | <DocLink id="kibExpressionsPluginApi" section="def-public.ExpressionsServiceSetup.getFunction" text="getFunction"/> | canvas | - |
diff --git a/api_docs/deprecations_by_plugin.mdx b/api_docs/deprecations_by_plugin.mdx
index e7a872a0aeb7c..747673056fa15 100644
--- a/api_docs/deprecations_by_plugin.mdx
+++ b/api_docs/deprecations_by_plugin.mdx
@@ -7,7 +7,7 @@ id: kibDevDocsDeprecationsByPlugin
 slug: /kibana-dev-docs/api-meta/deprecated-api-list-by-plugin
 title: Deprecated API usage by plugin
 description: A list of deprecated APIs, which plugins are still referencing them, and when they need to be removed by.
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana']
 ---
 
diff --git a/api_docs/deprecations_by_team.mdx b/api_docs/deprecations_by_team.mdx
index 8a54dff579e5f..f5763c23b9b37 100644
--- a/api_docs/deprecations_by_team.mdx
+++ b/api_docs/deprecations_by_team.mdx
@@ -7,7 +7,7 @@ id: kibDevDocsDeprecationsDueByTeam
 slug: /kibana-dev-docs/api-meta/deprecations-due-by-team
 title: Deprecated APIs due to be removed, by team
 description: Lists the teams that are referencing deprecated APIs with a remove by date.
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana']
 ---
 
diff --git a/api_docs/dev_tools.mdx b/api_docs/dev_tools.mdx
index c74b6557d7426..bcf610652648e 100644
--- a/api_docs/dev_tools.mdx
+++ b/api_docs/dev_tools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/devTools
 title: "devTools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the devTools plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'devTools']
 ---
 import devToolsObj from './dev_tools.devdocs.json';
diff --git a/api_docs/discover.devdocs.json b/api_docs/discover.devdocs.json
index 61aa5a32721fb..71254ce683ac4 100644
--- a/api_docs/discover.devdocs.json
+++ b/api_docs/discover.devdocs.json
@@ -1158,14 +1158,14 @@
             "deprecated": true,
             "trackAdoption": false,
             "references": [
-              {
-                "plugin": "observability",
-                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_discover_link.tsx"
-              },
               {
                 "plugin": "exploratoryView",
                 "path": "x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/hooks/use_discover_link.tsx"
               },
+              {
+                "plugin": "observability",
+                "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_discover_link.tsx"
+              },
               {
                 "plugin": "dataVisualizer",
                 "path": "x-pack/plugins/data_visualizer/public/application/common/components/results_links/results_links.tsx"
diff --git a/api_docs/discover.mdx b/api_docs/discover.mdx
index 8148d36e69bd3..5fbb097256f14 100644
--- a/api_docs/discover.mdx
+++ b/api_docs/discover.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/discover
 title: "discover"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the discover plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'discover']
 ---
 import discoverObj from './discover.devdocs.json';
diff --git a/api_docs/discover_enhanced.mdx b/api_docs/discover_enhanced.mdx
index 6506ac759fa7a..54a9f327c9f01 100644
--- a/api_docs/discover_enhanced.mdx
+++ b/api_docs/discover_enhanced.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/discoverEnhanced
 title: "discoverEnhanced"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the discoverEnhanced plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'discoverEnhanced']
 ---
 import discoverEnhancedObj from './discover_enhanced.devdocs.json';
diff --git a/api_docs/ecs_data_quality_dashboard.mdx b/api_docs/ecs_data_quality_dashboard.mdx
index 83f166dcad9b5..846c5ca955d1a 100644
--- a/api_docs/ecs_data_quality_dashboard.mdx
+++ b/api_docs/ecs_data_quality_dashboard.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ecsDataQualityDashboard
 title: "ecsDataQualityDashboard"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the ecsDataQualityDashboard plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ecsDataQualityDashboard']
 ---
 import ecsDataQualityDashboardObj from './ecs_data_quality_dashboard.devdocs.json';
diff --git a/api_docs/embeddable.mdx b/api_docs/embeddable.mdx
index 94a4960c02079..02977e3729e9f 100644
--- a/api_docs/embeddable.mdx
+++ b/api_docs/embeddable.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/embeddable
 title: "embeddable"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the embeddable plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'embeddable']
 ---
 import embeddableObj from './embeddable.devdocs.json';
diff --git a/api_docs/embeddable_enhanced.mdx b/api_docs/embeddable_enhanced.mdx
index 8e86c1bdf95dc..14506c9223e2f 100644
--- a/api_docs/embeddable_enhanced.mdx
+++ b/api_docs/embeddable_enhanced.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/embeddableEnhanced
 title: "embeddableEnhanced"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the embeddableEnhanced plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'embeddableEnhanced']
 ---
 import embeddableEnhancedObj from './embeddable_enhanced.devdocs.json';
diff --git a/api_docs/encrypted_saved_objects.mdx b/api_docs/encrypted_saved_objects.mdx
index 971596d4509a9..6b95e96118bbe 100644
--- a/api_docs/encrypted_saved_objects.mdx
+++ b/api_docs/encrypted_saved_objects.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/encryptedSavedObjects
 title: "encryptedSavedObjects"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the encryptedSavedObjects plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'encryptedSavedObjects']
 ---
 import encryptedSavedObjectsObj from './encrypted_saved_objects.devdocs.json';
diff --git a/api_docs/enterprise_search.mdx b/api_docs/enterprise_search.mdx
index 76aeb4cff30d7..103ba9e65a7f3 100644
--- a/api_docs/enterprise_search.mdx
+++ b/api_docs/enterprise_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/enterpriseSearch
 title: "enterpriseSearch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the enterpriseSearch plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'enterpriseSearch']
 ---
 import enterpriseSearchObj from './enterprise_search.devdocs.json';
diff --git a/api_docs/es_ui_shared.mdx b/api_docs/es_ui_shared.mdx
index 9291c86e82e60..e35fd39160a86 100644
--- a/api_docs/es_ui_shared.mdx
+++ b/api_docs/es_ui_shared.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/esUiShared
 title: "esUiShared"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the esUiShared plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'esUiShared']
 ---
 import esUiSharedObj from './es_ui_shared.devdocs.json';
diff --git a/api_docs/event_annotation.mdx b/api_docs/event_annotation.mdx
index e9eb2b400ee05..e516bb6a05bb9 100644
--- a/api_docs/event_annotation.mdx
+++ b/api_docs/event_annotation.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/eventAnnotation
 title: "eventAnnotation"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the eventAnnotation plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'eventAnnotation']
 ---
 import eventAnnotationObj from './event_annotation.devdocs.json';
diff --git a/api_docs/event_log.mdx b/api_docs/event_log.mdx
index 87cb559074c9a..b56a56228963f 100644
--- a/api_docs/event_log.mdx
+++ b/api_docs/event_log.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/eventLog
 title: "eventLog"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the eventLog plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'eventLog']
 ---
 import eventLogObj from './event_log.devdocs.json';
diff --git a/api_docs/exploratory_view.devdocs.json b/api_docs/exploratory_view.devdocs.json
index e3a6af7a52ef5..8d7c0c15654a4 100644
--- a/api_docs/exploratory_view.devdocs.json
+++ b/api_docs/exploratory_view.devdocs.json
@@ -1884,66 +1884,6 @@
             "deprecated": false,
             "trackAdoption": false
           },
-          {
-            "parentPluginId": "exploratoryView",
-            "id": "def-public.ExploratoryViewPublicPluginsSetup.observability",
-            "type": "Object",
-            "tags": [],
-            "label": "observability",
-            "description": [],
-            "signature": [
-              "{ dashboard: { register: <T extends ",
-              {
-                "pluginId": "observability",
-                "scope": "public",
-                "docId": "kibObservabilityPluginApi",
-                "section": "def-public.ObservabilityFetchDataPlugins",
-                "text": "ObservabilityFetchDataPlugins"
-              },
-              ">({ appName, fetchData, hasData, }: { appName: T; } & ",
-              {
-                "pluginId": "observability",
-                "scope": "public",
-                "docId": "kibObservabilityPluginApi",
-                "section": "def-public.DataHandler",
-                "text": "DataHandler"
-              },
-              "<T>) => void; }; observabilityRuleTypeRegistry: { register: (type: ",
-              {
-                "pluginId": "observability",
-                "scope": "public",
-                "docId": "kibObservabilityPluginApi",
-                "section": "def-public.ObservabilityRuleTypeModel",
-                "text": "ObservabilityRuleTypeModel"
-              },
-              "<any>) => void; getFormatter: (typeId: string) => ",
-              {
-                "pluginId": "observability",
-                "scope": "public",
-                "docId": "kibObservabilityPluginApi",
-                "section": "def-public.ObservabilityRuleTypeFormatter",
-                "text": "ObservabilityRuleTypeFormatter"
-              },
-              " | undefined; list: () => string[]; }; navigation: { registerSections: (sections$: ",
-              "Observable",
-              "<",
-              {
-                "pluginId": "observability",
-                "scope": "public",
-                "docId": "kibObservabilityPluginApi",
-                "section": "def-public.NavigationSection",
-                "text": "NavigationSection"
-              },
-              "[]>) => void; }; useRulesLink: (options?: ",
-              "Options",
-              ") => ",
-              "LinkProps",
-              "; }"
-            ],
-            "path": "x-pack/plugins/exploratory_view/public/plugin.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
           {
             "parentPluginId": "exploratoryView",
             "id": "def-public.ExploratoryViewPublicPluginsSetup.share",
@@ -2252,63 +2192,33 @@
           },
           {
             "parentPluginId": "exploratoryView",
-            "id": "def-public.ExploratoryViewPublicPluginsStart.observability",
+            "id": "def-public.ExploratoryViewPublicPluginsStart.observabilityShared",
             "type": "Object",
             "tags": [],
-            "label": "observability",
+            "label": "observabilityShared",
             "description": [],
             "signature": [
-              "{ observabilityRuleTypeRegistry: { register: (type: ",
-              {
-                "pluginId": "observability",
-                "scope": "public",
-                "docId": "kibObservabilityPluginApi",
-                "section": "def-public.ObservabilityRuleTypeModel",
-                "text": "ObservabilityRuleTypeModel"
-              },
-              "<any>) => void; getFormatter: (typeId: string) => ",
-              {
-                "pluginId": "observability",
-                "scope": "public",
-                "docId": "kibObservabilityPluginApi",
-                "section": "def-public.ObservabilityRuleTypeFormatter",
-                "text": "ObservabilityRuleTypeFormatter"
-              },
-              " | undefined; list: () => string[]; }; navigation: { PageTemplate: (pageTemplateProps: ",
+              "{ navigation: { PageTemplate: (pageTemplateProps: ",
               "WrappedPageTemplateProps",
-              ") => JSX.Element; }; createExploratoryViewUrl: ({ reportType, allSeries }: { reportType: ",
-              "ReportViewType",
-              "; allSeries: ",
-              {
-                "pluginId": "observability",
-                "scope": "public",
-                "docId": "kibObservabilityPluginApi",
-                "section": "def-public.AllSeries",
-                "text": "AllSeries"
-              },
-              "; }, baseHref?: string, appId?: string) => string; getAppDataView: (appId: ",
-              "AppDataType",
-              ", indexPattern?: string | undefined) => Promise<",
+              ") => JSX.Element; }; updateGlobalNavigation: ({ capabilities, deepLinks, updater$, }: { capabilities: Readonly<{ [x: string]: Readonly<{ [x: string]: boolean | Readonly<{ [x: string]: boolean; }>; }>; navLinks: Readonly<{ [x: string]: boolean; }>; management: Readonly<{ [x: string]: Readonly<{ [x: string]: boolean; }>; }>; catalogue: Readonly<{ [x: string]: boolean; }>; }>; deepLinks: ",
               {
-                "pluginId": "dataViews",
+                "pluginId": "@kbn/core-application-browser",
                 "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
+                "docId": "kibKbnCoreApplicationBrowserPluginApi",
+                "section": "def-common.AppDeepLink",
+                "text": "AppDeepLink"
               },
-              " | null | undefined>; ExploratoryViewEmbeddable: (props: ",
+              "[]; updater$: ",
+              "Subject",
+              "<",
               {
-                "pluginId": "observability",
-                "scope": "public",
-                "docId": "kibObservabilityPluginApi",
-                "section": "def-public.ExploratoryEmbeddableProps",
-                "text": "ExploratoryEmbeddableProps"
+                "pluginId": "@kbn/core-application-browser",
+                "scope": "common",
+                "docId": "kibKbnCoreApplicationBrowserPluginApi",
+                "section": "def-common.AppUpdater",
+                "text": "AppUpdater"
               },
-              ") => JSX.Element | null; useRulesLink: (options?: ",
-              "Options",
-              ") => ",
-              "LinkProps",
-              "; }"
+              ">; }) => void; }"
             ],
             "path": "x-pack/plugins/exploratory_view/public/plugin.ts",
             "deprecated": false,
diff --git a/api_docs/exploratory_view.mdx b/api_docs/exploratory_view.mdx
index a59314c8667fd..849453338e010 100644
--- a/api_docs/exploratory_view.mdx
+++ b/api_docs/exploratory_view.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/exploratoryView
 title: "exploratoryView"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the exploratoryView plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'exploratoryView']
 ---
 import exploratoryViewObj from './exploratory_view.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/uptime](https://github.com/orgs/elastic/teams/uptime) for ques
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 352 | 4 | 349 | 22 |
+| 351 | 4 | 348 | 22 |
 
 ## Client
 
diff --git a/api_docs/expression_error.mdx b/api_docs/expression_error.mdx
index 058907c640274..45f3eb5cbf61f 100644
--- a/api_docs/expression_error.mdx
+++ b/api_docs/expression_error.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionError
 title: "expressionError"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionError plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionError']
 ---
 import expressionErrorObj from './expression_error.devdocs.json';
diff --git a/api_docs/expression_gauge.mdx b/api_docs/expression_gauge.mdx
index d005bd65c76ee..c0bccdf35a0fe 100644
--- a/api_docs/expression_gauge.mdx
+++ b/api_docs/expression_gauge.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionGauge
 title: "expressionGauge"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionGauge plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionGauge']
 ---
 import expressionGaugeObj from './expression_gauge.devdocs.json';
diff --git a/api_docs/expression_heatmap.mdx b/api_docs/expression_heatmap.mdx
index 631985dfa297a..d934e55b7f2c6 100644
--- a/api_docs/expression_heatmap.mdx
+++ b/api_docs/expression_heatmap.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionHeatmap
 title: "expressionHeatmap"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionHeatmap plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionHeatmap']
 ---
 import expressionHeatmapObj from './expression_heatmap.devdocs.json';
diff --git a/api_docs/expression_image.mdx b/api_docs/expression_image.mdx
index 58e8ab5d87739..f64aa1581a3c5 100644
--- a/api_docs/expression_image.mdx
+++ b/api_docs/expression_image.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionImage
 title: "expressionImage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionImage plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionImage']
 ---
 import expressionImageObj from './expression_image.devdocs.json';
diff --git a/api_docs/expression_legacy_metric_vis.mdx b/api_docs/expression_legacy_metric_vis.mdx
index 4cf6d1dd4a9de..22e421096034b 100644
--- a/api_docs/expression_legacy_metric_vis.mdx
+++ b/api_docs/expression_legacy_metric_vis.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionLegacyMetricVis
 title: "expressionLegacyMetricVis"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionLegacyMetricVis plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionLegacyMetricVis']
 ---
 import expressionLegacyMetricVisObj from './expression_legacy_metric_vis.devdocs.json';
diff --git a/api_docs/expression_metric.mdx b/api_docs/expression_metric.mdx
index 3d65bc107e617..b5e8ad43772ee 100644
--- a/api_docs/expression_metric.mdx
+++ b/api_docs/expression_metric.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionMetric
 title: "expressionMetric"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionMetric plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionMetric']
 ---
 import expressionMetricObj from './expression_metric.devdocs.json';
diff --git a/api_docs/expression_metric_vis.mdx b/api_docs/expression_metric_vis.mdx
index 75517415267e0..b83a4acedad45 100644
--- a/api_docs/expression_metric_vis.mdx
+++ b/api_docs/expression_metric_vis.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionMetricVis
 title: "expressionMetricVis"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionMetricVis plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionMetricVis']
 ---
 import expressionMetricVisObj from './expression_metric_vis.devdocs.json';
diff --git a/api_docs/expression_partition_vis.mdx b/api_docs/expression_partition_vis.mdx
index 42a25678e777d..613f702138868 100644
--- a/api_docs/expression_partition_vis.mdx
+++ b/api_docs/expression_partition_vis.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionPartitionVis
 title: "expressionPartitionVis"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionPartitionVis plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionPartitionVis']
 ---
 import expressionPartitionVisObj from './expression_partition_vis.devdocs.json';
diff --git a/api_docs/expression_repeat_image.mdx b/api_docs/expression_repeat_image.mdx
index 9bafa35f80794..3f5cb2ac0f28b 100644
--- a/api_docs/expression_repeat_image.mdx
+++ b/api_docs/expression_repeat_image.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionRepeatImage
 title: "expressionRepeatImage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionRepeatImage plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionRepeatImage']
 ---
 import expressionRepeatImageObj from './expression_repeat_image.devdocs.json';
diff --git a/api_docs/expression_reveal_image.mdx b/api_docs/expression_reveal_image.mdx
index e0cdc69d636d9..b3235f04d4e6d 100644
--- a/api_docs/expression_reveal_image.mdx
+++ b/api_docs/expression_reveal_image.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionRevealImage
 title: "expressionRevealImage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionRevealImage plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionRevealImage']
 ---
 import expressionRevealImageObj from './expression_reveal_image.devdocs.json';
diff --git a/api_docs/expression_shape.mdx b/api_docs/expression_shape.mdx
index 62aa475f1156c..dbb0961004d02 100644
--- a/api_docs/expression_shape.mdx
+++ b/api_docs/expression_shape.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionShape
 title: "expressionShape"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionShape plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionShape']
 ---
 import expressionShapeObj from './expression_shape.devdocs.json';
diff --git a/api_docs/expression_tagcloud.mdx b/api_docs/expression_tagcloud.mdx
index cd5d90a3e6cf3..f10426042f970 100644
--- a/api_docs/expression_tagcloud.mdx
+++ b/api_docs/expression_tagcloud.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionTagcloud
 title: "expressionTagcloud"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionTagcloud plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionTagcloud']
 ---
 import expressionTagcloudObj from './expression_tagcloud.devdocs.json';
diff --git a/api_docs/expression_x_y.mdx b/api_docs/expression_x_y.mdx
index e338d57e6f0f1..1fb52cf6c77eb 100644
--- a/api_docs/expression_x_y.mdx
+++ b/api_docs/expression_x_y.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionXY
 title: "expressionXY"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionXY plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionXY']
 ---
 import expressionXYObj from './expression_x_y.devdocs.json';
diff --git a/api_docs/expressions.mdx b/api_docs/expressions.mdx
index c187ed5a0c268..1bd11ec87fad7 100644
--- a/api_docs/expressions.mdx
+++ b/api_docs/expressions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressions
 title: "expressions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressions plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressions']
 ---
 import expressionsObj from './expressions.devdocs.json';
diff --git a/api_docs/features.mdx b/api_docs/features.mdx
index 268a930b7c64d..21867f9dcb7c3 100644
--- a/api_docs/features.mdx
+++ b/api_docs/features.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/features
 title: "features"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the features plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'features']
 ---
 import featuresObj from './features.devdocs.json';
diff --git a/api_docs/field_formats.mdx b/api_docs/field_formats.mdx
index c2955918d2cbb..03df4c3fcfb44 100644
--- a/api_docs/field_formats.mdx
+++ b/api_docs/field_formats.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/fieldFormats
 title: "fieldFormats"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the fieldFormats plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'fieldFormats']
 ---
 import fieldFormatsObj from './field_formats.devdocs.json';
diff --git a/api_docs/file_upload.mdx b/api_docs/file_upload.mdx
index 951a040359fc0..cef26e17b6d33 100644
--- a/api_docs/file_upload.mdx
+++ b/api_docs/file_upload.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/fileUpload
 title: "fileUpload"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the fileUpload plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'fileUpload']
 ---
 import fileUploadObj from './file_upload.devdocs.json';
diff --git a/api_docs/files.devdocs.json b/api_docs/files.devdocs.json
index 7f34684f9d5ad..284fc310bee93 100644
--- a/api_docs/files.devdocs.json
+++ b/api_docs/files.devdocs.json
@@ -553,6 +553,30 @@
           "deprecated": false,
           "trackAdoption": true,
           "references": [
+            {
+              "plugin": "cases",
+              "path": "x-pack/plugins/cases/public/application.tsx"
+            },
+            {
+              "plugin": "cases",
+              "path": "x-pack/plugins/cases/public/plugin.ts"
+            },
+            {
+              "plugin": "cases",
+              "path": "x-pack/plugins/cases/public/plugin.ts"
+            },
+            {
+              "plugin": "cases",
+              "path": "x-pack/plugins/cases/public/plugin.ts"
+            },
+            {
+              "plugin": "cases",
+              "path": "x-pack/plugins/cases/public/plugin.ts"
+            },
+            {
+              "plugin": "cases",
+              "path": "x-pack/plugins/cases/public/plugin.ts"
+            },
             {
               "plugin": "imageEmbeddable",
               "path": "src/plugins/image_embeddable/public/plugin.ts"
diff --git a/api_docs/files.mdx b/api_docs/files.mdx
index 5b9d6f3da2059..9a81f60a70ba5 100644
--- a/api_docs/files.mdx
+++ b/api_docs/files.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/files
 title: "files"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the files plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'files']
 ---
 import filesObj from './files.devdocs.json';
diff --git a/api_docs/files_management.mdx b/api_docs/files_management.mdx
index 46c3e88281155..e25bf2cf7fee0 100644
--- a/api_docs/files_management.mdx
+++ b/api_docs/files_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/filesManagement
 title: "filesManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the filesManagement plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'filesManagement']
 ---
 import filesManagementObj from './files_management.devdocs.json';
diff --git a/api_docs/fleet.devdocs.json b/api_docs/fleet.devdocs.json
index 942a2edd93055..c8b3355a17f38 100644
--- a/api_docs/fleet.devdocs.json
+++ b/api_docs/fleet.devdocs.json
@@ -20188,7 +20188,7 @@
             "label": "data_stream",
             "description": [],
             "signature": [
-              "{ dataset: string; type: string; elasticsearch?: { privileges?: { indices?: string[] | undefined; } | undefined; index_mode?: string | undefined; source_mode?: string | undefined; } | undefined; }"
+              "{ dataset: string; type: string; elasticsearch?: { dynamic_dataset?: boolean | undefined; dynamic_namespace?: boolean | undefined; privileges?: { indices?: string[] | undefined; } | undefined; index_mode?: string | undefined; source_mode?: string | undefined; } | undefined; }"
             ],
             "path": "x-pack/plugins/fleet/common/types/models/package_policy.ts",
             "deprecated": false,
@@ -21511,6 +21511,34 @@
             "path": "x-pack/plugins/fleet/common/types/models/epm.ts",
             "deprecated": false,
             "trackAdoption": false
+          },
+          {
+            "parentPluginId": "fleet",
+            "id": "def-common.RegistryElasticsearch.dynamic_dataset",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "dynamic_dataset",
+            "description": [],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "x-pack/plugins/fleet/common/types/models/epm.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "fleet",
+            "id": "def-common.RegistryElasticsearch.dynamic_namespace",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "dynamic_namespace",
+            "description": [],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "x-pack/plugins/fleet/common/types/models/epm.ts",
+            "deprecated": false,
+            "trackAdoption": false
           }
         ],
         "initialIsOpen": false
@@ -25192,6 +25220,21 @@
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "fleet",
+        "id": "def-common.DASHBOARD_LOCATORS_IDS",
+        "type": "Object",
+        "tags": [],
+        "label": "DASHBOARD_LOCATORS_IDS",
+        "description": [],
+        "signature": [
+          "{ readonly ELASTIC_AGENT_OVERVIEW: \"elastic_agent-a148dc70-6b3c-11ed-98de-67bdecd21824\"; readonly ELASTIC_AGENT_AGENT_INFO: \"elastic_agent-0600ffa0-6b5e-11ed-98de-67bdecd21824\"; readonly ELASTIC_AGENT_AGENT_METRICS: \"elastic_agent-f47f18cc-9c7d-4278-b2ea-a6dee816d395\"; readonly ELASTIC_AGENT_INTEGRATIONS: \"elastic_agent-1a4e7280-6b5e-11ed-98de-67bdecd21824\"; }"
+        ],
+        "path": "x-pack/plugins/fleet/common/constants/locators.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "fleet",
         "id": "def-common.ENDPOINT_PRIVILEGES",
diff --git a/api_docs/fleet.mdx b/api_docs/fleet.mdx
index 624c2d71bce89..765d621169bd4 100644
--- a/api_docs/fleet.mdx
+++ b/api_docs/fleet.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/fleet
 title: "fleet"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the fleet plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'fleet']
 ---
 import fleetObj from './fleet.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/fleet](https://github.com/orgs/elastic/teams/fleet) for questi
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 1098 | 3 | 993 | 27 |
+| 1101 | 3 | 996 | 27 |
 
 ## Client
 
diff --git a/api_docs/global_search.mdx b/api_docs/global_search.mdx
index 2aef1eb1e7d44..0b55b1f3091c7 100644
--- a/api_docs/global_search.mdx
+++ b/api_docs/global_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/globalSearch
 title: "globalSearch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the globalSearch plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'globalSearch']
 ---
 import globalSearchObj from './global_search.devdocs.json';
diff --git a/api_docs/guided_onboarding.mdx b/api_docs/guided_onboarding.mdx
index 600524142c9e8..4ae55190ce38e 100644
--- a/api_docs/guided_onboarding.mdx
+++ b/api_docs/guided_onboarding.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/guidedOnboarding
 title: "guidedOnboarding"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the guidedOnboarding plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'guidedOnboarding']
 ---
 import guidedOnboardingObj from './guided_onboarding.devdocs.json';
diff --git a/api_docs/home.mdx b/api_docs/home.mdx
index 18bc7c3f5e0f6..bc635db196102 100644
--- a/api_docs/home.mdx
+++ b/api_docs/home.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/home
 title: "home"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the home plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'home']
 ---
 import homeObj from './home.devdocs.json';
diff --git a/api_docs/image_embeddable.mdx b/api_docs/image_embeddable.mdx
index 77912afc2126a..dda6824fbe32f 100644
--- a/api_docs/image_embeddable.mdx
+++ b/api_docs/image_embeddable.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/imageEmbeddable
 title: "imageEmbeddable"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the imageEmbeddable plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'imageEmbeddable']
 ---
 import imageEmbeddableObj from './image_embeddable.devdocs.json';
diff --git a/api_docs/index_lifecycle_management.mdx b/api_docs/index_lifecycle_management.mdx
index 577a0ee22da7a..d7eb6a2fdad96 100644
--- a/api_docs/index_lifecycle_management.mdx
+++ b/api_docs/index_lifecycle_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/indexLifecycleManagement
 title: "indexLifecycleManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the indexLifecycleManagement plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'indexLifecycleManagement']
 ---
 import indexLifecycleManagementObj from './index_lifecycle_management.devdocs.json';
diff --git a/api_docs/index_management.mdx b/api_docs/index_management.mdx
index 22fa699bdcd19..089c8288851a9 100644
--- a/api_docs/index_management.mdx
+++ b/api_docs/index_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/indexManagement
 title: "indexManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the indexManagement plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'indexManagement']
 ---
 import indexManagementObj from './index_management.devdocs.json';
diff --git a/api_docs/infra.mdx b/api_docs/infra.mdx
index a9c227d21af98..9bd4b9bb764dd 100644
--- a/api_docs/infra.mdx
+++ b/api_docs/infra.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/infra
 title: "infra"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the infra plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'infra']
 ---
 import infraObj from './infra.devdocs.json';
diff --git a/api_docs/inspector.mdx b/api_docs/inspector.mdx
index 6ae66934a55d1..42ee86d841d19 100644
--- a/api_docs/inspector.mdx
+++ b/api_docs/inspector.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/inspector
 title: "inspector"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the inspector plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'inspector']
 ---
 import inspectorObj from './inspector.devdocs.json';
diff --git a/api_docs/interactive_setup.mdx b/api_docs/interactive_setup.mdx
index 2ab5d39b10e30..2759a7bf7be21 100644
--- a/api_docs/interactive_setup.mdx
+++ b/api_docs/interactive_setup.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/interactiveSetup
 title: "interactiveSetup"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the interactiveSetup plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'interactiveSetup']
 ---
 import interactiveSetupObj from './interactive_setup.devdocs.json';
diff --git a/api_docs/kbn_ace.mdx b/api_docs/kbn_ace.mdx
index 67ee43007fdc9..e4d2390ade27b 100644
--- a/api_docs/kbn_ace.mdx
+++ b/api_docs/kbn_ace.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ace
 title: "@kbn/ace"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ace plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ace']
 ---
 import kbnAceObj from './kbn_ace.devdocs.json';
diff --git a/api_docs/kbn_aiops_components.mdx b/api_docs/kbn_aiops_components.mdx
index 3803893785185..f4e8bc70d1518 100644
--- a/api_docs/kbn_aiops_components.mdx
+++ b/api_docs/kbn_aiops_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-aiops-components
 title: "@kbn/aiops-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/aiops-components plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/aiops-components']
 ---
 import kbnAiopsComponentsObj from './kbn_aiops_components.devdocs.json';
diff --git a/api_docs/kbn_aiops_utils.mdx b/api_docs/kbn_aiops_utils.mdx
index c71c2df062db1..c73719f74b85f 100644
--- a/api_docs/kbn_aiops_utils.mdx
+++ b/api_docs/kbn_aiops_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-aiops-utils
 title: "@kbn/aiops-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/aiops-utils plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/aiops-utils']
 ---
 import kbnAiopsUtilsObj from './kbn_aiops_utils.devdocs.json';
diff --git a/api_docs/kbn_alerting_state_types.mdx b/api_docs/kbn_alerting_state_types.mdx
index dc2bd696405a8..a7333dbad536a 100644
--- a/api_docs/kbn_alerting_state_types.mdx
+++ b/api_docs/kbn_alerting_state_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerting-state-types
 title: "@kbn/alerting-state-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerting-state-types plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerting-state-types']
 ---
 import kbnAlertingStateTypesObj from './kbn_alerting_state_types.devdocs.json';
diff --git a/api_docs/kbn_alerts.mdx b/api_docs/kbn_alerts.mdx
index 5610770bef960..c15074ba938bf 100644
--- a/api_docs/kbn_alerts.mdx
+++ b/api_docs/kbn_alerts.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerts
 title: "@kbn/alerts"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerts plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerts']
 ---
 import kbnAlertsObj from './kbn_alerts.devdocs.json';
diff --git a/api_docs/kbn_alerts_as_data_utils.mdx b/api_docs/kbn_alerts_as_data_utils.mdx
index dbc0fccbc39ff..41cbc25fe19e0 100644
--- a/api_docs/kbn_alerts_as_data_utils.mdx
+++ b/api_docs/kbn_alerts_as_data_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerts-as-data-utils
 title: "@kbn/alerts-as-data-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerts-as-data-utils plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerts-as-data-utils']
 ---
 import kbnAlertsAsDataUtilsObj from './kbn_alerts_as_data_utils.devdocs.json';
diff --git a/api_docs/kbn_alerts_ui_shared.mdx b/api_docs/kbn_alerts_ui_shared.mdx
index 1f152e91c60e2..f0910f5fc35a6 100644
--- a/api_docs/kbn_alerts_ui_shared.mdx
+++ b/api_docs/kbn_alerts_ui_shared.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerts-ui-shared
 title: "@kbn/alerts-ui-shared"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerts-ui-shared plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerts-ui-shared']
 ---
 import kbnAlertsUiSharedObj from './kbn_alerts_ui_shared.devdocs.json';
diff --git a/api_docs/kbn_analytics.mdx b/api_docs/kbn_analytics.mdx
index a5b9c7ed5ca56..ac5cff2d62a3b 100644
--- a/api_docs/kbn_analytics.mdx
+++ b/api_docs/kbn_analytics.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics
 title: "@kbn/analytics"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics']
 ---
 import kbnAnalyticsObj from './kbn_analytics.devdocs.json';
diff --git a/api_docs/kbn_analytics_client.mdx b/api_docs/kbn_analytics_client.mdx
index 26bc13c4db5fc..8f9f6554e4150 100644
--- a/api_docs/kbn_analytics_client.mdx
+++ b/api_docs/kbn_analytics_client.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-client
 title: "@kbn/analytics-client"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics-client plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-client']
 ---
 import kbnAnalyticsClientObj from './kbn_analytics_client.devdocs.json';
diff --git a/api_docs/kbn_analytics_shippers_elastic_v3_browser.mdx b/api_docs/kbn_analytics_shippers_elastic_v3_browser.mdx
index 242a6221a751d..f4161c633a6c0 100644
--- a/api_docs/kbn_analytics_shippers_elastic_v3_browser.mdx
+++ b/api_docs/kbn_analytics_shippers_elastic_v3_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-shippers-elastic-v3-browser
 title: "@kbn/analytics-shippers-elastic-v3-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics-shippers-elastic-v3-browser plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-shippers-elastic-v3-browser']
 ---
 import kbnAnalyticsShippersElasticV3BrowserObj from './kbn_analytics_shippers_elastic_v3_browser.devdocs.json';
diff --git a/api_docs/kbn_analytics_shippers_elastic_v3_common.mdx b/api_docs/kbn_analytics_shippers_elastic_v3_common.mdx
index 74799d1f0d30f..974386ed1b8e4 100644
--- a/api_docs/kbn_analytics_shippers_elastic_v3_common.mdx
+++ b/api_docs/kbn_analytics_shippers_elastic_v3_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-shippers-elastic-v3-common
 title: "@kbn/analytics-shippers-elastic-v3-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics-shippers-elastic-v3-common plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-shippers-elastic-v3-common']
 ---
 import kbnAnalyticsShippersElasticV3CommonObj from './kbn_analytics_shippers_elastic_v3_common.devdocs.json';
diff --git a/api_docs/kbn_analytics_shippers_elastic_v3_server.mdx b/api_docs/kbn_analytics_shippers_elastic_v3_server.mdx
index fa20d286793fb..5fc1dc2f5919a 100644
--- a/api_docs/kbn_analytics_shippers_elastic_v3_server.mdx
+++ b/api_docs/kbn_analytics_shippers_elastic_v3_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-shippers-elastic-v3-server
 title: "@kbn/analytics-shippers-elastic-v3-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics-shippers-elastic-v3-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-shippers-elastic-v3-server']
 ---
 import kbnAnalyticsShippersElasticV3ServerObj from './kbn_analytics_shippers_elastic_v3_server.devdocs.json';
diff --git a/api_docs/kbn_analytics_shippers_fullstory.mdx b/api_docs/kbn_analytics_shippers_fullstory.mdx
index c46bd2626a0d7..79b0ae9090ca8 100644
--- a/api_docs/kbn_analytics_shippers_fullstory.mdx
+++ b/api_docs/kbn_analytics_shippers_fullstory.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-shippers-fullstory
 title: "@kbn/analytics-shippers-fullstory"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics-shippers-fullstory plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-shippers-fullstory']
 ---
 import kbnAnalyticsShippersFullstoryObj from './kbn_analytics_shippers_fullstory.devdocs.json';
diff --git a/api_docs/kbn_analytics_shippers_gainsight.mdx b/api_docs/kbn_analytics_shippers_gainsight.mdx
index 2f789d03d3064..9867bcd91ff48 100644
--- a/api_docs/kbn_analytics_shippers_gainsight.mdx
+++ b/api_docs/kbn_analytics_shippers_gainsight.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-shippers-gainsight
 title: "@kbn/analytics-shippers-gainsight"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics-shippers-gainsight plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-shippers-gainsight']
 ---
 import kbnAnalyticsShippersGainsightObj from './kbn_analytics_shippers_gainsight.devdocs.json';
diff --git a/api_docs/kbn_apm_config_loader.mdx b/api_docs/kbn_apm_config_loader.mdx
index 646095277ae18..eeda8b4391283 100644
--- a/api_docs/kbn_apm_config_loader.mdx
+++ b/api_docs/kbn_apm_config_loader.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-config-loader
 title: "@kbn/apm-config-loader"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/apm-config-loader plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-config-loader']
 ---
 import kbnApmConfigLoaderObj from './kbn_apm_config_loader.devdocs.json';
diff --git a/api_docs/kbn_apm_synthtrace.mdx b/api_docs/kbn_apm_synthtrace.mdx
index 440bc59095fb9..1f768ab557e33 100644
--- a/api_docs/kbn_apm_synthtrace.mdx
+++ b/api_docs/kbn_apm_synthtrace.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-synthtrace
 title: "@kbn/apm-synthtrace"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/apm-synthtrace plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-synthtrace']
 ---
 import kbnApmSynthtraceObj from './kbn_apm_synthtrace.devdocs.json';
diff --git a/api_docs/kbn_apm_synthtrace_client.mdx b/api_docs/kbn_apm_synthtrace_client.mdx
index fb4fc2d58e1d7..ef2fe4abe9747 100644
--- a/api_docs/kbn_apm_synthtrace_client.mdx
+++ b/api_docs/kbn_apm_synthtrace_client.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-synthtrace-client
 title: "@kbn/apm-synthtrace-client"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/apm-synthtrace-client plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-synthtrace-client']
 ---
 import kbnApmSynthtraceClientObj from './kbn_apm_synthtrace_client.devdocs.json';
diff --git a/api_docs/kbn_apm_utils.mdx b/api_docs/kbn_apm_utils.mdx
index 1a24a499081d6..2d1f6245bdf03 100644
--- a/api_docs/kbn_apm_utils.mdx
+++ b/api_docs/kbn_apm_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-utils
 title: "@kbn/apm-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/apm-utils plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-utils']
 ---
 import kbnApmUtilsObj from './kbn_apm_utils.devdocs.json';
diff --git a/api_docs/kbn_axe_config.mdx b/api_docs/kbn_axe_config.mdx
index cfc894c0aed33..a43abcdbeded7 100644
--- a/api_docs/kbn_axe_config.mdx
+++ b/api_docs/kbn_axe_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-axe-config
 title: "@kbn/axe-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/axe-config plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/axe-config']
 ---
 import kbnAxeConfigObj from './kbn_axe_config.devdocs.json';
diff --git a/api_docs/kbn_cases_components.mdx b/api_docs/kbn_cases_components.mdx
index 20950b0b5504b..802c542ff1d9d 100644
--- a/api_docs/kbn_cases_components.mdx
+++ b/api_docs/kbn_cases_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cases-components
 title: "@kbn/cases-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/cases-components plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/cases-components']
 ---
 import kbnCasesComponentsObj from './kbn_cases_components.devdocs.json';
diff --git a/api_docs/kbn_cell_actions.mdx b/api_docs/kbn_cell_actions.mdx
index 39e5c1f3876ed..d14cdd10cb5cd 100644
--- a/api_docs/kbn_cell_actions.mdx
+++ b/api_docs/kbn_cell_actions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cell-actions
 title: "@kbn/cell-actions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/cell-actions plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/cell-actions']
 ---
 import kbnCellActionsObj from './kbn_cell_actions.devdocs.json';
diff --git a/api_docs/kbn_chart_expressions_common.mdx b/api_docs/kbn_chart_expressions_common.mdx
index 4b9682a493355..c2d0094e972d7 100644
--- a/api_docs/kbn_chart_expressions_common.mdx
+++ b/api_docs/kbn_chart_expressions_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-chart-expressions-common
 title: "@kbn/chart-expressions-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/chart-expressions-common plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/chart-expressions-common']
 ---
 import kbnChartExpressionsCommonObj from './kbn_chart_expressions_common.devdocs.json';
diff --git a/api_docs/kbn_chart_icons.mdx b/api_docs/kbn_chart_icons.mdx
index 6ee7741aac660..1d3086cc5fa5a 100644
--- a/api_docs/kbn_chart_icons.mdx
+++ b/api_docs/kbn_chart_icons.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-chart-icons
 title: "@kbn/chart-icons"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/chart-icons plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/chart-icons']
 ---
 import kbnChartIconsObj from './kbn_chart_icons.devdocs.json';
diff --git a/api_docs/kbn_ci_stats_core.mdx b/api_docs/kbn_ci_stats_core.mdx
index 7535c8f6802bb..d4fe8d7090728 100644
--- a/api_docs/kbn_ci_stats_core.mdx
+++ b/api_docs/kbn_ci_stats_core.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ci-stats-core
 title: "@kbn/ci-stats-core"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ci-stats-core plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ci-stats-core']
 ---
 import kbnCiStatsCoreObj from './kbn_ci_stats_core.devdocs.json';
diff --git a/api_docs/kbn_ci_stats_performance_metrics.mdx b/api_docs/kbn_ci_stats_performance_metrics.mdx
index e38354234f2a1..eb4a00a5ef79f 100644
--- a/api_docs/kbn_ci_stats_performance_metrics.mdx
+++ b/api_docs/kbn_ci_stats_performance_metrics.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ci-stats-performance-metrics
 title: "@kbn/ci-stats-performance-metrics"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ci-stats-performance-metrics plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ci-stats-performance-metrics']
 ---
 import kbnCiStatsPerformanceMetricsObj from './kbn_ci_stats_performance_metrics.devdocs.json';
diff --git a/api_docs/kbn_ci_stats_reporter.mdx b/api_docs/kbn_ci_stats_reporter.mdx
index 436a35b857d97..abe5feff261ca 100644
--- a/api_docs/kbn_ci_stats_reporter.mdx
+++ b/api_docs/kbn_ci_stats_reporter.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ci-stats-reporter
 title: "@kbn/ci-stats-reporter"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ci-stats-reporter plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ci-stats-reporter']
 ---
 import kbnCiStatsReporterObj from './kbn_ci_stats_reporter.devdocs.json';
diff --git a/api_docs/kbn_cli_dev_mode.mdx b/api_docs/kbn_cli_dev_mode.mdx
index 72b4147358ebf..273214fcd1e9c 100644
--- a/api_docs/kbn_cli_dev_mode.mdx
+++ b/api_docs/kbn_cli_dev_mode.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cli-dev-mode
 title: "@kbn/cli-dev-mode"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/cli-dev-mode plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/cli-dev-mode']
 ---
 import kbnCliDevModeObj from './kbn_cli_dev_mode.devdocs.json';
diff --git a/api_docs/kbn_code_editor.mdx b/api_docs/kbn_code_editor.mdx
index a438c3ac72212..a2ca9df0c6105 100644
--- a/api_docs/kbn_code_editor.mdx
+++ b/api_docs/kbn_code_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-code-editor
 title: "@kbn/code-editor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/code-editor plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/code-editor']
 ---
 import kbnCodeEditorObj from './kbn_code_editor.devdocs.json';
diff --git a/api_docs/kbn_code_editor_mocks.mdx b/api_docs/kbn_code_editor_mocks.mdx
index 6faa2e668df36..5e946e9d7a68b 100644
--- a/api_docs/kbn_code_editor_mocks.mdx
+++ b/api_docs/kbn_code_editor_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-code-editor-mocks
 title: "@kbn/code-editor-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/code-editor-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/code-editor-mocks']
 ---
 import kbnCodeEditorMocksObj from './kbn_code_editor_mocks.devdocs.json';
diff --git a/api_docs/kbn_coloring.mdx b/api_docs/kbn_coloring.mdx
index d0f93bffc6bcd..119058d250f7f 100644
--- a/api_docs/kbn_coloring.mdx
+++ b/api_docs/kbn_coloring.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-coloring
 title: "@kbn/coloring"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/coloring plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/coloring']
 ---
 import kbnColoringObj from './kbn_coloring.devdocs.json';
diff --git a/api_docs/kbn_config.mdx b/api_docs/kbn_config.mdx
index 0c1bc4ec3037a..5056c3647e515 100644
--- a/api_docs/kbn_config.mdx
+++ b/api_docs/kbn_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-config
 title: "@kbn/config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/config plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/config']
 ---
 import kbnConfigObj from './kbn_config.devdocs.json';
diff --git a/api_docs/kbn_config_mocks.mdx b/api_docs/kbn_config_mocks.mdx
index 654be1f4dc6f6..4dec3e2cd3f5d 100644
--- a/api_docs/kbn_config_mocks.mdx
+++ b/api_docs/kbn_config_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-config-mocks
 title: "@kbn/config-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/config-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/config-mocks']
 ---
 import kbnConfigMocksObj from './kbn_config_mocks.devdocs.json';
diff --git a/api_docs/kbn_config_schema.mdx b/api_docs/kbn_config_schema.mdx
index e33c9b85eb791..368b3abc63350 100644
--- a/api_docs/kbn_config_schema.mdx
+++ b/api_docs/kbn_config_schema.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-config-schema
 title: "@kbn/config-schema"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/config-schema plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/config-schema']
 ---
 import kbnConfigSchemaObj from './kbn_config_schema.devdocs.json';
diff --git a/api_docs/kbn_content_management_content_editor.mdx b/api_docs/kbn_content_management_content_editor.mdx
index 8080fd41a6217..b0ab27ae78600 100644
--- a/api_docs/kbn_content_management_content_editor.mdx
+++ b/api_docs/kbn_content_management_content_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-content-editor
 title: "@kbn/content-management-content-editor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-content-editor plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-content-editor']
 ---
 import kbnContentManagementContentEditorObj from './kbn_content_management_content_editor.devdocs.json';
diff --git a/api_docs/kbn_content_management_table_list.mdx b/api_docs/kbn_content_management_table_list.mdx
index 8eb1ca361def0..3ecf51fd33244 100644
--- a/api_docs/kbn_content_management_table_list.mdx
+++ b/api_docs/kbn_content_management_table_list.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-table-list
 title: "@kbn/content-management-table-list"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-table-list plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-table-list']
 ---
 import kbnContentManagementTableListObj from './kbn_content_management_table_list.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_browser.mdx b/api_docs/kbn_core_analytics_browser.mdx
index 7e6d452bd3dc8..f30b5bae17d46 100644
--- a/api_docs/kbn_core_analytics_browser.mdx
+++ b/api_docs/kbn_core_analytics_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-browser
 title: "@kbn/core-analytics-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-browser plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-browser']
 ---
 import kbnCoreAnalyticsBrowserObj from './kbn_core_analytics_browser.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_browser_internal.mdx b/api_docs/kbn_core_analytics_browser_internal.mdx
index f88d22357c501..28e92d54f0efb 100644
--- a/api_docs/kbn_core_analytics_browser_internal.mdx
+++ b/api_docs/kbn_core_analytics_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-browser-internal
 title: "@kbn/core-analytics-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-browser-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-browser-internal']
 ---
 import kbnCoreAnalyticsBrowserInternalObj from './kbn_core_analytics_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_browser_mocks.mdx b/api_docs/kbn_core_analytics_browser_mocks.mdx
index 9ed87daf3b53d..67b75e7d10057 100644
--- a/api_docs/kbn_core_analytics_browser_mocks.mdx
+++ b/api_docs/kbn_core_analytics_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-browser-mocks
 title: "@kbn/core-analytics-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-browser-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-browser-mocks']
 ---
 import kbnCoreAnalyticsBrowserMocksObj from './kbn_core_analytics_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_server.mdx b/api_docs/kbn_core_analytics_server.mdx
index 3ee3bc858e18f..8189da0441012 100644
--- a/api_docs/kbn_core_analytics_server.mdx
+++ b/api_docs/kbn_core_analytics_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-server
 title: "@kbn/core-analytics-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-server']
 ---
 import kbnCoreAnalyticsServerObj from './kbn_core_analytics_server.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_server_internal.mdx b/api_docs/kbn_core_analytics_server_internal.mdx
index 944c7c7e5e095..58893459be1ef 100644
--- a/api_docs/kbn_core_analytics_server_internal.mdx
+++ b/api_docs/kbn_core_analytics_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-server-internal
 title: "@kbn/core-analytics-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-server-internal']
 ---
 import kbnCoreAnalyticsServerInternalObj from './kbn_core_analytics_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_server_mocks.mdx b/api_docs/kbn_core_analytics_server_mocks.mdx
index e8b3ed64abd21..aca802c739677 100644
--- a/api_docs/kbn_core_analytics_server_mocks.mdx
+++ b/api_docs/kbn_core_analytics_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-server-mocks
 title: "@kbn/core-analytics-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-server-mocks']
 ---
 import kbnCoreAnalyticsServerMocksObj from './kbn_core_analytics_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_application_browser.mdx b/api_docs/kbn_core_application_browser.mdx
index 73a96764f0a20..d8ff0064c33a3 100644
--- a/api_docs/kbn_core_application_browser.mdx
+++ b/api_docs/kbn_core_application_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-browser
 title: "@kbn/core-application-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-application-browser plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-application-browser']
 ---
 import kbnCoreApplicationBrowserObj from './kbn_core_application_browser.devdocs.json';
diff --git a/api_docs/kbn_core_application_browser_internal.mdx b/api_docs/kbn_core_application_browser_internal.mdx
index 65e5281d02558..48946a11b73d9 100644
--- a/api_docs/kbn_core_application_browser_internal.mdx
+++ b/api_docs/kbn_core_application_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-browser-internal
 title: "@kbn/core-application-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-application-browser-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-application-browser-internal']
 ---
 import kbnCoreApplicationBrowserInternalObj from './kbn_core_application_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_application_browser_mocks.mdx b/api_docs/kbn_core_application_browser_mocks.mdx
index e0544bfb741b8..b7d1bd73c2ad6 100644
--- a/api_docs/kbn_core_application_browser_mocks.mdx
+++ b/api_docs/kbn_core_application_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-browser-mocks
 title: "@kbn/core-application-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-application-browser-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-application-browser-mocks']
 ---
 import kbnCoreApplicationBrowserMocksObj from './kbn_core_application_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_application_common.mdx b/api_docs/kbn_core_application_common.mdx
index abdcdcab8b3da..7c641e8a33eab 100644
--- a/api_docs/kbn_core_application_common.mdx
+++ b/api_docs/kbn_core_application_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-common
 title: "@kbn/core-application-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-application-common plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-application-common']
 ---
 import kbnCoreApplicationCommonObj from './kbn_core_application_common.devdocs.json';
diff --git a/api_docs/kbn_core_apps_browser_internal.mdx b/api_docs/kbn_core_apps_browser_internal.mdx
index 5a7df9b5c701d..67c181dbe353c 100644
--- a/api_docs/kbn_core_apps_browser_internal.mdx
+++ b/api_docs/kbn_core_apps_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-apps-browser-internal
 title: "@kbn/core-apps-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-apps-browser-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-apps-browser-internal']
 ---
 import kbnCoreAppsBrowserInternalObj from './kbn_core_apps_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_apps_browser_mocks.mdx b/api_docs/kbn_core_apps_browser_mocks.mdx
index 4f7120a3dcfe7..3e937416907f7 100644
--- a/api_docs/kbn_core_apps_browser_mocks.mdx
+++ b/api_docs/kbn_core_apps_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-apps-browser-mocks
 title: "@kbn/core-apps-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-apps-browser-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-apps-browser-mocks']
 ---
 import kbnCoreAppsBrowserMocksObj from './kbn_core_apps_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_apps_server_internal.mdx b/api_docs/kbn_core_apps_server_internal.mdx
index 04b4becdc9ed7..0fb69311a41d3 100644
--- a/api_docs/kbn_core_apps_server_internal.mdx
+++ b/api_docs/kbn_core_apps_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-apps-server-internal
 title: "@kbn/core-apps-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-apps-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-apps-server-internal']
 ---
 import kbnCoreAppsServerInternalObj from './kbn_core_apps_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_base_browser_mocks.mdx b/api_docs/kbn_core_base_browser_mocks.mdx
index 7edc1c2bf0108..723403c04a56b 100644
--- a/api_docs/kbn_core_base_browser_mocks.mdx
+++ b/api_docs/kbn_core_base_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-browser-mocks
 title: "@kbn/core-base-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-base-browser-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-base-browser-mocks']
 ---
 import kbnCoreBaseBrowserMocksObj from './kbn_core_base_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_base_common.mdx b/api_docs/kbn_core_base_common.mdx
index 31241bd3ebab8..38c200dd4fc4e 100644
--- a/api_docs/kbn_core_base_common.mdx
+++ b/api_docs/kbn_core_base_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-common
 title: "@kbn/core-base-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-base-common plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-base-common']
 ---
 import kbnCoreBaseCommonObj from './kbn_core_base_common.devdocs.json';
diff --git a/api_docs/kbn_core_base_server_internal.mdx b/api_docs/kbn_core_base_server_internal.mdx
index c77e0e47adc5e..2822cebc8f2b6 100644
--- a/api_docs/kbn_core_base_server_internal.mdx
+++ b/api_docs/kbn_core_base_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-server-internal
 title: "@kbn/core-base-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-base-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-base-server-internal']
 ---
 import kbnCoreBaseServerInternalObj from './kbn_core_base_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_base_server_mocks.mdx b/api_docs/kbn_core_base_server_mocks.mdx
index 415fe2fed1189..85f67738b5127 100644
--- a/api_docs/kbn_core_base_server_mocks.mdx
+++ b/api_docs/kbn_core_base_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-server-mocks
 title: "@kbn/core-base-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-base-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-base-server-mocks']
 ---
 import kbnCoreBaseServerMocksObj from './kbn_core_base_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_capabilities_browser_mocks.mdx b/api_docs/kbn_core_capabilities_browser_mocks.mdx
index b98ffe805e860..a195e14f8eb08 100644
--- a/api_docs/kbn_core_capabilities_browser_mocks.mdx
+++ b/api_docs/kbn_core_capabilities_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-browser-mocks
 title: "@kbn/core-capabilities-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-capabilities-browser-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-capabilities-browser-mocks']
 ---
 import kbnCoreCapabilitiesBrowserMocksObj from './kbn_core_capabilities_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_capabilities_common.mdx b/api_docs/kbn_core_capabilities_common.mdx
index 4777bb07d8cb8..dee08ccafaa3b 100644
--- a/api_docs/kbn_core_capabilities_common.mdx
+++ b/api_docs/kbn_core_capabilities_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-common
 title: "@kbn/core-capabilities-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-capabilities-common plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-capabilities-common']
 ---
 import kbnCoreCapabilitiesCommonObj from './kbn_core_capabilities_common.devdocs.json';
diff --git a/api_docs/kbn_core_capabilities_server.mdx b/api_docs/kbn_core_capabilities_server.mdx
index 4f83cbf656d29..0500817634ff9 100644
--- a/api_docs/kbn_core_capabilities_server.mdx
+++ b/api_docs/kbn_core_capabilities_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-server
 title: "@kbn/core-capabilities-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-capabilities-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-capabilities-server']
 ---
 import kbnCoreCapabilitiesServerObj from './kbn_core_capabilities_server.devdocs.json';
diff --git a/api_docs/kbn_core_capabilities_server_mocks.mdx b/api_docs/kbn_core_capabilities_server_mocks.mdx
index b29b724f4ff08..69b03a9701053 100644
--- a/api_docs/kbn_core_capabilities_server_mocks.mdx
+++ b/api_docs/kbn_core_capabilities_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-server-mocks
 title: "@kbn/core-capabilities-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-capabilities-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-capabilities-server-mocks']
 ---
 import kbnCoreCapabilitiesServerMocksObj from './kbn_core_capabilities_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_chrome_browser.mdx b/api_docs/kbn_core_chrome_browser.mdx
index 4f4b841e7c133..5d39c7f82fc91 100644
--- a/api_docs/kbn_core_chrome_browser.mdx
+++ b/api_docs/kbn_core_chrome_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-chrome-browser
 title: "@kbn/core-chrome-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-chrome-browser plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-chrome-browser']
 ---
 import kbnCoreChromeBrowserObj from './kbn_core_chrome_browser.devdocs.json';
diff --git a/api_docs/kbn_core_chrome_browser_mocks.mdx b/api_docs/kbn_core_chrome_browser_mocks.mdx
index 78e1da6e97f8d..a7455a3d124fe 100644
--- a/api_docs/kbn_core_chrome_browser_mocks.mdx
+++ b/api_docs/kbn_core_chrome_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-chrome-browser-mocks
 title: "@kbn/core-chrome-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-chrome-browser-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-chrome-browser-mocks']
 ---
 import kbnCoreChromeBrowserMocksObj from './kbn_core_chrome_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_config_server_internal.mdx b/api_docs/kbn_core_config_server_internal.mdx
index c387e23236985..f148b51bf4f79 100644
--- a/api_docs/kbn_core_config_server_internal.mdx
+++ b/api_docs/kbn_core_config_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-config-server-internal
 title: "@kbn/core-config-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-config-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-config-server-internal']
 ---
 import kbnCoreConfigServerInternalObj from './kbn_core_config_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_browser.mdx b/api_docs/kbn_core_custom_branding_browser.mdx
index c85986cb5d39c..a8931e398dba4 100644
--- a/api_docs/kbn_core_custom_branding_browser.mdx
+++ b/api_docs/kbn_core_custom_branding_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-browser
 title: "@kbn/core-custom-branding-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-browser plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-browser']
 ---
 import kbnCoreCustomBrandingBrowserObj from './kbn_core_custom_branding_browser.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_browser_internal.mdx b/api_docs/kbn_core_custom_branding_browser_internal.mdx
index 6cd7e8cdd4dd8..7e42f2af72f22 100644
--- a/api_docs/kbn_core_custom_branding_browser_internal.mdx
+++ b/api_docs/kbn_core_custom_branding_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-browser-internal
 title: "@kbn/core-custom-branding-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-browser-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-browser-internal']
 ---
 import kbnCoreCustomBrandingBrowserInternalObj from './kbn_core_custom_branding_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_browser_mocks.mdx b/api_docs/kbn_core_custom_branding_browser_mocks.mdx
index 5828e4b3e796f..6e16eb883e32b 100644
--- a/api_docs/kbn_core_custom_branding_browser_mocks.mdx
+++ b/api_docs/kbn_core_custom_branding_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-browser-mocks
 title: "@kbn/core-custom-branding-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-browser-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-browser-mocks']
 ---
 import kbnCoreCustomBrandingBrowserMocksObj from './kbn_core_custom_branding_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_common.mdx b/api_docs/kbn_core_custom_branding_common.mdx
index 024319834e756..fd22accfa2fd9 100644
--- a/api_docs/kbn_core_custom_branding_common.mdx
+++ b/api_docs/kbn_core_custom_branding_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-common
 title: "@kbn/core-custom-branding-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-common plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-common']
 ---
 import kbnCoreCustomBrandingCommonObj from './kbn_core_custom_branding_common.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_server.mdx b/api_docs/kbn_core_custom_branding_server.mdx
index ffb1c6e6442ca..69a6b20efc1f4 100644
--- a/api_docs/kbn_core_custom_branding_server.mdx
+++ b/api_docs/kbn_core_custom_branding_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-server
 title: "@kbn/core-custom-branding-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-server']
 ---
 import kbnCoreCustomBrandingServerObj from './kbn_core_custom_branding_server.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_server_internal.mdx b/api_docs/kbn_core_custom_branding_server_internal.mdx
index 7bbf0fae324be..096bf2db5c03c 100644
--- a/api_docs/kbn_core_custom_branding_server_internal.mdx
+++ b/api_docs/kbn_core_custom_branding_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-server-internal
 title: "@kbn/core-custom-branding-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-server-internal']
 ---
 import kbnCoreCustomBrandingServerInternalObj from './kbn_core_custom_branding_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_server_mocks.mdx b/api_docs/kbn_core_custom_branding_server_mocks.mdx
index 417f2f0c4d598..06faf0dd23001 100644
--- a/api_docs/kbn_core_custom_branding_server_mocks.mdx
+++ b/api_docs/kbn_core_custom_branding_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-server-mocks
 title: "@kbn/core-custom-branding-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-server-mocks']
 ---
 import kbnCoreCustomBrandingServerMocksObj from './kbn_core_custom_branding_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_browser.mdx b/api_docs/kbn_core_deprecations_browser.mdx
index bf994f0f500a0..903e4f01a2028 100644
--- a/api_docs/kbn_core_deprecations_browser.mdx
+++ b/api_docs/kbn_core_deprecations_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-browser
 title: "@kbn/core-deprecations-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-browser plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-browser']
 ---
 import kbnCoreDeprecationsBrowserObj from './kbn_core_deprecations_browser.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_browser_internal.mdx b/api_docs/kbn_core_deprecations_browser_internal.mdx
index 8c304566110e9..4a90ce31147d8 100644
--- a/api_docs/kbn_core_deprecations_browser_internal.mdx
+++ b/api_docs/kbn_core_deprecations_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-browser-internal
 title: "@kbn/core-deprecations-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-browser-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-browser-internal']
 ---
 import kbnCoreDeprecationsBrowserInternalObj from './kbn_core_deprecations_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_browser_mocks.mdx b/api_docs/kbn_core_deprecations_browser_mocks.mdx
index 5c4bc6c627f55..f0c9aff947736 100644
--- a/api_docs/kbn_core_deprecations_browser_mocks.mdx
+++ b/api_docs/kbn_core_deprecations_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-browser-mocks
 title: "@kbn/core-deprecations-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-browser-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-browser-mocks']
 ---
 import kbnCoreDeprecationsBrowserMocksObj from './kbn_core_deprecations_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_common.mdx b/api_docs/kbn_core_deprecations_common.mdx
index e63ecc8a6ff52..11e72887b3c3c 100644
--- a/api_docs/kbn_core_deprecations_common.mdx
+++ b/api_docs/kbn_core_deprecations_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-common
 title: "@kbn/core-deprecations-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-common plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-common']
 ---
 import kbnCoreDeprecationsCommonObj from './kbn_core_deprecations_common.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_server.mdx b/api_docs/kbn_core_deprecations_server.mdx
index 387f9924f6896..832893355aa18 100644
--- a/api_docs/kbn_core_deprecations_server.mdx
+++ b/api_docs/kbn_core_deprecations_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-server
 title: "@kbn/core-deprecations-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-server']
 ---
 import kbnCoreDeprecationsServerObj from './kbn_core_deprecations_server.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_server_internal.mdx b/api_docs/kbn_core_deprecations_server_internal.mdx
index 353c19d437d5e..e13e0e5865ab0 100644
--- a/api_docs/kbn_core_deprecations_server_internal.mdx
+++ b/api_docs/kbn_core_deprecations_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-server-internal
 title: "@kbn/core-deprecations-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-server-internal']
 ---
 import kbnCoreDeprecationsServerInternalObj from './kbn_core_deprecations_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_server_mocks.mdx b/api_docs/kbn_core_deprecations_server_mocks.mdx
index 6d146e44d7510..5155aeece5ccc 100644
--- a/api_docs/kbn_core_deprecations_server_mocks.mdx
+++ b/api_docs/kbn_core_deprecations_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-server-mocks
 title: "@kbn/core-deprecations-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-server-mocks']
 ---
 import kbnCoreDeprecationsServerMocksObj from './kbn_core_deprecations_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_doc_links_browser.mdx b/api_docs/kbn_core_doc_links_browser.mdx
index ebfad96952499..e75e82dadd7b5 100644
--- a/api_docs/kbn_core_doc_links_browser.mdx
+++ b/api_docs/kbn_core_doc_links_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-browser
 title: "@kbn/core-doc-links-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-doc-links-browser plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-doc-links-browser']
 ---
 import kbnCoreDocLinksBrowserObj from './kbn_core_doc_links_browser.devdocs.json';
diff --git a/api_docs/kbn_core_doc_links_browser_mocks.mdx b/api_docs/kbn_core_doc_links_browser_mocks.mdx
index 9dab9c9bbbcad..270978b9a289b 100644
--- a/api_docs/kbn_core_doc_links_browser_mocks.mdx
+++ b/api_docs/kbn_core_doc_links_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-browser-mocks
 title: "@kbn/core-doc-links-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-doc-links-browser-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-doc-links-browser-mocks']
 ---
 import kbnCoreDocLinksBrowserMocksObj from './kbn_core_doc_links_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_doc_links_server.mdx b/api_docs/kbn_core_doc_links_server.mdx
index 32dddf219dbdd..eb15cc5893e3a 100644
--- a/api_docs/kbn_core_doc_links_server.mdx
+++ b/api_docs/kbn_core_doc_links_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-server
 title: "@kbn/core-doc-links-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-doc-links-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-doc-links-server']
 ---
 import kbnCoreDocLinksServerObj from './kbn_core_doc_links_server.devdocs.json';
diff --git a/api_docs/kbn_core_doc_links_server_mocks.mdx b/api_docs/kbn_core_doc_links_server_mocks.mdx
index 57321c54b22b9..38a2642f3ca7f 100644
--- a/api_docs/kbn_core_doc_links_server_mocks.mdx
+++ b/api_docs/kbn_core_doc_links_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-server-mocks
 title: "@kbn/core-doc-links-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-doc-links-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-doc-links-server-mocks']
 ---
 import kbnCoreDocLinksServerMocksObj from './kbn_core_doc_links_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_elasticsearch_client_server_internal.mdx b/api_docs/kbn_core_elasticsearch_client_server_internal.mdx
index e91f768a9b11d..c06dbb2c4cabf 100644
--- a/api_docs/kbn_core_elasticsearch_client_server_internal.mdx
+++ b/api_docs/kbn_core_elasticsearch_client_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-client-server-internal
 title: "@kbn/core-elasticsearch-client-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-client-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-client-server-internal']
 ---
 import kbnCoreElasticsearchClientServerInternalObj from './kbn_core_elasticsearch_client_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx b/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx
index 6b9414e0651b1..855c92977a56a 100644
--- a/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx
+++ b/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-client-server-mocks
 title: "@kbn/core-elasticsearch-client-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-client-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-client-server-mocks']
 ---
 import kbnCoreElasticsearchClientServerMocksObj from './kbn_core_elasticsearch_client_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_elasticsearch_server.mdx b/api_docs/kbn_core_elasticsearch_server.mdx
index 145c7f1af2727..72e01b8ab8af3 100644
--- a/api_docs/kbn_core_elasticsearch_server.mdx
+++ b/api_docs/kbn_core_elasticsearch_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-server
 title: "@kbn/core-elasticsearch-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-server']
 ---
 import kbnCoreElasticsearchServerObj from './kbn_core_elasticsearch_server.devdocs.json';
diff --git a/api_docs/kbn_core_elasticsearch_server_internal.mdx b/api_docs/kbn_core_elasticsearch_server_internal.mdx
index b545705cc9937..34f856af0a5b0 100644
--- a/api_docs/kbn_core_elasticsearch_server_internal.mdx
+++ b/api_docs/kbn_core_elasticsearch_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-server-internal
 title: "@kbn/core-elasticsearch-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-server-internal']
 ---
 import kbnCoreElasticsearchServerInternalObj from './kbn_core_elasticsearch_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_elasticsearch_server_mocks.mdx b/api_docs/kbn_core_elasticsearch_server_mocks.mdx
index b0c53699fdaf4..6525743a6df56 100644
--- a/api_docs/kbn_core_elasticsearch_server_mocks.mdx
+++ b/api_docs/kbn_core_elasticsearch_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-server-mocks
 title: "@kbn/core-elasticsearch-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-server-mocks']
 ---
 import kbnCoreElasticsearchServerMocksObj from './kbn_core_elasticsearch_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_environment_server_internal.mdx b/api_docs/kbn_core_environment_server_internal.mdx
index bf60d16f51e7e..e947629304916 100644
--- a/api_docs/kbn_core_environment_server_internal.mdx
+++ b/api_docs/kbn_core_environment_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-environment-server-internal
 title: "@kbn/core-environment-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-environment-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-environment-server-internal']
 ---
 import kbnCoreEnvironmentServerInternalObj from './kbn_core_environment_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_environment_server_mocks.mdx b/api_docs/kbn_core_environment_server_mocks.mdx
index 53bc31f39d5ac..6dbf86aff88ba 100644
--- a/api_docs/kbn_core_environment_server_mocks.mdx
+++ b/api_docs/kbn_core_environment_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-environment-server-mocks
 title: "@kbn/core-environment-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-environment-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-environment-server-mocks']
 ---
 import kbnCoreEnvironmentServerMocksObj from './kbn_core_environment_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_browser.mdx b/api_docs/kbn_core_execution_context_browser.mdx
index f172396845792..3d31ac3c5a93f 100644
--- a/api_docs/kbn_core_execution_context_browser.mdx
+++ b/api_docs/kbn_core_execution_context_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-browser
 title: "@kbn/core-execution-context-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-browser plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-browser']
 ---
 import kbnCoreExecutionContextBrowserObj from './kbn_core_execution_context_browser.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_browser_internal.mdx b/api_docs/kbn_core_execution_context_browser_internal.mdx
index 8e788545d793c..14668296fd09b 100644
--- a/api_docs/kbn_core_execution_context_browser_internal.mdx
+++ b/api_docs/kbn_core_execution_context_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-browser-internal
 title: "@kbn/core-execution-context-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-browser-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-browser-internal']
 ---
 import kbnCoreExecutionContextBrowserInternalObj from './kbn_core_execution_context_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_browser_mocks.mdx b/api_docs/kbn_core_execution_context_browser_mocks.mdx
index b06caeb0c3c3d..bac6725f95815 100644
--- a/api_docs/kbn_core_execution_context_browser_mocks.mdx
+++ b/api_docs/kbn_core_execution_context_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-browser-mocks
 title: "@kbn/core-execution-context-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-browser-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-browser-mocks']
 ---
 import kbnCoreExecutionContextBrowserMocksObj from './kbn_core_execution_context_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_common.mdx b/api_docs/kbn_core_execution_context_common.mdx
index cd8d797b06c1b..3a75e07c2d942 100644
--- a/api_docs/kbn_core_execution_context_common.mdx
+++ b/api_docs/kbn_core_execution_context_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-common
 title: "@kbn/core-execution-context-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-common plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-common']
 ---
 import kbnCoreExecutionContextCommonObj from './kbn_core_execution_context_common.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_server.mdx b/api_docs/kbn_core_execution_context_server.mdx
index a57c274f69d25..d647820be221a 100644
--- a/api_docs/kbn_core_execution_context_server.mdx
+++ b/api_docs/kbn_core_execution_context_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-server
 title: "@kbn/core-execution-context-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-server']
 ---
 import kbnCoreExecutionContextServerObj from './kbn_core_execution_context_server.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_server_internal.mdx b/api_docs/kbn_core_execution_context_server_internal.mdx
index 0eba46d8c5a93..e6599896f5008 100644
--- a/api_docs/kbn_core_execution_context_server_internal.mdx
+++ b/api_docs/kbn_core_execution_context_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-server-internal
 title: "@kbn/core-execution-context-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-server-internal']
 ---
 import kbnCoreExecutionContextServerInternalObj from './kbn_core_execution_context_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_server_mocks.mdx b/api_docs/kbn_core_execution_context_server_mocks.mdx
index aead6167b10ea..78898bec9c262 100644
--- a/api_docs/kbn_core_execution_context_server_mocks.mdx
+++ b/api_docs/kbn_core_execution_context_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-server-mocks
 title: "@kbn/core-execution-context-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-server-mocks']
 ---
 import kbnCoreExecutionContextServerMocksObj from './kbn_core_execution_context_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_fatal_errors_browser.mdx b/api_docs/kbn_core_fatal_errors_browser.mdx
index a980e30066c77..2cdc139e6a958 100644
--- a/api_docs/kbn_core_fatal_errors_browser.mdx
+++ b/api_docs/kbn_core_fatal_errors_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-fatal-errors-browser
 title: "@kbn/core-fatal-errors-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-fatal-errors-browser plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-fatal-errors-browser']
 ---
 import kbnCoreFatalErrorsBrowserObj from './kbn_core_fatal_errors_browser.devdocs.json';
diff --git a/api_docs/kbn_core_fatal_errors_browser_mocks.mdx b/api_docs/kbn_core_fatal_errors_browser_mocks.mdx
index fa51d22025e81..71ad5cf9a4746 100644
--- a/api_docs/kbn_core_fatal_errors_browser_mocks.mdx
+++ b/api_docs/kbn_core_fatal_errors_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-fatal-errors-browser-mocks
 title: "@kbn/core-fatal-errors-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-fatal-errors-browser-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-fatal-errors-browser-mocks']
 ---
 import kbnCoreFatalErrorsBrowserMocksObj from './kbn_core_fatal_errors_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_http_browser.mdx b/api_docs/kbn_core_http_browser.mdx
index b74fbf8ec1b93..f46e20977cc14 100644
--- a/api_docs/kbn_core_http_browser.mdx
+++ b/api_docs/kbn_core_http_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-browser
 title: "@kbn/core-http-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-browser plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-browser']
 ---
 import kbnCoreHttpBrowserObj from './kbn_core_http_browser.devdocs.json';
diff --git a/api_docs/kbn_core_http_browser_internal.mdx b/api_docs/kbn_core_http_browser_internal.mdx
index 0bc4d6205ab8a..2c2a798a89c6c 100644
--- a/api_docs/kbn_core_http_browser_internal.mdx
+++ b/api_docs/kbn_core_http_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-browser-internal
 title: "@kbn/core-http-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-browser-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-browser-internal']
 ---
 import kbnCoreHttpBrowserInternalObj from './kbn_core_http_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_http_browser_mocks.mdx b/api_docs/kbn_core_http_browser_mocks.mdx
index 7e3f26557d9db..dc84030777a3f 100644
--- a/api_docs/kbn_core_http_browser_mocks.mdx
+++ b/api_docs/kbn_core_http_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-browser-mocks
 title: "@kbn/core-http-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-browser-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-browser-mocks']
 ---
 import kbnCoreHttpBrowserMocksObj from './kbn_core_http_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_http_common.mdx b/api_docs/kbn_core_http_common.mdx
index 01974c526d562..f46f80f157990 100644
--- a/api_docs/kbn_core_http_common.mdx
+++ b/api_docs/kbn_core_http_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-common
 title: "@kbn/core-http-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-common plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-common']
 ---
 import kbnCoreHttpCommonObj from './kbn_core_http_common.devdocs.json';
diff --git a/api_docs/kbn_core_http_context_server_mocks.mdx b/api_docs/kbn_core_http_context_server_mocks.mdx
index 1ef26910b0abc..2bcecde44aae2 100644
--- a/api_docs/kbn_core_http_context_server_mocks.mdx
+++ b/api_docs/kbn_core_http_context_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-context-server-mocks
 title: "@kbn/core-http-context-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-context-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-context-server-mocks']
 ---
 import kbnCoreHttpContextServerMocksObj from './kbn_core_http_context_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_http_request_handler_context_server.mdx b/api_docs/kbn_core_http_request_handler_context_server.mdx
index b7a7d506ca531..728e77b24337f 100644
--- a/api_docs/kbn_core_http_request_handler_context_server.mdx
+++ b/api_docs/kbn_core_http_request_handler_context_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-request-handler-context-server
 title: "@kbn/core-http-request-handler-context-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-request-handler-context-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-request-handler-context-server']
 ---
 import kbnCoreHttpRequestHandlerContextServerObj from './kbn_core_http_request_handler_context_server.devdocs.json';
diff --git a/api_docs/kbn_core_http_resources_server.mdx b/api_docs/kbn_core_http_resources_server.mdx
index 35b029295c88a..15d62f1afa04a 100644
--- a/api_docs/kbn_core_http_resources_server.mdx
+++ b/api_docs/kbn_core_http_resources_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-resources-server
 title: "@kbn/core-http-resources-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-resources-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-resources-server']
 ---
 import kbnCoreHttpResourcesServerObj from './kbn_core_http_resources_server.devdocs.json';
diff --git a/api_docs/kbn_core_http_resources_server_internal.mdx b/api_docs/kbn_core_http_resources_server_internal.mdx
index 0064704c524f7..753a64b907940 100644
--- a/api_docs/kbn_core_http_resources_server_internal.mdx
+++ b/api_docs/kbn_core_http_resources_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-resources-server-internal
 title: "@kbn/core-http-resources-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-resources-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-resources-server-internal']
 ---
 import kbnCoreHttpResourcesServerInternalObj from './kbn_core_http_resources_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_http_resources_server_mocks.mdx b/api_docs/kbn_core_http_resources_server_mocks.mdx
index ac43fb7e82ffc..af0d51dc7dcb2 100644
--- a/api_docs/kbn_core_http_resources_server_mocks.mdx
+++ b/api_docs/kbn_core_http_resources_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-resources-server-mocks
 title: "@kbn/core-http-resources-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-resources-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-resources-server-mocks']
 ---
 import kbnCoreHttpResourcesServerMocksObj from './kbn_core_http_resources_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_http_router_server_internal.mdx b/api_docs/kbn_core_http_router_server_internal.mdx
index 3acf14a21fdfb..b18c188eb87ba 100644
--- a/api_docs/kbn_core_http_router_server_internal.mdx
+++ b/api_docs/kbn_core_http_router_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-router-server-internal
 title: "@kbn/core-http-router-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-router-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-router-server-internal']
 ---
 import kbnCoreHttpRouterServerInternalObj from './kbn_core_http_router_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_http_router_server_mocks.mdx b/api_docs/kbn_core_http_router_server_mocks.mdx
index 8cb95d181376b..ce5cbd31fa38c 100644
--- a/api_docs/kbn_core_http_router_server_mocks.mdx
+++ b/api_docs/kbn_core_http_router_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-router-server-mocks
 title: "@kbn/core-http-router-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-router-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-router-server-mocks']
 ---
 import kbnCoreHttpRouterServerMocksObj from './kbn_core_http_router_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_http_server.mdx b/api_docs/kbn_core_http_server.mdx
index b9282cf2c5cc4..edea32f36d0a3 100644
--- a/api_docs/kbn_core_http_server.mdx
+++ b/api_docs/kbn_core_http_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-server
 title: "@kbn/core-http-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-server']
 ---
 import kbnCoreHttpServerObj from './kbn_core_http_server.devdocs.json';
diff --git a/api_docs/kbn_core_http_server_internal.mdx b/api_docs/kbn_core_http_server_internal.mdx
index 6b9719e5fe08e..7f9c6838f648f 100644
--- a/api_docs/kbn_core_http_server_internal.mdx
+++ b/api_docs/kbn_core_http_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-server-internal
 title: "@kbn/core-http-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-server-internal']
 ---
 import kbnCoreHttpServerInternalObj from './kbn_core_http_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_http_server_mocks.mdx b/api_docs/kbn_core_http_server_mocks.mdx
index c9abe3268ff3e..8f98589ac9bb2 100644
--- a/api_docs/kbn_core_http_server_mocks.mdx
+++ b/api_docs/kbn_core_http_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-server-mocks
 title: "@kbn/core-http-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-server-mocks']
 ---
 import kbnCoreHttpServerMocksObj from './kbn_core_http_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_i18n_browser.mdx b/api_docs/kbn_core_i18n_browser.mdx
index bf69c5ce0ced0..48717a4928ceb 100644
--- a/api_docs/kbn_core_i18n_browser.mdx
+++ b/api_docs/kbn_core_i18n_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-browser
 title: "@kbn/core-i18n-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-browser plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-browser']
 ---
 import kbnCoreI18nBrowserObj from './kbn_core_i18n_browser.devdocs.json';
diff --git a/api_docs/kbn_core_i18n_browser_mocks.mdx b/api_docs/kbn_core_i18n_browser_mocks.mdx
index ced2f59a04bc6..91c88b93b9899 100644
--- a/api_docs/kbn_core_i18n_browser_mocks.mdx
+++ b/api_docs/kbn_core_i18n_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-browser-mocks
 title: "@kbn/core-i18n-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-browser-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-browser-mocks']
 ---
 import kbnCoreI18nBrowserMocksObj from './kbn_core_i18n_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_i18n_server.mdx b/api_docs/kbn_core_i18n_server.mdx
index 3fb1ad0fbd480..dfd6759f82c3e 100644
--- a/api_docs/kbn_core_i18n_server.mdx
+++ b/api_docs/kbn_core_i18n_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-server
 title: "@kbn/core-i18n-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-server']
 ---
 import kbnCoreI18nServerObj from './kbn_core_i18n_server.devdocs.json';
diff --git a/api_docs/kbn_core_i18n_server_internal.mdx b/api_docs/kbn_core_i18n_server_internal.mdx
index b15078d9792e1..2fb875c29aedb 100644
--- a/api_docs/kbn_core_i18n_server_internal.mdx
+++ b/api_docs/kbn_core_i18n_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-server-internal
 title: "@kbn/core-i18n-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-server-internal']
 ---
 import kbnCoreI18nServerInternalObj from './kbn_core_i18n_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_i18n_server_mocks.mdx b/api_docs/kbn_core_i18n_server_mocks.mdx
index 25a5f3a2ca0a2..d7374f1d2ea55 100644
--- a/api_docs/kbn_core_i18n_server_mocks.mdx
+++ b/api_docs/kbn_core_i18n_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-server-mocks
 title: "@kbn/core-i18n-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-server-mocks']
 ---
 import kbnCoreI18nServerMocksObj from './kbn_core_i18n_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_injected_metadata_browser_mocks.mdx b/api_docs/kbn_core_injected_metadata_browser_mocks.mdx
index fc7ff72335b58..106e6b27d00fb 100644
--- a/api_docs/kbn_core_injected_metadata_browser_mocks.mdx
+++ b/api_docs/kbn_core_injected_metadata_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-injected-metadata-browser-mocks
 title: "@kbn/core-injected-metadata-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-injected-metadata-browser-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-injected-metadata-browser-mocks']
 ---
 import kbnCoreInjectedMetadataBrowserMocksObj from './kbn_core_injected_metadata_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_integrations_browser_internal.mdx b/api_docs/kbn_core_integrations_browser_internal.mdx
index 1ee295744c671..6c8f8c341950d 100644
--- a/api_docs/kbn_core_integrations_browser_internal.mdx
+++ b/api_docs/kbn_core_integrations_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-integrations-browser-internal
 title: "@kbn/core-integrations-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-integrations-browser-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-integrations-browser-internal']
 ---
 import kbnCoreIntegrationsBrowserInternalObj from './kbn_core_integrations_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_integrations_browser_mocks.mdx b/api_docs/kbn_core_integrations_browser_mocks.mdx
index 6cfe8aed78427..b753450d5d6ce 100644
--- a/api_docs/kbn_core_integrations_browser_mocks.mdx
+++ b/api_docs/kbn_core_integrations_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-integrations-browser-mocks
 title: "@kbn/core-integrations-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-integrations-browser-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-integrations-browser-mocks']
 ---
 import kbnCoreIntegrationsBrowserMocksObj from './kbn_core_integrations_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_lifecycle_browser.mdx b/api_docs/kbn_core_lifecycle_browser.mdx
index 1921f2d7981df..3a36ca3942e7a 100644
--- a/api_docs/kbn_core_lifecycle_browser.mdx
+++ b/api_docs/kbn_core_lifecycle_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-lifecycle-browser
 title: "@kbn/core-lifecycle-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-lifecycle-browser plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-lifecycle-browser']
 ---
 import kbnCoreLifecycleBrowserObj from './kbn_core_lifecycle_browser.devdocs.json';
diff --git a/api_docs/kbn_core_lifecycle_browser_mocks.mdx b/api_docs/kbn_core_lifecycle_browser_mocks.mdx
index 99b286b50fd86..475eb48ccbccb 100644
--- a/api_docs/kbn_core_lifecycle_browser_mocks.mdx
+++ b/api_docs/kbn_core_lifecycle_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-lifecycle-browser-mocks
 title: "@kbn/core-lifecycle-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-lifecycle-browser-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-lifecycle-browser-mocks']
 ---
 import kbnCoreLifecycleBrowserMocksObj from './kbn_core_lifecycle_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_lifecycle_server.mdx b/api_docs/kbn_core_lifecycle_server.mdx
index 2899d24f85f98..0ef4bf8d43a32 100644
--- a/api_docs/kbn_core_lifecycle_server.mdx
+++ b/api_docs/kbn_core_lifecycle_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-lifecycle-server
 title: "@kbn/core-lifecycle-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-lifecycle-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-lifecycle-server']
 ---
 import kbnCoreLifecycleServerObj from './kbn_core_lifecycle_server.devdocs.json';
diff --git a/api_docs/kbn_core_lifecycle_server_mocks.mdx b/api_docs/kbn_core_lifecycle_server_mocks.mdx
index d45cec86f6c29..3649461b7c5a6 100644
--- a/api_docs/kbn_core_lifecycle_server_mocks.mdx
+++ b/api_docs/kbn_core_lifecycle_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-lifecycle-server-mocks
 title: "@kbn/core-lifecycle-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-lifecycle-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-lifecycle-server-mocks']
 ---
 import kbnCoreLifecycleServerMocksObj from './kbn_core_lifecycle_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_logging_browser_mocks.mdx b/api_docs/kbn_core_logging_browser_mocks.mdx
index 1ce36deed650a..052bf0ba74258 100644
--- a/api_docs/kbn_core_logging_browser_mocks.mdx
+++ b/api_docs/kbn_core_logging_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-browser-mocks
 title: "@kbn/core-logging-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-browser-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-browser-mocks']
 ---
 import kbnCoreLoggingBrowserMocksObj from './kbn_core_logging_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_logging_common_internal.mdx b/api_docs/kbn_core_logging_common_internal.mdx
index 0440a99935453..07e96d1422f6a 100644
--- a/api_docs/kbn_core_logging_common_internal.mdx
+++ b/api_docs/kbn_core_logging_common_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-common-internal
 title: "@kbn/core-logging-common-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-common-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-common-internal']
 ---
 import kbnCoreLoggingCommonInternalObj from './kbn_core_logging_common_internal.devdocs.json';
diff --git a/api_docs/kbn_core_logging_server.mdx b/api_docs/kbn_core_logging_server.mdx
index e61272d2b8f3c..ce0ac13ded0d6 100644
--- a/api_docs/kbn_core_logging_server.mdx
+++ b/api_docs/kbn_core_logging_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-server
 title: "@kbn/core-logging-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-server']
 ---
 import kbnCoreLoggingServerObj from './kbn_core_logging_server.devdocs.json';
diff --git a/api_docs/kbn_core_logging_server_internal.mdx b/api_docs/kbn_core_logging_server_internal.mdx
index d441fba7df7e0..55bed0b817434 100644
--- a/api_docs/kbn_core_logging_server_internal.mdx
+++ b/api_docs/kbn_core_logging_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-server-internal
 title: "@kbn/core-logging-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-server-internal']
 ---
 import kbnCoreLoggingServerInternalObj from './kbn_core_logging_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_logging_server_mocks.mdx b/api_docs/kbn_core_logging_server_mocks.mdx
index 3d9fb1ec20a50..1425aa6b5cd5d 100644
--- a/api_docs/kbn_core_logging_server_mocks.mdx
+++ b/api_docs/kbn_core_logging_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-server-mocks
 title: "@kbn/core-logging-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-server-mocks']
 ---
 import kbnCoreLoggingServerMocksObj from './kbn_core_logging_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_metrics_collectors_server_internal.mdx b/api_docs/kbn_core_metrics_collectors_server_internal.mdx
index b1d5addb6e328..6e0c42f2ccb83 100644
--- a/api_docs/kbn_core_metrics_collectors_server_internal.mdx
+++ b/api_docs/kbn_core_metrics_collectors_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-collectors-server-internal
 title: "@kbn/core-metrics-collectors-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-collectors-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-collectors-server-internal']
 ---
 import kbnCoreMetricsCollectorsServerInternalObj from './kbn_core_metrics_collectors_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_metrics_collectors_server_mocks.mdx b/api_docs/kbn_core_metrics_collectors_server_mocks.mdx
index 6a39200864922..5cac745fb95e6 100644
--- a/api_docs/kbn_core_metrics_collectors_server_mocks.mdx
+++ b/api_docs/kbn_core_metrics_collectors_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-collectors-server-mocks
 title: "@kbn/core-metrics-collectors-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-collectors-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-collectors-server-mocks']
 ---
 import kbnCoreMetricsCollectorsServerMocksObj from './kbn_core_metrics_collectors_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_metrics_server.mdx b/api_docs/kbn_core_metrics_server.mdx
index 9fc468eed40ba..8b0e0e1d6c1ca 100644
--- a/api_docs/kbn_core_metrics_server.mdx
+++ b/api_docs/kbn_core_metrics_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-server
 title: "@kbn/core-metrics-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-server']
 ---
 import kbnCoreMetricsServerObj from './kbn_core_metrics_server.devdocs.json';
diff --git a/api_docs/kbn_core_metrics_server_internal.mdx b/api_docs/kbn_core_metrics_server_internal.mdx
index 21fb4380378b4..1c31017866648 100644
--- a/api_docs/kbn_core_metrics_server_internal.mdx
+++ b/api_docs/kbn_core_metrics_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-server-internal
 title: "@kbn/core-metrics-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-server-internal']
 ---
 import kbnCoreMetricsServerInternalObj from './kbn_core_metrics_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_metrics_server_mocks.mdx b/api_docs/kbn_core_metrics_server_mocks.mdx
index c8492f5909518..768a293980d04 100644
--- a/api_docs/kbn_core_metrics_server_mocks.mdx
+++ b/api_docs/kbn_core_metrics_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-server-mocks
 title: "@kbn/core-metrics-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-server-mocks']
 ---
 import kbnCoreMetricsServerMocksObj from './kbn_core_metrics_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_mount_utils_browser.mdx b/api_docs/kbn_core_mount_utils_browser.mdx
index 22cb2ce1146b2..48dc25bf2cf39 100644
--- a/api_docs/kbn_core_mount_utils_browser.mdx
+++ b/api_docs/kbn_core_mount_utils_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-mount-utils-browser
 title: "@kbn/core-mount-utils-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-mount-utils-browser plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-mount-utils-browser']
 ---
 import kbnCoreMountUtilsBrowserObj from './kbn_core_mount_utils_browser.devdocs.json';
diff --git a/api_docs/kbn_core_node_server.mdx b/api_docs/kbn_core_node_server.mdx
index 3a1fd042efd8b..9fb1afd0b61fb 100644
--- a/api_docs/kbn_core_node_server.mdx
+++ b/api_docs/kbn_core_node_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-node-server
 title: "@kbn/core-node-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-node-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-node-server']
 ---
 import kbnCoreNodeServerObj from './kbn_core_node_server.devdocs.json';
diff --git a/api_docs/kbn_core_node_server_internal.mdx b/api_docs/kbn_core_node_server_internal.mdx
index 86ab31ae15db5..55ae8a712881b 100644
--- a/api_docs/kbn_core_node_server_internal.mdx
+++ b/api_docs/kbn_core_node_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-node-server-internal
 title: "@kbn/core-node-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-node-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-node-server-internal']
 ---
 import kbnCoreNodeServerInternalObj from './kbn_core_node_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_node_server_mocks.mdx b/api_docs/kbn_core_node_server_mocks.mdx
index ebf5d96d68d32..63681b4273d7a 100644
--- a/api_docs/kbn_core_node_server_mocks.mdx
+++ b/api_docs/kbn_core_node_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-node-server-mocks
 title: "@kbn/core-node-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-node-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-node-server-mocks']
 ---
 import kbnCoreNodeServerMocksObj from './kbn_core_node_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_notifications_browser.mdx b/api_docs/kbn_core_notifications_browser.mdx
index ca32afc17128c..20ab26c0bc749 100644
--- a/api_docs/kbn_core_notifications_browser.mdx
+++ b/api_docs/kbn_core_notifications_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-notifications-browser
 title: "@kbn/core-notifications-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-notifications-browser plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-notifications-browser']
 ---
 import kbnCoreNotificationsBrowserObj from './kbn_core_notifications_browser.devdocs.json';
diff --git a/api_docs/kbn_core_notifications_browser_internal.mdx b/api_docs/kbn_core_notifications_browser_internal.mdx
index c1b9cd2cb048d..d824c45cc7aac 100644
--- a/api_docs/kbn_core_notifications_browser_internal.mdx
+++ b/api_docs/kbn_core_notifications_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-notifications-browser-internal
 title: "@kbn/core-notifications-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-notifications-browser-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-notifications-browser-internal']
 ---
 import kbnCoreNotificationsBrowserInternalObj from './kbn_core_notifications_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_notifications_browser_mocks.mdx b/api_docs/kbn_core_notifications_browser_mocks.mdx
index c19f99c51a76b..82241455ede13 100644
--- a/api_docs/kbn_core_notifications_browser_mocks.mdx
+++ b/api_docs/kbn_core_notifications_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-notifications-browser-mocks
 title: "@kbn/core-notifications-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-notifications-browser-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-notifications-browser-mocks']
 ---
 import kbnCoreNotificationsBrowserMocksObj from './kbn_core_notifications_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_overlays_browser.mdx b/api_docs/kbn_core_overlays_browser.mdx
index 85299008590c8..bd6e525f0fb93 100644
--- a/api_docs/kbn_core_overlays_browser.mdx
+++ b/api_docs/kbn_core_overlays_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-overlays-browser
 title: "@kbn/core-overlays-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-overlays-browser plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-overlays-browser']
 ---
 import kbnCoreOverlaysBrowserObj from './kbn_core_overlays_browser.devdocs.json';
diff --git a/api_docs/kbn_core_overlays_browser_internal.mdx b/api_docs/kbn_core_overlays_browser_internal.mdx
index 1df34a6718024..023c363df1f90 100644
--- a/api_docs/kbn_core_overlays_browser_internal.mdx
+++ b/api_docs/kbn_core_overlays_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-overlays-browser-internal
 title: "@kbn/core-overlays-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-overlays-browser-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-overlays-browser-internal']
 ---
 import kbnCoreOverlaysBrowserInternalObj from './kbn_core_overlays_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_overlays_browser_mocks.mdx b/api_docs/kbn_core_overlays_browser_mocks.mdx
index 7f7318e1e7bbe..82863e8d7c246 100644
--- a/api_docs/kbn_core_overlays_browser_mocks.mdx
+++ b/api_docs/kbn_core_overlays_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-overlays-browser-mocks
 title: "@kbn/core-overlays-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-overlays-browser-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-overlays-browser-mocks']
 ---
 import kbnCoreOverlaysBrowserMocksObj from './kbn_core_overlays_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_plugins_browser.mdx b/api_docs/kbn_core_plugins_browser.mdx
index 3787319cb72ac..79c15731be923 100644
--- a/api_docs/kbn_core_plugins_browser.mdx
+++ b/api_docs/kbn_core_plugins_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-browser
 title: "@kbn/core-plugins-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-browser plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-browser']
 ---
 import kbnCorePluginsBrowserObj from './kbn_core_plugins_browser.devdocs.json';
diff --git a/api_docs/kbn_core_plugins_browser_mocks.mdx b/api_docs/kbn_core_plugins_browser_mocks.mdx
index d0cc0e312d275..98c3abd58f3a3 100644
--- a/api_docs/kbn_core_plugins_browser_mocks.mdx
+++ b/api_docs/kbn_core_plugins_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-browser-mocks
 title: "@kbn/core-plugins-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-browser-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-browser-mocks']
 ---
 import kbnCorePluginsBrowserMocksObj from './kbn_core_plugins_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_plugins_server.mdx b/api_docs/kbn_core_plugins_server.mdx
index 4accc1effb67b..186767ae5b0ca 100644
--- a/api_docs/kbn_core_plugins_server.mdx
+++ b/api_docs/kbn_core_plugins_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-server
 title: "@kbn/core-plugins-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-server']
 ---
 import kbnCorePluginsServerObj from './kbn_core_plugins_server.devdocs.json';
diff --git a/api_docs/kbn_core_plugins_server_mocks.mdx b/api_docs/kbn_core_plugins_server_mocks.mdx
index dc7ada51253ea..5c1c91d0d9180 100644
--- a/api_docs/kbn_core_plugins_server_mocks.mdx
+++ b/api_docs/kbn_core_plugins_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-server-mocks
 title: "@kbn/core-plugins-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-server-mocks']
 ---
 import kbnCorePluginsServerMocksObj from './kbn_core_plugins_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_preboot_server.mdx b/api_docs/kbn_core_preboot_server.mdx
index 3a0e3a2d07668..3fccd50f19133 100644
--- a/api_docs/kbn_core_preboot_server.mdx
+++ b/api_docs/kbn_core_preboot_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-preboot-server
 title: "@kbn/core-preboot-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-preboot-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-preboot-server']
 ---
 import kbnCorePrebootServerObj from './kbn_core_preboot_server.devdocs.json';
diff --git a/api_docs/kbn_core_preboot_server_mocks.mdx b/api_docs/kbn_core_preboot_server_mocks.mdx
index f07d5958f5ee7..5fa6b166396df 100644
--- a/api_docs/kbn_core_preboot_server_mocks.mdx
+++ b/api_docs/kbn_core_preboot_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-preboot-server-mocks
 title: "@kbn/core-preboot-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-preboot-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-preboot-server-mocks']
 ---
 import kbnCorePrebootServerMocksObj from './kbn_core_preboot_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_rendering_browser_mocks.mdx b/api_docs/kbn_core_rendering_browser_mocks.mdx
index 33fd78a2fd135..91c5d2eaf7349 100644
--- a/api_docs/kbn_core_rendering_browser_mocks.mdx
+++ b/api_docs/kbn_core_rendering_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-rendering-browser-mocks
 title: "@kbn/core-rendering-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-rendering-browser-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-rendering-browser-mocks']
 ---
 import kbnCoreRenderingBrowserMocksObj from './kbn_core_rendering_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_rendering_server_internal.mdx b/api_docs/kbn_core_rendering_server_internal.mdx
index 6d6fa4111b0d4..1181c8e829960 100644
--- a/api_docs/kbn_core_rendering_server_internal.mdx
+++ b/api_docs/kbn_core_rendering_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-rendering-server-internal
 title: "@kbn/core-rendering-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-rendering-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-rendering-server-internal']
 ---
 import kbnCoreRenderingServerInternalObj from './kbn_core_rendering_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_rendering_server_mocks.mdx b/api_docs/kbn_core_rendering_server_mocks.mdx
index b2fa6c7df66e6..541950376bd3a 100644
--- a/api_docs/kbn_core_rendering_server_mocks.mdx
+++ b/api_docs/kbn_core_rendering_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-rendering-server-mocks
 title: "@kbn/core-rendering-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-rendering-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-rendering-server-mocks']
 ---
 import kbnCoreRenderingServerMocksObj from './kbn_core_rendering_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_root_server_internal.mdx b/api_docs/kbn_core_root_server_internal.mdx
index e51f7a895dd7d..515e475f7ea60 100644
--- a/api_docs/kbn_core_root_server_internal.mdx
+++ b/api_docs/kbn_core_root_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-root-server-internal
 title: "@kbn/core-root-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-root-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-root-server-internal']
 ---
 import kbnCoreRootServerInternalObj from './kbn_core_root_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_api_browser.mdx b/api_docs/kbn_core_saved_objects_api_browser.mdx
index c933f2d88e056..bbb5648505e86 100644
--- a/api_docs/kbn_core_saved_objects_api_browser.mdx
+++ b/api_docs/kbn_core_saved_objects_api_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-browser
 title: "@kbn/core-saved-objects-api-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-api-browser plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-api-browser']
 ---
 import kbnCoreSavedObjectsApiBrowserObj from './kbn_core_saved_objects_api_browser.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_api_server.mdx b/api_docs/kbn_core_saved_objects_api_server.mdx
index bc6057ff8197f..80723a578e801 100644
--- a/api_docs/kbn_core_saved_objects_api_server.mdx
+++ b/api_docs/kbn_core_saved_objects_api_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-server
 title: "@kbn/core-saved-objects-api-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-api-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-api-server']
 ---
 import kbnCoreSavedObjectsApiServerObj from './kbn_core_saved_objects_api_server.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_api_server_internal.mdx b/api_docs/kbn_core_saved_objects_api_server_internal.mdx
index 2a1c53c28631e..364e3d6c2e0d0 100644
--- a/api_docs/kbn_core_saved_objects_api_server_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_api_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-server-internal
 title: "@kbn/core-saved-objects-api-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-api-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-api-server-internal']
 ---
 import kbnCoreSavedObjectsApiServerInternalObj from './kbn_core_saved_objects_api_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_api_server_mocks.mdx b/api_docs/kbn_core_saved_objects_api_server_mocks.mdx
index adef2a71d375a..9b2c6c049793a 100644
--- a/api_docs/kbn_core_saved_objects_api_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_api_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-server-mocks
 title: "@kbn/core-saved-objects-api-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-api-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-api-server-mocks']
 ---
 import kbnCoreSavedObjectsApiServerMocksObj from './kbn_core_saved_objects_api_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_base_server_internal.mdx b/api_docs/kbn_core_saved_objects_base_server_internal.mdx
index 20ccc6c58b0e3..2dbf03e97e737 100644
--- a/api_docs/kbn_core_saved_objects_base_server_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_base_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-base-server-internal
 title: "@kbn/core-saved-objects-base-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-base-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-base-server-internal']
 ---
 import kbnCoreSavedObjectsBaseServerInternalObj from './kbn_core_saved_objects_base_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_base_server_mocks.mdx b/api_docs/kbn_core_saved_objects_base_server_mocks.mdx
index 6faaed1ffe963..784bad9b0340a 100644
--- a/api_docs/kbn_core_saved_objects_base_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_base_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-base-server-mocks
 title: "@kbn/core-saved-objects-base-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-base-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-base-server-mocks']
 ---
 import kbnCoreSavedObjectsBaseServerMocksObj from './kbn_core_saved_objects_base_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_browser.devdocs.json b/api_docs/kbn_core_saved_objects_browser.devdocs.json
index b7d377b2da608..1a9ced3fa1030 100644
--- a/api_docs/kbn_core_saved_objects_browser.devdocs.json
+++ b/api_docs/kbn_core_saved_objects_browser.devdocs.json
@@ -89,14 +89,6 @@
             "plugin": "lens",
             "path": "x-pack/plugins/lens/public/app_plugin/types.ts"
           },
-          {
-            "plugin": "observability",
-            "path": "x-pack/plugins/observability/public/application/types.ts"
-          },
-          {
-            "plugin": "observability",
-            "path": "x-pack/plugins/observability/public/application/types.ts"
-          },
           {
             "plugin": "exploratoryView",
             "path": "x-pack/plugins/exploratory_view/public/application/types.ts"
@@ -105,6 +97,14 @@
             "plugin": "exploratoryView",
             "path": "x-pack/plugins/exploratory_view/public/application/types.ts"
           },
+          {
+            "plugin": "observability",
+            "path": "x-pack/plugins/observability/public/application/types.ts"
+          },
+          {
+            "plugin": "observability",
+            "path": "x-pack/plugins/observability/public/application/types.ts"
+          },
           {
             "plugin": "canvas",
             "path": "x-pack/plugins/canvas/public/services/platform.ts"
diff --git a/api_docs/kbn_core_saved_objects_browser.mdx b/api_docs/kbn_core_saved_objects_browser.mdx
index 79d10e9f12bb2..ac17cc0f50ddc 100644
--- a/api_docs/kbn_core_saved_objects_browser.mdx
+++ b/api_docs/kbn_core_saved_objects_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-browser
 title: "@kbn/core-saved-objects-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-browser plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-browser']
 ---
 import kbnCoreSavedObjectsBrowserObj from './kbn_core_saved_objects_browser.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_browser_internal.mdx b/api_docs/kbn_core_saved_objects_browser_internal.mdx
index 2c587119409cf..35eb402d34bad 100644
--- a/api_docs/kbn_core_saved_objects_browser_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-browser-internal
 title: "@kbn/core-saved-objects-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-browser-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-browser-internal']
 ---
 import kbnCoreSavedObjectsBrowserInternalObj from './kbn_core_saved_objects_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_browser_mocks.mdx b/api_docs/kbn_core_saved_objects_browser_mocks.mdx
index 97d7ea86b6137..655b42e41a076 100644
--- a/api_docs/kbn_core_saved_objects_browser_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-browser-mocks
 title: "@kbn/core-saved-objects-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-browser-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-browser-mocks']
 ---
 import kbnCoreSavedObjectsBrowserMocksObj from './kbn_core_saved_objects_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_common.mdx b/api_docs/kbn_core_saved_objects_common.mdx
index 3783c6ead532a..6aa791f02b305 100644
--- a/api_docs/kbn_core_saved_objects_common.mdx
+++ b/api_docs/kbn_core_saved_objects_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-common
 title: "@kbn/core-saved-objects-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-common plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-common']
 ---
 import kbnCoreSavedObjectsCommonObj from './kbn_core_saved_objects_common.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx b/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx
index a75d12fdd58ca..ef9c2eee7dda8 100644
--- a/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-import-export-server-internal
 title: "@kbn/core-saved-objects-import-export-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-import-export-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-import-export-server-internal']
 ---
 import kbnCoreSavedObjectsImportExportServerInternalObj from './kbn_core_saved_objects_import_export_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx b/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx
index d8b3a4d217c3a..9c2ac13d123a4 100644
--- a/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-import-export-server-mocks
 title: "@kbn/core-saved-objects-import-export-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-import-export-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-import-export-server-mocks']
 ---
 import kbnCoreSavedObjectsImportExportServerMocksObj from './kbn_core_saved_objects_import_export_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_migration_server_internal.mdx b/api_docs/kbn_core_saved_objects_migration_server_internal.mdx
index 9eb556d39981e..9211f55ae686f 100644
--- a/api_docs/kbn_core_saved_objects_migration_server_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_migration_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-migration-server-internal
 title: "@kbn/core-saved-objects-migration-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-migration-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-migration-server-internal']
 ---
 import kbnCoreSavedObjectsMigrationServerInternalObj from './kbn_core_saved_objects_migration_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx b/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx
index 56b4cfe2ecd4c..6ab358dddacee 100644
--- a/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-migration-server-mocks
 title: "@kbn/core-saved-objects-migration-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-migration-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-migration-server-mocks']
 ---
 import kbnCoreSavedObjectsMigrationServerMocksObj from './kbn_core_saved_objects_migration_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_server.mdx b/api_docs/kbn_core_saved_objects_server.mdx
index a48fa96e1fbb5..0ab1681109f8b 100644
--- a/api_docs/kbn_core_saved_objects_server.mdx
+++ b/api_docs/kbn_core_saved_objects_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-server
 title: "@kbn/core-saved-objects-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-server']
 ---
 import kbnCoreSavedObjectsServerObj from './kbn_core_saved_objects_server.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_server_internal.mdx b/api_docs/kbn_core_saved_objects_server_internal.mdx
index 133a501912d9c..2bfef7896ed9e 100644
--- a/api_docs/kbn_core_saved_objects_server_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-server-internal
 title: "@kbn/core-saved-objects-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-server-internal']
 ---
 import kbnCoreSavedObjectsServerInternalObj from './kbn_core_saved_objects_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_server_mocks.mdx b/api_docs/kbn_core_saved_objects_server_mocks.mdx
index e8baf46b04b57..5969fa3fec42b 100644
--- a/api_docs/kbn_core_saved_objects_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-server-mocks
 title: "@kbn/core-saved-objects-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-server-mocks']
 ---
 import kbnCoreSavedObjectsServerMocksObj from './kbn_core_saved_objects_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_utils_server.mdx b/api_docs/kbn_core_saved_objects_utils_server.mdx
index 7be39b3ddfd27..f03b52f175605 100644
--- a/api_docs/kbn_core_saved_objects_utils_server.mdx
+++ b/api_docs/kbn_core_saved_objects_utils_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-utils-server
 title: "@kbn/core-saved-objects-utils-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-utils-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-utils-server']
 ---
 import kbnCoreSavedObjectsUtilsServerObj from './kbn_core_saved_objects_utils_server.devdocs.json';
diff --git a/api_docs/kbn_core_status_common.mdx b/api_docs/kbn_core_status_common.mdx
index b43a1574290d7..98e14db6a9771 100644
--- a/api_docs/kbn_core_status_common.mdx
+++ b/api_docs/kbn_core_status_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-common
 title: "@kbn/core-status-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-common plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-common']
 ---
 import kbnCoreStatusCommonObj from './kbn_core_status_common.devdocs.json';
diff --git a/api_docs/kbn_core_status_common_internal.mdx b/api_docs/kbn_core_status_common_internal.mdx
index ff765eefc4403..138054ebf6074 100644
--- a/api_docs/kbn_core_status_common_internal.mdx
+++ b/api_docs/kbn_core_status_common_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-common-internal
 title: "@kbn/core-status-common-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-common-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-common-internal']
 ---
 import kbnCoreStatusCommonInternalObj from './kbn_core_status_common_internal.devdocs.json';
diff --git a/api_docs/kbn_core_status_server.mdx b/api_docs/kbn_core_status_server.mdx
index 71b5c9ad74a7d..cec848d089f1a 100644
--- a/api_docs/kbn_core_status_server.mdx
+++ b/api_docs/kbn_core_status_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-server
 title: "@kbn/core-status-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-server']
 ---
 import kbnCoreStatusServerObj from './kbn_core_status_server.devdocs.json';
diff --git a/api_docs/kbn_core_status_server_internal.mdx b/api_docs/kbn_core_status_server_internal.mdx
index 6bf95189f71e7..6dd568e68595b 100644
--- a/api_docs/kbn_core_status_server_internal.mdx
+++ b/api_docs/kbn_core_status_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-server-internal
 title: "@kbn/core-status-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-server-internal']
 ---
 import kbnCoreStatusServerInternalObj from './kbn_core_status_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_status_server_mocks.mdx b/api_docs/kbn_core_status_server_mocks.mdx
index 1ba66cbcba441..b1b3f3c84cf7f 100644
--- a/api_docs/kbn_core_status_server_mocks.mdx
+++ b/api_docs/kbn_core_status_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-server-mocks
 title: "@kbn/core-status-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-server-mocks']
 ---
 import kbnCoreStatusServerMocksObj from './kbn_core_status_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_test_helpers_deprecations_getters.mdx b/api_docs/kbn_core_test_helpers_deprecations_getters.mdx
index 1265fd8c4c41c..b9e2efa25823f 100644
--- a/api_docs/kbn_core_test_helpers_deprecations_getters.mdx
+++ b/api_docs/kbn_core_test_helpers_deprecations_getters.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-deprecations-getters
 title: "@kbn/core-test-helpers-deprecations-getters"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-deprecations-getters plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-deprecations-getters']
 ---
 import kbnCoreTestHelpersDeprecationsGettersObj from './kbn_core_test_helpers_deprecations_getters.devdocs.json';
diff --git a/api_docs/kbn_core_test_helpers_http_setup_browser.mdx b/api_docs/kbn_core_test_helpers_http_setup_browser.mdx
index e42ae9f1452a9..d89c14bb7d6f3 100644
--- a/api_docs/kbn_core_test_helpers_http_setup_browser.mdx
+++ b/api_docs/kbn_core_test_helpers_http_setup_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-http-setup-browser
 title: "@kbn/core-test-helpers-http-setup-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-http-setup-browser plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-http-setup-browser']
 ---
 import kbnCoreTestHelpersHttpSetupBrowserObj from './kbn_core_test_helpers_http_setup_browser.devdocs.json';
diff --git a/api_docs/kbn_core_test_helpers_kbn_server.mdx b/api_docs/kbn_core_test_helpers_kbn_server.mdx
index d818c868e946a..8bba1c8faaadd 100644
--- a/api_docs/kbn_core_test_helpers_kbn_server.mdx
+++ b/api_docs/kbn_core_test_helpers_kbn_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-kbn-server
 title: "@kbn/core-test-helpers-kbn-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-kbn-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-kbn-server']
 ---
 import kbnCoreTestHelpersKbnServerObj from './kbn_core_test_helpers_kbn_server.devdocs.json';
diff --git a/api_docs/kbn_core_test_helpers_so_type_serializer.mdx b/api_docs/kbn_core_test_helpers_so_type_serializer.mdx
index 4e19bbc6dda04..9e3173f339a99 100644
--- a/api_docs/kbn_core_test_helpers_so_type_serializer.mdx
+++ b/api_docs/kbn_core_test_helpers_so_type_serializer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-so-type-serializer
 title: "@kbn/core-test-helpers-so-type-serializer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-so-type-serializer plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-so-type-serializer']
 ---
 import kbnCoreTestHelpersSoTypeSerializerObj from './kbn_core_test_helpers_so_type_serializer.devdocs.json';
diff --git a/api_docs/kbn_core_test_helpers_test_utils.mdx b/api_docs/kbn_core_test_helpers_test_utils.mdx
index 45a40df59f54c..737f37c0f6807 100644
--- a/api_docs/kbn_core_test_helpers_test_utils.mdx
+++ b/api_docs/kbn_core_test_helpers_test_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-test-utils
 title: "@kbn/core-test-helpers-test-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-test-utils plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-test-utils']
 ---
 import kbnCoreTestHelpersTestUtilsObj from './kbn_core_test_helpers_test_utils.devdocs.json';
diff --git a/api_docs/kbn_core_theme_browser.mdx b/api_docs/kbn_core_theme_browser.mdx
index c917ce6f4508a..8af892b1926aa 100644
--- a/api_docs/kbn_core_theme_browser.mdx
+++ b/api_docs/kbn_core_theme_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-theme-browser
 title: "@kbn/core-theme-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-theme-browser plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-theme-browser']
 ---
 import kbnCoreThemeBrowserObj from './kbn_core_theme_browser.devdocs.json';
diff --git a/api_docs/kbn_core_theme_browser_internal.mdx b/api_docs/kbn_core_theme_browser_internal.mdx
index bf7ca3a681be8..ec571030356a6 100644
--- a/api_docs/kbn_core_theme_browser_internal.mdx
+++ b/api_docs/kbn_core_theme_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-theme-browser-internal
 title: "@kbn/core-theme-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-theme-browser-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-theme-browser-internal']
 ---
 import kbnCoreThemeBrowserInternalObj from './kbn_core_theme_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_theme_browser_mocks.mdx b/api_docs/kbn_core_theme_browser_mocks.mdx
index 9f99419f85f7e..2334b44813bba 100644
--- a/api_docs/kbn_core_theme_browser_mocks.mdx
+++ b/api_docs/kbn_core_theme_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-theme-browser-mocks
 title: "@kbn/core-theme-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-theme-browser-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-theme-browser-mocks']
 ---
 import kbnCoreThemeBrowserMocksObj from './kbn_core_theme_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_browser.mdx b/api_docs/kbn_core_ui_settings_browser.mdx
index 676be86e74cdd..cdb58a7f10ff6 100644
--- a/api_docs/kbn_core_ui_settings_browser.mdx
+++ b/api_docs/kbn_core_ui_settings_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-browser
 title: "@kbn/core-ui-settings-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-browser plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-browser']
 ---
 import kbnCoreUiSettingsBrowserObj from './kbn_core_ui_settings_browser.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_browser_internal.mdx b/api_docs/kbn_core_ui_settings_browser_internal.mdx
index 812718a2f7545..40806c06351df 100644
--- a/api_docs/kbn_core_ui_settings_browser_internal.mdx
+++ b/api_docs/kbn_core_ui_settings_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-browser-internal
 title: "@kbn/core-ui-settings-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-browser-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-browser-internal']
 ---
 import kbnCoreUiSettingsBrowserInternalObj from './kbn_core_ui_settings_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_browser_mocks.mdx b/api_docs/kbn_core_ui_settings_browser_mocks.mdx
index 0647caa343e58..d917f1e1aad65 100644
--- a/api_docs/kbn_core_ui_settings_browser_mocks.mdx
+++ b/api_docs/kbn_core_ui_settings_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-browser-mocks
 title: "@kbn/core-ui-settings-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-browser-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-browser-mocks']
 ---
 import kbnCoreUiSettingsBrowserMocksObj from './kbn_core_ui_settings_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_common.mdx b/api_docs/kbn_core_ui_settings_common.mdx
index eeb3a779d35b5..e018d2c0411e5 100644
--- a/api_docs/kbn_core_ui_settings_common.mdx
+++ b/api_docs/kbn_core_ui_settings_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-common
 title: "@kbn/core-ui-settings-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-common plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-common']
 ---
 import kbnCoreUiSettingsCommonObj from './kbn_core_ui_settings_common.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_server.mdx b/api_docs/kbn_core_ui_settings_server.mdx
index f0d34230776c8..b7ea799469138 100644
--- a/api_docs/kbn_core_ui_settings_server.mdx
+++ b/api_docs/kbn_core_ui_settings_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-server
 title: "@kbn/core-ui-settings-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-server']
 ---
 import kbnCoreUiSettingsServerObj from './kbn_core_ui_settings_server.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_server_internal.mdx b/api_docs/kbn_core_ui_settings_server_internal.mdx
index 32b32d0e7fd94..6f49e6af8e8cc 100644
--- a/api_docs/kbn_core_ui_settings_server_internal.mdx
+++ b/api_docs/kbn_core_ui_settings_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-server-internal
 title: "@kbn/core-ui-settings-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-server-internal']
 ---
 import kbnCoreUiSettingsServerInternalObj from './kbn_core_ui_settings_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_server_mocks.mdx b/api_docs/kbn_core_ui_settings_server_mocks.mdx
index 1119ea24ebfb0..fbb82389c6e58 100644
--- a/api_docs/kbn_core_ui_settings_server_mocks.mdx
+++ b/api_docs/kbn_core_ui_settings_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-server-mocks
 title: "@kbn/core-ui-settings-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-server-mocks']
 ---
 import kbnCoreUiSettingsServerMocksObj from './kbn_core_ui_settings_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_usage_data_server.mdx b/api_docs/kbn_core_usage_data_server.mdx
index d6e8a9d0818f9..40ce42a44cf15 100644
--- a/api_docs/kbn_core_usage_data_server.mdx
+++ b/api_docs/kbn_core_usage_data_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-usage-data-server
 title: "@kbn/core-usage-data-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-usage-data-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-usage-data-server']
 ---
 import kbnCoreUsageDataServerObj from './kbn_core_usage_data_server.devdocs.json';
diff --git a/api_docs/kbn_core_usage_data_server_internal.mdx b/api_docs/kbn_core_usage_data_server_internal.mdx
index 9d0c2a074e8c1..f53a1d696836e 100644
--- a/api_docs/kbn_core_usage_data_server_internal.mdx
+++ b/api_docs/kbn_core_usage_data_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-usage-data-server-internal
 title: "@kbn/core-usage-data-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-usage-data-server-internal plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-usage-data-server-internal']
 ---
 import kbnCoreUsageDataServerInternalObj from './kbn_core_usage_data_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_usage_data_server_mocks.mdx b/api_docs/kbn_core_usage_data_server_mocks.mdx
index 39b7f3a676bf2..63c67653c704c 100644
--- a/api_docs/kbn_core_usage_data_server_mocks.mdx
+++ b/api_docs/kbn_core_usage_data_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-usage-data-server-mocks
 title: "@kbn/core-usage-data-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-usage-data-server-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-usage-data-server-mocks']
 ---
 import kbnCoreUsageDataServerMocksObj from './kbn_core_usage_data_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_crypto.mdx b/api_docs/kbn_crypto.mdx
index cebe27a86e77a..e579c0b88b82b 100644
--- a/api_docs/kbn_crypto.mdx
+++ b/api_docs/kbn_crypto.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-crypto
 title: "@kbn/crypto"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/crypto plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/crypto']
 ---
 import kbnCryptoObj from './kbn_crypto.devdocs.json';
diff --git a/api_docs/kbn_crypto_browser.mdx b/api_docs/kbn_crypto_browser.mdx
index 91bb769b9a842..c6ac7c1e36a6f 100644
--- a/api_docs/kbn_crypto_browser.mdx
+++ b/api_docs/kbn_crypto_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-crypto-browser
 title: "@kbn/crypto-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/crypto-browser plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/crypto-browser']
 ---
 import kbnCryptoBrowserObj from './kbn_crypto_browser.devdocs.json';
diff --git a/api_docs/kbn_cypress_config.mdx b/api_docs/kbn_cypress_config.mdx
index 936c0194cf100..425ea8f8ebd24 100644
--- a/api_docs/kbn_cypress_config.mdx
+++ b/api_docs/kbn_cypress_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cypress-config
 title: "@kbn/cypress-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/cypress-config plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/cypress-config']
 ---
 import kbnCypressConfigObj from './kbn_cypress_config.devdocs.json';
diff --git a/api_docs/kbn_datemath.mdx b/api_docs/kbn_datemath.mdx
index f4d70bb7beaf9..63d561e44cf27 100644
--- a/api_docs/kbn_datemath.mdx
+++ b/api_docs/kbn_datemath.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-datemath
 title: "@kbn/datemath"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/datemath plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/datemath']
 ---
 import kbnDatemathObj from './kbn_datemath.devdocs.json';
diff --git a/api_docs/kbn_dev_cli_errors.mdx b/api_docs/kbn_dev_cli_errors.mdx
index bf21852659826..0d605704eab6e 100644
--- a/api_docs/kbn_dev_cli_errors.mdx
+++ b/api_docs/kbn_dev_cli_errors.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-cli-errors
 title: "@kbn/dev-cli-errors"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dev-cli-errors plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-cli-errors']
 ---
 import kbnDevCliErrorsObj from './kbn_dev_cli_errors.devdocs.json';
diff --git a/api_docs/kbn_dev_cli_runner.mdx b/api_docs/kbn_dev_cli_runner.mdx
index af8aa3f690f90..a14f794d444e4 100644
--- a/api_docs/kbn_dev_cli_runner.mdx
+++ b/api_docs/kbn_dev_cli_runner.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-cli-runner
 title: "@kbn/dev-cli-runner"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dev-cli-runner plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-cli-runner']
 ---
 import kbnDevCliRunnerObj from './kbn_dev_cli_runner.devdocs.json';
diff --git a/api_docs/kbn_dev_proc_runner.mdx b/api_docs/kbn_dev_proc_runner.mdx
index de10bacc58724..6c434f94f2b97 100644
--- a/api_docs/kbn_dev_proc_runner.mdx
+++ b/api_docs/kbn_dev_proc_runner.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-proc-runner
 title: "@kbn/dev-proc-runner"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dev-proc-runner plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-proc-runner']
 ---
 import kbnDevProcRunnerObj from './kbn_dev_proc_runner.devdocs.json';
diff --git a/api_docs/kbn_dev_utils.mdx b/api_docs/kbn_dev_utils.mdx
index 7e7d3a57e59ad..a74d64dd14608 100644
--- a/api_docs/kbn_dev_utils.mdx
+++ b/api_docs/kbn_dev_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-utils
 title: "@kbn/dev-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dev-utils plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-utils']
 ---
 import kbnDevUtilsObj from './kbn_dev_utils.devdocs.json';
diff --git a/api_docs/kbn_doc_links.mdx b/api_docs/kbn_doc_links.mdx
index f2bab21b1bf69..022b4c600076b 100644
--- a/api_docs/kbn_doc_links.mdx
+++ b/api_docs/kbn_doc_links.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-doc-links
 title: "@kbn/doc-links"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/doc-links plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/doc-links']
 ---
 import kbnDocLinksObj from './kbn_doc_links.devdocs.json';
diff --git a/api_docs/kbn_docs_utils.mdx b/api_docs/kbn_docs_utils.mdx
index 136cbbc27c6dd..dd54a131f03c0 100644
--- a/api_docs/kbn_docs_utils.mdx
+++ b/api_docs/kbn_docs_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-docs-utils
 title: "@kbn/docs-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/docs-utils plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/docs-utils']
 ---
 import kbnDocsUtilsObj from './kbn_docs_utils.devdocs.json';
diff --git a/api_docs/kbn_dom_drag_drop.mdx b/api_docs/kbn_dom_drag_drop.mdx
index 43c5a487fa41a..d97372d79ebdd 100644
--- a/api_docs/kbn_dom_drag_drop.mdx
+++ b/api_docs/kbn_dom_drag_drop.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dom-drag-drop
 title: "@kbn/dom-drag-drop"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dom-drag-drop plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dom-drag-drop']
 ---
 import kbnDomDragDropObj from './kbn_dom_drag_drop.devdocs.json';
diff --git a/api_docs/kbn_ebt_tools.mdx b/api_docs/kbn_ebt_tools.mdx
index 8ee7f09600b9c..c4e26078f26c2 100644
--- a/api_docs/kbn_ebt_tools.mdx
+++ b/api_docs/kbn_ebt_tools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ebt-tools
 title: "@kbn/ebt-tools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ebt-tools plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ebt-tools']
 ---
 import kbnEbtToolsObj from './kbn_ebt_tools.devdocs.json';
diff --git a/api_docs/kbn_ecs.mdx b/api_docs/kbn_ecs.mdx
index dabd67ea639b2..589a982102229 100644
--- a/api_docs/kbn_ecs.mdx
+++ b/api_docs/kbn_ecs.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ecs
 title: "@kbn/ecs"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ecs plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ecs']
 ---
 import kbnEcsObj from './kbn_ecs.devdocs.json';
diff --git a/api_docs/kbn_ecs_data_quality_dashboard.mdx b/api_docs/kbn_ecs_data_quality_dashboard.mdx
index 3f8b2071edb6f..11f7705253010 100644
--- a/api_docs/kbn_ecs_data_quality_dashboard.mdx
+++ b/api_docs/kbn_ecs_data_quality_dashboard.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ecs-data-quality-dashboard
 title: "@kbn/ecs-data-quality-dashboard"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ecs-data-quality-dashboard plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ecs-data-quality-dashboard']
 ---
 import kbnEcsDataQualityDashboardObj from './kbn_ecs_data_quality_dashboard.devdocs.json';
diff --git a/api_docs/kbn_es.mdx b/api_docs/kbn_es.mdx
index d0211ec7b739d..19d33d2cc2bf6 100644
--- a/api_docs/kbn_es.mdx
+++ b/api_docs/kbn_es.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es
 title: "@kbn/es"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es']
 ---
 import kbnEsObj from './kbn_es.devdocs.json';
diff --git a/api_docs/kbn_es_archiver.mdx b/api_docs/kbn_es_archiver.mdx
index c47aa16f5d9aa..ea829b18afe8c 100644
--- a/api_docs/kbn_es_archiver.mdx
+++ b/api_docs/kbn_es_archiver.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-archiver
 title: "@kbn/es-archiver"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es-archiver plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es-archiver']
 ---
 import kbnEsArchiverObj from './kbn_es_archiver.devdocs.json';
diff --git a/api_docs/kbn_es_errors.mdx b/api_docs/kbn_es_errors.mdx
index b23404d6e673c..baedea81274c2 100644
--- a/api_docs/kbn_es_errors.mdx
+++ b/api_docs/kbn_es_errors.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-errors
 title: "@kbn/es-errors"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es-errors plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es-errors']
 ---
 import kbnEsErrorsObj from './kbn_es_errors.devdocs.json';
diff --git a/api_docs/kbn_es_query.mdx b/api_docs/kbn_es_query.mdx
index b3484d0acfb86..98d2f9264c732 100644
--- a/api_docs/kbn_es_query.mdx
+++ b/api_docs/kbn_es_query.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-query
 title: "@kbn/es-query"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es-query plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es-query']
 ---
 import kbnEsQueryObj from './kbn_es_query.devdocs.json';
diff --git a/api_docs/kbn_es_types.mdx b/api_docs/kbn_es_types.mdx
index ae320937273a3..2c4e5b793efdd 100644
--- a/api_docs/kbn_es_types.mdx
+++ b/api_docs/kbn_es_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-types
 title: "@kbn/es-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es-types plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es-types']
 ---
 import kbnEsTypesObj from './kbn_es_types.devdocs.json';
diff --git a/api_docs/kbn_eslint_plugin_imports.mdx b/api_docs/kbn_eslint_plugin_imports.mdx
index c0cd7f247745c..b09632ba7c10f 100644
--- a/api_docs/kbn_eslint_plugin_imports.mdx
+++ b/api_docs/kbn_eslint_plugin_imports.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-eslint-plugin-imports
 title: "@kbn/eslint-plugin-imports"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/eslint-plugin-imports plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/eslint-plugin-imports']
 ---
 import kbnEslintPluginImportsObj from './kbn_eslint_plugin_imports.devdocs.json';
diff --git a/api_docs/kbn_expandable_flyout.mdx b/api_docs/kbn_expandable_flyout.mdx
index bd67f9c70c6ee..1cb4678323b20 100644
--- a/api_docs/kbn_expandable_flyout.mdx
+++ b/api_docs/kbn_expandable_flyout.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-expandable-flyout
 title: "@kbn/expandable-flyout"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/expandable-flyout plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/expandable-flyout']
 ---
 import kbnExpandableFlyoutObj from './kbn_expandable_flyout.devdocs.json';
diff --git a/api_docs/kbn_field_types.mdx b/api_docs/kbn_field_types.mdx
index d24f4d36aacaa..33c796182f8d8 100644
--- a/api_docs/kbn_field_types.mdx
+++ b/api_docs/kbn_field_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-field-types
 title: "@kbn/field-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/field-types plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/field-types']
 ---
 import kbnFieldTypesObj from './kbn_field_types.devdocs.json';
diff --git a/api_docs/kbn_find_used_node_modules.mdx b/api_docs/kbn_find_used_node_modules.mdx
index 0ff18adb57009..22e741bcea6c2 100644
--- a/api_docs/kbn_find_used_node_modules.mdx
+++ b/api_docs/kbn_find_used_node_modules.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-find-used-node-modules
 title: "@kbn/find-used-node-modules"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/find-used-node-modules plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/find-used-node-modules']
 ---
 import kbnFindUsedNodeModulesObj from './kbn_find_used_node_modules.devdocs.json';
diff --git a/api_docs/kbn_ftr_common_functional_services.mdx b/api_docs/kbn_ftr_common_functional_services.mdx
index b5cb393ecee58..e2b7a8557341b 100644
--- a/api_docs/kbn_ftr_common_functional_services.mdx
+++ b/api_docs/kbn_ftr_common_functional_services.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ftr-common-functional-services
 title: "@kbn/ftr-common-functional-services"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ftr-common-functional-services plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ftr-common-functional-services']
 ---
 import kbnFtrCommonFunctionalServicesObj from './kbn_ftr_common_functional_services.devdocs.json';
diff --git a/api_docs/kbn_generate.mdx b/api_docs/kbn_generate.mdx
index af71fb24bab46..c367835ac3fe0 100644
--- a/api_docs/kbn_generate.mdx
+++ b/api_docs/kbn_generate.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-generate
 title: "@kbn/generate"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/generate plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/generate']
 ---
 import kbnGenerateObj from './kbn_generate.devdocs.json';
diff --git a/api_docs/kbn_generate_csv.mdx b/api_docs/kbn_generate_csv.mdx
index 0974d13e014d5..e61ee026319bb 100644
--- a/api_docs/kbn_generate_csv.mdx
+++ b/api_docs/kbn_generate_csv.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-generate-csv
 title: "@kbn/generate-csv"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/generate-csv plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/generate-csv']
 ---
 import kbnGenerateCsvObj from './kbn_generate_csv.devdocs.json';
diff --git a/api_docs/kbn_generate_csv_types.mdx b/api_docs/kbn_generate_csv_types.mdx
index b34fdeed86825..bc547e035a7c9 100644
--- a/api_docs/kbn_generate_csv_types.mdx
+++ b/api_docs/kbn_generate_csv_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-generate-csv-types
 title: "@kbn/generate-csv-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/generate-csv-types plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/generate-csv-types']
 ---
 import kbnGenerateCsvTypesObj from './kbn_generate_csv_types.devdocs.json';
diff --git a/api_docs/kbn_guided_onboarding.mdx b/api_docs/kbn_guided_onboarding.mdx
index 42afc5141731d..6c1f189614fab 100644
--- a/api_docs/kbn_guided_onboarding.mdx
+++ b/api_docs/kbn_guided_onboarding.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-guided-onboarding
 title: "@kbn/guided-onboarding"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/guided-onboarding plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/guided-onboarding']
 ---
 import kbnGuidedOnboardingObj from './kbn_guided_onboarding.devdocs.json';
diff --git a/api_docs/kbn_handlebars.mdx b/api_docs/kbn_handlebars.mdx
index c40b6ea1d58ce..ebddb3c829bea 100644
--- a/api_docs/kbn_handlebars.mdx
+++ b/api_docs/kbn_handlebars.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-handlebars
 title: "@kbn/handlebars"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/handlebars plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/handlebars']
 ---
 import kbnHandlebarsObj from './kbn_handlebars.devdocs.json';
diff --git a/api_docs/kbn_hapi_mocks.mdx b/api_docs/kbn_hapi_mocks.mdx
index bdf2a88a68487..7e931a6919a3c 100644
--- a/api_docs/kbn_hapi_mocks.mdx
+++ b/api_docs/kbn_hapi_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-hapi-mocks
 title: "@kbn/hapi-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/hapi-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/hapi-mocks']
 ---
 import kbnHapiMocksObj from './kbn_hapi_mocks.devdocs.json';
diff --git a/api_docs/kbn_health_gateway_server.mdx b/api_docs/kbn_health_gateway_server.mdx
index cdc18073f6f93..09cda43a18ac0 100644
--- a/api_docs/kbn_health_gateway_server.mdx
+++ b/api_docs/kbn_health_gateway_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-health-gateway-server
 title: "@kbn/health-gateway-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/health-gateway-server plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/health-gateway-server']
 ---
 import kbnHealthGatewayServerObj from './kbn_health_gateway_server.devdocs.json';
diff --git a/api_docs/kbn_home_sample_data_card.mdx b/api_docs/kbn_home_sample_data_card.mdx
index fec966b810f85..3b51d62c6a7a5 100644
--- a/api_docs/kbn_home_sample_data_card.mdx
+++ b/api_docs/kbn_home_sample_data_card.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-home-sample-data-card
 title: "@kbn/home-sample-data-card"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/home-sample-data-card plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/home-sample-data-card']
 ---
 import kbnHomeSampleDataCardObj from './kbn_home_sample_data_card.devdocs.json';
diff --git a/api_docs/kbn_home_sample_data_tab.mdx b/api_docs/kbn_home_sample_data_tab.mdx
index 203bb222166b2..54626a8c45b6f 100644
--- a/api_docs/kbn_home_sample_data_tab.mdx
+++ b/api_docs/kbn_home_sample_data_tab.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-home-sample-data-tab
 title: "@kbn/home-sample-data-tab"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/home-sample-data-tab plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/home-sample-data-tab']
 ---
 import kbnHomeSampleDataTabObj from './kbn_home_sample_data_tab.devdocs.json';
diff --git a/api_docs/kbn_i18n.mdx b/api_docs/kbn_i18n.mdx
index 55b34ed2a0bb2..85a07c8287f09 100644
--- a/api_docs/kbn_i18n.mdx
+++ b/api_docs/kbn_i18n.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-i18n
 title: "@kbn/i18n"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/i18n plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/i18n']
 ---
 import kbnI18nObj from './kbn_i18n.devdocs.json';
diff --git a/api_docs/kbn_i18n_react.mdx b/api_docs/kbn_i18n_react.mdx
index e32b616b7d68e..7159df8ea8c7c 100644
--- a/api_docs/kbn_i18n_react.mdx
+++ b/api_docs/kbn_i18n_react.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-i18n-react
 title: "@kbn/i18n-react"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/i18n-react plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/i18n-react']
 ---
 import kbnI18nReactObj from './kbn_i18n_react.devdocs.json';
diff --git a/api_docs/kbn_import_resolver.mdx b/api_docs/kbn_import_resolver.mdx
index eccc8f7a032b2..ce0e9d0f943da 100644
--- a/api_docs/kbn_import_resolver.mdx
+++ b/api_docs/kbn_import_resolver.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-import-resolver
 title: "@kbn/import-resolver"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/import-resolver plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/import-resolver']
 ---
 import kbnImportResolverObj from './kbn_import_resolver.devdocs.json';
diff --git a/api_docs/kbn_interpreter.mdx b/api_docs/kbn_interpreter.mdx
index 21b0f06c85c3c..ff307710d9591 100644
--- a/api_docs/kbn_interpreter.mdx
+++ b/api_docs/kbn_interpreter.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-interpreter
 title: "@kbn/interpreter"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/interpreter plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/interpreter']
 ---
 import kbnInterpreterObj from './kbn_interpreter.devdocs.json';
diff --git a/api_docs/kbn_io_ts_utils.mdx b/api_docs/kbn_io_ts_utils.mdx
index 9b1ab460a48e2..5513baf02af0f 100644
--- a/api_docs/kbn_io_ts_utils.mdx
+++ b/api_docs/kbn_io_ts_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-io-ts-utils
 title: "@kbn/io-ts-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/io-ts-utils plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/io-ts-utils']
 ---
 import kbnIoTsUtilsObj from './kbn_io_ts_utils.devdocs.json';
diff --git a/api_docs/kbn_jest_serializers.mdx b/api_docs/kbn_jest_serializers.mdx
index a24ea34372a88..01f83e2645e3c 100644
--- a/api_docs/kbn_jest_serializers.mdx
+++ b/api_docs/kbn_jest_serializers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-jest-serializers
 title: "@kbn/jest-serializers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/jest-serializers plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/jest-serializers']
 ---
 import kbnJestSerializersObj from './kbn_jest_serializers.devdocs.json';
diff --git a/api_docs/kbn_journeys.mdx b/api_docs/kbn_journeys.mdx
index b12d5db04de4e..7bb8caca77b03 100644
--- a/api_docs/kbn_journeys.mdx
+++ b/api_docs/kbn_journeys.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-journeys
 title: "@kbn/journeys"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/journeys plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/journeys']
 ---
 import kbnJourneysObj from './kbn_journeys.devdocs.json';
diff --git a/api_docs/kbn_json_ast.mdx b/api_docs/kbn_json_ast.mdx
index cf09efc67ac87..df2ecccb26274 100644
--- a/api_docs/kbn_json_ast.mdx
+++ b/api_docs/kbn_json_ast.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-json-ast
 title: "@kbn/json-ast"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/json-ast plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/json-ast']
 ---
 import kbnJsonAstObj from './kbn_json_ast.devdocs.json';
diff --git a/api_docs/kbn_kibana_manifest_schema.mdx b/api_docs/kbn_kibana_manifest_schema.mdx
index 7a779ddd3c4bd..b370b7075838f 100644
--- a/api_docs/kbn_kibana_manifest_schema.mdx
+++ b/api_docs/kbn_kibana_manifest_schema.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-kibana-manifest-schema
 title: "@kbn/kibana-manifest-schema"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/kibana-manifest-schema plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/kibana-manifest-schema']
 ---
 import kbnKibanaManifestSchemaObj from './kbn_kibana_manifest_schema.devdocs.json';
diff --git a/api_docs/kbn_language_documentation_popover.mdx b/api_docs/kbn_language_documentation_popover.mdx
index 16fbaa5a83b23..f71c8943b6932 100644
--- a/api_docs/kbn_language_documentation_popover.mdx
+++ b/api_docs/kbn_language_documentation_popover.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-language-documentation-popover
 title: "@kbn/language-documentation-popover"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/language-documentation-popover plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/language-documentation-popover']
 ---
 import kbnLanguageDocumentationPopoverObj from './kbn_language_documentation_popover.devdocs.json';
diff --git a/api_docs/kbn_logging.mdx b/api_docs/kbn_logging.mdx
index 7b06571307450..6ccc85fc8b17d 100644
--- a/api_docs/kbn_logging.mdx
+++ b/api_docs/kbn_logging.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-logging
 title: "@kbn/logging"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/logging plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/logging']
 ---
 import kbnLoggingObj from './kbn_logging.devdocs.json';
diff --git a/api_docs/kbn_logging_mocks.mdx b/api_docs/kbn_logging_mocks.mdx
index 518342efda00a..be471478b0784 100644
--- a/api_docs/kbn_logging_mocks.mdx
+++ b/api_docs/kbn_logging_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-logging-mocks
 title: "@kbn/logging-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/logging-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/logging-mocks']
 ---
 import kbnLoggingMocksObj from './kbn_logging_mocks.devdocs.json';
diff --git a/api_docs/kbn_managed_vscode_config.mdx b/api_docs/kbn_managed_vscode_config.mdx
index 98ff5384db391..62bfc0653e309 100644
--- a/api_docs/kbn_managed_vscode_config.mdx
+++ b/api_docs/kbn_managed_vscode_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-managed-vscode-config
 title: "@kbn/managed-vscode-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/managed-vscode-config plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/managed-vscode-config']
 ---
 import kbnManagedVscodeConfigObj from './kbn_managed_vscode_config.devdocs.json';
diff --git a/api_docs/kbn_mapbox_gl.mdx b/api_docs/kbn_mapbox_gl.mdx
index 4ae224c44b852..59d73c4659fc7 100644
--- a/api_docs/kbn_mapbox_gl.mdx
+++ b/api_docs/kbn_mapbox_gl.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-mapbox-gl
 title: "@kbn/mapbox-gl"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/mapbox-gl plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/mapbox-gl']
 ---
 import kbnMapboxGlObj from './kbn_mapbox_gl.devdocs.json';
diff --git a/api_docs/kbn_ml_agg_utils.mdx b/api_docs/kbn_ml_agg_utils.mdx
index d5a6b147d2164..e044be4e2d738 100644
--- a/api_docs/kbn_ml_agg_utils.mdx
+++ b/api_docs/kbn_ml_agg_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-agg-utils
 title: "@kbn/ml-agg-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-agg-utils plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-agg-utils']
 ---
 import kbnMlAggUtilsObj from './kbn_ml_agg_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_date_picker.mdx b/api_docs/kbn_ml_date_picker.mdx
index ad1a76cda77fd..c8f1b2857f741 100644
--- a/api_docs/kbn_ml_date_picker.mdx
+++ b/api_docs/kbn_ml_date_picker.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-date-picker
 title: "@kbn/ml-date-picker"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-date-picker plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-date-picker']
 ---
 import kbnMlDatePickerObj from './kbn_ml_date_picker.devdocs.json';
diff --git a/api_docs/kbn_ml_is_defined.mdx b/api_docs/kbn_ml_is_defined.mdx
index 53f52958f230d..c882708c87d62 100644
--- a/api_docs/kbn_ml_is_defined.mdx
+++ b/api_docs/kbn_ml_is_defined.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-is-defined
 title: "@kbn/ml-is-defined"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-is-defined plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-is-defined']
 ---
 import kbnMlIsDefinedObj from './kbn_ml_is_defined.devdocs.json';
diff --git a/api_docs/kbn_ml_is_populated_object.mdx b/api_docs/kbn_ml_is_populated_object.mdx
index df2d44a227076..35cac8263fb52 100644
--- a/api_docs/kbn_ml_is_populated_object.mdx
+++ b/api_docs/kbn_ml_is_populated_object.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-is-populated-object
 title: "@kbn/ml-is-populated-object"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-is-populated-object plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-is-populated-object']
 ---
 import kbnMlIsPopulatedObjectObj from './kbn_ml_is_populated_object.devdocs.json';
diff --git a/api_docs/kbn_ml_local_storage.mdx b/api_docs/kbn_ml_local_storage.mdx
index 74d5d50e2ffd7..bfc1083f66c9a 100644
--- a/api_docs/kbn_ml_local_storage.mdx
+++ b/api_docs/kbn_ml_local_storage.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-local-storage
 title: "@kbn/ml-local-storage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-local-storage plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-local-storage']
 ---
 import kbnMlLocalStorageObj from './kbn_ml_local_storage.devdocs.json';
diff --git a/api_docs/kbn_ml_nested_property.mdx b/api_docs/kbn_ml_nested_property.mdx
index db930f178714d..7a96b5d544120 100644
--- a/api_docs/kbn_ml_nested_property.mdx
+++ b/api_docs/kbn_ml_nested_property.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-nested-property
 title: "@kbn/ml-nested-property"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-nested-property plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-nested-property']
 ---
 import kbnMlNestedPropertyObj from './kbn_ml_nested_property.devdocs.json';
diff --git a/api_docs/kbn_ml_number_utils.mdx b/api_docs/kbn_ml_number_utils.mdx
index ae2c03e78f9ff..b9b82f44e2f05 100644
--- a/api_docs/kbn_ml_number_utils.mdx
+++ b/api_docs/kbn_ml_number_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-number-utils
 title: "@kbn/ml-number-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-number-utils plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-number-utils']
 ---
 import kbnMlNumberUtilsObj from './kbn_ml_number_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_query_utils.mdx b/api_docs/kbn_ml_query_utils.mdx
index 9c81b23eb01dd..65b228df42293 100644
--- a/api_docs/kbn_ml_query_utils.mdx
+++ b/api_docs/kbn_ml_query_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-query-utils
 title: "@kbn/ml-query-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-query-utils plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-query-utils']
 ---
 import kbnMlQueryUtilsObj from './kbn_ml_query_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_random_sampler_utils.mdx b/api_docs/kbn_ml_random_sampler_utils.mdx
index 7042b416b5611..c01e9794722c5 100644
--- a/api_docs/kbn_ml_random_sampler_utils.mdx
+++ b/api_docs/kbn_ml_random_sampler_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-random-sampler-utils
 title: "@kbn/ml-random-sampler-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-random-sampler-utils plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-random-sampler-utils']
 ---
 import kbnMlRandomSamplerUtilsObj from './kbn_ml_random_sampler_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_route_utils.mdx b/api_docs/kbn_ml_route_utils.mdx
index f84a407e7f61a..849f20fba0795 100644
--- a/api_docs/kbn_ml_route_utils.mdx
+++ b/api_docs/kbn_ml_route_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-route-utils
 title: "@kbn/ml-route-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-route-utils plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-route-utils']
 ---
 import kbnMlRouteUtilsObj from './kbn_ml_route_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_string_hash.mdx b/api_docs/kbn_ml_string_hash.mdx
index 00bf605ac7816..7e786976d78b9 100644
--- a/api_docs/kbn_ml_string_hash.mdx
+++ b/api_docs/kbn_ml_string_hash.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-string-hash
 title: "@kbn/ml-string-hash"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-string-hash plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-string-hash']
 ---
 import kbnMlStringHashObj from './kbn_ml_string_hash.devdocs.json';
diff --git a/api_docs/kbn_ml_trained_models_utils.mdx b/api_docs/kbn_ml_trained_models_utils.mdx
index f5dd277729937..51dec0f93ddeb 100644
--- a/api_docs/kbn_ml_trained_models_utils.mdx
+++ b/api_docs/kbn_ml_trained_models_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-trained-models-utils
 title: "@kbn/ml-trained-models-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-trained-models-utils plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-trained-models-utils']
 ---
 import kbnMlTrainedModelsUtilsObj from './kbn_ml_trained_models_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_url_state.mdx b/api_docs/kbn_ml_url_state.mdx
index 473f114a50709..0b1bf48cd584b 100644
--- a/api_docs/kbn_ml_url_state.mdx
+++ b/api_docs/kbn_ml_url_state.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-url-state
 title: "@kbn/ml-url-state"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-url-state plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-url-state']
 ---
 import kbnMlUrlStateObj from './kbn_ml_url_state.devdocs.json';
diff --git a/api_docs/kbn_monaco.mdx b/api_docs/kbn_monaco.mdx
index dbd1322725e51..f753592a95739 100644
--- a/api_docs/kbn_monaco.mdx
+++ b/api_docs/kbn_monaco.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-monaco
 title: "@kbn/monaco"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/monaco plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/monaco']
 ---
 import kbnMonacoObj from './kbn_monaco.devdocs.json';
diff --git a/api_docs/kbn_object_versioning.mdx b/api_docs/kbn_object_versioning.mdx
index bdf70880504f7..a70891f0e72f4 100644
--- a/api_docs/kbn_object_versioning.mdx
+++ b/api_docs/kbn_object_versioning.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-object-versioning
 title: "@kbn/object-versioning"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/object-versioning plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/object-versioning']
 ---
 import kbnObjectVersioningObj from './kbn_object_versioning.devdocs.json';
diff --git a/api_docs/kbn_observability_alert_details.mdx b/api_docs/kbn_observability_alert_details.mdx
index ef2cadc4516c3..6d25386de3158 100644
--- a/api_docs/kbn_observability_alert_details.mdx
+++ b/api_docs/kbn_observability_alert_details.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-observability-alert-details
 title: "@kbn/observability-alert-details"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/observability-alert-details plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/observability-alert-details']
 ---
 import kbnObservabilityAlertDetailsObj from './kbn_observability_alert_details.devdocs.json';
diff --git a/api_docs/kbn_optimizer.mdx b/api_docs/kbn_optimizer.mdx
index 0897ce442f287..2a345e6b1aabd 100644
--- a/api_docs/kbn_optimizer.mdx
+++ b/api_docs/kbn_optimizer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-optimizer
 title: "@kbn/optimizer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/optimizer plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/optimizer']
 ---
 import kbnOptimizerObj from './kbn_optimizer.devdocs.json';
diff --git a/api_docs/kbn_optimizer_webpack_helpers.mdx b/api_docs/kbn_optimizer_webpack_helpers.mdx
index 93899a1c199f4..1255de26b275f 100644
--- a/api_docs/kbn_optimizer_webpack_helpers.mdx
+++ b/api_docs/kbn_optimizer_webpack_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-optimizer-webpack-helpers
 title: "@kbn/optimizer-webpack-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/optimizer-webpack-helpers plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/optimizer-webpack-helpers']
 ---
 import kbnOptimizerWebpackHelpersObj from './kbn_optimizer_webpack_helpers.devdocs.json';
diff --git a/api_docs/kbn_osquery_io_ts_types.mdx b/api_docs/kbn_osquery_io_ts_types.mdx
index 8d78be6e10ad9..e8886fb80a281 100644
--- a/api_docs/kbn_osquery_io_ts_types.mdx
+++ b/api_docs/kbn_osquery_io_ts_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-osquery-io-ts-types
 title: "@kbn/osquery-io-ts-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/osquery-io-ts-types plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/osquery-io-ts-types']
 ---
 import kbnOsqueryIoTsTypesObj from './kbn_osquery_io_ts_types.devdocs.json';
diff --git a/api_docs/kbn_performance_testing_dataset_extractor.mdx b/api_docs/kbn_performance_testing_dataset_extractor.mdx
index 9f597884b2955..be186b8aefbf7 100644
--- a/api_docs/kbn_performance_testing_dataset_extractor.mdx
+++ b/api_docs/kbn_performance_testing_dataset_extractor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-performance-testing-dataset-extractor
 title: "@kbn/performance-testing-dataset-extractor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/performance-testing-dataset-extractor plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/performance-testing-dataset-extractor']
 ---
 import kbnPerformanceTestingDatasetExtractorObj from './kbn_performance_testing_dataset_extractor.devdocs.json';
diff --git a/api_docs/kbn_plugin_generator.mdx b/api_docs/kbn_plugin_generator.mdx
index ef15cdfe2059a..1c2bd87c3a2fb 100644
--- a/api_docs/kbn_plugin_generator.mdx
+++ b/api_docs/kbn_plugin_generator.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-plugin-generator
 title: "@kbn/plugin-generator"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/plugin-generator plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/plugin-generator']
 ---
 import kbnPluginGeneratorObj from './kbn_plugin_generator.devdocs.json';
diff --git a/api_docs/kbn_plugin_helpers.mdx b/api_docs/kbn_plugin_helpers.mdx
index c67a14a04373e..6957d39392ab0 100644
--- a/api_docs/kbn_plugin_helpers.mdx
+++ b/api_docs/kbn_plugin_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-plugin-helpers
 title: "@kbn/plugin-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/plugin-helpers plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/plugin-helpers']
 ---
 import kbnPluginHelpersObj from './kbn_plugin_helpers.devdocs.json';
diff --git a/api_docs/kbn_react_field.mdx b/api_docs/kbn_react_field.mdx
index 2a0a1a155a82c..3f9c876bec28d 100644
--- a/api_docs/kbn_react_field.mdx
+++ b/api_docs/kbn_react_field.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-field
 title: "@kbn/react-field"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-field plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-field']
 ---
 import kbnReactFieldObj from './kbn_react_field.devdocs.json';
diff --git a/api_docs/kbn_repo_file_maps.mdx b/api_docs/kbn_repo_file_maps.mdx
index e1f6c59096a77..50ffb132d5ee4 100644
--- a/api_docs/kbn_repo_file_maps.mdx
+++ b/api_docs/kbn_repo_file_maps.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-repo-file-maps
 title: "@kbn/repo-file-maps"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/repo-file-maps plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/repo-file-maps']
 ---
 import kbnRepoFileMapsObj from './kbn_repo_file_maps.devdocs.json';
diff --git a/api_docs/kbn_repo_linter.mdx b/api_docs/kbn_repo_linter.mdx
index c60888f9af90a..64d76681a94c2 100644
--- a/api_docs/kbn_repo_linter.mdx
+++ b/api_docs/kbn_repo_linter.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-repo-linter
 title: "@kbn/repo-linter"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/repo-linter plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/repo-linter']
 ---
 import kbnRepoLinterObj from './kbn_repo_linter.devdocs.json';
diff --git a/api_docs/kbn_repo_path.mdx b/api_docs/kbn_repo_path.mdx
index af11a10209f93..726d4775a7541 100644
--- a/api_docs/kbn_repo_path.mdx
+++ b/api_docs/kbn_repo_path.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-repo-path
 title: "@kbn/repo-path"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/repo-path plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/repo-path']
 ---
 import kbnRepoPathObj from './kbn_repo_path.devdocs.json';
diff --git a/api_docs/kbn_repo_source_classifier.mdx b/api_docs/kbn_repo_source_classifier.mdx
index d7fc93cb103ac..ebc905fe80095 100644
--- a/api_docs/kbn_repo_source_classifier.mdx
+++ b/api_docs/kbn_repo_source_classifier.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-repo-source-classifier
 title: "@kbn/repo-source-classifier"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/repo-source-classifier plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/repo-source-classifier']
 ---
 import kbnRepoSourceClassifierObj from './kbn_repo_source_classifier.devdocs.json';
diff --git a/api_docs/kbn_reporting_common.mdx b/api_docs/kbn_reporting_common.mdx
index 335b4b0cbc84a..f16d5d346aa8f 100644
--- a/api_docs/kbn_reporting_common.mdx
+++ b/api_docs/kbn_reporting_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-common
 title: "@kbn/reporting-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-common plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-common']
 ---
 import kbnReportingCommonObj from './kbn_reporting_common.devdocs.json';
diff --git a/api_docs/kbn_rison.mdx b/api_docs/kbn_rison.mdx
index 06232d88b030c..ffabeef0c0662 100644
--- a/api_docs/kbn_rison.mdx
+++ b/api_docs/kbn_rison.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-rison
 title: "@kbn/rison"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/rison plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/rison']
 ---
 import kbnRisonObj from './kbn_rison.devdocs.json';
diff --git a/api_docs/kbn_rule_data_utils.mdx b/api_docs/kbn_rule_data_utils.mdx
index ac693b0eb23e7..d9d1a037f64b1 100644
--- a/api_docs/kbn_rule_data_utils.mdx
+++ b/api_docs/kbn_rule_data_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-rule-data-utils
 title: "@kbn/rule-data-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/rule-data-utils plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/rule-data-utils']
 ---
 import kbnRuleDataUtilsObj from './kbn_rule_data_utils.devdocs.json';
diff --git a/api_docs/kbn_saved_objects_settings.mdx b/api_docs/kbn_saved_objects_settings.mdx
index 27b29d34528e0..6a8a7b7b45d2f 100644
--- a/api_docs/kbn_saved_objects_settings.mdx
+++ b/api_docs/kbn_saved_objects_settings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-saved-objects-settings
 title: "@kbn/saved-objects-settings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/saved-objects-settings plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/saved-objects-settings']
 ---
 import kbnSavedObjectsSettingsObj from './kbn_saved_objects_settings.devdocs.json';
diff --git a/api_docs/kbn_security_solution_side_nav.mdx b/api_docs/kbn_security_solution_side_nav.mdx
index 8edfc25a8f14b..6c4e47f1a4351 100644
--- a/api_docs/kbn_security_solution_side_nav.mdx
+++ b/api_docs/kbn_security_solution_side_nav.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-solution-side-nav
 title: "@kbn/security-solution-side-nav"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-solution-side-nav plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-solution-side-nav']
 ---
 import kbnSecuritySolutionSideNavObj from './kbn_security_solution_side_nav.devdocs.json';
diff --git a/api_docs/kbn_security_solution_storybook_config.mdx b/api_docs/kbn_security_solution_storybook_config.mdx
index bec820301d81d..0003d9f974b86 100644
--- a/api_docs/kbn_security_solution_storybook_config.mdx
+++ b/api_docs/kbn_security_solution_storybook_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-solution-storybook-config
 title: "@kbn/security-solution-storybook-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-solution-storybook-config plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-solution-storybook-config']
 ---
 import kbnSecuritySolutionStorybookConfigObj from './kbn_security_solution_storybook_config.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_autocomplete.mdx b/api_docs/kbn_securitysolution_autocomplete.mdx
index a2b697366ceb2..30b6726407b20 100644
--- a/api_docs/kbn_securitysolution_autocomplete.mdx
+++ b/api_docs/kbn_securitysolution_autocomplete.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-autocomplete
 title: "@kbn/securitysolution-autocomplete"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-autocomplete plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-autocomplete']
 ---
 import kbnSecuritysolutionAutocompleteObj from './kbn_securitysolution_autocomplete.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_data_table.mdx b/api_docs/kbn_securitysolution_data_table.mdx
index 3d942659e507e..93f74959bb28e 100644
--- a/api_docs/kbn_securitysolution_data_table.mdx
+++ b/api_docs/kbn_securitysolution_data_table.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-data-table
 title: "@kbn/securitysolution-data-table"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-data-table plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-data-table']
 ---
 import kbnSecuritysolutionDataTableObj from './kbn_securitysolution_data_table.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_ecs.mdx b/api_docs/kbn_securitysolution_ecs.mdx
index 23f26f13400c5..c6864d53f5987 100644
--- a/api_docs/kbn_securitysolution_ecs.mdx
+++ b/api_docs/kbn_securitysolution_ecs.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-ecs
 title: "@kbn/securitysolution-ecs"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-ecs plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-ecs']
 ---
 import kbnSecuritysolutionEcsObj from './kbn_securitysolution_ecs.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_es_utils.mdx b/api_docs/kbn_securitysolution_es_utils.mdx
index ec272c689d3b4..0683ce18f1779 100644
--- a/api_docs/kbn_securitysolution_es_utils.mdx
+++ b/api_docs/kbn_securitysolution_es_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-es-utils
 title: "@kbn/securitysolution-es-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-es-utils plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-es-utils']
 ---
 import kbnSecuritysolutionEsUtilsObj from './kbn_securitysolution_es_utils.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_exception_list_components.mdx b/api_docs/kbn_securitysolution_exception_list_components.mdx
index 42a51ba60af2c..fa2c635cb5987 100644
--- a/api_docs/kbn_securitysolution_exception_list_components.mdx
+++ b/api_docs/kbn_securitysolution_exception_list_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-exception-list-components
 title: "@kbn/securitysolution-exception-list-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-exception-list-components plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-exception-list-components']
 ---
 import kbnSecuritysolutionExceptionListComponentsObj from './kbn_securitysolution_exception_list_components.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_grouping.mdx b/api_docs/kbn_securitysolution_grouping.mdx
index 4f0072fd817a8..6f5cade1143a6 100644
--- a/api_docs/kbn_securitysolution_grouping.mdx
+++ b/api_docs/kbn_securitysolution_grouping.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-grouping
 title: "@kbn/securitysolution-grouping"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-grouping plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-grouping']
 ---
 import kbnSecuritysolutionGroupingObj from './kbn_securitysolution_grouping.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_hook_utils.mdx b/api_docs/kbn_securitysolution_hook_utils.mdx
index 38f6f58e2a7b9..144d4664cd8d2 100644
--- a/api_docs/kbn_securitysolution_hook_utils.mdx
+++ b/api_docs/kbn_securitysolution_hook_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-hook-utils
 title: "@kbn/securitysolution-hook-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-hook-utils plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-hook-utils']
 ---
 import kbnSecuritysolutionHookUtilsObj from './kbn_securitysolution_hook_utils.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx b/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx
index 8eda87547a660..2fb1367fc08ad 100644
--- a/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx
+++ b/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-alerting-types
 title: "@kbn/securitysolution-io-ts-alerting-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-io-ts-alerting-types plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-io-ts-alerting-types']
 ---
 import kbnSecuritysolutionIoTsAlertingTypesObj from './kbn_securitysolution_io_ts_alerting_types.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_io_ts_list_types.mdx b/api_docs/kbn_securitysolution_io_ts_list_types.mdx
index a99d546082489..b5109765d9b12 100644
--- a/api_docs/kbn_securitysolution_io_ts_list_types.mdx
+++ b/api_docs/kbn_securitysolution_io_ts_list_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-list-types
 title: "@kbn/securitysolution-io-ts-list-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-io-ts-list-types plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-io-ts-list-types']
 ---
 import kbnSecuritysolutionIoTsListTypesObj from './kbn_securitysolution_io_ts_list_types.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_io_ts_types.mdx b/api_docs/kbn_securitysolution_io_ts_types.mdx
index c206469d9c81e..24a04a2bd93b6 100644
--- a/api_docs/kbn_securitysolution_io_ts_types.mdx
+++ b/api_docs/kbn_securitysolution_io_ts_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-types
 title: "@kbn/securitysolution-io-ts-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-io-ts-types plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-io-ts-types']
 ---
 import kbnSecuritysolutionIoTsTypesObj from './kbn_securitysolution_io_ts_types.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_io_ts_utils.mdx b/api_docs/kbn_securitysolution_io_ts_utils.mdx
index 2c92875e75bd7..47c3625cc4e59 100644
--- a/api_docs/kbn_securitysolution_io_ts_utils.mdx
+++ b/api_docs/kbn_securitysolution_io_ts_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-utils
 title: "@kbn/securitysolution-io-ts-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-io-ts-utils plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-io-ts-utils']
 ---
 import kbnSecuritysolutionIoTsUtilsObj from './kbn_securitysolution_io_ts_utils.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_list_api.mdx b/api_docs/kbn_securitysolution_list_api.mdx
index ae136149d07d6..04b3393bdfa7f 100644
--- a/api_docs/kbn_securitysolution_list_api.mdx
+++ b/api_docs/kbn_securitysolution_list_api.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-api
 title: "@kbn/securitysolution-list-api"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-list-api plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-list-api']
 ---
 import kbnSecuritysolutionListApiObj from './kbn_securitysolution_list_api.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_list_constants.mdx b/api_docs/kbn_securitysolution_list_constants.mdx
index d60684245c382..9e574e3409680 100644
--- a/api_docs/kbn_securitysolution_list_constants.mdx
+++ b/api_docs/kbn_securitysolution_list_constants.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-constants
 title: "@kbn/securitysolution-list-constants"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-list-constants plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-list-constants']
 ---
 import kbnSecuritysolutionListConstantsObj from './kbn_securitysolution_list_constants.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_list_hooks.mdx b/api_docs/kbn_securitysolution_list_hooks.mdx
index 4b33f8a6abbd3..b674110dcacb4 100644
--- a/api_docs/kbn_securitysolution_list_hooks.mdx
+++ b/api_docs/kbn_securitysolution_list_hooks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-hooks
 title: "@kbn/securitysolution-list-hooks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-list-hooks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-list-hooks']
 ---
 import kbnSecuritysolutionListHooksObj from './kbn_securitysolution_list_hooks.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_list_utils.mdx b/api_docs/kbn_securitysolution_list_utils.mdx
index 91b702277c921..c2aa79d1226d9 100644
--- a/api_docs/kbn_securitysolution_list_utils.mdx
+++ b/api_docs/kbn_securitysolution_list_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-utils
 title: "@kbn/securitysolution-list-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-list-utils plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-list-utils']
 ---
 import kbnSecuritysolutionListUtilsObj from './kbn_securitysolution_list_utils.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_rules.mdx b/api_docs/kbn_securitysolution_rules.mdx
index 27ce921681830..0477dce73217b 100644
--- a/api_docs/kbn_securitysolution_rules.mdx
+++ b/api_docs/kbn_securitysolution_rules.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-rules
 title: "@kbn/securitysolution-rules"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-rules plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-rules']
 ---
 import kbnSecuritysolutionRulesObj from './kbn_securitysolution_rules.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_t_grid.mdx b/api_docs/kbn_securitysolution_t_grid.mdx
index a474045f5c74e..2f9f9263ae18e 100644
--- a/api_docs/kbn_securitysolution_t_grid.mdx
+++ b/api_docs/kbn_securitysolution_t_grid.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-t-grid
 title: "@kbn/securitysolution-t-grid"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-t-grid plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-t-grid']
 ---
 import kbnSecuritysolutionTGridObj from './kbn_securitysolution_t_grid.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_utils.mdx b/api_docs/kbn_securitysolution_utils.mdx
index d2603e518f764..bf30718757312 100644
--- a/api_docs/kbn_securitysolution_utils.mdx
+++ b/api_docs/kbn_securitysolution_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-utils
 title: "@kbn/securitysolution-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-utils plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-utils']
 ---
 import kbnSecuritysolutionUtilsObj from './kbn_securitysolution_utils.devdocs.json';
diff --git a/api_docs/kbn_server_http_tools.mdx b/api_docs/kbn_server_http_tools.mdx
index 8094dc6ed8a35..f05a9f838751d 100644
--- a/api_docs/kbn_server_http_tools.mdx
+++ b/api_docs/kbn_server_http_tools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-server-http-tools
 title: "@kbn/server-http-tools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/server-http-tools plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/server-http-tools']
 ---
 import kbnServerHttpToolsObj from './kbn_server_http_tools.devdocs.json';
diff --git a/api_docs/kbn_server_route_repository.mdx b/api_docs/kbn_server_route_repository.mdx
index 8f06616ffeafa..33001595efbb3 100644
--- a/api_docs/kbn_server_route_repository.mdx
+++ b/api_docs/kbn_server_route_repository.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-server-route-repository
 title: "@kbn/server-route-repository"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/server-route-repository plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/server-route-repository']
 ---
 import kbnServerRouteRepositoryObj from './kbn_server_route_repository.devdocs.json';
diff --git a/api_docs/kbn_shared_svg.mdx b/api_docs/kbn_shared_svg.mdx
index 625af47e20b91..b2aae28dfd413 100644
--- a/api_docs/kbn_shared_svg.mdx
+++ b/api_docs/kbn_shared_svg.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-svg
 title: "@kbn/shared-svg"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-svg plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-svg']
 ---
 import kbnSharedSvgObj from './kbn_shared_svg.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_avatar_solution.mdx b/api_docs/kbn_shared_ux_avatar_solution.mdx
index f3c543936022f..8d727e343ce46 100644
--- a/api_docs/kbn_shared_ux_avatar_solution.mdx
+++ b/api_docs/kbn_shared_ux_avatar_solution.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-avatar-solution
 title: "@kbn/shared-ux-avatar-solution"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-avatar-solution plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-avatar-solution']
 ---
 import kbnSharedUxAvatarSolutionObj from './kbn_shared_ux_avatar_solution.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_avatar_user_profile_components.mdx b/api_docs/kbn_shared_ux_avatar_user_profile_components.mdx
index c7f660fc5d422..1d96f50090471 100644
--- a/api_docs/kbn_shared_ux_avatar_user_profile_components.mdx
+++ b/api_docs/kbn_shared_ux_avatar_user_profile_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-avatar-user-profile-components
 title: "@kbn/shared-ux-avatar-user-profile-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-avatar-user-profile-components plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-avatar-user-profile-components']
 ---
 import kbnSharedUxAvatarUserProfileComponentsObj from './kbn_shared_ux_avatar_user_profile_components.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_button_exit_full_screen.mdx b/api_docs/kbn_shared_ux_button_exit_full_screen.mdx
index 3722ab19af545..c238eebf30ce3 100644
--- a/api_docs/kbn_shared_ux_button_exit_full_screen.mdx
+++ b/api_docs/kbn_shared_ux_button_exit_full_screen.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-button-exit-full-screen
 title: "@kbn/shared-ux-button-exit-full-screen"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-button-exit-full-screen plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-button-exit-full-screen']
 ---
 import kbnSharedUxButtonExitFullScreenObj from './kbn_shared_ux_button_exit_full_screen.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_button_exit_full_screen_mocks.mdx b/api_docs/kbn_shared_ux_button_exit_full_screen_mocks.mdx
index 23d88b9bb7bc2..e571e864814a7 100644
--- a/api_docs/kbn_shared_ux_button_exit_full_screen_mocks.mdx
+++ b/api_docs/kbn_shared_ux_button_exit_full_screen_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-button-exit-full-screen-mocks
 title: "@kbn/shared-ux-button-exit-full-screen-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-button-exit-full-screen-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-button-exit-full-screen-mocks']
 ---
 import kbnSharedUxButtonExitFullScreenMocksObj from './kbn_shared_ux_button_exit_full_screen_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_button_toolbar.mdx b/api_docs/kbn_shared_ux_button_toolbar.mdx
index 65a874e30c4ba..17d863ad15b80 100644
--- a/api_docs/kbn_shared_ux_button_toolbar.mdx
+++ b/api_docs/kbn_shared_ux_button_toolbar.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-button-toolbar
 title: "@kbn/shared-ux-button-toolbar"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-button-toolbar plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-button-toolbar']
 ---
 import kbnSharedUxButtonToolbarObj from './kbn_shared_ux_button_toolbar.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_card_no_data.mdx b/api_docs/kbn_shared_ux_card_no_data.mdx
index 6c6bd673810c8..c7560cd21c835 100644
--- a/api_docs/kbn_shared_ux_card_no_data.mdx
+++ b/api_docs/kbn_shared_ux_card_no_data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-card-no-data
 title: "@kbn/shared-ux-card-no-data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-card-no-data plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-card-no-data']
 ---
 import kbnSharedUxCardNoDataObj from './kbn_shared_ux_card_no_data.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_card_no_data_mocks.mdx b/api_docs/kbn_shared_ux_card_no_data_mocks.mdx
index e223fdfdebcb9..7c3cbca6bfa65 100644
--- a/api_docs/kbn_shared_ux_card_no_data_mocks.mdx
+++ b/api_docs/kbn_shared_ux_card_no_data_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-card-no-data-mocks
 title: "@kbn/shared-ux-card-no-data-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-card-no-data-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-card-no-data-mocks']
 ---
 import kbnSharedUxCardNoDataMocksObj from './kbn_shared_ux_card_no_data_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_context.mdx b/api_docs/kbn_shared_ux_file_context.mdx
index 76f3f5836a837..3458dd32b4b5c 100644
--- a/api_docs/kbn_shared_ux_file_context.mdx
+++ b/api_docs/kbn_shared_ux_file_context.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-context
 title: "@kbn/shared-ux-file-context"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-context plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-context']
 ---
 import kbnSharedUxFileContextObj from './kbn_shared_ux_file_context.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_image.mdx b/api_docs/kbn_shared_ux_file_image.mdx
index 2309a89ee51ae..c5b10b3e93361 100644
--- a/api_docs/kbn_shared_ux_file_image.mdx
+++ b/api_docs/kbn_shared_ux_file_image.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-image
 title: "@kbn/shared-ux-file-image"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-image plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-image']
 ---
 import kbnSharedUxFileImageObj from './kbn_shared_ux_file_image.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_image_mocks.mdx b/api_docs/kbn_shared_ux_file_image_mocks.mdx
index 7d504a9b90abe..03765102bad1c 100644
--- a/api_docs/kbn_shared_ux_file_image_mocks.mdx
+++ b/api_docs/kbn_shared_ux_file_image_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-image-mocks
 title: "@kbn/shared-ux-file-image-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-image-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-image-mocks']
 ---
 import kbnSharedUxFileImageMocksObj from './kbn_shared_ux_file_image_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_mocks.mdx b/api_docs/kbn_shared_ux_file_mocks.mdx
index c1c7b2bd635ef..c2a6b2898f267 100644
--- a/api_docs/kbn_shared_ux_file_mocks.mdx
+++ b/api_docs/kbn_shared_ux_file_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-mocks
 title: "@kbn/shared-ux-file-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-mocks']
 ---
 import kbnSharedUxFileMocksObj from './kbn_shared_ux_file_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_picker.mdx b/api_docs/kbn_shared_ux_file_picker.mdx
index bc72a83b4631a..a3072335000dd 100644
--- a/api_docs/kbn_shared_ux_file_picker.mdx
+++ b/api_docs/kbn_shared_ux_file_picker.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-picker
 title: "@kbn/shared-ux-file-picker"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-picker plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-picker']
 ---
 import kbnSharedUxFilePickerObj from './kbn_shared_ux_file_picker.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_types.mdx b/api_docs/kbn_shared_ux_file_types.mdx
index 7bfade800a5b0..73dffa9666505 100644
--- a/api_docs/kbn_shared_ux_file_types.mdx
+++ b/api_docs/kbn_shared_ux_file_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-types
 title: "@kbn/shared-ux-file-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-types plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-types']
 ---
 import kbnSharedUxFileTypesObj from './kbn_shared_ux_file_types.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_upload.mdx b/api_docs/kbn_shared_ux_file_upload.mdx
index d789138a1f3c4..b44a3ebd0cf57 100644
--- a/api_docs/kbn_shared_ux_file_upload.mdx
+++ b/api_docs/kbn_shared_ux_file_upload.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-upload
 title: "@kbn/shared-ux-file-upload"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-upload plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-upload']
 ---
 import kbnSharedUxFileUploadObj from './kbn_shared_ux_file_upload.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_util.mdx b/api_docs/kbn_shared_ux_file_util.mdx
index cd2005cbe2f6c..29f8177f6a683 100644
--- a/api_docs/kbn_shared_ux_file_util.mdx
+++ b/api_docs/kbn_shared_ux_file_util.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-util
 title: "@kbn/shared-ux-file-util"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-util plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-util']
 ---
 import kbnSharedUxFileUtilObj from './kbn_shared_ux_file_util.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_link_redirect_app.mdx b/api_docs/kbn_shared_ux_link_redirect_app.mdx
index 453e3d551b616..bfeb8a5123374 100644
--- a/api_docs/kbn_shared_ux_link_redirect_app.mdx
+++ b/api_docs/kbn_shared_ux_link_redirect_app.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-link-redirect-app
 title: "@kbn/shared-ux-link-redirect-app"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-link-redirect-app plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-link-redirect-app']
 ---
 import kbnSharedUxLinkRedirectAppObj from './kbn_shared_ux_link_redirect_app.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx b/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx
index 840098b088fb6..124de09fbb6b2 100644
--- a/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx
+++ b/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-link-redirect-app-mocks
 title: "@kbn/shared-ux-link-redirect-app-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-link-redirect-app-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-link-redirect-app-mocks']
 ---
 import kbnSharedUxLinkRedirectAppMocksObj from './kbn_shared_ux_link_redirect_app_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_markdown.mdx b/api_docs/kbn_shared_ux_markdown.mdx
index 6168d5ff59b0c..ffef3842a8f49 100644
--- a/api_docs/kbn_shared_ux_markdown.mdx
+++ b/api_docs/kbn_shared_ux_markdown.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-markdown
 title: "@kbn/shared-ux-markdown"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-markdown plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-markdown']
 ---
 import kbnSharedUxMarkdownObj from './kbn_shared_ux_markdown.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_markdown_mocks.mdx b/api_docs/kbn_shared_ux_markdown_mocks.mdx
index 0b2c65a94ccc3..12253c541138d 100644
--- a/api_docs/kbn_shared_ux_markdown_mocks.mdx
+++ b/api_docs/kbn_shared_ux_markdown_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-markdown-mocks
 title: "@kbn/shared-ux-markdown-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-markdown-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-markdown-mocks']
 ---
 import kbnSharedUxMarkdownMocksObj from './kbn_shared_ux_markdown_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_analytics_no_data.mdx b/api_docs/kbn_shared_ux_page_analytics_no_data.mdx
index 733df6b02ef93..521e7afeffc28 100644
--- a/api_docs/kbn_shared_ux_page_analytics_no_data.mdx
+++ b/api_docs/kbn_shared_ux_page_analytics_no_data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-analytics-no-data
 title: "@kbn/shared-ux-page-analytics-no-data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-analytics-no-data plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-analytics-no-data']
 ---
 import kbnSharedUxPageAnalyticsNoDataObj from './kbn_shared_ux_page_analytics_no_data.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx b/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx
index 0826251e7e69b..d94f87f474a06 100644
--- a/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-analytics-no-data-mocks
 title: "@kbn/shared-ux-page-analytics-no-data-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-analytics-no-data-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-analytics-no-data-mocks']
 ---
 import kbnSharedUxPageAnalyticsNoDataMocksObj from './kbn_shared_ux_page_analytics_no_data_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_kibana_no_data.mdx b/api_docs/kbn_shared_ux_page_kibana_no_data.mdx
index 8d57ca813a7bb..9256b249ddec3 100644
--- a/api_docs/kbn_shared_ux_page_kibana_no_data.mdx
+++ b/api_docs/kbn_shared_ux_page_kibana_no_data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-no-data
 title: "@kbn/shared-ux-page-kibana-no-data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-kibana-no-data plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-kibana-no-data']
 ---
 import kbnSharedUxPageKibanaNoDataObj from './kbn_shared_ux_page_kibana_no_data.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx b/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx
index 4796a4dc64d56..98c666dc7ac30 100644
--- a/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-no-data-mocks
 title: "@kbn/shared-ux-page-kibana-no-data-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-kibana-no-data-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-kibana-no-data-mocks']
 ---
 import kbnSharedUxPageKibanaNoDataMocksObj from './kbn_shared_ux_page_kibana_no_data_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_kibana_template.mdx b/api_docs/kbn_shared_ux_page_kibana_template.mdx
index e41913e16925f..c7e445662d405 100644
--- a/api_docs/kbn_shared_ux_page_kibana_template.mdx
+++ b/api_docs/kbn_shared_ux_page_kibana_template.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-template
 title: "@kbn/shared-ux-page-kibana-template"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-kibana-template plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-kibana-template']
 ---
 import kbnSharedUxPageKibanaTemplateObj from './kbn_shared_ux_page_kibana_template.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx b/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx
index 3104c250cd274..16e2e693823a6 100644
--- a/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-template-mocks
 title: "@kbn/shared-ux-page-kibana-template-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-kibana-template-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-kibana-template-mocks']
 ---
 import kbnSharedUxPageKibanaTemplateMocksObj from './kbn_shared_ux_page_kibana_template_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_no_data.mdx b/api_docs/kbn_shared_ux_page_no_data.mdx
index c4f55f5c20806..dd303a55b92d1 100644
--- a/api_docs/kbn_shared_ux_page_no_data.mdx
+++ b/api_docs/kbn_shared_ux_page_no_data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data
 title: "@kbn/shared-ux-page-no-data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-no-data plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-no-data']
 ---
 import kbnSharedUxPageNoDataObj from './kbn_shared_ux_page_no_data.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_no_data_config.mdx b/api_docs/kbn_shared_ux_page_no_data_config.mdx
index d167b1e958751..730c8b3b4a670 100644
--- a/api_docs/kbn_shared_ux_page_no_data_config.mdx
+++ b/api_docs/kbn_shared_ux_page_no_data_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data-config
 title: "@kbn/shared-ux-page-no-data-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-no-data-config plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-no-data-config']
 ---
 import kbnSharedUxPageNoDataConfigObj from './kbn_shared_ux_page_no_data_config.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx b/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx
index f5de870c5b104..b9a5faef6e24d 100644
--- a/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data-config-mocks
 title: "@kbn/shared-ux-page-no-data-config-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-no-data-config-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-no-data-config-mocks']
 ---
 import kbnSharedUxPageNoDataConfigMocksObj from './kbn_shared_ux_page_no_data_config_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_no_data_mocks.mdx b/api_docs/kbn_shared_ux_page_no_data_mocks.mdx
index 7ec62a659a858..eb3cdb4b62c34 100644
--- a/api_docs/kbn_shared_ux_page_no_data_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_no_data_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data-mocks
 title: "@kbn/shared-ux-page-no-data-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-no-data-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-no-data-mocks']
 ---
 import kbnSharedUxPageNoDataMocksObj from './kbn_shared_ux_page_no_data_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_solution_nav.mdx b/api_docs/kbn_shared_ux_page_solution_nav.mdx
index 64c532fffed65..50643295597d3 100644
--- a/api_docs/kbn_shared_ux_page_solution_nav.mdx
+++ b/api_docs/kbn_shared_ux_page_solution_nav.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-solution-nav
 title: "@kbn/shared-ux-page-solution-nav"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-solution-nav plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-solution-nav']
 ---
 import kbnSharedUxPageSolutionNavObj from './kbn_shared_ux_page_solution_nav.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_prompt_no_data_views.mdx b/api_docs/kbn_shared_ux_prompt_no_data_views.mdx
index 71813a99b74dc..a3b0893d962cc 100644
--- a/api_docs/kbn_shared_ux_prompt_no_data_views.mdx
+++ b/api_docs/kbn_shared_ux_prompt_no_data_views.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-prompt-no-data-views
 title: "@kbn/shared-ux-prompt-no-data-views"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-prompt-no-data-views plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-prompt-no-data-views']
 ---
 import kbnSharedUxPromptNoDataViewsObj from './kbn_shared_ux_prompt_no_data_views.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx b/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx
index 52ba22e84684f..0419eea5c2561 100644
--- a/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx
+++ b/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-prompt-no-data-views-mocks
 title: "@kbn/shared-ux-prompt-no-data-views-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-prompt-no-data-views-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-prompt-no-data-views-mocks']
 ---
 import kbnSharedUxPromptNoDataViewsMocksObj from './kbn_shared_ux_prompt_no_data_views_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_prompt_not_found.mdx b/api_docs/kbn_shared_ux_prompt_not_found.mdx
index 9f237bb6371dc..8d93e65e58a7a 100644
--- a/api_docs/kbn_shared_ux_prompt_not_found.mdx
+++ b/api_docs/kbn_shared_ux_prompt_not_found.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-prompt-not-found
 title: "@kbn/shared-ux-prompt-not-found"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-prompt-not-found plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-prompt-not-found']
 ---
 import kbnSharedUxPromptNotFoundObj from './kbn_shared_ux_prompt_not_found.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_router.mdx b/api_docs/kbn_shared_ux_router.mdx
index ea4b2719da63f..7b06d8fedf3bc 100644
--- a/api_docs/kbn_shared_ux_router.mdx
+++ b/api_docs/kbn_shared_ux_router.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-router
 title: "@kbn/shared-ux-router"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-router plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-router']
 ---
 import kbnSharedUxRouterObj from './kbn_shared_ux_router.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_router_mocks.mdx b/api_docs/kbn_shared_ux_router_mocks.mdx
index 29ff909748e4b..ba35535d9c82d 100644
--- a/api_docs/kbn_shared_ux_router_mocks.mdx
+++ b/api_docs/kbn_shared_ux_router_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-router-mocks
 title: "@kbn/shared-ux-router-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-router-mocks plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-router-mocks']
 ---
 import kbnSharedUxRouterMocksObj from './kbn_shared_ux_router_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_storybook_config.mdx b/api_docs/kbn_shared_ux_storybook_config.mdx
index 2827c6086dc04..b80a811065383 100644
--- a/api_docs/kbn_shared_ux_storybook_config.mdx
+++ b/api_docs/kbn_shared_ux_storybook_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-storybook-config
 title: "@kbn/shared-ux-storybook-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-storybook-config plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-storybook-config']
 ---
 import kbnSharedUxStorybookConfigObj from './kbn_shared_ux_storybook_config.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_storybook_mock.mdx b/api_docs/kbn_shared_ux_storybook_mock.mdx
index cca631a87cd4d..fdd01db6e7893 100644
--- a/api_docs/kbn_shared_ux_storybook_mock.mdx
+++ b/api_docs/kbn_shared_ux_storybook_mock.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-storybook-mock
 title: "@kbn/shared-ux-storybook-mock"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-storybook-mock plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-storybook-mock']
 ---
 import kbnSharedUxStorybookMockObj from './kbn_shared_ux_storybook_mock.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_utility.mdx b/api_docs/kbn_shared_ux_utility.mdx
index fd49eeb3bece1..002e032035f2d 100644
--- a/api_docs/kbn_shared_ux_utility.mdx
+++ b/api_docs/kbn_shared_ux_utility.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-utility
 title: "@kbn/shared-ux-utility"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-utility plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-utility']
 ---
 import kbnSharedUxUtilityObj from './kbn_shared_ux_utility.devdocs.json';
diff --git a/api_docs/kbn_slo_schema.mdx b/api_docs/kbn_slo_schema.mdx
index 354903e690a21..909cbc86dbb9a 100644
--- a/api_docs/kbn_slo_schema.mdx
+++ b/api_docs/kbn_slo_schema.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-slo-schema
 title: "@kbn/slo-schema"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/slo-schema plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/slo-schema']
 ---
 import kbnSloSchemaObj from './kbn_slo_schema.devdocs.json';
diff --git a/api_docs/kbn_some_dev_log.mdx b/api_docs/kbn_some_dev_log.mdx
index d66dea91b8a6f..32a0175b0ae11 100644
--- a/api_docs/kbn_some_dev_log.mdx
+++ b/api_docs/kbn_some_dev_log.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-some-dev-log
 title: "@kbn/some-dev-log"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/some-dev-log plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/some-dev-log']
 ---
 import kbnSomeDevLogObj from './kbn_some_dev_log.devdocs.json';
diff --git a/api_docs/kbn_std.mdx b/api_docs/kbn_std.mdx
index 4fccf81370810..760fb637dca1f 100644
--- a/api_docs/kbn_std.mdx
+++ b/api_docs/kbn_std.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-std
 title: "@kbn/std"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/std plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/std']
 ---
 import kbnStdObj from './kbn_std.devdocs.json';
diff --git a/api_docs/kbn_stdio_dev_helpers.mdx b/api_docs/kbn_stdio_dev_helpers.mdx
index fb3bbf806a401..c7c0f0be1c9a8 100644
--- a/api_docs/kbn_stdio_dev_helpers.mdx
+++ b/api_docs/kbn_stdio_dev_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-stdio-dev-helpers
 title: "@kbn/stdio-dev-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/stdio-dev-helpers plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/stdio-dev-helpers']
 ---
 import kbnStdioDevHelpersObj from './kbn_stdio_dev_helpers.devdocs.json';
diff --git a/api_docs/kbn_storybook.mdx b/api_docs/kbn_storybook.mdx
index 3de038e136336..a8aaf772dfbeb 100644
--- a/api_docs/kbn_storybook.mdx
+++ b/api_docs/kbn_storybook.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-storybook
 title: "@kbn/storybook"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/storybook plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/storybook']
 ---
 import kbnStorybookObj from './kbn_storybook.devdocs.json';
diff --git a/api_docs/kbn_telemetry_tools.mdx b/api_docs/kbn_telemetry_tools.mdx
index cfcafe77f4a48..e6fb061b3c4e2 100644
--- a/api_docs/kbn_telemetry_tools.mdx
+++ b/api_docs/kbn_telemetry_tools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-telemetry-tools
 title: "@kbn/telemetry-tools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/telemetry-tools plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/telemetry-tools']
 ---
 import kbnTelemetryToolsObj from './kbn_telemetry_tools.devdocs.json';
diff --git a/api_docs/kbn_test.mdx b/api_docs/kbn_test.mdx
index a7e70f981fba1..9bc5f62ac0fb9 100644
--- a/api_docs/kbn_test.mdx
+++ b/api_docs/kbn_test.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-test
 title: "@kbn/test"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/test plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/test']
 ---
 import kbnTestObj from './kbn_test.devdocs.json';
diff --git a/api_docs/kbn_test_jest_helpers.mdx b/api_docs/kbn_test_jest_helpers.mdx
index e90b770c49a23..7cdb7653f1365 100644
--- a/api_docs/kbn_test_jest_helpers.mdx
+++ b/api_docs/kbn_test_jest_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-test-jest-helpers
 title: "@kbn/test-jest-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/test-jest-helpers plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/test-jest-helpers']
 ---
 import kbnTestJestHelpersObj from './kbn_test_jest_helpers.devdocs.json';
diff --git a/api_docs/kbn_test_subj_selector.mdx b/api_docs/kbn_test_subj_selector.mdx
index ea78c22a4920e..fa0e562873fca 100644
--- a/api_docs/kbn_test_subj_selector.mdx
+++ b/api_docs/kbn_test_subj_selector.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-test-subj-selector
 title: "@kbn/test-subj-selector"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/test-subj-selector plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/test-subj-selector']
 ---
 import kbnTestSubjSelectorObj from './kbn_test_subj_selector.devdocs.json';
diff --git a/api_docs/kbn_tooling_log.mdx b/api_docs/kbn_tooling_log.mdx
index 33e8ca0f4e73e..06c7351858830 100644
--- a/api_docs/kbn_tooling_log.mdx
+++ b/api_docs/kbn_tooling_log.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-tooling-log
 title: "@kbn/tooling-log"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/tooling-log plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/tooling-log']
 ---
 import kbnToolingLogObj from './kbn_tooling_log.devdocs.json';
diff --git a/api_docs/kbn_ts_projects.mdx b/api_docs/kbn_ts_projects.mdx
index 4ef9e429af459..2b501f8c55bdb 100644
--- a/api_docs/kbn_ts_projects.mdx
+++ b/api_docs/kbn_ts_projects.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ts-projects
 title: "@kbn/ts-projects"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ts-projects plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ts-projects']
 ---
 import kbnTsProjectsObj from './kbn_ts_projects.devdocs.json';
diff --git a/api_docs/kbn_typed_react_router_config.mdx b/api_docs/kbn_typed_react_router_config.mdx
index 3631c441c34ee..1d9e624fb0ea9 100644
--- a/api_docs/kbn_typed_react_router_config.mdx
+++ b/api_docs/kbn_typed_react_router_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-typed-react-router-config
 title: "@kbn/typed-react-router-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/typed-react-router-config plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/typed-react-router-config']
 ---
 import kbnTypedReactRouterConfigObj from './kbn_typed_react_router_config.devdocs.json';
diff --git a/api_docs/kbn_ui_actions_browser.mdx b/api_docs/kbn_ui_actions_browser.mdx
index 2fae9c1d82668..2b2bdd60e4ce7 100644
--- a/api_docs/kbn_ui_actions_browser.mdx
+++ b/api_docs/kbn_ui_actions_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ui-actions-browser
 title: "@kbn/ui-actions-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ui-actions-browser plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ui-actions-browser']
 ---
 import kbnUiActionsBrowserObj from './kbn_ui_actions_browser.devdocs.json';
diff --git a/api_docs/kbn_ui_shared_deps_src.mdx b/api_docs/kbn_ui_shared_deps_src.mdx
index 8191484ba5834..2461a2ae517a5 100644
--- a/api_docs/kbn_ui_shared_deps_src.mdx
+++ b/api_docs/kbn_ui_shared_deps_src.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ui-shared-deps-src
 title: "@kbn/ui-shared-deps-src"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ui-shared-deps-src plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ui-shared-deps-src']
 ---
 import kbnUiSharedDepsSrcObj from './kbn_ui_shared_deps_src.devdocs.json';
diff --git a/api_docs/kbn_ui_theme.mdx b/api_docs/kbn_ui_theme.mdx
index afa5621c24dd0..889b19937ba67 100644
--- a/api_docs/kbn_ui_theme.mdx
+++ b/api_docs/kbn_ui_theme.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ui-theme
 title: "@kbn/ui-theme"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ui-theme plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ui-theme']
 ---
 import kbnUiThemeObj from './kbn_ui_theme.devdocs.json';
diff --git a/api_docs/kbn_user_profile_components.mdx b/api_docs/kbn_user_profile_components.mdx
index 186a8f826428d..c68316050f7c4 100644
--- a/api_docs/kbn_user_profile_components.mdx
+++ b/api_docs/kbn_user_profile_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-user-profile-components
 title: "@kbn/user-profile-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/user-profile-components plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/user-profile-components']
 ---
 import kbnUserProfileComponentsObj from './kbn_user_profile_components.devdocs.json';
diff --git a/api_docs/kbn_utility_types.mdx b/api_docs/kbn_utility_types.mdx
index d1fc0f672252e..27d8eed321f38 100644
--- a/api_docs/kbn_utility_types.mdx
+++ b/api_docs/kbn_utility_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-utility-types
 title: "@kbn/utility-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/utility-types plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/utility-types']
 ---
 import kbnUtilityTypesObj from './kbn_utility_types.devdocs.json';
diff --git a/api_docs/kbn_utility_types_jest.mdx b/api_docs/kbn_utility_types_jest.mdx
index a78c9ff36b9c8..23117d51a44f0 100644
--- a/api_docs/kbn_utility_types_jest.mdx
+++ b/api_docs/kbn_utility_types_jest.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-utility-types-jest
 title: "@kbn/utility-types-jest"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/utility-types-jest plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/utility-types-jest']
 ---
 import kbnUtilityTypesJestObj from './kbn_utility_types_jest.devdocs.json';
diff --git a/api_docs/kbn_utils.mdx b/api_docs/kbn_utils.mdx
index ffdbc677b4d20..dd420e4509c04 100644
--- a/api_docs/kbn_utils.mdx
+++ b/api_docs/kbn_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-utils
 title: "@kbn/utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/utils plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/utils']
 ---
 import kbnUtilsObj from './kbn_utils.devdocs.json';
diff --git a/api_docs/kbn_yarn_lock_validator.mdx b/api_docs/kbn_yarn_lock_validator.mdx
index afbc6e1514ece..eb3b59e92004e 100644
--- a/api_docs/kbn_yarn_lock_validator.mdx
+++ b/api_docs/kbn_yarn_lock_validator.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-yarn-lock-validator
 title: "@kbn/yarn-lock-validator"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/yarn-lock-validator plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/yarn-lock-validator']
 ---
 import kbnYarnLockValidatorObj from './kbn_yarn_lock_validator.devdocs.json';
diff --git a/api_docs/kibana_overview.mdx b/api_docs/kibana_overview.mdx
index 4a14e097b5a6e..92633990126eb 100644
--- a/api_docs/kibana_overview.mdx
+++ b/api_docs/kibana_overview.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kibanaOverview
 title: "kibanaOverview"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the kibanaOverview plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kibanaOverview']
 ---
 import kibanaOverviewObj from './kibana_overview.devdocs.json';
diff --git a/api_docs/kibana_react.devdocs.json b/api_docs/kibana_react.devdocs.json
index 30afa8507031f..1dbaea8a030f5 100644
--- a/api_docs/kibana_react.devdocs.json
+++ b/api_docs/kibana_react.devdocs.json
@@ -1268,18 +1268,6 @@
             "plugin": "savedObjectsManagement",
             "path": "src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx"
           },
-          {
-            "plugin": "observability",
-            "path": "x-pack/plugins/observability/public/application/index.tsx"
-          },
-          {
-            "plugin": "observability",
-            "path": "x-pack/plugins/observability/public/application/index.tsx"
-          },
-          {
-            "plugin": "observability",
-            "path": "x-pack/plugins/observability/public/application/index.tsx"
-          },
           {
             "plugin": "exploratoryView",
             "path": "x-pack/plugins/exploratory_view/public/application/index.tsx"
@@ -1316,6 +1304,18 @@
             "plugin": "fleet",
             "path": "x-pack/plugins/fleet/public/components/custom_assets_accordion.tsx"
           },
+          {
+            "plugin": "observability",
+            "path": "x-pack/plugins/observability/public/application/index.tsx"
+          },
+          {
+            "plugin": "observability",
+            "path": "x-pack/plugins/observability/public/application/index.tsx"
+          },
+          {
+            "plugin": "observability",
+            "path": "x-pack/plugins/observability/public/application/index.tsx"
+          },
           {
             "plugin": "ml",
             "path": "x-pack/plugins/ml/public/application/management/jobs_list/components/jobs_list_page/jobs_list_page.tsx"
diff --git a/api_docs/kibana_react.mdx b/api_docs/kibana_react.mdx
index 5a580fea57c7c..b521c0367a597 100644
--- a/api_docs/kibana_react.mdx
+++ b/api_docs/kibana_react.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kibanaReact
 title: "kibanaReact"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the kibanaReact plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kibanaReact']
 ---
 import kibanaReactObj from './kibana_react.devdocs.json';
diff --git a/api_docs/kibana_utils.mdx b/api_docs/kibana_utils.mdx
index 9694f7d515bb3..8dd98ee82cd67 100644
--- a/api_docs/kibana_utils.mdx
+++ b/api_docs/kibana_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kibanaUtils
 title: "kibanaUtils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the kibanaUtils plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kibanaUtils']
 ---
 import kibanaUtilsObj from './kibana_utils.devdocs.json';
diff --git a/api_docs/kubernetes_security.mdx b/api_docs/kubernetes_security.mdx
index 76c162d42d53a..edea19a333163 100644
--- a/api_docs/kubernetes_security.mdx
+++ b/api_docs/kubernetes_security.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kubernetesSecurity
 title: "kubernetesSecurity"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the kubernetesSecurity plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kubernetesSecurity']
 ---
 import kubernetesSecurityObj from './kubernetes_security.devdocs.json';
diff --git a/api_docs/lens.devdocs.json b/api_docs/lens.devdocs.json
index 4e7a2c648a02e..802b5f80050e6 100644
--- a/api_docs/lens.devdocs.json
+++ b/api_docs/lens.devdocs.json
@@ -6585,7 +6585,7 @@
             "signature": [
               "((props: ",
               "VisualizationConfigProps",
-              "<T>) => boolean) | undefined"
+              "<T>) => Record<\"data\" | \"appearance\", boolean>) | undefined"
             ],
             "path": "x-pack/plugins/lens/public/types.ts",
             "deprecated": false,
@@ -6619,8 +6619,8 @@
             "description": [],
             "signature": [
               "((domElement: Element, props: ",
-              "VisualizationLayerSettingsProps",
-              "<T>) => void | ((cleanupElement: Element) => void)) | undefined"
+              "VisualizationConfigProps",
+              "<T> & { setState(newState: T | ((currState: T) => T)): void; panelRef: React.MutableRefObject<HTMLDivElement | null>; } & { section: \"data\" | \"appearance\"; }) => void | ((cleanupElement: Element) => void)) | undefined"
             ],
             "path": "x-pack/plugins/lens/public/types.ts",
             "deprecated": false,
@@ -6649,8 +6649,8 @@
                 "label": "props",
                 "description": [],
                 "signature": [
-                  "VisualizationLayerSettingsProps",
-                  "<T>"
+                  "VisualizationConfigProps",
+                  "<T> & { setState(newState: T | ((currState: T) => T)): void; panelRef: React.MutableRefObject<HTMLDivElement | null>; } & { section: \"data\" | \"appearance\"; }"
                 ],
                 "path": "x-pack/plugins/lens/public/types.ts",
                 "deprecated": false,
@@ -7602,6 +7602,40 @@
               }
             ],
             "returnComment": []
+          },
+          {
+            "parentPluginId": "lens",
+            "id": "def-public.Visualization.getReportingLayout",
+            "type": "Function",
+            "tags": [],
+            "label": "getReportingLayout",
+            "description": [
+              "\nA visualization can return custom dimensions for the reporting tool"
+            ],
+            "signature": [
+              "((state: T) => { height: number; width: number; }) | undefined"
+            ],
+            "path": "x-pack/plugins/lens/public/types.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "lens",
+                "id": "def-public.Visualization.getReportingLayout.$1",
+                "type": "Uncategorized",
+                "tags": [],
+                "label": "state",
+                "description": [],
+                "signature": [
+                  "T"
+                ],
+                "path": "x-pack/plugins/lens/public/types.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
           }
         ],
         "initialIsOpen": false
diff --git a/api_docs/lens.mdx b/api_docs/lens.mdx
index 5377268b2dc32..67003127c5a66 100644
--- a/api_docs/lens.mdx
+++ b/api_docs/lens.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/lens
 title: "lens"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the lens plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'lens']
 ---
 import lensObj from './lens.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/k
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 608 | 0 | 513 | 53 |
+| 610 | 0 | 514 | 52 |
 
 ## Client
 
diff --git a/api_docs/license_api_guard.mdx b/api_docs/license_api_guard.mdx
index 7fe813ac1ed82..523a22146062a 100644
--- a/api_docs/license_api_guard.mdx
+++ b/api_docs/license_api_guard.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/licenseApiGuard
 title: "licenseApiGuard"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the licenseApiGuard plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'licenseApiGuard']
 ---
 import licenseApiGuardObj from './license_api_guard.devdocs.json';
diff --git a/api_docs/license_management.mdx b/api_docs/license_management.mdx
index 5b6307ca22c86..f8f04c8ea317a 100644
--- a/api_docs/license_management.mdx
+++ b/api_docs/license_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/licenseManagement
 title: "licenseManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the licenseManagement plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'licenseManagement']
 ---
 import licenseManagementObj from './license_management.devdocs.json';
diff --git a/api_docs/licensing.mdx b/api_docs/licensing.mdx
index 98bf9c1fa8ae2..5d218b97477d5 100644
--- a/api_docs/licensing.mdx
+++ b/api_docs/licensing.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/licensing
 title: "licensing"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the licensing plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'licensing']
 ---
 import licensingObj from './licensing.devdocs.json';
diff --git a/api_docs/lists.mdx b/api_docs/lists.mdx
index 017be96350ac0..3fa35bd4fee29 100644
--- a/api_docs/lists.mdx
+++ b/api_docs/lists.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/lists
 title: "lists"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the lists plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'lists']
 ---
 import listsObj from './lists.devdocs.json';
diff --git a/api_docs/management.mdx b/api_docs/management.mdx
index f95d5c3108003..869b213005de0 100644
--- a/api_docs/management.mdx
+++ b/api_docs/management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/management
 title: "management"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the management plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'management']
 ---
 import managementObj from './management.devdocs.json';
diff --git a/api_docs/maps.devdocs.json b/api_docs/maps.devdocs.json
index 327c896765d86..5b7625d514738 100644
--- a/api_docs/maps.devdocs.json
+++ b/api_docs/maps.devdocs.json
@@ -3976,7 +3976,7 @@
         "signature": [
           "\"__kbn__feature_id__\""
         ],
-        "path": "x-pack/plugins/maps/public/classes/layers/vector_layer/geojson_vector_layer/assign_feature_ids.ts",
+        "path": "x-pack/plugins/maps/common/constants.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
@@ -4101,7 +4101,7 @@
         "signature": [
           "\"MAPS_APP_LOCATOR\""
         ],
-        "path": "x-pack/plugins/maps/public/locators.ts",
+        "path": "x-pack/plugins/maps/public/locators/map_locator/locator_definition.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
diff --git a/api_docs/maps.mdx b/api_docs/maps.mdx
index 4162686593d2e..c61e46893d581 100644
--- a/api_docs/maps.mdx
+++ b/api_docs/maps.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/maps
 title: "maps"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the maps plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'maps']
 ---
 import mapsObj from './maps.devdocs.json';
diff --git a/api_docs/maps_ems.mdx b/api_docs/maps_ems.mdx
index 058893cf79f57..880d15fc8021b 100644
--- a/api_docs/maps_ems.mdx
+++ b/api_docs/maps_ems.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/mapsEms
 title: "mapsEms"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the mapsEms plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'mapsEms']
 ---
 import mapsEmsObj from './maps_ems.devdocs.json';
diff --git a/api_docs/ml.mdx b/api_docs/ml.mdx
index f87cd86d7c650..3f870e60e045f 100644
--- a/api_docs/ml.mdx
+++ b/api_docs/ml.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ml
 title: "ml"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the ml plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ml']
 ---
 import mlObj from './ml.devdocs.json';
diff --git a/api_docs/monitoring.mdx b/api_docs/monitoring.mdx
index 66f5f745e831d..52cfc7d67cff5 100644
--- a/api_docs/monitoring.mdx
+++ b/api_docs/monitoring.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/monitoring
 title: "monitoring"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the monitoring plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'monitoring']
 ---
 import monitoringObj from './monitoring.devdocs.json';
diff --git a/api_docs/monitoring_collection.mdx b/api_docs/monitoring_collection.mdx
index 099410cb470cd..0dd111f72ef78 100644
--- a/api_docs/monitoring_collection.mdx
+++ b/api_docs/monitoring_collection.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/monitoringCollection
 title: "monitoringCollection"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the monitoringCollection plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'monitoringCollection']
 ---
 import monitoringCollectionObj from './monitoring_collection.devdocs.json';
diff --git a/api_docs/navigation.mdx b/api_docs/navigation.mdx
index bbabd06919df1..3121830a9f2a7 100644
--- a/api_docs/navigation.mdx
+++ b/api_docs/navigation.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/navigation
 title: "navigation"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the navigation plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'navigation']
 ---
 import navigationObj from './navigation.devdocs.json';
diff --git a/api_docs/newsfeed.mdx b/api_docs/newsfeed.mdx
index 16aea8ad4d480..37887d4843b4c 100644
--- a/api_docs/newsfeed.mdx
+++ b/api_docs/newsfeed.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/newsfeed
 title: "newsfeed"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the newsfeed plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'newsfeed']
 ---
 import newsfeedObj from './newsfeed.devdocs.json';
diff --git a/api_docs/notifications.mdx b/api_docs/notifications.mdx
index 2b804922debe0..f9bde1b340e02 100644
--- a/api_docs/notifications.mdx
+++ b/api_docs/notifications.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/notifications
 title: "notifications"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the notifications plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'notifications']
 ---
 import notificationsObj from './notifications.devdocs.json';
diff --git a/api_docs/observability.devdocs.json b/api_docs/observability.devdocs.json
index 44e312e71c6d6..7a97a26b790af 100644
--- a/api_docs/observability.devdocs.json
+++ b/api_docs/observability.devdocs.json
@@ -4242,6 +4242,24 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "observability",
+            "id": "def-public.ObservabilityPublicPluginsSetup.observabilityShared",
+            "type": "Object",
+            "tags": [],
+            "label": "observabilityShared",
+            "description": [],
+            "signature": [
+              "{ navigation: { registerSections: (sections$: ",
+              "Observable",
+              "<",
+              "NavigationSection",
+              "[]>) => void; }; }"
+            ],
+            "path": "x-pack/plugins/observability/public/plugin.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "observability",
             "id": "def-public.ObservabilityPublicPluginsSetup.share",
@@ -4526,6 +4544,26 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "observability",
+            "id": "def-public.ObservabilityPublicPluginsStart.exploratoryView",
+            "type": "Object",
+            "tags": [],
+            "label": "exploratoryView",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "exploratoryView",
+                "scope": "public",
+                "docId": "kibExploratoryViewPluginApi",
+                "section": "def-public.ExploratoryViewPublicPluginsStart",
+                "text": "ExploratoryViewPublicPluginsStart"
+              }
+            ],
+            "path": "x-pack/plugins/observability/public/plugin.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "observability",
             "id": "def-public.ObservabilityPublicPluginsStart.guidedOnboarding",
@@ -4586,6 +4624,40 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "observability",
+            "id": "def-public.ObservabilityPublicPluginsStart.observabilityShared",
+            "type": "Object",
+            "tags": [],
+            "label": "observabilityShared",
+            "description": [],
+            "signature": [
+              "{ navigation: { PageTemplate: (pageTemplateProps: ",
+              "WrappedPageTemplateProps",
+              ") => JSX.Element; }; updateGlobalNavigation: ({ capabilities, deepLinks, updater$, }: { capabilities: Readonly<{ [x: string]: Readonly<{ [x: string]: boolean | Readonly<{ [x: string]: boolean; }>; }>; navLinks: Readonly<{ [x: string]: boolean; }>; management: Readonly<{ [x: string]: Readonly<{ [x: string]: boolean; }>; }>; catalogue: Readonly<{ [x: string]: boolean; }>; }>; deepLinks: ",
+              {
+                "pluginId": "@kbn/core-application-browser",
+                "scope": "common",
+                "docId": "kibKbnCoreApplicationBrowserPluginApi",
+                "section": "def-common.AppDeepLink",
+                "text": "AppDeepLink"
+              },
+              "[]; updater$: ",
+              "Subject",
+              "<",
+              {
+                "pluginId": "@kbn/core-application-browser",
+                "scope": "common",
+                "docId": "kibKbnCoreApplicationBrowserPluginApi",
+                "section": "def-common.AppUpdater",
+                "text": "AppUpdater"
+              },
+              ">; }) => void; }"
+            ],
+            "path": "x-pack/plugins/observability/public/plugin.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "observability",
             "id": "def-public.ObservabilityPublicPluginsStart.ruleTypeRegistry",
@@ -6845,17 +6917,7 @@
           "section": "def-public.ObservabilityRuleTypeFormatter",
           "text": "ObservabilityRuleTypeFormatter"
         },
-        " | undefined; list: () => string[]; }; navigation: { registerSections: (sections$: ",
-        "Observable",
-        "<",
-        {
-          "pluginId": "observability",
-          "scope": "public",
-          "docId": "kibObservabilityPluginApi",
-          "section": "def-public.NavigationSection",
-          "text": "NavigationSection"
-        },
-        "[]>) => void; }; useRulesLink: (options?: ",
+        " | undefined; list: () => string[]; }; useRulesLink: (options?: ",
         "Options",
         ") => ",
         "LinkProps",
@@ -6891,37 +6953,7 @@
           "section": "def-public.ObservabilityRuleTypeFormatter",
           "text": "ObservabilityRuleTypeFormatter"
         },
-        " | undefined; list: () => string[]; }; navigation: { PageTemplate: (pageTemplateProps: ",
-        "WrappedPageTemplateProps",
-        ") => JSX.Element; }; createExploratoryViewUrl: ({ reportType, allSeries }: { reportType: ",
-        "ReportViewType",
-        "; allSeries: ",
-        {
-          "pluginId": "observability",
-          "scope": "public",
-          "docId": "kibObservabilityPluginApi",
-          "section": "def-public.AllSeries",
-          "text": "AllSeries"
-        },
-        "; }, baseHref?: string, appId?: string) => string; getAppDataView: (appId: ",
-        "AppDataType",
-        ", indexPattern?: string | undefined) => Promise<",
-        {
-          "pluginId": "dataViews",
-          "scope": "common",
-          "docId": "kibDataViewsPluginApi",
-          "section": "def-common.DataView",
-          "text": "DataView"
-        },
-        " | null | undefined>; ExploratoryViewEmbeddable: (props: ",
-        {
-          "pluginId": "observability",
-          "scope": "public",
-          "docId": "kibObservabilityPluginApi",
-          "section": "def-public.ExploratoryEmbeddableProps",
-          "text": "ExploratoryEmbeddableProps"
-        },
-        ") => JSX.Element | null; useRulesLink: (options?: ",
+        " | undefined; list: () => string[]; }; useRulesLink: (options?: ",
         "Options",
         ") => ",
         "LinkProps",
diff --git a/api_docs/observability.mdx b/api_docs/observability.mdx
index f9e097a2564a2..3e7b223414a79 100644
--- a/api_docs/observability.mdx
+++ b/api_docs/observability.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observability
 title: "observability"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observability plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observability']
 ---
 import observabilityObj from './observability.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/actionable-observability](https://github.com/orgs/elastic/team
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 653 | 44 | 647 | 34 |
+| 656 | 44 | 650 | 33 |
 
 ## Client
 
diff --git a/api_docs/observability_shared.devdocs.json b/api_docs/observability_shared.devdocs.json
index cc911b709261d..703f3db5c4d04 100644
--- a/api_docs/observability_shared.devdocs.json
+++ b/api_docs/observability_shared.devdocs.json
@@ -154,7 +154,26 @@
         "initialIsOpen": false
       }
     ],
-    "functions": [],
+    "functions": [
+      {
+        "parentPluginId": "observabilityShared",
+        "id": "def-public.useObservabilityTourContext",
+        "type": "Function",
+        "tags": [],
+        "label": "useObservabilityTourContext",
+        "description": [],
+        "signature": [
+          "() => ",
+          "ObservabilityTourContextValue"
+        ],
+        "path": "x-pack/plugins/observability_shared/public/components/tour/tour.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [],
+        "returnComment": [],
+        "initialIsOpen": false
+      }
+    ],
     "interfaces": [
       {
         "parentPluginId": "observabilityShared",
@@ -376,6 +395,21 @@
         "trackAdoption": false,
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "observabilityShared",
+        "id": "def-public.observabilityAppId",
+        "type": "string",
+        "tags": [],
+        "label": "observabilityAppId",
+        "description": [],
+        "signature": [
+          "\"observability-overview\""
+        ],
+        "path": "x-pack/plugins/observability_shared/common/index.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "observabilityShared",
         "id": "def-public.observabilityFeatureId",
diff --git a/api_docs/observability_shared.mdx b/api_docs/observability_shared.mdx
index d5d70399bfd0f..4056665de1ed6 100644
--- a/api_docs/observability_shared.mdx
+++ b/api_docs/observability_shared.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observabilityShared
 title: "observabilityShared"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observabilityShared plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observabilityShared']
 ---
 import observabilitySharedObj from './observability_shared.devdocs.json';
@@ -21,10 +21,13 @@ Contact [@elastic/actionable-observability](https://github.com/orgs/elastic/team
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 30 | 0 | 30 | 4 |
+| 32 | 0 | 32 | 5 |
 
 ## Client
 
+### Functions
+<DocDefinitionList data={observabilitySharedObj.client.functions}/>
+
 ### Classes
 <DocDefinitionList data={observabilitySharedObj.client.classes}/>
 
diff --git a/api_docs/osquery.mdx b/api_docs/osquery.mdx
index 11f7de7c24d37..4663fb00ad3f8 100644
--- a/api_docs/osquery.mdx
+++ b/api_docs/osquery.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/osquery
 title: "osquery"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the osquery plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'osquery']
 ---
 import osqueryObj from './osquery.devdocs.json';
diff --git a/api_docs/plugin_directory.mdx b/api_docs/plugin_directory.mdx
index c2992ea7066af..9c0fa8d2d15ae 100644
--- a/api_docs/plugin_directory.mdx
+++ b/api_docs/plugin_directory.mdx
@@ -7,7 +7,7 @@ id: kibDevDocsPluginDirectory
 slug: /kibana-dev-docs/api-meta/plugin-api-directory
 title: Directory
 description: Directory of public APIs available through plugins or packages.
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana']
 ---
 
@@ -21,7 +21,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 
 | API Count | Any Count | Missing comments | Missing exports |
 |--------------|----------|-----------------|--------|
-| 68983 | 526 | 59579 | 1338 |
+| 68995 | 526 | 59590 | 1337 |
 
 ## Plugin Directory
 
@@ -72,7 +72,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibEsUiSharedPluginApi" text="esUiShared"/> | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 114 | 3 | 110 | 5 |
 | <DocLink id="kibEventAnnotationPluginApi" text="eventAnnotation"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | The Event Annotation service contains expressions for event annotations | 172 | 30 | 172 | 3 |
 | <DocLink id="kibEventLogPluginApi" text="eventLog"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 116 | 0 | 116 | 11 |
-| <DocLink id="kibExploratoryViewPluginApi" text="exploratoryView"/> | [@elastic/uptime](https://github.com/orgs/elastic/teams/uptime) | - | 352 | 4 | 349 | 22 |
+| <DocLink id="kibExploratoryViewPluginApi" text="exploratoryView"/> | [@elastic/uptime](https://github.com/orgs/elastic/teams/uptime) | - | 351 | 4 | 348 | 22 |
 | <DocLink id="kibExpressionErrorPluginApi" text="expressionError"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds 'error' renderer to expressions | 17 | 0 | 15 | 2 |
 | <DocLink id="kibExpressionGaugePluginApi" text="expressionGauge"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | Expression Gauge plugin adds a `gauge` renderer and function to the expression plugin. The renderer will display the `gauge` chart. | 59 | 0 | 59 | 2 |
 | <DocLink id="kibExpressionHeatmapPluginApi" text="expressionHeatmap"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | Expression Heatmap plugin adds a `heatmap` renderer and function to the expression plugin. The renderer will display the `heatmap` chart. | 112 | 14 | 108 | 2 |
@@ -92,7 +92,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibFileUploadPluginApi" text="fileUpload"/> | [@elastic/kibana-gis](https://github.com/orgs/elastic/teams/kibana-gis) | The file upload plugin contains components and services for uploading a file, analyzing its data, and then importing the data into an Elasticsearch index. Supported file types include CSV, TSV, newline-delimited JSON and GeoJSON. | 62 | 0 | 62 | 2 |
 | <DocLink id="kibFilesPluginApi" text="files"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | File upload, download, sharing, and serving over HTTP implementation in Kibana. | 215 | 0 | 10 | 5 |
 | <DocLink id="kibFilesManagementPluginApi" text="filesManagement"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | Simple UI for managing files in Kibana | 2 | 1 | 2 | 0 |
-| <DocLink id="kibFleetPluginApi" text="fleet"/> | [@elastic/fleet](https://github.com/orgs/elastic/teams/fleet) | - | 1098 | 3 | 993 | 27 |
+| <DocLink id="kibFleetPluginApi" text="fleet"/> | [@elastic/fleet](https://github.com/orgs/elastic/teams/fleet) | - | 1101 | 3 | 996 | 27 |
 | ftrApis | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 0 | 0 | 0 | 0 |
 | <DocLink id="kibGlobalSearchPluginApi" text="globalSearch"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 68 | 0 | 14 | 5 |
 | globalSearchBar | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 0 | 0 | 0 | 0 |
@@ -114,7 +114,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | kibanaUsageCollection | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 0 | 0 | 0 | 0 |
 | <DocLink id="kibKibanaUtilsPluginApi" text="kibanaUtils"/> | [@elastic/kibana-app-services](https://github.com/orgs/elastic/teams/kibana-app-services) | - | 609 | 3 | 416 | 9 |
 | <DocLink id="kibKubernetesSecurityPluginApi" text="kubernetesSecurity"/> | [@elastic/sec-cloudnative-integrations](https://github.com/orgs/elastic/teams/sec-cloudnative-integrations) | - | 3 | 0 | 3 | 1 |
-| <DocLink id="kibLensPluginApi" text="lens"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | Visualization editor allowing to quickly and easily configure compelling visualizations to use on dashboards and canvas workpads. Exposes components to embed visualizations and link into the Lens editor from within other apps in Kibana. | 608 | 0 | 513 | 53 |
+| <DocLink id="kibLensPluginApi" text="lens"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | Visualization editor allowing to quickly and easily configure compelling visualizations to use on dashboards and canvas workpads. Exposes components to embed visualizations and link into the Lens editor from within other apps in Kibana. | 610 | 0 | 514 | 52 |
 | <DocLink id="kibLicenseApiGuardPluginApi" text="licenseApiGuard"/> | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 8 | 0 | 8 | 0 |
 | <DocLink id="kibLicenseManagementPluginApi" text="licenseManagement"/> | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 4 | 0 | 4 | 1 |
 | <DocLink id="kibLicensingPluginApi" text="licensing"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 117 | 0 | 42 | 10 |
@@ -129,8 +129,8 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibNavigationPluginApi" text="navigation"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 34 | 0 | 34 | 2 |
 | <DocLink id="kibNewsfeedPluginApi" text="newsfeed"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 17 | 0 | 17 | 0 |
 | <DocLink id="kibNotificationsPluginApi" text="notifications"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 2 | 0 | 2 | 1 |
-| <DocLink id="kibObservabilityPluginApi" text="observability"/> | [@elastic/actionable-observability](https://github.com/orgs/elastic/teams/actionable-observability) | - | 653 | 44 | 647 | 34 |
-| <DocLink id="kibObservabilitySharedPluginApi" text="observabilityShared"/> | [@elastic/actionable-observability](https://github.com/orgs/elastic/teams/actionable-observability) | - | 30 | 0 | 30 | 4 |
+| <DocLink id="kibObservabilityPluginApi" text="observability"/> | [@elastic/actionable-observability](https://github.com/orgs/elastic/teams/actionable-observability) | - | 656 | 44 | 650 | 33 |
+| <DocLink id="kibObservabilitySharedPluginApi" text="observabilityShared"/> | [@elastic/actionable-observability](https://github.com/orgs/elastic/teams/actionable-observability) | - | 32 | 0 | 32 | 5 |
 | <DocLink id="kibOsqueryPluginApi" text="osquery"/> | [@elastic/security-defend-workflows](https://github.com/orgs/elastic/teams/security-defend-workflows) | - | 24 | 0 | 24 | 6 |
 | painlessLab | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 0 | 0 | 0 | 0 |
 | <DocLink id="kibPresentationUtilPluginApi" text="presentationUtil"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | The Presentation Utility Plugin is a set of common, shared components and toolkits for solutions within the Presentation space, (e.g. Dashboards, Canvas). | 207 | 8 | 151 | 12 |
@@ -138,7 +138,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibRemoteClustersPluginApi" text="remoteClusters"/> | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 4 | 0 | 4 | 0 |
 | <DocLink id="kibReportingPluginApi" text="reporting"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | Reporting Services enables applications to feature reports that the user can automate with Watcher and download later. | 36 | 0 | 16 | 0 |
 | <DocLink id="kibRollupPluginApi" text="rollup"/> | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 21 | 0 | 21 | 0 |
-| <DocLink id="kibRuleRegistryPluginApi" text="ruleRegistry"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 260 | 0 | 231 | 14 |
+| <DocLink id="kibRuleRegistryPluginApi" text="ruleRegistry"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 263 | 0 | 234 | 14 |
 | <DocLink id="kibRuntimeFieldsPluginApi" text="runtimeFields"/> | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 24 | 0 | 19 | 2 |
 | <DocLink id="kibSavedObjectsPluginApi" text="savedObjects"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 127 | 2 | 116 | 4 |
 | <DocLink id="kibSavedObjectsFinderPluginApi" text="savedObjectsFinder"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 44 | 0 | 44 | 0 |
diff --git a/api_docs/presentation_util.mdx b/api_docs/presentation_util.mdx
index a5e850da8b2cb..63d78b82deb52 100644
--- a/api_docs/presentation_util.mdx
+++ b/api_docs/presentation_util.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/presentationUtil
 title: "presentationUtil"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the presentationUtil plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'presentationUtil']
 ---
 import presentationUtilObj from './presentation_util.devdocs.json';
diff --git a/api_docs/profiling.mdx b/api_docs/profiling.mdx
index 532a14b3be1cb..3c12612495706 100644
--- a/api_docs/profiling.mdx
+++ b/api_docs/profiling.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/profiling
 title: "profiling"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the profiling plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'profiling']
 ---
 import profilingObj from './profiling.devdocs.json';
diff --git a/api_docs/remote_clusters.mdx b/api_docs/remote_clusters.mdx
index 7afb72b454a44..a33d94e833ade 100644
--- a/api_docs/remote_clusters.mdx
+++ b/api_docs/remote_clusters.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/remoteClusters
 title: "remoteClusters"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the remoteClusters plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'remoteClusters']
 ---
 import remoteClustersObj from './remote_clusters.devdocs.json';
diff --git a/api_docs/reporting.mdx b/api_docs/reporting.mdx
index cb79cce43c521..f38277af4ee88 100644
--- a/api_docs/reporting.mdx
+++ b/api_docs/reporting.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/reporting
 title: "reporting"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the reporting plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'reporting']
 ---
 import reportingObj from './reporting.devdocs.json';
diff --git a/api_docs/rollup.mdx b/api_docs/rollup.mdx
index 465dff3eeb282..90c95d189b35b 100644
--- a/api_docs/rollup.mdx
+++ b/api_docs/rollup.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/rollup
 title: "rollup"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the rollup plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'rollup']
 ---
 import rollupObj from './rollup.devdocs.json';
diff --git a/api_docs/rule_registry.devdocs.json b/api_docs/rule_registry.devdocs.json
index 6b966ac060602..a7c14ef74b66d 100644
--- a/api_docs/rule_registry.devdocs.json
+++ b/api_docs/rule_registry.devdocs.json
@@ -314,7 +314,7 @@
             "description": [],
             "signature": [
               "({ caseId, alerts }: ",
-              "RemoveAlertsFromCaseOptions",
+              "RemoveCaseIdFromAlertsOptions",
               ") => Promise<void>"
             ],
             "path": "x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts",
@@ -329,7 +329,7 @@
                 "label": "{ caseId, alerts }",
                 "description": [],
                 "signature": [
-                  "RemoveAlertsFromCaseOptions"
+                  "RemoveCaseIdFromAlertsOptions"
                 ],
                 "path": "x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts",
                 "deprecated": false,
@@ -339,6 +339,50 @@
             ],
             "returnComment": []
           },
+          {
+            "parentPluginId": "ruleRegistry",
+            "id": "def-server.AlertsClient.removeCaseIdsFromAllAlerts",
+            "type": "Function",
+            "tags": [],
+            "label": "removeCaseIdsFromAllAlerts",
+            "description": [],
+            "signature": [
+              "({ caseIds }: { caseIds: string[]; }) => Promise<void>"
+            ],
+            "path": "x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "ruleRegistry",
+                "id": "def-server.AlertsClient.removeCaseIdsFromAllAlerts.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "{ caseIds }",
+                "description": [],
+                "path": "x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "children": [
+                  {
+                    "parentPluginId": "ruleRegistry",
+                    "id": "def-server.AlertsClient.removeCaseIdsFromAllAlerts.$1.caseIds",
+                    "type": "Array",
+                    "tags": [],
+                    "label": "caseIds",
+                    "description": [],
+                    "signature": [
+                      "string[]"
+                    ],
+                    "path": "x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  }
+                ]
+              }
+            ],
+            "returnComment": []
+          },
           {
             "parentPluginId": "ruleRegistry",
             "id": "def-server.AlertsClient.find",
diff --git a/api_docs/rule_registry.mdx b/api_docs/rule_registry.mdx
index 0c3666ca0988c..03e511b5dd320 100644
--- a/api_docs/rule_registry.mdx
+++ b/api_docs/rule_registry.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ruleRegistry
 title: "ruleRegistry"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the ruleRegistry plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ruleRegistry']
 ---
 import ruleRegistryObj from './rule_registry.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-o
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 260 | 0 | 231 | 14 |
+| 263 | 0 | 234 | 14 |
 
 ## Server
 
diff --git a/api_docs/runtime_fields.mdx b/api_docs/runtime_fields.mdx
index d8d18ebab68ce..abc334737e1d2 100644
--- a/api_docs/runtime_fields.mdx
+++ b/api_docs/runtime_fields.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/runtimeFields
 title: "runtimeFields"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the runtimeFields plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'runtimeFields']
 ---
 import runtimeFieldsObj from './runtime_fields.devdocs.json';
diff --git a/api_docs/saved_objects.mdx b/api_docs/saved_objects.mdx
index 75f04d6d2a9ab..1f7640d60a3e5 100644
--- a/api_docs/saved_objects.mdx
+++ b/api_docs/saved_objects.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjects
 title: "savedObjects"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjects plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjects']
 ---
 import savedObjectsObj from './saved_objects.devdocs.json';
diff --git a/api_docs/saved_objects_finder.mdx b/api_docs/saved_objects_finder.mdx
index 944092f2f1730..9f9007d746036 100644
--- a/api_docs/saved_objects_finder.mdx
+++ b/api_docs/saved_objects_finder.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsFinder
 title: "savedObjectsFinder"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjectsFinder plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsFinder']
 ---
 import savedObjectsFinderObj from './saved_objects_finder.devdocs.json';
diff --git a/api_docs/saved_objects_management.mdx b/api_docs/saved_objects_management.mdx
index 46da841238f33..cafcf387064c8 100644
--- a/api_docs/saved_objects_management.mdx
+++ b/api_docs/saved_objects_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsManagement
 title: "savedObjectsManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjectsManagement plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsManagement']
 ---
 import savedObjectsManagementObj from './saved_objects_management.devdocs.json';
diff --git a/api_docs/saved_objects_tagging.mdx b/api_docs/saved_objects_tagging.mdx
index 97ffc99a1d799..73795b54fde91 100644
--- a/api_docs/saved_objects_tagging.mdx
+++ b/api_docs/saved_objects_tagging.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsTagging
 title: "savedObjectsTagging"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjectsTagging plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsTagging']
 ---
 import savedObjectsTaggingObj from './saved_objects_tagging.devdocs.json';
diff --git a/api_docs/saved_objects_tagging_oss.mdx b/api_docs/saved_objects_tagging_oss.mdx
index a8b1ad9fdf80a..8fe115ad61b6b 100644
--- a/api_docs/saved_objects_tagging_oss.mdx
+++ b/api_docs/saved_objects_tagging_oss.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsTaggingOss
 title: "savedObjectsTaggingOss"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjectsTaggingOss plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsTaggingOss']
 ---
 import savedObjectsTaggingOssObj from './saved_objects_tagging_oss.devdocs.json';
diff --git a/api_docs/saved_search.mdx b/api_docs/saved_search.mdx
index 64dce1aa69699..b20decae874f6 100644
--- a/api_docs/saved_search.mdx
+++ b/api_docs/saved_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedSearch
 title: "savedSearch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedSearch plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedSearch']
 ---
 import savedSearchObj from './saved_search.devdocs.json';
diff --git a/api_docs/screenshot_mode.mdx b/api_docs/screenshot_mode.mdx
index 2e34968c8916b..5d6890995a537 100644
--- a/api_docs/screenshot_mode.mdx
+++ b/api_docs/screenshot_mode.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/screenshotMode
 title: "screenshotMode"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the screenshotMode plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'screenshotMode']
 ---
 import screenshotModeObj from './screenshot_mode.devdocs.json';
diff --git a/api_docs/screenshotting.mdx b/api_docs/screenshotting.mdx
index ec45ea848d125..1a81510cb27e3 100644
--- a/api_docs/screenshotting.mdx
+++ b/api_docs/screenshotting.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/screenshotting
 title: "screenshotting"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the screenshotting plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'screenshotting']
 ---
 import screenshottingObj from './screenshotting.devdocs.json';
diff --git a/api_docs/security.mdx b/api_docs/security.mdx
index 1698f95c19367..dad65436a8394 100644
--- a/api_docs/security.mdx
+++ b/api_docs/security.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/security
 title: "security"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the security plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'security']
 ---
 import securityObj from './security.devdocs.json';
diff --git a/api_docs/security_solution.devdocs.json b/api_docs/security_solution.devdocs.json
index 3c468e74d4b85..7ceeedb3fb56d 100644
--- a/api_docs/security_solution.devdocs.json
+++ b/api_docs/security_solution.devdocs.json
@@ -95,7 +95,7 @@
             "label": "experimentalFeatures",
             "description": [],
             "signature": [
-              "{ readonly tGridEnabled: boolean; readonly tGridEventRenderedViewEnabled: boolean; readonly excludePoliciesInFilterEnabled: boolean; readonly kubernetesEnabled: boolean; readonly disableIsolationUIPendingStatuses: boolean; readonly pendingActionResponsesWithAck: boolean; readonly policyListEnabled: boolean; readonly policyResponseInFleetEnabled: boolean; readonly chartEmbeddablesEnabled: boolean; readonly donutChartEmbeddablesEnabled: boolean; readonly alertsPreviewChartEmbeddablesEnabled: boolean; readonly previewTelemetryUrlEnabled: boolean; readonly responseActionsConsoleEnabled: boolean; readonly insightsRelatedAlertsByProcessAncestry: boolean; readonly extendedRuleExecutionLoggingEnabled: boolean; readonly prebuiltRulesNewUpgradeAndInstallationWorkflowsEnabled: boolean; readonly socTrendsEnabled: boolean; readonly responseActionsEnabled: boolean; readonly endpointResponseActionsEnabled: boolean; readonly endpointRbacEnabled: boolean; readonly endpointRbacV1Enabled: boolean; readonly alertDetailsPageEnabled: boolean; readonly responseActionGetFileEnabled: boolean; readonly responseActionExecuteEnabled: boolean; readonly alertsPageChartsEnabled: boolean; readonly alertTypeEnabled: boolean; readonly securityFlyoutEnabled: boolean; readonly riskyHostsEnabled: boolean; readonly riskyUsersEnabled: boolean; readonly alertsPageFiltersEnabled: boolean; }"
+              "{ readonly tGridEnabled: boolean; readonly tGridEventRenderedViewEnabled: boolean; readonly excludePoliciesInFilterEnabled: boolean; readonly kubernetesEnabled: boolean; readonly disableIsolationUIPendingStatuses: boolean; readonly pendingActionResponsesWithAck: boolean; readonly policyListEnabled: boolean; readonly policyResponseInFleetEnabled: boolean; readonly chartEmbeddablesEnabled: boolean; readonly donutChartEmbeddablesEnabled: boolean; readonly alertsPreviewChartEmbeddablesEnabled: boolean; readonly previewTelemetryUrlEnabled: boolean; readonly responseActionsConsoleEnabled: boolean; readonly insightsRelatedAlertsByProcessAncestry: boolean; readonly extendedRuleExecutionLoggingEnabled: boolean; readonly prebuiltRulesNewUpgradeAndInstallationWorkflowsEnabled: boolean; readonly socTrendsEnabled: boolean; readonly responseActionsEnabled: boolean; readonly endpointResponseActionsEnabled: boolean; readonly endpointRbacEnabled: boolean; readonly endpointRbacV1Enabled: boolean; readonly alertDetailsPageEnabled: boolean; readonly responseActionGetFileEnabled: boolean; readonly responseActionExecuteEnabled: boolean; readonly alertsPageChartsEnabled: boolean; readonly alertTypeEnabled: boolean; readonly securityFlyoutEnabled: boolean; readonly riskyHostsEnabled: boolean; readonly riskyUsersEnabled: boolean; readonly alertsPageFiltersEnabled: boolean; readonly newUserDetailsFlyout: boolean; }"
             ],
             "path": "x-pack/plugins/security_solution/public/plugin.tsx",
             "deprecated": false,
diff --git a/api_docs/security_solution.mdx b/api_docs/security_solution.mdx
index af52d6774356e..8ad48aa527f9a 100644
--- a/api_docs/security_solution.mdx
+++ b/api_docs/security_solution.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/securitySolution
 title: "securitySolution"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the securitySolution plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'securitySolution']
 ---
 import securitySolutionObj from './security_solution.devdocs.json';
diff --git a/api_docs/session_view.mdx b/api_docs/session_view.mdx
index 4214cc36d11c5..a9735544749f3 100644
--- a/api_docs/session_view.mdx
+++ b/api_docs/session_view.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/sessionView
 title: "sessionView"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the sessionView plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'sessionView']
 ---
 import sessionViewObj from './session_view.devdocs.json';
diff --git a/api_docs/share.mdx b/api_docs/share.mdx
index 0c0fe95e8eb93..b747319f1e8dc 100644
--- a/api_docs/share.mdx
+++ b/api_docs/share.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/share
 title: "share"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the share plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'share']
 ---
 import shareObj from './share.devdocs.json';
diff --git a/api_docs/snapshot_restore.mdx b/api_docs/snapshot_restore.mdx
index 89d8fd224eaaa..6db34a3fb6340 100644
--- a/api_docs/snapshot_restore.mdx
+++ b/api_docs/snapshot_restore.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/snapshotRestore
 title: "snapshotRestore"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the snapshotRestore plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'snapshotRestore']
 ---
 import snapshotRestoreObj from './snapshot_restore.devdocs.json';
diff --git a/api_docs/spaces.mdx b/api_docs/spaces.mdx
index 0ae0d52259d7d..a0abb5235fc22 100644
--- a/api_docs/spaces.mdx
+++ b/api_docs/spaces.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/spaces
 title: "spaces"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the spaces plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'spaces']
 ---
 import spacesObj from './spaces.devdocs.json';
diff --git a/api_docs/stack_alerts.mdx b/api_docs/stack_alerts.mdx
index 5c08c52b7f8d1..54ceca2baa1ac 100644
--- a/api_docs/stack_alerts.mdx
+++ b/api_docs/stack_alerts.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/stackAlerts
 title: "stackAlerts"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the stackAlerts plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'stackAlerts']
 ---
 import stackAlertsObj from './stack_alerts.devdocs.json';
diff --git a/api_docs/stack_connectors.mdx b/api_docs/stack_connectors.mdx
index 4c7ac9b47cfbe..f253101036027 100644
--- a/api_docs/stack_connectors.mdx
+++ b/api_docs/stack_connectors.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/stackConnectors
 title: "stackConnectors"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the stackConnectors plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'stackConnectors']
 ---
 import stackConnectorsObj from './stack_connectors.devdocs.json';
diff --git a/api_docs/task_manager.mdx b/api_docs/task_manager.mdx
index 94c77afcffa2a..fa4754530cfe1 100644
--- a/api_docs/task_manager.mdx
+++ b/api_docs/task_manager.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/taskManager
 title: "taskManager"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the taskManager plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'taskManager']
 ---
 import taskManagerObj from './task_manager.devdocs.json';
diff --git a/api_docs/telemetry.mdx b/api_docs/telemetry.mdx
index f4b92ece0e010..1129c23641775 100644
--- a/api_docs/telemetry.mdx
+++ b/api_docs/telemetry.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetry
 title: "telemetry"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the telemetry plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetry']
 ---
 import telemetryObj from './telemetry.devdocs.json';
diff --git a/api_docs/telemetry_collection_manager.mdx b/api_docs/telemetry_collection_manager.mdx
index 2af3fecb0bdbb..2bd33bd8db740 100644
--- a/api_docs/telemetry_collection_manager.mdx
+++ b/api_docs/telemetry_collection_manager.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetryCollectionManager
 title: "telemetryCollectionManager"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the telemetryCollectionManager plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetryCollectionManager']
 ---
 import telemetryCollectionManagerObj from './telemetry_collection_manager.devdocs.json';
diff --git a/api_docs/telemetry_collection_xpack.mdx b/api_docs/telemetry_collection_xpack.mdx
index 310868095e02b..3536a151b1b87 100644
--- a/api_docs/telemetry_collection_xpack.mdx
+++ b/api_docs/telemetry_collection_xpack.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetryCollectionXpack
 title: "telemetryCollectionXpack"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the telemetryCollectionXpack plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetryCollectionXpack']
 ---
 import telemetryCollectionXpackObj from './telemetry_collection_xpack.devdocs.json';
diff --git a/api_docs/telemetry_management_section.mdx b/api_docs/telemetry_management_section.mdx
index bde4e1fa26213..ffa3e18a9de78 100644
--- a/api_docs/telemetry_management_section.mdx
+++ b/api_docs/telemetry_management_section.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetryManagementSection
 title: "telemetryManagementSection"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the telemetryManagementSection plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetryManagementSection']
 ---
 import telemetryManagementSectionObj from './telemetry_management_section.devdocs.json';
diff --git a/api_docs/threat_intelligence.mdx b/api_docs/threat_intelligence.mdx
index 6649db6849400..5dc2189325209 100644
--- a/api_docs/threat_intelligence.mdx
+++ b/api_docs/threat_intelligence.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/threatIntelligence
 title: "threatIntelligence"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the threatIntelligence plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'threatIntelligence']
 ---
 import threatIntelligenceObj from './threat_intelligence.devdocs.json';
diff --git a/api_docs/timelines.mdx b/api_docs/timelines.mdx
index 4419699db323b..f139696fae67d 100644
--- a/api_docs/timelines.mdx
+++ b/api_docs/timelines.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/timelines
 title: "timelines"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the timelines plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'timelines']
 ---
 import timelinesObj from './timelines.devdocs.json';
diff --git a/api_docs/transform.mdx b/api_docs/transform.mdx
index 628c255d1b188..3a23c501e9939 100644
--- a/api_docs/transform.mdx
+++ b/api_docs/transform.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/transform
 title: "transform"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the transform plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'transform']
 ---
 import transformObj from './transform.devdocs.json';
diff --git a/api_docs/triggers_actions_ui.mdx b/api_docs/triggers_actions_ui.mdx
index c6ad3886c12b0..8d2457325cc8f 100644
--- a/api_docs/triggers_actions_ui.mdx
+++ b/api_docs/triggers_actions_ui.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/triggersActionsUi
 title: "triggersActionsUi"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the triggersActionsUi plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'triggersActionsUi']
 ---
 import triggersActionsUiObj from './triggers_actions_ui.devdocs.json';
diff --git a/api_docs/ui_actions.mdx b/api_docs/ui_actions.mdx
index a2cfa74cfd650..d5cc70c49e339 100644
--- a/api_docs/ui_actions.mdx
+++ b/api_docs/ui_actions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/uiActions
 title: "uiActions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the uiActions plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'uiActions']
 ---
 import uiActionsObj from './ui_actions.devdocs.json';
diff --git a/api_docs/ui_actions_enhanced.mdx b/api_docs/ui_actions_enhanced.mdx
index bb9a992413684..205ef372f2cf8 100644
--- a/api_docs/ui_actions_enhanced.mdx
+++ b/api_docs/ui_actions_enhanced.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/uiActionsEnhanced
 title: "uiActionsEnhanced"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the uiActionsEnhanced plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'uiActionsEnhanced']
 ---
 import uiActionsEnhancedObj from './ui_actions_enhanced.devdocs.json';
diff --git a/api_docs/unified_field_list.mdx b/api_docs/unified_field_list.mdx
index 0e8df430367a3..b87c428bf726f 100644
--- a/api_docs/unified_field_list.mdx
+++ b/api_docs/unified_field_list.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedFieldList
 title: "unifiedFieldList"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the unifiedFieldList plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedFieldList']
 ---
 import unifiedFieldListObj from './unified_field_list.devdocs.json';
diff --git a/api_docs/unified_histogram.mdx b/api_docs/unified_histogram.mdx
index 9ab0773517528..78d219b601783 100644
--- a/api_docs/unified_histogram.mdx
+++ b/api_docs/unified_histogram.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedHistogram
 title: "unifiedHistogram"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the unifiedHistogram plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedHistogram']
 ---
 import unifiedHistogramObj from './unified_histogram.devdocs.json';
diff --git a/api_docs/unified_search.mdx b/api_docs/unified_search.mdx
index 6d31cdbf6b69e..decb9376b9b01 100644
--- a/api_docs/unified_search.mdx
+++ b/api_docs/unified_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedSearch
 title: "unifiedSearch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the unifiedSearch plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedSearch']
 ---
 import unifiedSearchObj from './unified_search.devdocs.json';
diff --git a/api_docs/unified_search_autocomplete.mdx b/api_docs/unified_search_autocomplete.mdx
index 6b324846fbb51..23dac2d6d06ae 100644
--- a/api_docs/unified_search_autocomplete.mdx
+++ b/api_docs/unified_search_autocomplete.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedSearch-autocomplete
 title: "unifiedSearch.autocomplete"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the unifiedSearch.autocomplete plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedSearch.autocomplete']
 ---
 import unifiedSearchAutocompleteObj from './unified_search_autocomplete.devdocs.json';
diff --git a/api_docs/url_forwarding.mdx b/api_docs/url_forwarding.mdx
index f0438b8d54d73..a131918660baf 100644
--- a/api_docs/url_forwarding.mdx
+++ b/api_docs/url_forwarding.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/urlForwarding
 title: "urlForwarding"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the urlForwarding plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'urlForwarding']
 ---
 import urlForwardingObj from './url_forwarding.devdocs.json';
diff --git a/api_docs/usage_collection.mdx b/api_docs/usage_collection.mdx
index d4c77908e9162..5323eb431a1db 100644
--- a/api_docs/usage_collection.mdx
+++ b/api_docs/usage_collection.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/usageCollection
 title: "usageCollection"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the usageCollection plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'usageCollection']
 ---
 import usageCollectionObj from './usage_collection.devdocs.json';
diff --git a/api_docs/ux.mdx b/api_docs/ux.mdx
index bba75c953766b..55579684c8294 100644
--- a/api_docs/ux.mdx
+++ b/api_docs/ux.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ux
 title: "ux"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the ux plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ux']
 ---
 import uxObj from './ux.devdocs.json';
diff --git a/api_docs/vis_default_editor.mdx b/api_docs/vis_default_editor.mdx
index d5785fa647c1d..19e4daeb84ec2 100644
--- a/api_docs/vis_default_editor.mdx
+++ b/api_docs/vis_default_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visDefaultEditor
 title: "visDefaultEditor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visDefaultEditor plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visDefaultEditor']
 ---
 import visDefaultEditorObj from './vis_default_editor.devdocs.json';
diff --git a/api_docs/vis_type_gauge.mdx b/api_docs/vis_type_gauge.mdx
index 301bc3ea87a6a..5cbc1fabc9bdf 100644
--- a/api_docs/vis_type_gauge.mdx
+++ b/api_docs/vis_type_gauge.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeGauge
 title: "visTypeGauge"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeGauge plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeGauge']
 ---
 import visTypeGaugeObj from './vis_type_gauge.devdocs.json';
diff --git a/api_docs/vis_type_heatmap.mdx b/api_docs/vis_type_heatmap.mdx
index 274f2b0cdd702..ede12c188e2e3 100644
--- a/api_docs/vis_type_heatmap.mdx
+++ b/api_docs/vis_type_heatmap.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeHeatmap
 title: "visTypeHeatmap"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeHeatmap plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeHeatmap']
 ---
 import visTypeHeatmapObj from './vis_type_heatmap.devdocs.json';
diff --git a/api_docs/vis_type_pie.mdx b/api_docs/vis_type_pie.mdx
index 303568940f534..d9697ae33c35d 100644
--- a/api_docs/vis_type_pie.mdx
+++ b/api_docs/vis_type_pie.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypePie
 title: "visTypePie"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypePie plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypePie']
 ---
 import visTypePieObj from './vis_type_pie.devdocs.json';
diff --git a/api_docs/vis_type_table.mdx b/api_docs/vis_type_table.mdx
index 0a9b787d4a65e..9177c2197fbb7 100644
--- a/api_docs/vis_type_table.mdx
+++ b/api_docs/vis_type_table.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeTable
 title: "visTypeTable"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeTable plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeTable']
 ---
 import visTypeTableObj from './vis_type_table.devdocs.json';
diff --git a/api_docs/vis_type_timelion.mdx b/api_docs/vis_type_timelion.mdx
index 7bdb30db5dbe4..502100b2541ef 100644
--- a/api_docs/vis_type_timelion.mdx
+++ b/api_docs/vis_type_timelion.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeTimelion
 title: "visTypeTimelion"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeTimelion plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeTimelion']
 ---
 import visTypeTimelionObj from './vis_type_timelion.devdocs.json';
diff --git a/api_docs/vis_type_timeseries.mdx b/api_docs/vis_type_timeseries.mdx
index 4df03c3b1d319..01ec3973ced2f 100644
--- a/api_docs/vis_type_timeseries.mdx
+++ b/api_docs/vis_type_timeseries.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeTimeseries
 title: "visTypeTimeseries"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeTimeseries plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeTimeseries']
 ---
 import visTypeTimeseriesObj from './vis_type_timeseries.devdocs.json';
diff --git a/api_docs/vis_type_vega.mdx b/api_docs/vis_type_vega.mdx
index 2ae8799970648..2a75cae2ee36d 100644
--- a/api_docs/vis_type_vega.mdx
+++ b/api_docs/vis_type_vega.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeVega
 title: "visTypeVega"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeVega plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeVega']
 ---
 import visTypeVegaObj from './vis_type_vega.devdocs.json';
diff --git a/api_docs/vis_type_vislib.mdx b/api_docs/vis_type_vislib.mdx
index 56a01202a9b99..88c97e8638f13 100644
--- a/api_docs/vis_type_vislib.mdx
+++ b/api_docs/vis_type_vislib.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeVislib
 title: "visTypeVislib"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeVislib plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeVislib']
 ---
 import visTypeVislibObj from './vis_type_vislib.devdocs.json';
diff --git a/api_docs/vis_type_xy.mdx b/api_docs/vis_type_xy.mdx
index 894c6fe49c6a7..b3f1e332f5e8a 100644
--- a/api_docs/vis_type_xy.mdx
+++ b/api_docs/vis_type_xy.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeXy
 title: "visTypeXy"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeXy plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeXy']
 ---
 import visTypeXyObj from './vis_type_xy.devdocs.json';
diff --git a/api_docs/visualizations.mdx b/api_docs/visualizations.mdx
index d551e436f7742..1d18208d4c2fd 100644
--- a/api_docs/visualizations.mdx
+++ b/api_docs/visualizations.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visualizations
 title: "visualizations"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visualizations plugin
-date: 2023-04-18
+date: 2023-04-19
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visualizations']
 ---
 import visualizationsObj from './visualizations.devdocs.json';

From ff11323011882dd8b828a359b1da9677faa471a7 Mon Sep 17 00:00:00 2001
From: Julia Rechkunova <julia.rechkunova@elastic.co>
Date: Wed, 19 Apr 2023 08:45:26 +0200
Subject: [PATCH 050/100] [Discover] Unskip context filters tests (#154562)

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

250x
https://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/2147
---
 test/functional/apps/context/_filters.ts | 10 ++++++++--
 test/functional/services/data_grid.ts    |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/test/functional/apps/context/_filters.ts b/test/functional/apps/context/_filters.ts
index b3b8cc0a1fd62..9aff3f6c805fc 100644
--- a/test/functional/apps/context/_filters.ts
+++ b/test/functional/apps/context/_filters.ts
@@ -20,12 +20,18 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const filterBar = getService('filterBar');
   const retry = getService('retry');
   const browser = getService('browser');
+  const kibanaServer = getService('kibanaServer');
 
   const PageObjects = getPageObjects(['common', 'context']);
   const testSubjects = getService('testSubjects');
 
-  // FLAKY: https://github.com/elastic/kibana/issues/154387
-  describe.skip('context filters', function contextSize() {
+  describe('context filters', function contextSize() {
+    before(async function () {
+      await kibanaServer.uiSettings.update({
+        'discover:rowHeightOption': 0, // to have more grid rows visible at once
+      });
+    });
+
     beforeEach(async function () {
       await PageObjects.context.navigateTo(TEST_INDEX_PATTERN, TEST_ANCHOR_ID, {
         columns: TEST_COLUMN_NAMES,
diff --git a/test/functional/services/data_grid.ts b/test/functional/services/data_grid.ts
index 7fde46031e737..1f022c890b724 100644
--- a/test/functional/services/data_grid.ts
+++ b/test/functional/services/data_grid.ts
@@ -207,6 +207,8 @@ export class DataGridService extends FtrService {
       ? '~docTableExpandToggleColumnAnchor'
       : '~docTableExpandToggleColumn';
     const toggle = await row[0].findByTestSubject(testSubj);
+
+    await toggle.scrollIntoViewIfNecessary();
     await toggle.click();
   }
 

From 0a120ab8ffb218a7c177a399ad456190aada49cf Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad31comp@gmail.com>
Date: Wed, 19 Apr 2023 08:57:46 +0200
Subject: [PATCH 051/100] [Synthetics] Fix pending count in case of location
 filtering (#155200)

---
 .../monitors_page/overview/overview_page.tsx           |  2 +-
 .../server/routes/overview_status/overview_status.ts   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview_page.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview_page.tsx
index 14b5bbf0cfb57..a98f78249adbe 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview_page.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview_page.tsx
@@ -118,7 +118,7 @@ export const OverviewPage: React.FC = () => {
       {!noMonitorFound ? (
         <>
           <EuiFlexGroup gutterSize="m" wrap>
-            <EuiFlexItem grow={2}>
+            <EuiFlexItem grow={false}>
               <OverviewStatus />
             </EuiFlexItem>
             <EuiFlexItem grow={3} style={{ minWidth: 300 }}>
diff --git a/x-pack/plugins/synthetics/server/routes/overview_status/overview_status.ts b/x-pack/plugins/synthetics/server/routes/overview_status/overview_status.ts
index 11ae9ff793e21..f8c55ba4fae39 100644
--- a/x-pack/plugins/synthetics/server/routes/overview_status/overview_status.ts
+++ b/x-pack/plugins/synthetics/server/routes/overview_status/overview_status.ts
@@ -39,7 +39,9 @@ export function periodToMs(schedule: { number: string; unit: Unit }) {
 export async function getStatus(context: RouteContext, params: OverviewStatusQuery) {
   const { uptimeEsClient, syntheticsMonitorClient, savedObjectsClient, server } = context;
 
-  const { query, locations: queryLocations, scopeStatusByLocation = true } = params;
+  const { query, locations: qLocations, scopeStatusByLocation = true } = params;
+
+  const queryLocations = qLocations && !Array.isArray(qLocations) ? [qLocations] : qLocations;
   /**
    * Walk through all monitor saved objects, bucket IDs by disabled/enabled status.
    *
@@ -85,11 +87,9 @@ export async function getStatus(context: RouteContext, params: OverviewStatusQue
   );
 
   // Account for locations filter
-  const queryLocationsArray =
-    queryLocations && !Array.isArray(queryLocations) ? [queryLocations] : queryLocations;
   const listOfLocationAfterFilter =
-    queryLocationsArray && scopeStatusByLocation
-      ? intersection(listOfLocations, queryLocationsArray)
+    queryLocations && scopeStatusByLocation
+      ? intersection(listOfLocations, queryLocations)
       : listOfLocations;
 
   const range = {

From 8b6146d1836696ac894dfb017a4fdd777b79ee35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Efe=20G=C3=BCrkan=20YALAMAN?=
 <efeguerkan.yalaman@elastic.co>
Date: Wed, 19 Apr 2023 10:04:42 +0200
Subject: [PATCH 052/100] [Enterprise Search] Fix Connector scheduling show
 week information correctly (#155191)

## Summary


https://user-images.githubusercontent.com/1410658/232858008-ee843f6e-dfb4-40f1-b33f-66fd90bc8d2e.mov

When weekly scheduling selected we were showing the wrong information.
This fixes cron string parsing and shows correct information.

## Release note
Fixes connector scheduling now showing correct setting when weekly
intervals selected.


### 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
---
 .../shared/cron_editor/enterprise_search_cron_editor.tsx      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/cron_editor/enterprise_search_cron_editor.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/cron_editor/enterprise_search_cron_editor.tsx
index f0e2d371dc081..48b402436f69a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/cron_editor/enterprise_search_cron_editor.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/cron_editor/enterprise_search_cron_editor.tsx
@@ -66,10 +66,10 @@ function cronToFrequency(cron: string): Frequency {
   if (fields[3] === '*') {
     return 'DAY';
   }
-  if (fields[4] === '?') {
+  if (fields[4] === '*') {
     return 'WEEK';
   }
-  if (fields[4] === '*') {
+  if (fields[4] === '?') {
     return 'MONTH';
   }
   return 'YEAR';

From a1ffdb3414ec950e44f82685ff2b8544d231f1ce Mon Sep 17 00:00:00 2001
From: Sander Philipse <94373878+sphilipse@users.noreply.github.com>
Date: Wed, 19 Apr 2023 10:30:12 +0200
Subject: [PATCH 053/100] [Enterprise Search] Clarify timezone use for cron
 schedules (#155181)

## Summary

This updates the scheduling for the Elastic Web Crawler and Connectors
to be more specific about timezones.
---
 .../components/search_index/connector/connector_scheduling.tsx | 2 +-
 .../automatic_crawl_scheduler/automatic_crawl_scheduler.tsx    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_scheduling.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_scheduling.tsx
index 1d93e5c067e11..2feea44c703fb 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_scheduling.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_scheduling.tsx
@@ -156,7 +156,7 @@ export const ConnectorSchedulingComponent: React.FC = () => {
                 'xpack.enterpriseSearch.content.indices.connectorScheduling.configured.description',
                 {
                   defaultMessage:
-                    'Your connector is configured and deployed. Configure a one-time sync by clicking the Sync button, or enable a recurring sync schedule. ',
+                    'Your connector is configured and deployed. Configure a one-time sync by clicking the Sync button, or enable a recurring sync schedule. The connector uses UTC as its timezone. ',
                 }
               )}
             </EuiText>
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/automatic_crawl_scheduler/automatic_crawl_scheduler.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/automatic_crawl_scheduler/automatic_crawl_scheduler.tsx
index de6d247bd5bb6..3a4018776a9f7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/automatic_crawl_scheduler/automatic_crawl_scheduler.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/automatic_crawl_scheduler/automatic_crawl_scheduler.tsx
@@ -108,7 +108,8 @@ export const AutomaticCrawlScheduler: React.FC = () => {
                       {i18n.translate(
                         'xpack.enterpriseSearch.crawler.automaticCrawlSchedule.cronSchedulingDescription',
                         {
-                          defaultMessage: 'Define the frequency and time for scheduled crawls',
+                          defaultMessage:
+                            'Define the frequency and time for scheduled crawls. The crawler uses UTC as its timezone.',
                         }
                       )}
                     </EuiText>

From 4b0b8e469fa39ba6760d6b2cdbbfc15df3488a6e Mon Sep 17 00:00:00 2001
From: Sean Story <sean.j.story@gmail.com>
Date: Wed, 19 Apr 2023 03:31:40 -0500
Subject: [PATCH 054/100] Revert "Use unsigned_long for field
 indexed_document_volume" (#155199)

Reverts elastic/kibana#155014

See:
https://github.com/elastic/connectors-python/issues/735#issuecomment-1513725750
---
 .../server/index_management/setup_indices.test.ts               | 2 +-
 .../enterprise_search/server/index_management/setup_indices.ts  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/server/index_management/setup_indices.test.ts b/x-pack/plugins/enterprise_search/server/index_management/setup_indices.test.ts
index a62333a9abd5a..525434e326a3b 100644
--- a/x-pack/plugins/enterprise_search/server/index_management/setup_indices.test.ts
+++ b/x-pack/plugins/enterprise_search/server/index_management/setup_indices.test.ts
@@ -214,7 +214,7 @@ describe('Setup Indices', () => {
       deleted_document_count: { type: 'integer' },
       error: { type: 'keyword' },
       indexed_document_count: { type: 'integer' },
-      indexed_document_volume: { type: 'unsigned_long' },
+      indexed_document_volume: { type: 'integer' },
       last_seen: { type: 'date' },
       metadata: { type: 'object' },
       started_at: { type: 'date' },
diff --git a/x-pack/plugins/enterprise_search/server/index_management/setup_indices.ts b/x-pack/plugins/enterprise_search/server/index_management/setup_indices.ts
index c660ac2aa0e5b..050b85a872c01 100644
--- a/x-pack/plugins/enterprise_search/server/index_management/setup_indices.ts
+++ b/x-pack/plugins/enterprise_search/server/index_management/setup_indices.ts
@@ -238,7 +238,7 @@ const indices: IndexDefinition[] = [
         deleted_document_count: { type: 'integer' },
         error: { type: 'keyword' },
         indexed_document_count: { type: 'integer' },
-        indexed_document_volume: { type: 'unsigned_long' },
+        indexed_document_volume: { type: 'integer' },
         last_seen: { type: 'date' },
         metadata: { type: 'object' },
         started_at: { type: 'date' },

From 533381eab7d5329c3583ddd045e61414f588e446 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruhsen@elastic.co>
Date: Wed, 19 Apr 2023 10:38:49 +0200
Subject: [PATCH 055/100] [Fleet] Support for Profiling symbolization (#155115)

This fixes Universal Profiling data stream and index pattern from
`profiling-*-*` to `profiling-*` in the fleet-server and logstash key
generator.

Additionally, this adds the `.profiling-*` index pattern.
We use this for ILM / roll-over of the k/v indices, but want to hide
these type of indices from the user.
---
 .../fleet/server/services/api_keys/logstash_api_keys.ts     | 6 ++++--
 x-pack/plugins/fleet/server/services/data_streams.ts        | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/fleet/server/services/api_keys/logstash_api_keys.ts b/x-pack/plugins/fleet/server/services/api_keys/logstash_api_keys.ts
index f072bf0777566..66888223b02d1 100644
--- a/x-pack/plugins/fleet/server/services/api_keys/logstash_api_keys.ts
+++ b/x-pack/plugins/fleet/server/services/api_keys/logstash_api_keys.ts
@@ -24,7 +24,8 @@ export async function canCreateLogstashApiKey(esClient: ElasticsearchClient) {
           'synthetics-*-*',
           '.logs-endpoint.diagnostic.collection-*',
           '.logs-endpoint.action.responses-*',
-          'profiling-*-*',
+          'profiling-*',
+          '.profiling-*',
         ],
         privileges: ['auto_configure', 'create_doc'],
       },
@@ -59,7 +60,8 @@ export async function generateLogstashApiKey(esClient: ElasticsearchClient) {
               'synthetics-*-*',
               '.logs-endpoint.diagnostic.collection-*',
               '.logs-endpoint.action.responses-*',
-              'profiling-*-*',
+              'profiling-*',
+              '.profiling-*',
             ],
             privileges: ['auto_configure', 'create_doc'],
           },
diff --git a/x-pack/plugins/fleet/server/services/data_streams.ts b/x-pack/plugins/fleet/server/services/data_streams.ts
index 0cf7568c94772..6dd60a4e0be1e 100644
--- a/x-pack/plugins/fleet/server/services/data_streams.ts
+++ b/x-pack/plugins/fleet/server/services/data_streams.ts
@@ -8,7 +8,7 @@
 import type { IndicesDataStream, IndicesIndexTemplate } from '@elastic/elasticsearch/lib/api/types';
 import type { ElasticsearchClient } from '@kbn/core/server';
 
-const DATA_STREAM_INDEX_PATTERN = 'logs-*-*,metrics-*-*,traces-*-*,synthetics-*-*,profiling-*-*';
+const DATA_STREAM_INDEX_PATTERN = 'logs-*-*,metrics-*-*,traces-*-*,synthetics-*-*,profiling-*';
 
 class DataStreamService {
   public async getAllFleetDataStreams(esClient: ElasticsearchClient) {

From 153e1fcf45e320ac4dd47ca026ea90bcaacb08ed Mon Sep 17 00:00:00 2001
From: Yngrid Coello <yngrid.coello@elastic.co>
Date: Wed, 19 Apr 2023 10:49:10 +0200
Subject: [PATCH 056/100] [APM] plugin description (#155041)

While I was checking [some
documentation](https://www.elastic.co/guide/en/kibana/current/plugin-list.html)
I discovered APM plugin description was `undefined`

<img width="1847" alt="image"
src="https://user-images.githubusercontent.com/1313018/231450602-926abacc-b915-42dd-88fb-462643cc8dc1.png">
---
 docs/developer/plugin-list.asciidoc |  2 +-
 x-pack/plugins/apm/readme.md        | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
index 572452cec368c..1755f65193276 100644
--- a/docs/developer/plugin-list.asciidoc
+++ b/docs/developer/plugin-list.asciidoc
@@ -431,7 +431,7 @@ The plugin exposes the static DefaultEditorController class to consume.
 
 
 |{kib-repo}blob/{branch}/x-pack/plugins/apm/readme.md[apm]
-|undefined
+|This plugin provides access to App Monitoring features provided by Elastic. It allows you to monitor your software services and applications in real-time; visualize detailed performance information on your services, identify and analyze errors, and monitor host-level and APM agent-specific metrics like JVM and Go runtime metrics.
 
 
 |{kib-repo}blob/{branch}/x-pack/plugins/asset_manager/README.md[assetManager]
diff --git a/x-pack/plugins/apm/readme.md b/x-pack/plugins/apm/readme.md
index fb7cf20732bf3..51164460ce8be 100644
--- a/x-pack/plugins/apm/readme.md
+++ b/x-pack/plugins/apm/readme.md
@@ -1,21 +1,25 @@
-# Documentation for APM UI developers
+# APM
 
-## Getting started
+This plugin provides access to App Monitoring features provided by Elastic. It allows you to monitor your software services and applications in real-time; visualize detailed performance information on your services, identify and analyze errors, and monitor host-level and APM agent-specific metrics like JVM and Go runtime metrics.
+
+## Documentation for APM UI developers
+
+### Getting started
 - [Local setup](./dev_docs/local_setup.md)
 - [Testing (unit, api, e2e, storybook)](./dev_docs/testing.md)
 - [Linting (typescript, eslint, prettier)](./dev_docs/linting.md)
 
-## APM concepts
+### APM concepts
 - [Queries and data model](./dev_docs/apm_queries.md)
 - [Telemetry](./dev_docs/telemetry.md)
 - [Routing and Linking](./dev_docs/routing_and_linking.md)
 
-## Tooling
+### Tooling
 - [VSCode setup instructions](./dev_docs/vscode_setup.md)
 - [Github PR commands](./dev_docs/github_commands.md)
 - [Synthtrace (data generation)](https://github.com/elastic/kibana/blob/main/packages/kbn-apm-synthtrace/README.md)
 - [Query debugging in development and production](./dev_docs/query_debugging_in_development_and_production.md)
 
-## Other resources
+### Other resources
 - [Official APM UI settings docs](https://www.elastic.co/guide/en/kibana/current/apm-settings-in-kibana.html)
 - [Reading Material](./dev_docs/learning_material.md)

From a055d51627ebbe13eeb7c6032e3893e67be27c6b Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jeanlouis.leysens@elastic.co>
Date: Wed, 19 Apr 2023 10:50:54 +0200
Subject: [PATCH 057/100] [HTTP] Only run versioned router response validation
 in dev (#154907)

## Summary

This PR passes the `dev` environment value to `Router` which passes it
to `CoreVersionedRouter` so that we can toggle whether we run response
validation based on the environment.

- [x] Update and add unit and integration tests

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
---
 .../src/router.ts                             | 11 ++-
 .../core_versioned_route.test.ts              |  4 +-
 .../versioned_router/core_versioned_route.ts  |  2 +-
 .../versioned_router/core_versioned_router.ts | 24 +++---
 .../tsconfig.json                             |  2 +-
 .../src/http_service.ts                       |  7 +-
 .../http/versioned_router.test.ts             | 75 +++++++++++++++++--
 7 files changed, 99 insertions(+), 26 deletions(-)

diff --git a/packages/core/http/core-http-router-server-internal/src/router.ts b/packages/core/http/core-http-router-server-internal/src/router.ts
index d189b04d332a2..4b2519c6bc80f 100644
--- a/packages/core/http/core-http-router-server-internal/src/router.ts
+++ b/packages/core/http/core-http-router-server-internal/src/router.ts
@@ -119,6 +119,12 @@ function validOptions(
   return { ...options, body };
 }
 
+/** @internal */
+interface RouterOptions {
+  /** Whether we are running in development */
+  isDev: boolean;
+}
+
 /**
  * @internal
  */
@@ -135,7 +141,8 @@ export class Router<Context extends RequestHandlerContextBase = RequestHandlerCo
   constructor(
     public readonly routerPath: string,
     private readonly log: Logger,
-    private readonly enhanceWithContext: ContextEnhancer<any, any, any, any, any>
+    private readonly enhanceWithContext: ContextEnhancer<any, any, any, any, any>,
+    private readonly options: RouterOptions = { isDev: false }
   ) {
     const buildMethod =
       <Method extends RouteMethod>(method: Method) =>
@@ -209,7 +216,7 @@ export class Router<Context extends RequestHandlerContextBase = RequestHandlerCo
   private versionedRouter: undefined | VersionedRouter<Context> = undefined;
   public get versioned(): VersionedRouter<Context> {
     if (this.versionedRouter === undefined) {
-      this.versionedRouter = CoreVersionedRouter.from({ router: this });
+      this.versionedRouter = CoreVersionedRouter.from({ router: this, isDev: this.options.isDev });
     }
     return this.versionedRouter;
   }
diff --git a/packages/core/http/core-http-router-server-internal/src/versioned_router/core_versioned_route.test.ts b/packages/core/http/core-http-router-server-internal/src/versioned_router/core_versioned_route.test.ts
index 337348e425a8f..e95f4cf82a309 100644
--- a/packages/core/http/core-http-router-server-internal/src/versioned_router/core_versioned_route.test.ts
+++ b/packages/core/http/core-http-router-server-internal/src/versioned_router/core_versioned_route.test.ts
@@ -149,7 +149,7 @@ describe('Versioned route', () => {
     let validatedOutputBody = false;
 
     (router.post as jest.Mock).mockImplementation((opts: unknown, fn) => (handler = fn));
-    const versionedRouter = CoreVersionedRouter.from({ router, validateResponses: true });
+    const versionedRouter = CoreVersionedRouter.from({ router, isDev: true });
     versionedRouter.post({ path: '/test/{id}', access: 'internal' }).addVersion(
       {
         version: '1',
@@ -194,7 +194,7 @@ describe('Versioned route', () => {
     );
 
     const kibanaResponse = await handler!(
-      {} as any,
+      { core: { env: { mode: { dev: true } } } } as any,
       createRequest({
         version: '1',
         body: { foo: 1 },
diff --git a/packages/core/http/core-http-router-server-internal/src/versioned_router/core_versioned_route.ts b/packages/core/http/core-http-router-server-internal/src/versioned_router/core_versioned_route.ts
index 70035a05455b4..4d73b09563077 100644
--- a/packages/core/http/core-http-router-server-internal/src/versioned_router/core_versioned_route.ts
+++ b/packages/core/http/core-http-router-server-internal/src/versioned_router/core_versioned_route.ts
@@ -148,7 +148,7 @@ export class CoreVersionedRoute implements VersionedRoute {
 
     const response = await handler.fn(ctx, mutableCoreKibanaRequest, res);
 
-    if (this.router.validateResponses && validation?.response?.[response.status]) {
+    if (this.router.isDev && validation?.response?.[response.status]) {
       const responseValidation = validation.response[response.status];
       try {
         validate(
diff --git a/packages/core/http/core-http-router-server-internal/src/versioned_router/core_versioned_router.ts b/packages/core/http/core-http-router-server-internal/src/versioned_router/core_versioned_router.ts
index 2893fd325b712..2d148ab461a6e 100644
--- a/packages/core/http/core-http-router-server-internal/src/versioned_router/core_versioned_router.ts
+++ b/packages/core/http/core-http-router-server-internal/src/versioned_router/core_versioned_router.ts
@@ -11,23 +11,23 @@ import type { VersionedRouter, VersionedRoute, VersionedRouteConfig } from '@kbn
 import { CoreVersionedRoute } from './core_versioned_route';
 import { HandlerResolutionStrategy, Method, VersionedRouterRoute } from './types';
 
+/** @internal */
+interface Dependencies {
+  router: IRouter;
+  defaultHandlerResolutionStrategy?: HandlerResolutionStrategy;
+  /** Whether Kibana is running in a dev environment */
+  isDev?: boolean;
+}
+
 export class CoreVersionedRouter implements VersionedRouter {
   private readonly routes = new Set<CoreVersionedRoute>();
-  public static from({
-    router,
-    validateResponses,
-    defaultHandlerResolutionStrategy = 'oldest',
-  }: {
-    router: IRouter;
-    validateResponses?: boolean;
-    defaultHandlerResolutionStrategy?: HandlerResolutionStrategy;
-  }) {
-    return new CoreVersionedRouter(router, validateResponses, defaultHandlerResolutionStrategy);
+  public static from({ router, defaultHandlerResolutionStrategy, isDev }: Dependencies) {
+    return new CoreVersionedRouter(router, defaultHandlerResolutionStrategy, isDev);
   }
   private constructor(
     public readonly router: IRouter,
-    public readonly validateResponses: boolean = false,
-    public readonly defaultHandlerResolutionStrategy: HandlerResolutionStrategy = 'oldest'
+    public readonly defaultHandlerResolutionStrategy: HandlerResolutionStrategy = 'oldest',
+    public readonly isDev: boolean = false
   ) {}
 
   private registerVersionedRoute =
diff --git a/packages/core/http/core-http-router-server-internal/tsconfig.json b/packages/core/http/core-http-router-server-internal/tsconfig.json
index 067fd1a5173f4..e4a70cbcddeec 100644
--- a/packages/core/http/core-http-router-server-internal/tsconfig.json
+++ b/packages/core/http/core-http-router-server-internal/tsconfig.json
@@ -17,7 +17,7 @@
     "@kbn/hapi-mocks",
     "@kbn/core-logging-server-mocks",
     "@kbn/logging",
-    "@kbn/core-http-common",
+    "@kbn/core-http-common"
   ],
   "exclude": [
     "target/**/*",
diff --git a/packages/core/http/core-http-server-internal/src/http_service.ts b/packages/core/http/core-http-server-internal/src/http_service.ts
index 45841b72bdbee..5c1ec864b2141 100644
--- a/packages/core/http/core-http-server-internal/src/http_service.ts
+++ b/packages/core/http/core-http-server-internal/src/http_service.ts
@@ -128,7 +128,8 @@ export class HttpService
         const router = new Router<DefaultRequestHandlerType>(
           path,
           this.log,
-          prebootServerRequestHandlerContext.createHandler.bind(null, this.coreContext.coreId)
+          prebootServerRequestHandlerContext.createHandler.bind(null, this.coreContext.coreId),
+          { isDev: this.env.mode.dev }
         );
 
         registerCallback(router);
@@ -172,7 +173,9 @@ export class HttpService
         pluginId: PluginOpaqueId = this.coreContext.coreId
       ) => {
         const enhanceHandler = this.requestHandlerContext!.createHandler.bind(null, pluginId);
-        const router = new Router<Context>(path, this.log, enhanceHandler);
+        const router = new Router<Context>(path, this.log, enhanceHandler, {
+          isDev: this.env.mode.dev,
+        });
         registerRouter(router);
         return router;
       },
diff --git a/src/core/server/integration_tests/http/versioned_router.test.ts b/src/core/server/integration_tests/http/versioned_router.test.ts
index 9a0b18adceff1..4206bed642bba 100644
--- a/src/core/server/integration_tests/http/versioned_router.test.ts
+++ b/src/core/server/integration_tests/http/versioned_router.test.ts
@@ -7,6 +7,7 @@
  */
 
 import Supertest from 'supertest';
+import { createTestEnv, getEnvOptions } from '@kbn/config-mocks';
 import { schema } from '@kbn/config-schema';
 import { loggingSystemMock } from '@kbn/core-logging-server-mocks';
 import { executionContextServiceMock } from '@kbn/core-execution-context-server-mocks';
@@ -19,12 +20,11 @@ let server: HttpService;
 let logger: ReturnType<typeof loggingSystemMock.create>;
 
 describe('Routing versioned requests', () => {
-  const contextSetup = contextServiceMock.createSetupContract();
   let router: IRouterWithVersion;
   let supertest: Supertest.SuperTest<Supertest.Test>;
 
   const setupDeps = {
-    context: contextSetup,
+    context: contextServiceMock.createSetupContract(),
     executionContext: executionContextServiceMock.createInternalSetupContract(),
   };
 
@@ -114,11 +114,17 @@ describe('Routing versioned requests', () => {
     );
   });
 
-  it('returns the expected output for failed validation', async () => {
+  it('returns the expected responses for failed validation', async () => {
     router.versioned
-      .post({ access: 'internal', path: '/test/{id}' })
+      .post({ path: '/my-path', access: 'internal' })
+      // Bad request validation
       .addVersion(
-        { validate: { request: { body: schema.object({ foo: schema.number() }) } }, version: '1' },
+        {
+          validate: {
+            request: { body: schema.object({ foo: schema.number() }) },
+          },
+          version: '1',
+        },
         async (ctx, req, res) => {
           return res.ok({ body: { v: '1' } });
         }
@@ -128,7 +134,7 @@ describe('Routing versioned requests', () => {
 
     await expect(
       supertest
-        .post('/test/1')
+        .post('/my-path')
         .send({})
         .set('Elastic-Api-Version', '1')
         .expect(400)
@@ -159,6 +165,63 @@ describe('Routing versioned requests', () => {
     ).resolves.toEqual(expect.objectContaining({ 'elastic-api-version': '2020-02-02' }));
   });
 
+  it('runs response validation when in dev', async () => {
+    router.versioned
+      .get({ path: '/my-path', access: 'internal' })
+      .addVersion(
+        { validate: { response: { 200: { body: schema.number() } } }, version: '1' },
+        async (ctx, req, res) => {
+          return res.ok({ body: { v: '1' } });
+        }
+      );
+
+    await server.start();
+
+    await expect(
+      supertest
+        .get('/my-path')
+        .set('Elastic-Api-Version', '1')
+        .expect(500)
+        .then(({ body }) => body)
+    ).resolves.toEqual(
+      expect.objectContaining({
+        message: expect.stringMatching(/Failed output validation/),
+      })
+    );
+  });
+
+  it('does not run response validation in prod', async () => {
+    logger = loggingSystemMock.create();
+    await server.stop(); // stop the already started server
+    server = createHttpServer({
+      logger,
+      env: createTestEnv({ envOptions: getEnvOptions({ cliArgs: { dev: false } }) }),
+    });
+    await server.preboot({ context: contextServiceMock.createPrebootContract() });
+    const { server: innerServer, createRouter } = await server.setup(setupDeps);
+
+    router = createRouter('/');
+    supertest = Supertest(innerServer.listener);
+    router.versioned
+      .get({ path: '/my-path', access: 'internal' })
+      .addVersion(
+        { validate: { response: { 200: { body: schema.number() } } }, version: '1' },
+        async (ctx, req, res) => {
+          return res.ok({ body: { v: '1' } });
+        }
+      );
+
+    await server.start();
+
+    await expect(
+      supertest
+        .get('/my-path')
+        .set('Elastic-Api-Version', '1')
+        .expect(200)
+        .then(({ body }) => body.v)
+    ).resolves.toEqual('1');
+  });
+
   it('errors when no handler could be found', async () => {
     router.versioned.get({ path: '/my-path', access: 'public' });
 

From c7f95370dfe0b483e85a200d86ebddf13a3226c9 Mon Sep 17 00:00:00 2001
From: Jill Guyonnet <jill.guyonnet@elastic.co>
Date: Wed, 19 Apr 2023 11:04:28 +0200
Subject: [PATCH 058/100] [Fleet] Fix package policy validation for select
 variables (#155180)

## Summary

There is a bug in package policy validation when the variable is of type
`select`: empty strings are not correctly rejected as invalid values.
This PR fixes this.

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

### 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
---
 .../services/validate_package_policy.test.ts  | 21 +++++++++++++++++++
 .../services/validate_package_policy.ts       |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/fleet/common/services/validate_package_policy.test.ts b/x-pack/plugins/fleet/common/services/validate_package_policy.test.ts
index 35c1e8184c931..abf38ea7db0c5 100644
--- a/x-pack/plugins/fleet/common/services/validate_package_policy.test.ts
+++ b/x-pack/plugins/fleet/common/services/validate_package_policy.test.ts
@@ -968,6 +968,27 @@ describe('Fleet - validatePackagePolicyConfig', () => {
       expect(res).toEqual(['Invalid value for select type']);
     });
 
+    it('should return an error message if the value is an empty string', () => {
+      const res = validatePackagePolicyConfig(
+        {
+          type: 'select',
+          value: '',
+        },
+        {
+          name: 'myvariable',
+          type: 'select',
+          options: [
+            { value: 'a', text: 'A' },
+            { value: 'b', text: 'B' },
+          ],
+        },
+        'myvariable',
+        safeLoad
+      );
+
+      expect(res).toEqual(['Invalid value for select type']);
+    });
+
     it('should accept a select with a valid value', () => {
       const res = validatePackagePolicyConfig(
         {
diff --git a/x-pack/plugins/fleet/common/services/validate_package_policy.ts b/x-pack/plugins/fleet/common/services/validate_package_policy.ts
index 49a59f1e64eb8..f1aa6f3f19640 100644
--- a/x-pack/plugins/fleet/common/services/validate_package_policy.ts
+++ b/x-pack/plugins/fleet/common/services/validate_package_policy.ts
@@ -337,7 +337,7 @@ export const validatePackagePolicyConfig = (
     }
   }
 
-  if (varDef.type === 'select' && parsedValue) {
+  if (varDef.type === 'select' && parsedValue !== undefined) {
     if (!varDef.options?.map((o) => o.value).includes(parsedValue)) {
       errors.push(
         i18n.translate('xpack.fleet.packagePolicyValidation.invalidSelectValueErrorMessage', {

From 2d04254b9e935245a13a79d153ba7867d0cf8628 Mon Sep 17 00:00:00 2001
From: Candace Park <56409205+parkiino@users.noreply.github.com>
Date: Wed, 19 Apr 2023 05:57:33 -0400
Subject: [PATCH 059/100] [Security Solution][Admin][Policy] Add Cloud status
 to Policy (#155005)

## Summary
- [x] Adds cloud status to endpoint integration policy
- [x] Update 8.8 migration to include cloud id in meta field
- [x] Migration unit test

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: Kevin Logan <kevin.logan@elastic.co>
---
 .../security_solution/to_v8_8_0.test.ts       |  4 +--
 .../migrations/security_solution/to_v8_8_0.ts |  2 +-
 .../common/endpoint/models/policy_config.ts   |  3 ++-
 .../models/policy_config_helpers.test.ts      |  2 +-
 .../common/endpoint/types/index.ts            |  1 +
 .../policy/store/policy_details/index.test.ts |  2 +-
 .../plugins/security_solution/public/types.ts |  3 +++
 .../endpoint/endpoint_app_context_services.ts |  6 ++++-
 .../endpoint/lib/policy/license_watch.test.ts | 26 ++++++++++++++++---
 .../endpoint/lib/policy/license_watch.ts      |  6 +++++
 .../server/endpoint/mocks.ts                  |  2 ++
 .../fleet_integration.test.ts                 | 13 +++++++---
 .../fleet_integration/fleet_integration.ts    | 10 +++++--
 .../handlers/create_default_policy.test.ts    |  7 +++--
 .../handlers/create_default_policy.ts         |  7 +++--
 .../security_solution/server/plugin.ts        |  2 ++
 .../server/plugin_contract.ts                 |  1 +
 17 files changed, 78 insertions(+), 19 deletions(-)

diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_8_0.test.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_8_0.test.ts
index e360b655f2a61..1e5ede49f2c4b 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_8_0.test.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_8_0.test.ts
@@ -53,11 +53,11 @@ describe('8.8.0 Endpoint Package Policy migration', () => {
     };
   };
 
-  it('adds license to policy, defaulted to empty string', () => {
+  it('adds license and cloud status to policy, defaulted to empty string', () => {
     const initialDoc = policyDoc({});
 
     const migratedDoc = policyDoc({
-      meta: { license: '' },
+      meta: { license: '', cloud: false },
     });
 
     expect(migration(initialDoc, {} as SavedObjectMigrationContext)).toEqual(migratedDoc);
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_8_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_8_0.ts
index 24b769bcdec9a..954349f89714f 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_8_0.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_8_0.ts
@@ -24,7 +24,7 @@ export const migratePackagePolicyToV880: SavedObjectMigrationFn<PackagePolicy, P
     const policy = input.config.policy.value;
 
     // For the migration, we add an empty string, and the license watcher will correct it if needed.
-    policy.meta = { license: '' };
+    policy.meta = { license: '', cloud: false };
   }
 
   return updatedPackagePolicyDoc;
diff --git a/x-pack/plugins/security_solution/common/endpoint/models/policy_config.ts b/x-pack/plugins/security_solution/common/endpoint/models/policy_config.ts
index b0997a6b92787..06c7eda0785a7 100644
--- a/x-pack/plugins/security_solution/common/endpoint/models/policy_config.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/models/policy_config.ts
@@ -11,10 +11,11 @@ import { ProtectionModes } from '../types';
 /**
  * Return a new default `PolicyConfig` for platinum and above licenses
  */
-export const policyFactory = (license = ''): PolicyConfig => {
+export const policyFactory = (license = '', cloud = false): PolicyConfig => {
   return {
     meta: {
       license,
+      cloud,
     },
     windows: {
       events: {
diff --git a/x-pack/plugins/security_solution/common/endpoint/models/policy_config_helpers.test.ts b/x-pack/plugins/security_solution/common/endpoint/models/policy_config_helpers.test.ts
index b35bbc190fe43..c59844f70ead9 100644
--- a/x-pack/plugins/security_solution/common/endpoint/models/policy_config_helpers.test.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/models/policy_config_helpers.test.ts
@@ -119,7 +119,7 @@ describe('Policy Config helpers', () => {
 // This constant makes sure that if the type `PolicyConfig` is ever modified,
 // the logic for disabling protections is also modified due to type check.
 export const eventsOnlyPolicy: PolicyConfig = {
-  meta: { license: '' },
+  meta: { license: '', cloud: false },
   windows: {
     events: {
       credential_access: true,
diff --git a/x-pack/plugins/security_solution/common/endpoint/types/index.ts b/x-pack/plugins/security_solution/common/endpoint/types/index.ts
index eb4d5c7421eef..75899b5422039 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types/index.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types/index.ts
@@ -924,6 +924,7 @@ type KbnConfigSchemaNonOptionalProps<Props extends Record<string, unknown>> = Pi
 export interface PolicyConfig {
   meta: {
     license: string;
+    cloud: boolean;
   };
   windows: {
     advanced?: {
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts
index f4035498f81df..d2876f1bcdd24 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_details/index.test.ts
@@ -269,7 +269,7 @@ describe('policy details: ', () => {
               },
               policy: {
                 value: {
-                  meta: { license: '' },
+                  meta: { license: '', cloud: false },
                   windows: {
                     events: {
                       credential_access: true,
diff --git a/x-pack/plugins/security_solution/public/types.ts b/x-pack/plugins/security_solution/public/types.ts
index a9566fabc6c1a..e6e10a9c5b3dd 100644
--- a/x-pack/plugins/security_solution/public/types.ts
+++ b/x-pack/plugins/security_solution/public/types.ts
@@ -33,6 +33,7 @@ import type { LicensingPluginStart, LicensingPluginSetup } from '@kbn/licensing-
 import type { DashboardStart } from '@kbn/dashboard-plugin/public';
 import type { IndexPatternFieldEditorStart } from '@kbn/data-view-field-editor-plugin/public';
 import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import type { CloudSetup, CloudStart } from '@kbn/cloud-plugin/public';
 import type { CloudDefendPluginStart } from '@kbn/cloud-defend-plugin/public';
 import type { CspClientPluginStart } from '@kbn/cloud-security-posture-plugin/public';
 import type { ApmBase } from '@elastic/apm-rum';
@@ -65,6 +66,7 @@ import type { TelemetryClientStart } from './common/lib/telemetry';
 import type { Dashboards } from './dashboards';
 
 export interface SetupPlugins {
+  cloud?: CloudSetup;
   home?: HomePublicPluginSetup;
   licensing: LicensingPluginSetup;
   security: SecurityPluginSetup;
@@ -96,6 +98,7 @@ export interface StartPlugins {
   dataViewFieldEditor: IndexPatternFieldEditorStart;
   osquery: OsqueryPluginStart;
   security: SecurityPluginStart;
+  cloud?: CloudStart;
   cloudDefend: CloudDefendPluginStart;
   cloudSecurityPosture: CspClientPluginStart;
   threatIntelligence: ThreatIntelligencePluginStart;
diff --git a/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts b/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts
index 841a27b2650ac..489953a2d96d2 100644
--- a/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts
@@ -12,6 +12,7 @@ import type { SecurityPluginStart } from '@kbn/security-plugin/server';
 import type { FleetStartContract, MessageSigningServiceInterface } from '@kbn/fleet-plugin/server';
 import type { PluginStartContract as AlertsPluginStartContract } from '@kbn/alerting-plugin/server';
 import { ENDPOINT_HOST_ISOLATION_EXCEPTIONS_LIST_ID } from '@kbn/securitysolution-list-constants';
+import type { CloudSetup } from '@kbn/cloud-plugin/server';
 import {
   getPackagePolicyCreateCallback,
   getPackagePolicyUpdateCallback,
@@ -61,6 +62,7 @@ export interface EndpointAppContextServiceStartContract {
   experimentalFeatures: ExperimentalFeatures;
   messageSigningService: MessageSigningServiceInterface | undefined;
   actionCreateService: ActionCreateService | undefined;
+  cloud: CloudSetup;
 }
 
 /**
@@ -92,6 +94,7 @@ export class EndpointAppContextService {
         logger,
         manifestManager,
         alerting,
+        cloud,
         licenseService,
         exceptionListsClient,
         featureUsageService,
@@ -106,7 +109,8 @@ export class EndpointAppContextService {
           this.setupDependencies.securitySolutionRequestContextFactory,
           alerting,
           licenseService,
-          exceptionListsClient
+          exceptionListsClient,
+          cloud
         )
       );
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts b/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts
index 9d962bc0e64ce..9c57b8156e3e3 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts
@@ -16,6 +16,7 @@ import { createPackagePolicyServiceMock } from '@kbn/fleet-plugin/server/mocks';
 import { PolicyWatcher } from './license_watch';
 import type { ILicense } from '@kbn/licensing-plugin/common/types';
 import { licenseMock } from '@kbn/licensing-plugin/common/licensing.mock';
+import { cloudMock } from '@kbn/cloud-plugin/server/mocks';
 import type { PackagePolicyClient } from '@kbn/fleet-plugin/server';
 import type { PackagePolicy } from '@kbn/fleet-plugin/common';
 import { createPackagePolicyMock } from '@kbn/fleet-plugin/common/mocks';
@@ -35,6 +36,7 @@ const MockPPWithEndpointPolicy = (cb?: (p: PolicyConfig) => PolicyConfig): Packa
 
 describe('Policy-Changing license watcher', () => {
   const logger = loggingSystemMock.create().get('license_watch.test');
+  const cloudServiceMock = cloudMock.createSetup();
   const soStartMock = savedObjectsServiceMock.createStartContract();
   const esStartMock = elasticsearchServiceMock.createStart();
   let packagePolicySvcMock: jest.Mocked<PackagePolicyClient>;
@@ -51,7 +53,13 @@ describe('Policy-Changing license watcher', () => {
     // mock a license-changing service to test reactivity
     const licenseEmitter: Subject<ILicense> = new Subject();
     const licenseService = new LicenseService();
-    const pw = new PolicyWatcher(packagePolicySvcMock, soStartMock, esStartMock, logger);
+    const pw = new PolicyWatcher(
+      packagePolicySvcMock,
+      soStartMock,
+      esStartMock,
+      cloudServiceMock,
+      logger
+    );
 
     // swap out watch function, just to ensure it gets called when a license change happens
     const mockWatch = jest.fn();
@@ -96,7 +104,13 @@ describe('Policy-Changing license watcher', () => {
         perPage: 100,
       });
 
-    const pw = new PolicyWatcher(packagePolicySvcMock, soStartMock, esStartMock, logger);
+    const pw = new PolicyWatcher(
+      packagePolicySvcMock,
+      soStartMock,
+      esStartMock,
+      cloudServiceMock,
+      logger
+    );
     await pw.watch(Gold); // just manually trigger with a given license
 
     expect(packagePolicySvcMock.list.mock.calls.length).toBe(3); // should have asked for 3 pages of resuts
@@ -123,7 +137,13 @@ describe('Policy-Changing license watcher', () => {
       perPage: 100,
     });
 
-    const pw = new PolicyWatcher(packagePolicySvcMock, soStartMock, esStartMock, logger);
+    const pw = new PolicyWatcher(
+      packagePolicySvcMock,
+      soStartMock,
+      esStartMock,
+      cloudServiceMock,
+      logger
+    );
 
     // emulate a license change below paid tier
     await pw.watch(Basic);
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.ts b/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.ts
index 28a6eb273bcf3..dded85b559c6d 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.ts
@@ -17,6 +17,7 @@ import type {
 } from '@kbn/core/server';
 import type { PackagePolicy } from '@kbn/fleet-plugin/common';
 import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '@kbn/fleet-plugin/common';
+import type { CloudSetup } from '@kbn/cloud-plugin/server';
 import type { PackagePolicyClient } from '@kbn/fleet-plugin/server';
 import type { ILicense } from '@kbn/licensing-plugin/common/types';
 import { SECURITY_EXTENSION_ID } from '@kbn/core-saved-objects-server';
@@ -34,16 +35,19 @@ export class PolicyWatcher {
   private policyService: PackagePolicyClient;
   private subscription: Subscription | undefined;
   private soStart: SavedObjectsServiceStart;
+  private cloud: CloudSetup;
   constructor(
     policyService: PackagePolicyClient,
     soStart: SavedObjectsServiceStart,
     esStart: ElasticsearchServiceStart,
+    cloud: CloudSetup,
     logger: Logger
   ) {
     this.policyService = policyService;
     this.esClient = esStart.client.asInternalUser;
     this.logger = logger;
     this.soStart = soStart;
+    this.cloud = cloud;
   }
 
   /**
@@ -102,6 +106,8 @@ export class PolicyWatcher {
         const updatePolicy = getPolicyDataForUpdate(policy);
         const policyConfig = updatePolicy.inputs[0].config.policy.value;
         updatePolicy.inputs[0].config.policy.value.meta.license = license.type || '';
+        // add cloud info to policy meta
+        updatePolicy.inputs[0].config.policy.value.meta.cloud = this.cloud?.isCloudEnabled;
 
         try {
           if (!isEndpointPolicyValidForLicense(policyConfig, license)) {
diff --git a/x-pack/plugins/security_solution/server/endpoint/mocks.ts b/x-pack/plugins/security_solution/server/endpoint/mocks.ts
index 7177c92c961b3..46ffabfb5de17 100644
--- a/x-pack/plugins/security_solution/server/endpoint/mocks.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/mocks.ts
@@ -27,6 +27,7 @@ import type {
 import { listMock } from '@kbn/lists-plugin/server/mocks';
 import { securityMock } from '@kbn/security-plugin/server/mocks';
 import { alertsMock } from '@kbn/alerting-plugin/server/mocks';
+import { cloudMock } from '@kbn/cloud-plugin/server/mocks';
 import type { FleetStartContract } from '@kbn/fleet-plugin/server';
 import {
   createPackagePolicyServiceMock,
@@ -170,6 +171,7 @@ export const createMockEndpointAppContextServiceStartContract =
       >(),
       exceptionListsClient: listMock.getExceptionListClient(),
       cases: casesMock,
+      cloud: cloudMock.createSetup(),
       featureUsageService: createFeatureUsageServiceMock(),
       experimentalFeatures: createMockConfig().experimentalFeatures,
       messageSigningService: createMessageSigningServiceMock(),
diff --git a/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts b/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts
index 0ffdc09844c9a..30c7e776e718e 100644
--- a/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts
+++ b/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts
@@ -17,6 +17,7 @@ import {
   createNewPackagePolicyMock,
   deletePackagePolicyMock,
 } from '@kbn/fleet-plugin/common/mocks';
+import { cloudMock } from '@kbn/cloud-plugin/server/mocks';
 import {
   policyFactory,
   policyFactoryWithoutPaidFeatures,
@@ -68,6 +69,7 @@ describe('ingest_integration tests ', () => {
   const Platinum = licenseMock.createLicense({ license: { type: 'platinum', mode: 'platinum' } });
   const Gold = licenseMock.createLicense({ license: { type: 'gold', mode: 'gold' } });
   const generator = new EndpointDocGenerator();
+  const cloudService = cloudMock.createSetup();
 
   beforeEach(() => {
     endpointAppContextMock = createMockEndpointAppContextServiceStartContract();
@@ -92,13 +94,17 @@ describe('ingest_integration tests ', () => {
     const soClient = savedObjectsClientMock.create();
     const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser;
 
-    const createNewEndpointPolicyInput = (manifest: ManifestSchema, license = 'platinum') => ({
+    const createNewEndpointPolicyInput = (
+      manifest: ManifestSchema,
+      license = 'platinum',
+      cloud = cloudService.isCloudEnabled
+    ) => ({
       type: 'endpoint',
       enabled: true,
       streams: [],
       config: {
         integration_config: {},
-        policy: { value: disableProtections(policyFactory(license)) },
+        policy: { value: disableProtections(policyFactory(license, cloud)) },
         artifact_manifest: { value: manifest },
       },
     });
@@ -111,7 +117,8 @@ describe('ingest_integration tests ', () => {
         requestContextFactoryMock.create(),
         endpointAppContextMock.alerting,
         licenseService,
-        exceptionListClient
+        exceptionListClient,
+        cloudService
       );
 
       return callback(
diff --git a/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.ts b/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.ts
index a941b8f8aa4ca..fd6f85af1a045 100644
--- a/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.ts
+++ b/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.ts
@@ -20,6 +20,7 @@ import type {
   PackagePolicy,
   UpdatePackagePolicy,
 } from '@kbn/fleet-plugin/common';
+import type { CloudSetup } from '@kbn/cloud-plugin/server';
 import type { NewPolicyData, PolicyConfig } from '../../common/endpoint/types';
 import type { LicenseService } from '../../common/license';
 import type { ManifestManager } from '../endpoint/services';
@@ -52,7 +53,8 @@ export const getPackagePolicyCreateCallback = (
   securitySolutionRequestContextFactory: IRequestContextFactory,
   alerts: AlertsStartContract,
   licenseService: LicenseService,
-  exceptionsClient: ExceptionListClient | undefined
+  exceptionsClient: ExceptionListClient | undefined,
+  cloud: CloudSetup
 ): PostPackagePolicyCreateCallback => {
   return async (
     newPackagePolicy,
@@ -114,7 +116,11 @@ export const getPackagePolicyCreateCallback = (
     ]);
 
     // Add the default endpoint security policy
-    const defaultPolicyValue = createDefaultPolicy(licenseService, endpointIntegrationConfig);
+    const defaultPolicyValue = createDefaultPolicy(
+      licenseService,
+      endpointIntegrationConfig,
+      cloud
+    );
 
     return {
       // We cast the type here so that any changes to the Endpoint
diff --git a/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_default_policy.test.ts b/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_default_policy.test.ts
index c0b713b1bfa17..867876d6345a3 100644
--- a/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_default_policy.test.ts
+++ b/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_default_policy.test.ts
@@ -7,6 +7,7 @@
 import { Subject } from 'rxjs';
 import type { ILicense } from '@kbn/licensing-plugin/common/types';
 import { licenseMock } from '@kbn/licensing-plugin/common/licensing.mock';
+import { cloudMock } from '@kbn/cloud-plugin/server/mocks';
 import { LicenseService } from '../../../common/license';
 import { createDefaultPolicy } from './create_default_policy';
 import { ProtectionModes } from '../../../common/endpoint/types';
@@ -19,13 +20,14 @@ import type {
 } from '../types';
 
 describe('Create Default Policy tests ', () => {
+  const cloud = cloudMock.createSetup();
   const Platinum = licenseMock.createLicense({ license: { type: 'platinum', mode: 'platinum' } });
   const Gold = licenseMock.createLicense({ license: { type: 'gold', mode: 'gold' } });
   let licenseEmitter: Subject<ILicense>;
   let licenseService: LicenseService;
 
   const createDefaultPolicyCallback = (config: AnyPolicyCreateConfig | undefined): PolicyConfig => {
-    return createDefaultPolicy(licenseService, config);
+    return createDefaultPolicy(licenseService, config, cloud);
   };
 
   beforeEach(() => {
@@ -169,8 +171,9 @@ describe('Create Default Policy tests ', () => {
       const config = createEndpointConfig({ preset: 'EDRComplete' });
       const policy = createDefaultPolicyCallback(config);
       const defaultPolicy = policyFactory();
-      // update defaultPolicy w/ platinum license
+      // update defaultPolicy w/ platinum license & cloud info
       defaultPolicy.meta.license = 'platinum';
+      defaultPolicy.meta.cloud = true;
       expect(policy).toMatchObject(defaultPolicy);
     });
   });
diff --git a/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_default_policy.ts b/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_default_policy.ts
index 17b1972b743d6..52a686d198701 100644
--- a/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_default_policy.ts
+++ b/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_default_policy.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import type { CloudSetup } from '@kbn/cloud-plugin/server';
 import {
   policyFactory as policyConfigFactory,
   policyFactoryWithoutPaidFeatures as policyConfigFactoryWithoutPaidFeatures,
@@ -25,12 +26,14 @@ import { disableProtections } from '../../../common/endpoint/models/policy_confi
  */
 export const createDefaultPolicy = (
   licenseService: LicenseService,
-  config: AnyPolicyCreateConfig | undefined
+  config: AnyPolicyCreateConfig | undefined,
+  cloud: CloudSetup
 ): PolicyConfig => {
   const factoryPolicy = policyConfigFactory();
 
-  // Add license information after policy creation
+  // Add license and cloud information after policy creation
   factoryPolicy.meta.license = licenseService.getLicenseType();
+  factoryPolicy.meta.cloud = cloud?.isCloudEnabled;
 
   const defaultPolicyPerType =
     config?.type === 'cloud'
diff --git a/x-pack/plugins/security_solution/server/plugin.ts b/x-pack/plugins/security_solution/server/plugin.ts
index 2b6048c122f27..2ec2db2394068 100644
--- a/x-pack/plugins/security_solution/server/plugin.ts
+++ b/x-pack/plugins/security_solution/server/plugin.ts
@@ -468,6 +468,7 @@ export class Plugin implements ISecuritySolutionPlugin {
         plugins.fleet.packagePolicyService,
         core.savedObjects,
         core.elasticsearch,
+        plugins.cloud,
         logger
       );
       this.policyWatcher.start(licenseService);
@@ -498,6 +499,7 @@ export class Plugin implements ISecuritySolutionPlugin {
       manifestManager,
       registerIngestCallback,
       licenseService,
+      cloud: plugins.cloud,
       exceptionListsClient: exceptionListClient,
       registerListsServerExtension: this.lists?.registerExtension,
       featureUsageService,
diff --git a/x-pack/plugins/security_solution/server/plugin_contract.ts b/x-pack/plugins/security_solution/server/plugin_contract.ts
index 57c05d2490c05..6a06c67a6cb1b 100644
--- a/x-pack/plugins/security_solution/server/plugin_contract.ts
+++ b/x-pack/plugins/security_solution/server/plugin_contract.ts
@@ -66,6 +66,7 @@ export interface SecuritySolutionPluginSetupDependencies {
 export interface SecuritySolutionPluginStartDependencies {
   alerting: AlertingPluginStart;
   cases?: CasesStart;
+  cloud: CloudSetup;
   cloudExperiments?: CloudExperimentsPluginStart;
   data: DataPluginStart;
   dataViews: DataViewsPluginStart;

From 54757a0db85c18650a5a699aaf354f2b84bef9b1 Mon Sep 17 00:00:00 2001
From: Navarone Feekery <13634519+navarone-feekery@users.noreply.github.com>
Date: Wed, 19 Apr 2023 12:02:12 +0200
Subject: [PATCH 060/100] [Enterprise Search] Add tooltip and default value
 message (#155176)

- Adds tooltip to each configurable field label. If tooltip is empty,
the tooltip will not appear.
- Adds a message below fields that have a `default_value`
---
 .../common/connectors/native_connectors.ts    |  58 +++--
 .../common/types/connectors.ts                |  13 +-
 .../__mocks__/search_indices.mock.ts          |   9 +-
 .../__mocks__/view_index.mock.ts              |   9 +-
 .../connector_configuration_field.tsx         |  20 +-
 .../connector_configuration_form.tsx          |  42 +++-
 .../connector_configuration_logic.test.ts     |  94 ++++++--
 .../connector_configuration_logic.ts          |  35 ++-
 .../plugins/translations/translations/en.json | 213 ++++++++++++++++++
 9 files changed, 431 insertions(+), 62 deletions(-)
 create mode 100644 x-pack/plugins/translations/translations/en.json

diff --git a/x-pack/plugins/enterprise_search/common/connectors/native_connectors.ts b/x-pack/plugins/enterprise_search/common/connectors/native_connectors.ts
index aab72dce47f76..8d962ee206f9e 100644
--- a/x-pack/plugins/enterprise_search/common/connectors/native_connectors.ts
+++ b/x-pack/plugins/enterprise_search/common/connectors/native_connectors.ts
@@ -7,14 +7,15 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { FeatureName, NativeConnector } from '../types/connectors';
+import { DisplayType, FeatureName, NativeConnector } from '../types/connectors';
 
 export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | undefined> = {
   mongodb: {
     configuration: {
       host: {
+        default_value: '',
         depends_on: [],
-        display: 'textbox',
+        display: DisplayType.TEXTBOX,
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mongodb.configuration.hostLabel',
           {
@@ -25,11 +26,13 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 1,
         required: true,
         sensitive: false,
+        tooltip: '',
         value: '',
       },
       user: {
+        default_value: '',
         depends_on: [],
-        display: 'textbox',
+        display: DisplayType.TEXTBOX,
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mongodb.configuration.usernameLabel',
           {
@@ -40,11 +43,13 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 2,
         required: true,
         sensitive: false,
+        tooltip: '',
         value: '',
       },
       password: {
+        default_value: '',
         depends_on: [],
-        display: 'textbox',
+        display: DisplayType.TEXTBOX,
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mongodb.configuration.passwordLabel',
           {
@@ -55,11 +60,13 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 3,
         required: true,
         sensitive: true,
+        tooltip: '',
         value: '',
       },
       database: {
+        default_value: '',
         depends_on: [],
-        display: 'textbox',
+        display: DisplayType.TEXTBOX,
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mongodb.configuration.databaseLabel',
           {
@@ -70,11 +77,13 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 4,
         required: true,
         sensitive: false,
+        tooltip: '',
         value: '',
       },
       collection: {
+        default_value: '',
         depends_on: [],
-        display: 'textbox',
+        display: DisplayType.TEXTBOX,
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mongodb.configuration.collectionLabel',
           {
@@ -85,11 +94,13 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 5,
         required: true,
         sensitive: false,
+        tooltip: '',
         value: '',
       },
       direct_connection: {
+        default_value: true,
         depends_on: [],
-        display: 'toggle',
+        display: DisplayType.TOGGLE,
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mongodb.configuration.directConnectionLabel',
           {
@@ -100,6 +111,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 6,
         required: true,
         sensitive: false,
+        tooltip: '',
         value: true,
       },
     },
@@ -119,8 +131,9 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
   mysql: {
     configuration: {
       host: {
+        default_value: '',
         depends_on: [],
-        display: 'textbox',
+        display: DisplayType.TEXTBOX,
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mysql.configuration.hostLabel',
           {
@@ -131,11 +144,13 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 1,
         required: true,
         sensitive: false,
+        tooltip: '',
         value: '',
       },
       port: {
+        default_value: null,
         depends_on: [],
-        display: 'numeric',
+        display: DisplayType.NUMERIC,
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mysql.configuration.portLabel',
           {
@@ -146,11 +161,13 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 2,
         required: true,
         sensitive: false,
+        tooltip: '',
         value: '',
       },
       user: {
+        default_value: '',
         depends_on: [],
-        display: 'textbox',
+        display: DisplayType.TEXTBOX,
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mysql.configuration.usernameLabel',
           {
@@ -161,11 +178,13 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 3,
         required: false,
         sensitive: false,
+        tooltip: '',
         value: '',
       },
       password: {
+        default_value: '',
         depends_on: [],
-        display: 'textbox',
+        display: DisplayType.TEXTBOX,
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mysql.configuration.passwordLabel',
           {
@@ -176,11 +195,13 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 4,
         required: false,
         sensitive: true,
+        tooltip: '',
         value: '',
       },
       database: {
+        default_value: '',
         depends_on: [],
-        display: 'textbox',
+        display: DisplayType.TEXTBOX,
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mysql.configuration.databaseLabel',
           {
@@ -191,11 +212,13 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 5,
         required: true,
         sensitive: false,
+        tooltip: '',
         value: '',
       },
       tables: {
+        default_value: '',
         depends_on: [],
-        display: 'textarea',
+        display: DisplayType.TEXTAREA,
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mysql.configuration.tablesLabel',
           {
@@ -206,11 +229,13 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 6,
         required: true,
         sensitive: false,
+        tooltip: '',
         value: '',
       },
       ssl_enabled: {
+        default_value: false,
         depends_on: [],
-        display: 'toggle',
+        display: DisplayType.TOGGLE,
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mysql.configuration.sslEnabledLabel',
           {
@@ -221,11 +246,13 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 7,
         required: true,
         sensitive: false,
+        tooltip: '',
         value: false,
       },
       ssl_ca: {
+        default_value: '',
         depends_on: [{ field: 'ssl_enabled', value: true }],
-        display: 'textbox',
+        display: DisplayType.TEXTBOX,
         label: i18n.translate(
           'xpack.enterpriseSearch.nativeConnectors.mysql.configuration.sslCertificateLabel',
           {
@@ -236,6 +263,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 8,
         required: true,
         sensitive: false,
+        tooltip: '',
         value: '',
       },
     },
diff --git a/x-pack/plugins/enterprise_search/common/types/connectors.ts b/x-pack/plugins/enterprise_search/common/types/connectors.ts
index ad312c41a2df2..33d12e300c72b 100644
--- a/x-pack/plugins/enterprise_search/common/types/connectors.ts
+++ b/x-pack/plugins/enterprise_search/common/types/connectors.ts
@@ -17,14 +17,25 @@ export interface Dependency {
 
 export type DependencyLookup = Record<string, string | number | boolean | null>;
 
+export enum DisplayType {
+  TEXTBOX = 'textbox',
+  TEXTAREA = 'textarea',
+  NUMERIC = 'numeric',
+  TOGGLE = 'toggle',
+  DROPDOWN = 'dropdown',
+  CHECKBOX = 'checkbox',
+}
+
 export interface ConnectorConfigProperties {
+  default_value: string | number | boolean | null;
   depends_on: Dependency[];
-  display: string;
+  display: DisplayType;
   label: string;
   options: SelectOption[];
   order?: number | null;
   required: boolean;
   sensitive: boolean;
+  tooltip: string;
   value: string | number | boolean | null;
 }
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/search_indices.mock.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/search_indices.mock.ts
index 0ae7543eadd45..5ae2784b52664 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/search_indices.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/search_indices.mock.ts
@@ -9,6 +9,7 @@ import { ENTERPRISE_SEARCH_CONNECTOR_CRAWLER_SERVICE_TYPE } from '../../../../co
 
 import {
   ConnectorStatus,
+  DisplayType,
   FilteringPolicy,
   FilteringRuleRule,
   FilteringValidationState,
@@ -34,14 +35,16 @@ export const indices: ElasticsearchIndexWithIngestion[] = [
       api_key_id: null,
       configuration: {
         foo: {
+          default_value: '',
           depends_on: [],
-          display: 'textbox',
+          display: DisplayType.TEXTBOX,
           key: 'foo',
           label: 'bar',
           options: [],
           order: 1,
           required: false,
           sensitive: false,
+          tooltip: '',
           value: 'barbar',
         },
       },
@@ -142,14 +145,16 @@ export const indices: ElasticsearchIndexWithIngestion[] = [
       api_key_id: null,
       configuration: {
         foo: {
+          default_value: '',
           depends_on: [],
-          display: 'textbox',
+          display: DisplayType.TEXTBOX,
           key: 'foo',
           label: 'bar',
           options: [],
           order: 1,
           required: false,
           sensitive: false,
+          tooltip: '',
           value: 'barbar',
         },
       },
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/view_index.mock.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/view_index.mock.ts
index 517bad3746bc6..1674f5ca18675 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/view_index.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/view_index.mock.ts
@@ -13,6 +13,7 @@ import {
   FilteringPolicy,
   FilteringRuleRule,
   FilteringValidationState,
+  DisplayType,
 } from '../../../../common/types/connectors';
 
 import {
@@ -44,14 +45,16 @@ export const connectorIndex: ConnectorViewIndex = {
     api_key_id: null,
     configuration: {
       foo: {
+        default_value: '',
         depends_on: [],
-        display: 'textbox',
+        display: DisplayType.TEXTBOX,
         key: 'foo',
         label: 'bar',
         options: [],
         order: 1,
         required: false,
         sensitive: false,
+        tooltip: '',
         value: 'barbar',
       },
     },
@@ -156,14 +159,16 @@ export const crawlerIndex: CrawlerViewIndex = {
     api_key_id: null,
     configuration: {
       foo: {
+        default_value: '',
         depends_on: [],
-        display: 'textbox',
+        display: DisplayType.TEXTBOX,
         key: 'foo',
         label: 'bar',
         options: [],
         order: 1,
         required: false,
         sensitive: false,
+        tooltip: '',
         value: 'barbar',
       },
     },
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_field.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_field.tsx
index 5564388c0fdfd..1030cbdcfa5d9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_field.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_field.tsx
@@ -18,9 +18,11 @@ import {
   EuiSelect,
   EuiSwitch,
   EuiTextArea,
+  EuiToolTip,
 } from '@elastic/eui';
 
 import { Status } from '../../../../../../common/types/api';
+import { DisplayType } from '../../../../../../common/types/connectors';
 
 import { ConnectorConfigurationApiLogic } from '../../../api/connector/update_connector_configuration_api_logic';
 
@@ -42,10 +44,10 @@ export const ConnectorConfigurationField: React.FC<ConnectorConfigurationFieldPr
   const { status } = useValues(ConnectorConfigurationApiLogic);
   const { setLocalConfigEntry } = useActions(ConnectorConfigurationLogic);
 
-  const { key, display, label, options, required, sensitive, value } = configEntry;
+  const { key, display, label, options, required, sensitive, tooltip, value } = configEntry;
 
   switch (display) {
-    case 'dropdown':
+    case DisplayType.DROPDOWN:
       return options.length > 3 ? (
         <EuiSelect
           disabled={status === Status.LOADING}
@@ -68,7 +70,7 @@ export const ConnectorConfigurationField: React.FC<ConnectorConfigurationFieldPr
         />
       );
 
-    case 'numeric':
+    case DisplayType.NUMERIC:
       return (
         <EuiFieldNumber
           disabled={status === Status.LOADING}
@@ -80,7 +82,7 @@ export const ConnectorConfigurationField: React.FC<ConnectorConfigurationFieldPr
         />
       );
 
-    case 'textarea':
+    case DisplayType.TEXTAREA:
       const textarea = (
         <EuiTextArea
           disabled={status === Status.LOADING}
@@ -100,12 +102,18 @@ export const ConnectorConfigurationField: React.FC<ConnectorConfigurationFieldPr
         textarea
       );
 
-    case 'toggle':
+    case DisplayType.TOGGLE:
+      const toggleLabel = (
+        <EuiToolTip content={tooltip}>
+          <p>{label}</p>
+        </EuiToolTip>
+      );
+
       return (
         <EuiSwitch
           checked={ensureBooleanType(value)}
           disabled={status === Status.LOADING}
-          label={label}
+          label={toggleLabel}
           onChange={(event) => {
             setLocalConfigEntry({ ...configEntry, value: event.target.checked });
           }}
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_form.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_form.tsx
index 991e58a672016..2ef04c8e2c18b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_form.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_form.tsx
@@ -10,19 +10,20 @@ import React from 'react';
 import { useActions, useValues } from 'kea';
 
 import {
-  EuiForm,
-  EuiFormRow,
-  EuiFlexGroup,
-  EuiFlexItem,
   EuiButton,
   EuiButtonEmpty,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiForm,
+  EuiFormRow,
   EuiPanel,
+  EuiToolTip,
 } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 
 import { Status } from '../../../../../../common/types/api';
-import { DependencyLookup } from '../../../../../../common/types/connectors';
+import { DependencyLookup, DisplayType } from '../../../../../../common/types/connectors';
 
 import { ConnectorConfigurationApiLogic } from '../../../api/connector/update_connector_configuration_api_logic';
 
@@ -56,13 +57,38 @@ export const ConnectorConfigurationForm = () => {
       component="form"
     >
       {localConfigView.map((configEntry) => {
-        const { depends_on: dependencies, key, label } = configEntry;
+        const {
+          default_value: defaultValue,
+          depends_on: dependencies,
+          key,
+          display,
+          label,
+          tooltip,
+        } = configEntry;
+        // toggle label goes next to the element, not in the row
         const hasDependencies = dependencies.length > 0;
+        const helpText = defaultValue
+          ? i18n.translate(
+              'xpack.enterpriseSearch.content.indices.configurationConnector.config.defaultValue',
+              {
+                defaultMessage: 'If left empty, the default value {defaultValue} will be used.',
+                values: { defaultValue },
+              }
+            )
+          : '';
+        const rowLabel =
+          display !== DisplayType.TOGGLE ? (
+            <EuiToolTip content={tooltip}>
+              <p>{label}</p>
+            </EuiToolTip>
+          ) : (
+            <></>
+          );
 
         return hasDependencies ? (
           dependenciesSatisfied(dependencies, dependencyLookup) ? (
             <EuiPanel color="subdued" borderRadius="none">
-              <EuiFormRow label={label ?? ''} key={key}>
+              <EuiFormRow label={rowLabel} key={key} helpText={helpText}>
                 <ConnectorConfigurationField configEntry={configEntry} />
               </EuiFormRow>
             </EuiPanel>
@@ -70,7 +96,7 @@ export const ConnectorConfigurationForm = () => {
             <></>
           )
         ) : (
-          <EuiFormRow label={label ?? ''} key={key}>
+          <EuiFormRow label={rowLabel} key={key} helpText={helpText}>
             <ConnectorConfigurationField configEntry={configEntry} />
           </EuiFormRow>
         );
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_logic.test.ts
index ebb173a3c42ca..9ff1fc60db168 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_logic.test.ts
@@ -8,7 +8,7 @@
 import { LogicMounter } from '../../../../__mocks__/kea_logic';
 import { connectorIndex } from '../../../__mocks__/view_index.mock';
 
-import { ConnectorStatus } from '../../../../../../common/types/connectors';
+import { ConnectorStatus, DisplayType } from '../../../../../../common/types/connectors';
 
 import { ConnectorConfigurationApiLogic } from '../../../api/connector/update_connector_configuration_api_logic';
 import { CachedFetchIndexApiLogic } from '../../../api/index/cached_fetch_index_api_logic';
@@ -52,13 +52,15 @@ describe('ConnectorConfigurationLogic', () => {
       ConnectorConfigurationApiLogic.actions.apiSuccess({
         configuration: {
           foo: {
+            default_value: '',
             depends_on: [],
-            display: 'textbox',
+            display: DisplayType.TEXTBOX,
             label: 'newBar',
             options: [],
             order: 1,
             required: false,
             sensitive: false,
+            tooltip: '',
             value: 'oldBar',
           },
         },
@@ -68,26 +70,30 @@ describe('ConnectorConfigurationLogic', () => {
         ...DEFAULT_VALUES,
         configState: {
           foo: {
+            default_value: '',
             depends_on: [],
-            display: 'textbox',
+            display: DisplayType.TEXTBOX,
             label: 'newBar',
             options: [],
             order: 1,
             required: false,
             sensitive: false,
+            tooltip: '',
             value: 'oldBar',
           },
         },
         configView: [
           {
+            default_value: '',
             depends_on: [],
-            display: 'textbox',
+            display: DisplayType.TEXTBOX,
             key: 'foo',
             label: 'newBar',
             options: [],
             order: 1,
             required: false,
             sensitive: false,
+            tooltip: '',
             value: 'oldBar',
           },
         ],
@@ -96,13 +102,15 @@ describe('ConnectorConfigurationLogic', () => {
     it('should set config on setConfigState', () => {
       ConnectorConfigurationLogic.actions.setConfigState({
         foo: {
+          default_value: '',
           depends_on: [],
-          display: 'textbox',
+          display: DisplayType.TEXTBOX,
           label: 'thirdBar',
           options: [],
           order: 1,
           required: false,
           sensitive: false,
+          tooltip: '',
           value: 'fourthBar',
         },
       });
@@ -110,26 +118,30 @@ describe('ConnectorConfigurationLogic', () => {
         ...DEFAULT_VALUES,
         configState: {
           foo: {
+            default_value: '',
             depends_on: [],
-            display: 'textbox',
+            display: DisplayType.TEXTBOX,
             label: 'thirdBar',
             options: [],
             order: 1,
             required: false,
             sensitive: false,
+            tooltip: '',
             value: 'fourthBar',
           },
         },
         configView: [
           {
+            default_value: '',
             depends_on: [],
-            display: 'textbox',
+            display: DisplayType.TEXTBOX,
             key: 'foo',
             label: 'thirdBar',
             options: [],
             order: 1,
             required: false,
             sensitive: false,
+            tooltip: '',
             value: 'fourthBar',
           },
         ],
@@ -139,150 +151,176 @@ describe('ConnectorConfigurationLogic', () => {
       it('should set local config entry and sort keys', () => {
         ConnectorConfigurationLogic.actions.setConfigState({
           bar: {
+            default_value: '',
             depends_on: [],
-            display: 'textbox',
+            display: DisplayType.TEXTBOX,
             label: 'foo',
             options: [],
             order: 1,
             required: false,
             sensitive: false,
+            tooltip: '',
             value: 'foofoo',
           },
           password: {
+            default_value: '',
             depends_on: [],
-            display: 'textbox',
+            display: DisplayType.TEXTBOX,
             label: 'thirdBar',
             options: [],
             order: 2,
             required: false,
             sensitive: true,
+            tooltip: '',
             value: 'fourthBar',
           },
         });
         ConnectorConfigurationLogic.actions.setLocalConfigState({
           bar: {
+            default_value: '',
             depends_on: [],
-            display: 'textbox',
+            display: DisplayType.TEXTBOX,
             label: 'foo',
             options: [],
             order: 1,
             required: false,
             sensitive: false,
+            tooltip: '',
             value: 'foofoo',
           },
           password: {
+            default_value: '',
             depends_on: [],
-            display: 'textbox',
+            display: DisplayType.TEXTBOX,
             label: 'thirdBar',
             options: [],
             order: 2,
             required: false,
             sensitive: true,
+            tooltip: '',
             value: 'fourthBar',
           },
         });
         ConnectorConfigurationLogic.actions.setLocalConfigEntry({
+          default_value: '',
           depends_on: [],
-          display: 'textbox',
+          display: DisplayType.TEXTBOX,
           key: 'bar',
           label: 'foo',
           options: [],
           order: 1,
           required: false,
           sensitive: false,
+          tooltip: '',
           value: 'fafa',
         });
         expect(ConnectorConfigurationLogic.values).toEqual({
           ...DEFAULT_VALUES,
           configState: {
             bar: {
+              default_value: '',
               depends_on: [],
-              display: 'textbox',
+              display: DisplayType.TEXTBOX,
               label: 'foo',
               options: [],
               order: 1,
               required: false,
               sensitive: false,
+              tooltip: '',
               value: 'foofoo',
             },
             password: {
+              default_value: '',
               depends_on: [],
-              display: 'textbox',
+              display: DisplayType.TEXTBOX,
               label: 'thirdBar',
               options: [],
               order: 2,
               required: false,
               sensitive: true,
+              tooltip: '',
               value: 'fourthBar',
             },
           },
           configView: [
             {
+              default_value: '',
               depends_on: [],
-              display: 'textbox',
+              display: DisplayType.TEXTBOX,
               key: 'bar',
               label: 'foo',
               options: [],
               order: 1,
               required: false,
               sensitive: false,
+              tooltip: '',
               value: 'foofoo',
             },
             {
+              default_value: '',
               depends_on: [],
-              display: 'textbox',
+              display: DisplayType.TEXTBOX,
               key: 'password',
               label: 'thirdBar',
               options: [],
               order: 2,
               required: false,
               sensitive: true,
+              tooltip: '',
               value: 'fourthBar',
             },
           ],
           localConfigState: {
             bar: {
+              default_value: '',
               depends_on: [],
-              display: 'textbox',
+              display: DisplayType.TEXTBOX,
               label: 'foo',
               options: [],
               order: 1,
               required: false,
               sensitive: false,
+              tooltip: '',
               value: 'fafa',
             },
             password: {
+              default_value: '',
               depends_on: [],
-              display: 'textbox',
+              display: DisplayType.TEXTBOX,
               label: 'thirdBar',
               options: [],
               order: 2,
               required: false,
               sensitive: true,
+              tooltip: '',
               value: 'fourthBar',
             },
           },
           localConfigView: [
             {
+              default_value: '',
               depends_on: [],
-              display: 'textbox',
+              display: DisplayType.TEXTBOX,
               key: 'bar',
               label: 'foo',
               options: [],
               order: 1,
               required: false,
               sensitive: false,
+              tooltip: '',
               value: 'fafa',
             },
             {
+              default_value: '',
               depends_on: [],
-              display: 'textbox',
+              display: DisplayType.TEXTBOX,
               key: 'password',
               label: 'thirdBar',
               options: [],
               order: 2,
               required: false,
               sensitive: true,
+              tooltip: '',
               value: 'fourthBar',
             },
           ],
@@ -297,14 +335,16 @@ describe('ConnectorConfigurationLogic', () => {
           configState: connectorIndex.connector.configuration,
           configView: [
             {
+              default_value: '',
               depends_on: [],
-              display: 'textbox',
+              display: DisplayType.TEXTBOX,
               key: 'foo',
               label: 'bar',
               options: [],
               order: 1,
               required: false,
               sensitive: false,
+              tooltip: '',
               value: 'barbar',
             },
           ],
@@ -331,14 +371,16 @@ describe('ConnectorConfigurationLogic', () => {
           configState: connectorIndex.connector.configuration,
           configView: [
             {
+              default_value: '',
               depends_on: [],
-              display: 'textbox',
+              display: DisplayType.TEXTBOX,
               key: 'foo',
               label: 'bar',
               options: [],
               order: 1,
               required: false,
               sensitive: false,
+              tooltip: '',
               value: 'barbar',
             },
           ],
@@ -350,14 +392,16 @@ describe('ConnectorConfigurationLogic', () => {
           localConfigState: connectorIndex.connector.configuration,
           localConfigView: [
             {
+              default_value: '',
               depends_on: [],
-              display: 'textbox',
+              display: DisplayType.TEXTBOX,
               key: 'foo',
               label: 'bar',
               options: [],
               order: 1,
               required: false,
               sensitive: false,
+              tooltip: '',
               value: 'barbar',
             },
           ],
@@ -371,13 +415,15 @@ describe('ConnectorConfigurationLogic', () => {
         ConnectorConfigurationLogic.actions.fetchIndexApiSuccess(connectorIndex);
         ConnectorConfigurationLogic.actions.setLocalConfigState({
           foo: {
+            default_value: '',
             depends_on: [],
-            display: 'textbox',
+            display: DisplayType.TEXTBOX,
             label: 'bar',
             options: [],
             order: 1,
             required: false,
             sensitive: true,
+            tooltip: '',
             value: 'Barbara',
           },
         });
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_logic.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_logic.ts
index fee9496b3c069..02ebb7888b7b8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_logic.ts
@@ -12,6 +12,7 @@ import {
   ConnectorStatus,
   Dependency,
   DependencyLookup,
+  DisplayType,
   SelectOption,
 } from '../../../../../../common/types/connectors';
 import { isNotNullish } from '../../../../../../common/utils/is_not_nullish';
@@ -55,14 +56,16 @@ interface ConnectorConfigurationValues {
 }
 
 export interface ConfigEntry {
+  default_value: string | number | boolean | null;
   depends_on: Dependency[];
-  display: string;
+  display: DisplayType;
   key: string;
   label: string;
   options: SelectOption[];
   order?: number;
   required: boolean;
   sensitive: boolean;
+  tooltip: string;
   value: string | number | boolean | null;
 }
 
@@ -229,11 +232,35 @@ export const ConnectorConfigurationLogic = kea<
       {
         setLocalConfigEntry: (
           configState,
-          // eslint-disable-next-line @typescript-eslint/naming-convention
-          { key, depends_on, display, label, options, order, required, sensitive, value }
+          {
+            key,
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            default_value,
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            depends_on,
+            display,
+            label,
+            options,
+            order,
+            required,
+            sensitive,
+            tooltip,
+            value,
+          }
         ) => ({
           ...configState,
-          [key]: { depends_on, display, label, options, order, required, sensitive, value },
+          [key]: {
+            default_value,
+            depends_on,
+            display,
+            label,
+            options,
+            order,
+            required,
+            sensitive,
+            tooltip,
+            value,
+          },
         }),
         setLocalConfigState: (_, { configState }) => configState,
       },
diff --git a/x-pack/plugins/translations/translations/en.json b/x-pack/plugins/translations/translations/en.json
new file mode 100644
index 0000000000000..f6b5644656f8a
--- /dev/null
+++ b/x-pack/plugins/translations/translations/en.json
@@ -0,0 +1,213 @@
+{
+  formats: {
+    number: {
+      currency: {
+        style: 'currency',
+      },
+      percent: {
+        style: 'percent',
+      },
+    },
+    date: {
+      short: {
+        month: 'numeric',
+        day: 'numeric',
+        year: '2-digit',
+      },
+      medium: {
+        month: 'short',
+        day: 'numeric',
+        year: 'numeric',
+      },
+      long: {
+        month: 'long',
+        day: 'numeric',
+        year: 'numeric',
+      },
+      full: {
+        weekday: 'long',
+        month: 'long',
+        day: 'numeric',
+        year: 'numeric',
+      },
+    },
+    time: {
+      short: {
+        hour: 'numeric',
+        minute: 'numeric',
+      },
+      medium: {
+        hour: 'numeric',
+        minute: 'numeric',
+        second: 'numeric',
+      },
+      long: {
+        hour: 'numeric',
+        minute: 'numeric',
+        second: 'numeric',
+        timeZoneName: 'short',
+      },
+      full: {
+        hour: 'numeric',
+        minute: 'numeric',
+        second: 'numeric',
+        timeZoneName: 'short',
+      },
+    },
+    relative: {
+      years: {
+        units: 'year',
+      },
+      months: {
+        units: 'month',
+      },
+      days: {
+        units: 'day',
+      },
+      hours: {
+        units: 'hour',
+      },
+      minutes: {
+        units: 'minute',
+      },
+      seconds: {
+        units: 'second',
+      },
+    },
+  },
+  messages: {
+    'xpack.enterpriseSearch.connector.ingestionStatus.title': 'Ingestion status',
+    'xpack.enterpriseSearch.content.index.connector.filteringRules.regExError': 'Value should be a regular expression',
+    'xpack.enterpriseSearch.content.index.connector.syncRules.advancedFiltersDescription': 'These rules apply before the data is obtained from the data source.',
+    'xpack.enterpriseSearch.content.index.connector.syncRules.advancedFiltersLinkTitle': 'Learn more about advanced sync rules.',
+    'xpack.enterpriseSearch.content.index.connector.syncRules.advancedRulesTitle': 'Advanced rules',
+    'xpack.enterpriseSearch.content.index.connector.syncRules.advancedTabTitle': 'Advanced rules',
+    'xpack.enterpriseSearch.content.index.connector.syncRules.basicRulesDescription': 'These rules apply to documents during the integration filtering phase.',
+    'xpack.enterpriseSearch.content.index.connector.syncRules.basicRulesTitle': 'Basic rules',
+    'xpack.enterpriseSearch.content.index.connector.syncRules.basicTabTitle': 'Basic rules',
+    'xpack.enterpriseSearch.content.index.connector.syncRules.description': 'Add a sync rule to customize what data is synchronized from {indexName}. Everything is included by default, and documents are validated against the configured set of sync rules in the listed order.',
+    'xpack.enterpriseSearch.content.index.connector.syncRules.flyout.description': 'Plan and edit rules here before applying them to the next sync.',
+    'xpack.enterpriseSearch.content.index.connector.syncRules.flyout.errorTitle': 'Sync {idsLength, plural, one {rule} other {rules}} {ids} {idsLength, plural, one {is} other {are}} invalid.',
+    'xpack.enterpriseSearch.content.index.connector.syncRules.flyout.revertButtonTitle': 'Revert to active rules',
+    'xpack.enterpriseSearch.content.index.connector.syncRules.flyout.title': 'Draft rules',
+    'xpack.enterpriseSearch.content.index.connector.syncRules.link': 'Learn more about customizing your sync rules.',
+    'xpack.enterpriseSearch.content.index.connector.syncRules.table.addRuleLabel': 'Add sync rule',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.apiKey.button.label': 'Generate API key',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.apiKey.confirmModal.cancelButton.label': 'Cancel',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.apiKey.confirmModal.confirmButton.label': 'Generate API key',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.apiKey.confirmModal.description': 'Generating a new API key will invalidate the previous key. Are you sure you want to generate a new API key? This can not be undone.',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.apiKey.confirmModal.title': 'Generate an Elasticsearch API key',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.apiKey.description': 'First, generate an Elasticsearch API key. This {apiKeyName} key will enable read and write permissions for the connector to index documents to the created {indexName} index. Save the key in a safe place, as you will need it to configure your connector.',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.config.cancelEditingButton.title': 'Cancel',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.config.connectorClientLink': 'example connector client',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.config.defaultValue': 'If left empty, the default value {defaultValue} will be used.',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.config.description.firstParagraph': 'Now that your connector is deployed, enhance the deployed connector client for your custom data source. There’s an {link} for you to start adding your data source specific implementation logic.',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.config.description.secondParagraph': 'While the connector clients in the repository are built in Ruby, there’s no technical limitation to only use Ruby. Build a connector client with the technology that works best for your skillset.',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.config.description.thirdParagraph': 'If you need help, you can always open an {issuesLink} in the repository or ask a question in our {discussLink} forum.',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.config.discussLink': 'Discuss',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.config.editButton.title': 'Edit configuration',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.config.error.title': 'Connector error',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.config.issuesLink': 'issue',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.config.submitButton.title': 'Save configuration',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.config.warning.title': 'This connector is tied to your Elastic index',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.button.label': 'Explore the connectors repository',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.clientExamplesLink': 'connector client examples',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.configurationFileLink': 'configuration file',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.connectorConnected': 'Your connector {name} has connected to Enterprise Search successfully.',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.connectorDeployedText': 'Once you’ve configured the connector, deploy the connector to your self managed infrastructure.',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.description.firstParagraph': 'The connectors repository contains several connector client examples to help you utilize our framework for accelerated development against custom data sources.',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.description.secondParagraph': 'The connectors repository contains several {link} to help you utilize our framework for accelerated development against custom data sources.',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.description.thirdParagraph': 'In this step, you will need to clone or fork the repository, and copy the generated API key and connector ID to the associated {link}. The connector ID will identify this connector to Enterprise Search.',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.waitingForConnector.button.label': 'Recheck now',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.waitingForConnectorText': 'Your connector has not connected to Enterprise Search. Troubleshoot your configuration and refresh the page.',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.waitingForConnectorTitle': 'Waiting for your connector',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.nameAndDescriptionFlyout.description': 'By naming and describing this connector your colleagues and wider team will know what this connector is meant for.',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.nameAndDescriptionFlyout.saveButtonLabel': 'Save name and description',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.nameAndDescriptionFlyout.title': 'Describe this crawler',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.nameAndDescriptionForm.description': 'By naming and describing this connector your colleagues and wider team will know what this connector is meant for.',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.config.encryptionWarningMessage': 'Encryption for data source credentials is unavailable in this beta. Your data source credentials will be stored, unencrypted, in Elasticsearch.',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.config.securityDocumentationLinkLabel': 'Learn more about Elasticsearch security',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.config.sourceSecurityDocumentationLinkLabel': '{name} authentication',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.connectorConnected': 'Your connector {name} has connected to Enterprise Search successfully.',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.schedulingReminder.description': 'Remember to set a sync schedule in the Scheduling tab to continually refresh your searchable data.',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.schedulingReminder.title': 'Configurable sync schedule',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.securityReminder.description': 'Restrict and personalize the read access users have to the index documents at query time.',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.securityReminder.securityLinkLabel': 'Document level security',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.securityReminder.title': 'Document level security',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.steps.advancedConfigurationTitle': 'Advanced configuration',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.steps.configurationTitle': 'Configuration',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.steps.nameAndDescriptionTitle': 'Name and description',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.steps.researchConfigurationTitle': 'Research configuration requirements',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnectorAdvancedConfiguration.description': 'Finalize your connector by triggering a one time sync, or setting a recurring sync schedule.',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnectorAdvancedConfiguration.schedulingButtonLabel': 'Set schedule and sync',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.researchConfiguration.connectorDocumentationLinkLabel': 'Documentation',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.researchConfiguration.description': 'This connector supports several authentication methods. Ask your administrator for the correct connection credentials.',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.researchConfiguration.serviceDocumentationLinkLabel': '{name} documentation',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.scheduleSync.description': '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.',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.steps.deployConnector.title': 'Deploy a connector',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.steps.enhance.title': 'Enhance your connector client',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.steps.generateApiKey.title': 'Generate an API key',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.steps.nameAndDescriptionTitle': 'Name and description',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.steps.schedule.button.label': 'Set schedule and sync',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.steps.schedule.title': 'Set a recurring sync schedule',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.support.connectorFeedback.label': 'Connector feedback',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.support.description': 'Your connector will have to be deployed to your own infrastructure.',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.support.dontSeeIntegration.label': 'Don’t see the integration you’re looking for?',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.support.getHelp.label': 'Get help',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.support.issue.label': 'File an issue',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.support.manageKeys.label': 'Manage keys',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.support.readme.label': 'Connector readme',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.support.searchUI.label': 'Use Search UI for Workplace Search',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.support.title': 'Support and documentation',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.support.viewDocumentation.label': 'View documentation',
+    'xpack.enterpriseSearch.content.indices.configurationConnector.warning.description': 'If you sync at least one document before you’ve finalized your connector client, you will have to recreate your search index.',
+    'xpack.enterpriseSearch.content.indices.connector.syncRules.advancedRules.error': 'JSON format is invalid',
+    'xpack.enterpriseSearch.content.indices.connector.syncRules.advancedRules.title': 'Advanced rules',
+    'xpack.enterpriseSearch.content.indices.connectorScheduling.configured.description': 'Your connector is configured and deployed. Configure a one-time sync by clicking the Sync button, or enable a recurring sync schedule. ',
+    'xpack.enterpriseSearch.content.indices.connectorScheduling.error.title': 'Review your connector configuration for reported errors.',
+    'xpack.enterpriseSearch.content.indices.connectorScheduling.notConnected.button.label': 'Configure',
+    'xpack.enterpriseSearch.content.indices.connectorScheduling.notConnected.description': 'Configure and deploy your connector, then return here to set your sync schedule. This schedule will dictate the interval that the connector will sync with your data source for updated documents.',
+    'xpack.enterpriseSearch.content.indices.connectorScheduling.notConnected.title': 'Configure your connector to schedule a sync',
+    'xpack.enterpriseSearch.content.indices.connectorScheduling.resetButton.label': 'Reset',
+    'xpack.enterpriseSearch.content.indices.connectorScheduling.saveButton.label': 'Save',
+    'xpack.enterpriseSearch.content.indices.connectorScheduling.switch.label': 'Enable recurring syncs with the following schedule',
+    'xpack.enterpriseSearch.content.indices.connectorScheduling.unsaved.title': 'You have not saved your changes, are you sure you want to leave?',
+    'xpack.enterpriseSearch.content.indices.selectConnector.buildYourOwnConnectorLinkLabel': 'build your own',
+    'xpack.enterpriseSearch.content.indices.selectConnector.connectorCheckable.description': 'Search over your {name} content with Enterprise Search.',
+    'xpack.enterpriseSearch.content.indices.selectConnector.connectorCheckable.documentationLinkLabel': 'Documentation',
+    'xpack.enterpriseSearch.content.indices.selectConnector.description': 'Get started by selecting the connector you\'d like to configure to extract, index and sync data from your data source into your newly created search index.',
+    'xpack.enterpriseSearch.content.indices.selectConnector.moreConnectorsMessage': 'Looking for more connectors? {workplaceSearchLink} or {buildYourOwnConnectorLink}.',
+    'xpack.enterpriseSearch.content.indices.selectConnector.selectAndConfigureButtonLabel': 'Select and configure',
+    'xpack.enterpriseSearch.content.indices.selectConnector.successToast.title': 'Your index will now use the {connectorName} native connector.',
+    'xpack.enterpriseSearch.content.indices.selectConnector.title': 'Select a connector',
+    'xpack.enterpriseSearch.content.indices.selectConnector.workplaceSearchLinkLabel': 'View additional integrations in Workplace Search',
+    'xpack.enterpriseSearch.content.nativeConnectors.mongodb.name': 'MongoDB',
+    'xpack.enterpriseSearch.content.nativeConnectors.mysql.name': 'MySQL',
+    'xpack.enterpriseSearch.content.searchIndex.totalStats.documentCountCardLabel': 'Document count',
+    'xpack.enterpriseSearch.content.sources.basicRulesTable.includeEverythingMessage': 'Include everything else from this source',
+    'xpack.enterpriseSearch.index.connector.rule.basicTable.policyTitle': 'Policy',
+    'xpack.enterpriseSearch.index.connector.syncRules.basicTable.fieldTitle': 'Field',
+    'xpack.enterpriseSearch.index.connector.syncRules.basicTable.ruleTitle': 'Rule',
+    'xpack.enterpriseSearch.index.connector.syncRules.basicTable.valueTitle': 'Value',
+    'xpack.enterpriseSearch.index.connector.syncRules.cancelEditingFilteringDraft': 'Cancel',
+    'xpack.enterpriseSearch.index.connector.syncRules.description': 'Include or exclude high level items, file types and (file or folder) paths to
+                    synchronize from {indexName}. Everything is included by default. Each document is
+                    tested against the rules below and the first rule that matches will be applied.',
+    'xpack.enterpriseSearch.index.connector.syncRules.draftNewFilterRulesTitle': 'Draft new sync rules',
+    'xpack.enterpriseSearch.index.connector.syncRules.editFilterRulesTitle': 'Edit sync rules',
+    'xpack.enterpriseSearch.index.connector.syncRules.errorCallout.editDraftRulesTitle': 'Edit draft rules',
+    'xpack.enterpriseSearch.index.connector.syncRules.errorCallout.successEditDraftRulesTitle': 'Edit draft rules',
+    'xpack.enterpriseSearch.index.connector.syncRules.invalidDescription': 'Draft rules did not validate. Edit the draft rules before they can be activated.',
+    'xpack.enterpriseSearch.index.connector.syncRules.invalidTitle': 'Draft sync rules are invalid',
+    'xpack.enterpriseSearch.index.connector.syncRules.successCallout.applyDraftRulesTitle': 'Activate draft rules',
+    'xpack.enterpriseSearch.index.connector.syncRules.syncRulesLabel': 'Learn more about sync rules',
+    'xpack.enterpriseSearch.index.connector.syncRules.title': 'Sync rules ',
+    'xpack.enterpriseSearch.index.connector.syncRules.unsavedChanges': 'Your changes have not been saved. Are you sure you want to leave?',
+    'xpack.enterpriseSearch.index.connector.syncRules.validatedDescription': 'Activate draft rules to take effect on the next sync.',
+    'xpack.enterpriseSearch.index.connector.syncRules.validateDraftTitle': 'Save and validate draft',
+    'xpack.enterpriseSearch.index.connector.syncRules.validatedTitle': 'Draft sync rules validated',
+    'xpack.enterpriseSearch.index.connector.syncRules.validatingCallout.editDraftRulesTitle': 'Edit draft rules',
+    'xpack.enterpriseSearch.index.connector.syncRules.validatingDescription': 'Draft rules need to be validated before they can be activated. This may take a few minutes.',
+    'xpack.enterpriseSearch.index.connector.syncRules.validatingTitle': 'Draft sync rules are validating',
+  },
+}

From 1b36fb83c45f364b5c676c2a24322448c8173080 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yulia=20=C4=8Cech?=
 <6585477+yuliacech@users.noreply.github.com>
Date: Wed, 19 Apr 2023 12:17:10 +0200
Subject: [PATCH 061/100] [Upgrade Assistant] Make saved objects hidden
 (#154180)

## Summary
Fixes https://github.com/elastic/kibana/issues/154037

This PR updates the saved objects types used in Upgrade Assistant for
reindexing operations and ML snapshots. This is needed in preparation
for serverless and should not have any affect on the UI.

For testing this PR I would suggest using the same steps as in these 2
PRs for [reindexing](https://github.com/elastic/kibana/pull/150878) and
[ml snapshots](https://github.com/elastic/kibana/pull/151014).

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
---
 .../upgrade_assistant/server/plugin.ts        |  8 ++++++--
 .../server/routes/__mocks__/routes.mock.ts    |  3 ++-
 .../server/routes/ml_snapshots.test.ts        | 15 +++++++++-----
 .../server/routes/ml_snapshots.ts             | 10 +++++++---
 .../reindex_indices/batch_reindex_indices.ts  | 13 +++++++-----
 .../routes/reindex_indices/reindex_indices.ts | 20 ++++++++++++-------
 .../server/saved_object_types/index.ts        |  4 ++++
 .../ml_upgrade_operation_saved_object_type.ts |  2 +-
 .../reindex_operation_saved_object_type.ts    |  2 +-
 9 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/x-pack/plugins/upgrade_assistant/server/plugin.ts b/x-pack/plugins/upgrade_assistant/server/plugin.ts
index 922fdc8d89465..f77a5eabe1bda 100644
--- a/x-pack/plugins/upgrade_assistant/server/plugin.ts
+++ b/x-pack/plugins/upgrade_assistant/server/plugin.ts
@@ -29,7 +29,11 @@ import { registerUpgradeAssistantUsageCollector } from './lib/telemetry';
 import { versionService } from './lib/version';
 import { createReindexWorker } from './routes/reindex_indices';
 import { registerRoutes } from './routes/register_routes';
-import { reindexOperationSavedObjectType, mlSavedObjectType } from './saved_object_types';
+import {
+  reindexOperationSavedObjectType,
+  mlSavedObjectType,
+  hiddenTypes,
+} from './saved_object_types';
 import { handleEsError } from './shared_imports';
 import { RouteDependencies } from './types';
 import type { UpgradeAssistantConfig } from './config';
@@ -169,7 +173,7 @@ export class UpgradeAssistantServerPlugin implements Plugin {
       elasticsearchService: elasticsearch,
       logger: this.logger,
       savedObjects: new SavedObjectsClient(
-        this.savedObjectsServiceStart.createInternalRepository()
+        this.savedObjectsServiceStart.createInternalRepository(hiddenTypes)
       ),
       security: this.securityPluginStart,
     });
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/__mocks__/routes.mock.ts b/x-pack/plugins/upgrade_assistant/server/routes/__mocks__/routes.mock.ts
index 172b1d53474d4..3e6870391328a 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/__mocks__/routes.mock.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/__mocks__/routes.mock.ts
@@ -13,12 +13,13 @@ import {
   deprecationsServiceMock,
 } from '@kbn/core/server/mocks';
 
+export const savedObjectsClient = savedObjectsClientMock.create();
 export const routeHandlerContextMock = {
   core: {
     elasticsearch: {
       client: elasticsearchServiceMock.createScopedClusterClient(),
     },
-    savedObjects: { client: savedObjectsClientMock.create() },
+    savedObjects: { getClient: () => savedObjectsClient },
     deprecations: { client: deprecationsServiceMock.createClient() },
   },
 } as unknown as AwaitedProperties<RequestHandlerContext>;
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.test.ts b/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.test.ts
index 3b53600170d59..a841f3042f964 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.test.ts
@@ -9,7 +9,12 @@ import { kibanaResponseFactory, RequestHandler } from '@kbn/core/server';
 
 import { errors as esErrors } from '@elastic/elasticsearch';
 import { handleEsError } from '../shared_imports';
-import { createMockRouter, MockRouter, routeHandlerContextMock } from './__mocks__/routes.mock';
+import {
+  createMockRouter,
+  MockRouter,
+  routeHandlerContextMock,
+  savedObjectsClient,
+} from './__mocks__/routes.mock';
 import { createRequestMock } from './__mocks__/request.mock';
 import { registerMlSnapshotRoutes } from './ml_snapshots';
 
@@ -285,7 +290,7 @@ describe('ML snapshots APIs', () => {
         ],
       });
 
-      (routeHandlerContextMock.core.savedObjects.client.find as jest.Mock).mockResolvedValue({
+      (savedObjectsClient.find as jest.Mock).mockResolvedValue({
         total: 1,
         saved_objects: [
           {
@@ -356,7 +361,7 @@ describe('ML snapshots APIs', () => {
         ],
       });
 
-      (routeHandlerContextMock.core.savedObjects.client.find as jest.Mock).mockResolvedValue({
+      (savedObjectsClient.find as jest.Mock).mockResolvedValue({
         total: 1,
         saved_objects: [
           {
@@ -421,7 +426,7 @@ describe('ML snapshots APIs', () => {
         ],
       });
 
-      (routeHandlerContextMock.core.savedObjects.client.find as jest.Mock).mockResolvedValue({
+      (savedObjectsClient.find as jest.Mock).mockResolvedValue({
         total: 1,
         saved_objects: [
           {
@@ -449,7 +454,7 @@ describe('ML snapshots APIs', () => {
         index_settings: {},
       });
 
-      (routeHandlerContextMock.core.savedObjects.client.delete as jest.Mock).mockResolvedValue({});
+      (savedObjectsClient.delete as jest.Mock).mockResolvedValue({});
 
       const resp = await routeDependencies.router.getHandler({
         method: 'get',
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.ts b/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.ts
index 02ea68bac7b5e..0ad6543de5251 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/ml_snapshots.ts
@@ -155,7 +155,7 @@ export function registerMlSnapshotRoutes({
     versionCheckHandlerWrapper(async ({ core }, request, response) => {
       try {
         const {
-          savedObjects: { client: savedObjectsClient },
+          savedObjects: { getClient },
           elasticsearch: { client: esClient },
         } = await core;
         const { snapshotId, jobId } = request.body;
@@ -173,7 +173,10 @@ export function registerMlSnapshotRoutes({
 
         // Store snapshot in saved object if upgrade not complete
         if (body.completed !== true) {
-          await createMlOperation(savedObjectsClient, snapshotInfo);
+          await createMlOperation(
+            getClient({ includedHiddenTypes: [ML_UPGRADE_OP_TYPE] }),
+            snapshotInfo
+          );
         }
 
         return response.ok({
@@ -202,9 +205,10 @@ export function registerMlSnapshotRoutes({
     versionCheckHandlerWrapper(async ({ core }, request, response) => {
       try {
         const {
-          savedObjects: { client: savedObjectsClient },
+          savedObjects: { getClient },
           elasticsearch: { client: esClient },
         } = await core;
+        const savedObjectsClient = getClient({ includedHiddenTypes: [ML_UPGRADE_OP_TYPE] });
         const { snapshotId, jobId } = request.params;
 
         // Verify snapshot exists
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/batch_reindex_indices.ts b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/batch_reindex_indices.ts
index c6ea9b4a8fb96..c9a8eedceffe3 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/batch_reindex_indices.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/batch_reindex_indices.ts
@@ -9,7 +9,7 @@ import { schema } from '@kbn/config-schema';
 import { errors } from '@elastic/elasticsearch';
 
 import { API_BASE_PATH } from '../../../common/constants';
-import { ReindexStatus } from '../../../common/types';
+import { REINDEX_OP_TYPE, ReindexStatus } from '../../../common/types';
 import { versionCheckHandlerWrapper } from '../../lib/es_version_precheck';
 import { ReindexWorker } from '../../lib/reindexing';
 import { reindexActionsFactory } from '../../lib/reindexing/reindex_actions';
@@ -43,9 +43,12 @@ export function registerBatchReindexIndicesRoutes(
         elasticsearch: { client: esClient },
         savedObjects,
       } = await core;
-      const { client } = savedObjects;
+      const { getClient } = savedObjects;
       const callAsCurrentUser = esClient.asCurrentUser;
-      const reindexActions = reindexActionsFactory(client, callAsCurrentUser);
+      const reindexActions = reindexActionsFactory(
+        getClient({ includedHiddenTypes: [REINDEX_OP_TYPE] }),
+        callAsCurrentUser
+      );
       try {
         const inProgressOps = await reindexActions.findAllByStatus(ReindexStatus.inProgress);
         const { queue } = sortAndOrderReindexOperations(inProgressOps);
@@ -76,7 +79,7 @@ export function registerBatchReindexIndicesRoutes(
     },
     versionCheckHandlerWrapper(async ({ core }, request, response) => {
       const {
-        savedObjects: { client: savedObjectsClient },
+        savedObjects: { getClient },
         elasticsearch: { client: esClient },
       } = await core;
       const { indexNames } = request.body;
@@ -87,7 +90,7 @@ export function registerBatchReindexIndicesRoutes(
       for (const indexName of indexNames) {
         try {
           const result = await reindexHandler({
-            savedObjects: savedObjectsClient,
+            savedObjects: getClient({ includedHiddenTypes: [REINDEX_OP_TYPE] }),
             dataClient: esClient,
             indexName,
             log,
diff --git a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.ts b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.ts
index 11ebb6d5f4a98..0ffa9335c4de7 100644
--- a/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.ts
+++ b/x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.ts
@@ -9,7 +9,7 @@ import { schema } from '@kbn/config-schema';
 import { errors } from '@elastic/elasticsearch';
 
 import { API_BASE_PATH } from '../../../common/constants';
-import type { ReindexStatusResponse } from '../../../common/types';
+import { ReindexStatusResponse, REINDEX_OP_TYPE } from '../../../common/types';
 import { versionCheckHandlerWrapper } from '../../lib/es_version_precheck';
 import { reindexServiceFactory, ReindexWorker, generateNewIndexName } from '../../lib/reindexing';
 import { reindexActionsFactory } from '../../lib/reindexing/reindex_actions';
@@ -42,13 +42,13 @@ export function registerReindexIndicesRoutes(
     },
     versionCheckHandlerWrapper(async ({ core }, request, response) => {
       const {
-        savedObjects: { client: savedObjectsClient },
+        savedObjects: { getClient },
         elasticsearch: { client: esClient },
       } = await core;
       const { indexName } = request.params;
       try {
         const result = await reindexHandler({
-          savedObjects: savedObjectsClient,
+          savedObjects: getClient({ includedHiddenTypes: [REINDEX_OP_TYPE] }),
           dataClient: esClient,
           indexName,
           log,
@@ -88,10 +88,13 @@ export function registerReindexIndicesRoutes(
         savedObjects,
         elasticsearch: { client: esClient },
       } = await core;
-      const { client } = savedObjects;
+      const { getClient } = savedObjects;
       const { indexName } = request.params;
       const asCurrentUser = esClient.asCurrentUser;
-      const reindexActions = reindexActionsFactory(client, asCurrentUser);
+      const reindexActions = reindexActionsFactory(
+        getClient({ includedHiddenTypes: [REINDEX_OP_TYPE] }),
+        asCurrentUser
+      );
       const reindexService = reindexServiceFactory(asCurrentUser, reindexActions, log, licensing);
 
       try {
@@ -143,9 +146,12 @@ export function registerReindexIndicesRoutes(
         elasticsearch: { client: esClient },
       } = await core;
       const { indexName } = request.params;
-      const { client } = savedObjects;
+      const { getClient } = savedObjects;
       const callAsCurrentUser = esClient.asCurrentUser;
-      const reindexActions = reindexActionsFactory(client, callAsCurrentUser);
+      const reindexActions = reindexActionsFactory(
+        getClient({ includedHiddenTypes: [REINDEX_OP_TYPE] }),
+        callAsCurrentUser
+      );
       const reindexService = reindexServiceFactory(
         callAsCurrentUser,
         reindexActions,
diff --git a/x-pack/plugins/upgrade_assistant/server/saved_object_types/index.ts b/x-pack/plugins/upgrade_assistant/server/saved_object_types/index.ts
index fa8c1ac679ad6..f8e9ec86d437a 100644
--- a/x-pack/plugins/upgrade_assistant/server/saved_object_types/index.ts
+++ b/x-pack/plugins/upgrade_assistant/server/saved_object_types/index.ts
@@ -5,5 +5,9 @@
  * 2.0.
  */
 
+import { reindexOperationSavedObjectType } from './reindex_operation_saved_object_type';
+import { mlSavedObjectType } from './ml_upgrade_operation_saved_object_type';
+
 export { reindexOperationSavedObjectType } from './reindex_operation_saved_object_type';
 export { mlSavedObjectType } from './ml_upgrade_operation_saved_object_type';
+export const hiddenTypes = [reindexOperationSavedObjectType.name, mlSavedObjectType.name];
diff --git a/x-pack/plugins/upgrade_assistant/server/saved_object_types/ml_upgrade_operation_saved_object_type.ts b/x-pack/plugins/upgrade_assistant/server/saved_object_types/ml_upgrade_operation_saved_object_type.ts
index 7cb3d1d69f8af..9f677120a5374 100644
--- a/x-pack/plugins/upgrade_assistant/server/saved_object_types/ml_upgrade_operation_saved_object_type.ts
+++ b/x-pack/plugins/upgrade_assistant/server/saved_object_types/ml_upgrade_operation_saved_object_type.ts
@@ -11,7 +11,7 @@ import { ML_UPGRADE_OP_TYPE } from '../../common/types';
 
 export const mlSavedObjectType: SavedObjectsType = {
   name: ML_UPGRADE_OP_TYPE,
-  hidden: false,
+  hidden: true,
   namespaceType: 'agnostic',
   mappings: {
     dynamic: false,
diff --git a/x-pack/plugins/upgrade_assistant/server/saved_object_types/reindex_operation_saved_object_type.ts b/x-pack/plugins/upgrade_assistant/server/saved_object_types/reindex_operation_saved_object_type.ts
index d57909dd3f720..0c66253312c7a 100644
--- a/x-pack/plugins/upgrade_assistant/server/saved_object_types/reindex_operation_saved_object_type.ts
+++ b/x-pack/plugins/upgrade_assistant/server/saved_object_types/reindex_operation_saved_object_type.ts
@@ -11,7 +11,7 @@ import { REINDEX_OP_TYPE } from '../../common/types';
 
 export const reindexOperationSavedObjectType: SavedObjectsType = {
   name: REINDEX_OP_TYPE,
-  hidden: false,
+  hidden: true,
   namespaceType: 'agnostic',
   mappings: {
     dynamic: false,

From f8c16c159c1ebe1d7779d45cb2f74d2cdbe22d61 Mon Sep 17 00:00:00 2001
From: Vitalii Dmyterko <92328789+vitaliidm@users.noreply.github.com>
Date: Wed, 19 Apr 2023 11:48:37 +0100
Subject: [PATCH 062/100] [RAM][Security Solution][Alerts] moves legacy actions
 migration to rulesClient (#153101)

## Summary
- this PR is the first part of work related to conditional logic
actions. The rest of PRs, will be merged after this one. As they depend
on a work implemented here. [List of
tickets](https://github.com/elastic/security-team/issues/2894#issuecomment-1480253677)
- addresses https://github.com/elastic/kibana/issues/151919
- moves code related to legacy actions migration from D&R to
RulesClient,
[details](https://github.com/elastic/kibana/issues/151919#issuecomment-1473913699)
- similarly to D&R part, now rulesClient read APIs, would return legacy
actions within rule
- similarly, every mutation API in rulesClient, would migrate legacy
actions, and remove sidecar SO
- each migrated legacy action will have also [`frequency`
object](https://github.com/elastic/kibana/blob/8.7/x-pack/plugins/alerting/server/types.ts#L234-L238),
that would allow to have notifyWhen/throttle on action level once
https://github.com/elastic/kibana/issues/151916 is implemented, which is
targeted in 8.8, right after this PR.
But before it's merged, `frequency` is getting removed in
[update/bulk_edit/create
APIs](https://github.com/elastic/kibana/blob/8.7/x-pack/plugins/alerting/server/rules_client/methods/update.ts#L151-L160).
Hence it's not reflected in most of the tests at this point.
- cleanup of legacy actions related code in D&R
- adds unit tests for RulesClient
- keeps functional/e2e tests in D&R

Changes in behaviour, introduced in this PR:
- since, migration happens within single rulesClient API call, revision
in migrated rule will increment by `1` only.
- legacy actions from sidecar SO, now will be merged with rules actions,
if there any.
Before, in the previous implementation, there was inconsistency in a way
how legacy and rules actions were treated.
- On read: actions existing in rule, [would take precedence over legacy
ones
](https://github.com/elastic/kibana/blob/8.7/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/normalization/rule_actions.ts#L94-L114)
- On migration: SO actions [only
saved](https://github.com/elastic/kibana/blob/8.7/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/rule_actions/legacy_action_migration.ts#L114).
If any actions present in rule, they will be lost. Here is an example
video from **main** branch
      <details>
<summary>Here is an example video from MAIN branch, where action in rule
is overwritten by legacy action</summary>


https://user-images.githubusercontent.com/92328789/230397535-d3fcd644-7cf9-4970-a573-18fd8c9f2235.mov

      </details>

So, depends on sequence of events, different actions could be saved for
identical use case: rule has both legacy and existing action.
- if rule migrated through update API, existing in rule action will be
saved
- if rule migrated through enable/disable API, bulk edit, legacy action
will be saved

In this implementation, both existing in rule and legacy actions will be
merged, to prevent loss of actions
      <details>
<summary>Here is an example video from this PR branch, where actions are
merged</summary>
<video
src="https://user-images.githubusercontent.com/92328789/230405569-f1da38e9-4e36-46a8-9654-f664e0a31063.mov"
/>
      </details>

- when duplicating rule, we don't migrate source rule anymore. It can
lead to unwanted API key regeneration, with possible loss of privileges,
earlier associated with the source rule. As part of UX, when duplicating
any entity, users would not be expecting source entity to be changed

TODO:
- performance improvement issue for future
https://github.com/elastic/kibana/issues/154438
- currently, in main branch, when migration is performed through rule
enabling, actions not showing anymore in UI.
Relevant ticket is https://github.com/elastic/kibana/issues/154567
I haven't fixed it in this PR, as in[ the next one
](https://github.com/elastic/kibana/pull/153113), we will display
notifyWhen/throttle on action level in UI, rather than on rule level.
So, once that PR is merged, actions should be displayed in new UI

### 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

### 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)

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: Garrett Spong <spong@users.noreply.github.com>
---
 .../alerting/server/rules_client/lib/index.ts |   2 +
 .../format_legacy_actions.test.ts}            | 240 ++++++---
 .../format_legacy_actions.ts                  | 153 ++++++
 .../migrate_legacy_actions.test.ts            | 357 +++++++++++++
 .../migrate_legacy_actions.ts                 | 113 ++++
 .../retrieve_migrated_legacy_actions.mock.ts  | 368 +++++++++++++
 .../retrieve_migrated_legacy_actions.test.ts  | 267 ++++++++++
 .../retrieve_migrated_legacy_actions.ts       | 117 +++++
 .../transform_legacy_actions.test.ts          |  89 ++++
 .../transform_legacy_actions.ts               |  59 +++
 .../transform_to_notify_when.test.ts          |  23 +
 .../transform_to_notify_when.ts               |  25 +
 .../lib/siem_legacy_actions/types.ts          |  50 ++
 .../rules_client/methods/bulk_delete.ts       |  24 +-
 .../rules_client/methods/bulk_disable.ts      |  19 +-
 .../server/rules_client/methods/bulk_edit.ts  |  19 +-
 .../rules_client/methods/bulk_enable.ts       |  19 +-
 .../server/rules_client/methods/create.ts     |   2 +-
 .../server/rules_client/methods/delete.ts     |   7 +
 .../server/rules_client/methods/disable.ts    |  23 +-
 .../server/rules_client/methods/enable.ts     |  38 +-
 .../server/rules_client/methods/find.ts       |  37 +-
 .../server/rules_client/methods/get.ts        |  16 +-
 .../server/rules_client/methods/resolve.ts    |  16 +
 .../server/rules_client/methods/update.ts     |  19 +-
 .../rules_client/tests/bulk_delete.test.ts    |  53 ++
 .../rules_client/tests/bulk_disable.test.ts   |  61 ++-
 .../rules_client/tests/bulk_edit.test.ts      |  66 +++
 .../rules_client/tests/bulk_enable.test.ts    |  55 +-
 .../server/rules_client/tests/delete.test.ts  |  35 ++
 .../server/rules_client/tests/disable.test.ts |  45 ++
 .../server/rules_client/tests/enable.test.ts  |  68 +++
 .../server/rules_client/tests/find.test.ts    |  43 ++
 .../server/rules_client/tests/get.test.ts     |  76 +++
 .../server/rules_client/tests/resolve.test.ts |  86 ++++
 .../server/rules_client/tests/test_helpers.ts |  15 +
 .../server/rules_client/tests/update.test.ts  |  71 +++
 .../route.test.ts                             |  13 -
 .../update_prebuilt_rules.test.ts             |  16 +-
 .../rule_objects/update_prebuilt_rules.ts     |  19 +-
 .../routes/__mocks__/request_responses.ts     | 356 +------------
 .../rule_actions_legacy/index.ts              |   2 -
 ...gacy_get_bulk_rule_actions_saved_object.ts |  84 ---
 .../api/rules/bulk_actions/route.test.ts      |  13 -
 .../api/rules/bulk_actions/route.ts           | 111 +---
 .../api/rules/bulk_delete_rules/route.ts      |  14 +-
 .../api/rules/bulk_patch_rules/route.test.ts  |  16 -
 .../api/rules/bulk_patch_rules/route.ts       |  10 +-
 .../api/rules/bulk_update_rules/route.test.ts |  15 -
 .../api/rules/bulk_update_rules/route.ts      |  10 +-
 .../api/rules/delete_rule/route.test.ts       |  15 +-
 .../api/rules/delete_rule/route.ts            |  14 +-
 .../api/rules/find_rules/route.ts             |  14 +-
 .../api/rules/patch_rule/route.test.ts        |  15 -
 .../api/rules/patch_rule/route.ts             |  10 +-
 .../api/rules/read_rule/route.ts              |  11 +-
 .../api/rules/update_rule/route.test.ts       |  15 +-
 .../api/rules/update_rule/route.ts            |  10 +-
 .../detection_engine/rule_management/index.ts |   6 +-
 .../logic/export/get_export_all.ts            |  12 +-
 .../logic/export/get_export_by_object_ids.ts  |  12 +-
 .../logic/import/import_rules_utils.ts        |   9 +-
 .../legacy_action_migration.test.ts           | 486 ------------------
 .../rule_actions/legacy_action_migration.ts   | 178 -------
 .../normalization/rule_actions.test.ts        | 332 ++----------
 .../normalization/rule_actions.ts             |  56 +-
 .../normalization/rule_converters.ts          |  11 +-
 .../rule_management/utils/utils.test.ts       |  86 +---
 .../rule_management/utils/utils.ts            |  21 +-
 .../rule_management/utils/validate.test.ts    |   4 +-
 .../rule_management/utils/validate.ts         |   7 +-
 .../group1/delete_rules.ts                    |  13 +
 .../group1/delete_rules_bulk.ts               |  13 +
 .../group10/import_rules.ts                   |  43 ++
 .../group10/legacy_actions_migrations.ts      |  22 +-
 .../group10/patch_rules.ts                    |  13 +-
 .../group10/patch_rules_bulk.ts               |  16 +-
 .../group10/perform_bulk_action.ts            |  86 +++-
 .../group10/update_rules.ts                   |  15 +-
 .../group10/update_rules_bulk.ts              |  17 +-
 .../utils/wait_for_rule_status.ts             |   3 +
 81 files changed, 3044 insertions(+), 1976 deletions(-)
 rename x-pack/plugins/{security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_get_bulk_rule_actions_saved_object.test.ts => alerting/server/rules_client/lib/siem_legacy_actions/format_legacy_actions.test.ts} (66%)
 create mode 100644 x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/format_legacy_actions.ts
 create mode 100644 x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/migrate_legacy_actions.test.ts
 create mode 100644 x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/migrate_legacy_actions.ts
 create mode 100644 x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock.ts
 create mode 100644 x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.test.ts
 create mode 100644 x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.ts
 create mode 100644 x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/transform_legacy_actions.test.ts
 create mode 100644 x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/transform_legacy_actions.ts
 create mode 100644 x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/transform_to_notify_when.test.ts
 create mode 100644 x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/transform_to_notify_when.ts
 create mode 100644 x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/types.ts
 delete mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_get_bulk_rule_actions_saved_object.ts
 delete mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/rule_actions/legacy_action_migration.test.ts
 delete mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/rule_actions/legacy_action_migration.ts

diff --git a/x-pack/plugins/alerting/server/rules_client/lib/index.ts b/x-pack/plugins/alerting/server/rules_client/lib/index.ts
index 9f48184b94df6..0dcaa31fe51a1 100644
--- a/x-pack/plugins/alerting/server/rules_client/lib/index.ts
+++ b/x-pack/plugins/alerting/server/rules_client/lib/index.ts
@@ -15,5 +15,7 @@ export { checkAuthorizationAndGetTotal } from './check_authorization_and_get_tot
 export { scheduleTask } from './schedule_task';
 export { createNewAPIKeySet } from './create_new_api_key_set';
 export { recoverRuleAlerts } from './recover_rule_alerts';
+export { migrateLegacyActions } from './siem_legacy_actions/migrate_legacy_actions';
+export { formatLegacyActions } from './siem_legacy_actions/format_legacy_actions';
 export { addGeneratedActionValues } from './add_generated_action_values';
 export { incrementRevision } from './increment_revision';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_get_bulk_rule_actions_saved_object.test.ts b/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/format_legacy_actions.test.ts
similarity index 66%
rename from x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_get_bulk_rule_actions_saved_object.test.ts
rename to x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/format_legacy_actions.test.ts
index 6caca1b085be7..072a1e98cc3de 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_get_bulk_rule_actions_saved_object.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/format_legacy_actions.test.ts
@@ -5,23 +5,23 @@
  * 2.0.
  */
 
-import type { SavedObjectsFindOptions, SavedObjectsFindResult } from '@kbn/core/server';
+import type { SavedObjectsFindResult, SavedObjectAttribute } from '@kbn/core/server';
 
 import { loggingSystemMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 
-// eslint-disable-next-line no-restricted-imports
-import { legacyGetBulkRuleActionsSavedObject } from './legacy_get_bulk_rule_actions_saved_object';
-// eslint-disable-next-line no-restricted-imports
-import type { LegacyRulesActionsSavedObject } from './legacy_get_rule_actions_saved_object';
-// eslint-disable-next-line no-restricted-imports
-import { legacyRuleActionsSavedObjectType } from './legacy_saved_object_mappings';
-// eslint-disable-next-line no-restricted-imports
-import type { LegacyIRuleActionsAttributesSavedObjectAttributes } from './legacy_types';
+import { Rule } from '../../../types';
 
-describe('legacy_get_bulk_rule_actions_saved_object', () => {
+import {
+  legacyGetBulkRuleActionsSavedObject,
+  LegacyActionsObj,
+  formatLegacyActions,
+} from './format_legacy_actions';
+import { legacyRuleActionsSavedObjectType } from './types';
+
+describe('legacyGetBulkRuleActionsSavedObject', () => {
   let savedObjectsClient: ReturnType<typeof savedObjectsClientMock.create>;
   let logger: ReturnType<typeof loggingSystemMock.createLogger>;
-  type FuncReturn = Record<string, LegacyRulesActionsSavedObject>;
+  type FuncReturn = Record<string, LegacyActionsObj>;
 
   beforeEach(() => {
     logger = loggingSystemMock.createLogger();
@@ -34,10 +34,9 @@ describe('legacy_get_bulk_rule_actions_saved_object', () => {
     });
   });
 
-  test('calls "savedObjectsClient.find" with the expected "hasReferences"', () => {
-    legacyGetBulkRuleActionsSavedObject({ alertIds: ['123'], savedObjectsClient, logger });
-    const [[arg1]] = savedObjectsClient.find.mock.calls;
-    expect(arg1).toEqual<SavedObjectsFindOptions>({
+  test('calls "savedObjectsClient.find" with the expected "hasReferences"', async () => {
+    await legacyGetBulkRuleActionsSavedObject({ alertIds: ['123'], savedObjectsClient, logger });
+    expect(savedObjectsClient.find).toHaveBeenCalledWith({
       hasReference: [{ id: '123', type: 'alert' }],
       perPage: 10000,
       type: legacyRuleActionsSavedObjectType,
@@ -45,9 +44,7 @@ describe('legacy_get_bulk_rule_actions_saved_object', () => {
   });
 
   test('returns nothing transformed through the find if it does not return any matches against the alert id', async () => {
-    const savedObjects: Array<
-      SavedObjectsFindResult<LegacyIRuleActionsAttributesSavedObjectAttributes>
-    > = [];
+    const savedObjects: Array<SavedObjectsFindResult<SavedObjectAttribute>> = [];
     savedObjectsClient.find.mockResolvedValue({
       total: 0,
       per_page: 0,
@@ -64,9 +61,7 @@ describe('legacy_get_bulk_rule_actions_saved_object', () => {
   });
 
   test('returns 1 action transformed through the find if 1 was found for 1 single alert id', async () => {
-    const savedObjects: Array<
-      SavedObjectsFindResult<LegacyIRuleActionsAttributesSavedObjectAttributes>
-    > = [
+    const savedObjects: Array<SavedObjectsFindResult<SavedObjectAttribute>> = [
       {
         score: 0,
         id: '123',
@@ -111,12 +106,15 @@ describe('legacy_get_bulk_rule_actions_saved_object', () => {
     });
     expect(returnValue).toEqual<FuncReturn>({
       'alert-123': {
-        id: '123',
-        alertThrottle: '1d',
         ruleThrottle: '1d',
-        actions: [
+        legacyRuleActions: [
           {
-            action_type_id: 'action_type_1',
+            actionTypeId: 'action_type_1',
+            frequency: {
+              notifyWhen: 'onThrottleInterval',
+              summary: true,
+              throttle: '1d',
+            },
             group: 'group_1',
             id: 'action-123',
             params: {},
@@ -127,9 +125,7 @@ describe('legacy_get_bulk_rule_actions_saved_object', () => {
   });
 
   test('returns 1 action transformed through the find for 2 alerts with 1 action each', async () => {
-    const savedObjects: Array<
-      SavedObjectsFindResult<LegacyIRuleActionsAttributesSavedObjectAttributes>
-    > = [
+    const savedObjects: Array<SavedObjectsFindResult<SavedObjectAttribute>> = [
       {
         score: 0,
         id: '123',
@@ -203,12 +199,16 @@ describe('legacy_get_bulk_rule_actions_saved_object', () => {
     });
     expect(returnValue).toEqual<FuncReturn>({
       'alert-123': {
-        id: '123',
-        alertThrottle: '1d',
         ruleThrottle: '1d',
-        actions: [
+
+        legacyRuleActions: [
           {
-            action_type_id: 'action_type_1',
+            actionTypeId: 'action_type_1',
+            frequency: {
+              notifyWhen: 'onThrottleInterval',
+              summary: true,
+              throttle: '1d',
+            },
             group: 'group_1',
             id: 'action-123',
             params: {},
@@ -216,12 +216,15 @@ describe('legacy_get_bulk_rule_actions_saved_object', () => {
         ],
       },
       'alert-456': {
-        id: '456',
-        alertThrottle: '1d',
         ruleThrottle: '1d',
-        actions: [
+        legacyRuleActions: [
           {
-            action_type_id: 'action_type_2',
+            actionTypeId: 'action_type_2',
+            frequency: {
+              notifyWhen: 'onThrottleInterval',
+              summary: true,
+              throttle: '1d',
+            },
             group: 'group_2',
             id: 'action-456',
             params: {},
@@ -232,9 +235,7 @@ describe('legacy_get_bulk_rule_actions_saved_object', () => {
   });
 
   test('returns 2 actions transformed through the find if they were found for 1 single alert id', async () => {
-    const savedObjects: Array<
-      SavedObjectsFindResult<LegacyIRuleActionsAttributesSavedObjectAttributes>
-    > = [
+    const savedObjects: Array<SavedObjectsFindResult<SavedObjectAttribute>> = [
       {
         score: 0,
         id: '123',
@@ -290,18 +291,26 @@ describe('legacy_get_bulk_rule_actions_saved_object', () => {
     });
     expect(returnValue).toEqual<FuncReturn>({
       'alert-123': {
-        id: '123',
-        alertThrottle: '1d',
         ruleThrottle: '1d',
-        actions: [
+        legacyRuleActions: [
           {
-            action_type_id: 'action_type_1',
+            actionTypeId: 'action_type_1',
+            frequency: {
+              notifyWhen: 'onThrottleInterval',
+              summary: true,
+              throttle: '1d',
+            },
             group: 'group_1',
             id: 'action-123',
             params: {},
           },
           {
-            action_type_id: 'action_type_2',
+            actionTypeId: 'action_type_2',
+            frequency: {
+              notifyWhen: 'onThrottleInterval',
+              summary: true,
+              throttle: '1d',
+            },
             group: 'group_2',
             id: 'action-456',
             params: {},
@@ -312,9 +321,7 @@ describe('legacy_get_bulk_rule_actions_saved_object', () => {
   });
 
   test('returns only 1 action if for some unusual reason the actions reference is missing an item for 1 single alert id', async () => {
-    const savedObjects: Array<
-      SavedObjectsFindResult<LegacyIRuleActionsAttributesSavedObjectAttributes>
-    > = [
+    const savedObjects: Array<SavedObjectsFindResult<SavedObjectAttribute>> = [
       {
         score: 0,
         id: '123',
@@ -366,12 +373,15 @@ describe('legacy_get_bulk_rule_actions_saved_object', () => {
     });
     expect(returnValue).toEqual<FuncReturn>({
       'alert-123': {
-        id: '123',
-        alertThrottle: '1d',
         ruleThrottle: '1d',
-        actions: [
+        legacyRuleActions: [
           {
-            action_type_id: 'action_type_1',
+            actionTypeId: 'action_type_1',
+            frequency: {
+              notifyWhen: 'onThrottleInterval',
+              summary: true,
+              throttle: '1d',
+            },
             group: 'group_1',
             id: 'action-123',
             params: {},
@@ -382,9 +392,7 @@ describe('legacy_get_bulk_rule_actions_saved_object', () => {
   });
 
   test('returns only 1 action if for some unusual reason the action is missing from the attributes', async () => {
-    const savedObjects: Array<
-      SavedObjectsFindResult<LegacyIRuleActionsAttributesSavedObjectAttributes>
-    > = [
+    const savedObjects: Array<SavedObjectsFindResult<SavedObjectAttribute>> = [
       {
         score: 0,
         id: '123',
@@ -435,12 +443,15 @@ describe('legacy_get_bulk_rule_actions_saved_object', () => {
     });
     expect(returnValue).toEqual<FuncReturn>({
       'alert-123': {
-        id: '123',
-        alertThrottle: '1d',
         ruleThrottle: '1d',
-        actions: [
+        legacyRuleActions: [
           {
-            action_type_id: 'action_type_1',
+            actionTypeId: 'action_type_1',
+            frequency: {
+              notifyWhen: 'onThrottleInterval',
+              summary: true,
+              throttle: '1d',
+            },
             group: 'group_1',
             id: 'action-123',
             params: {},
@@ -451,9 +462,7 @@ describe('legacy_get_bulk_rule_actions_saved_object', () => {
   });
 
   test('returns nothing if the alert id is missing within the references array', async () => {
-    const savedObjects: Array<
-      SavedObjectsFindResult<LegacyIRuleActionsAttributesSavedObjectAttributes>
-    > = [
+    const savedObjects: Array<SavedObjectsFindResult<SavedObjectAttribute>> = [
       {
         score: 0,
         id: '123',
@@ -495,3 +504,112 @@ describe('legacy_get_bulk_rule_actions_saved_object', () => {
     expect(returnValue).toEqual<FuncReturn>({});
   });
 });
+
+describe('formatLegacyActions', () => {
+  let savedObjectsClient: ReturnType<typeof savedObjectsClientMock.create>;
+  let logger: ReturnType<typeof loggingSystemMock.createLogger>;
+
+  beforeEach(() => {
+    logger = loggingSystemMock.createLogger();
+    savedObjectsClient = savedObjectsClientMock.create();
+  });
+
+  it('should return not modified rule when error is thrown within method', async () => {
+    savedObjectsClient.find.mockRejectedValueOnce(new Error('test failure'));
+    const mockRules = [{ id: 'mock-id0' }, { id: 'mock-id1' }] as Rule[];
+    expect(
+      await formatLegacyActions(mockRules, {
+        logger,
+        savedObjectsClient,
+      })
+    ).toEqual(mockRules);
+
+    expect(logger.error).toHaveBeenCalledWith(
+      `formatLegacyActions(): Failed to read legacy actions for SIEM rules mock-id0, mock-id1: test failure`
+    );
+  });
+
+  it('should format rule correctly', async () => {
+    const savedObjects: Array<SavedObjectsFindResult<SavedObjectAttribute>> = [
+      {
+        score: 0,
+        id: '123',
+        type: legacyRuleActionsSavedObjectType,
+        references: [
+          {
+            name: 'alert_0',
+            id: 'alert-123',
+            type: 'alert',
+          },
+          {
+            name: 'action_0',
+            id: 'action-123',
+            type: 'action',
+          },
+        ],
+        attributes: {
+          actions: [
+            {
+              group: 'group_1',
+              params: {},
+              action_type_id: 'action_type_1',
+              actionRef: 'action_0',
+            },
+          ],
+          ruleThrottle: '1d',
+          alertThrottle: '1d',
+        },
+      },
+    ];
+    savedObjectsClient.find.mockResolvedValue({
+      total: 0,
+      per_page: 0,
+      page: 1,
+      saved_objects: savedObjects,
+    });
+
+    const mockRules = [
+      {
+        id: 'alert-123',
+        actions: [
+          {
+            actionTypeId: 'action_type_2',
+            group: 'group_1',
+            id: 'action-456',
+            params: {},
+          },
+        ],
+      },
+    ] as Rule[];
+    const migratedRules = await formatLegacyActions(mockRules, {
+      logger,
+      savedObjectsClient,
+    });
+
+    expect(migratedRules).toEqual([
+      {
+        // actions have been merged
+        actions: [
+          {
+            actionTypeId: 'action_type_2',
+            group: 'group_1',
+            id: 'action-456',
+            params: {},
+          },
+          {
+            actionTypeId: 'action_type_1',
+            frequency: { notifyWhen: 'onThrottleInterval', summary: true, throttle: '1d' },
+            group: 'group_1',
+            id: 'action-123',
+            params: {},
+          },
+        ],
+        id: 'alert-123',
+        // muteAll set to false
+        muteAll: false,
+        notifyWhen: 'onThrottleInterval',
+        throttle: '1d',
+      },
+    ]);
+  });
+});
diff --git a/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/format_legacy_actions.ts b/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/format_legacy_actions.ts
new file mode 100644
index 0000000000000..8689113ca7907
--- /dev/null
+++ b/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/format_legacy_actions.ts
@@ -0,0 +1,153 @@
+/*
+ * 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 { chunk } from 'lodash';
+import type { SavedObjectsFindOptionsReference, Logger } from '@kbn/core/server';
+import pMap from 'p-map';
+import { RuleAction, Rule } from '../../../types';
+import type { RuleExecutorServices } from '../../..';
+import { injectReferencesIntoActions } from '../../common';
+import { transformToNotifyWhen } from './transform_to_notify_when';
+import { transformFromLegacyActions } from './transform_legacy_actions';
+import { LegacyIRuleActionsAttributes, legacyRuleActionsSavedObjectType } from './types';
+
+/**
+ * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
+ */
+interface LegacyGetBulkRuleActionsSavedObject {
+  alertIds: string[];
+  savedObjectsClient: RuleExecutorServices['savedObjectsClient'];
+  logger: Logger;
+}
+
+/**
+ * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
+ */
+export interface LegacyActionsObj {
+  ruleThrottle: string | null;
+  legacyRuleActions: RuleAction[];
+}
+
+/**
+ * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
+ * this function finds all legacy actions associated with rules in bulk
+ * it's useful for such methods as find, so we do not request legacy actions in a separate request per rule
+ * @params params.alertIds - list of rule ids to look for legacy actions for
+ * @params params.savedObjectsClient - savedObjectsClient
+ * @params params.logger - logger
+ * @returns map of legacy actions objects per rule with legacy actions
+ */
+export const legacyGetBulkRuleActionsSavedObject = async ({
+  alertIds,
+  savedObjectsClient,
+  logger,
+}: LegacyGetBulkRuleActionsSavedObject): Promise<Record<string, LegacyActionsObj>> => {
+  const references = alertIds.map<SavedObjectsFindOptionsReference>((alertId) => ({
+    id: alertId,
+    type: 'alert',
+  }));
+  const errors: unknown[] = [];
+  const results = await pMap(
+    chunk(references, 1000),
+    async (referencesChunk) => {
+      try {
+        return savedObjectsClient.find<LegacyIRuleActionsAttributes>({
+          // here we looking legacyRuleActionsSavedObjectType, as not all of rules create `siem.notifications`
+          // more information on that can be found in https://github.com/elastic/kibana/pull/130511 PR
+          type: legacyRuleActionsSavedObjectType,
+          perPage: 10000,
+          hasReference: referencesChunk,
+        });
+      } catch (error) {
+        logger.error(
+          `Error fetching rule actions: ${error instanceof Error ? error.message : String(error)}`
+        );
+        errors.push(error);
+        return [];
+      }
+    },
+    { concurrency: 1 }
+  );
+  const actionSavedObjects = results.flat().flatMap((r) => r.saved_objects);
+
+  if (errors.length) {
+    throw new AggregateError(errors, 'Error fetching rule actions');
+  }
+
+  return actionSavedObjects.reduce((acc: { [key: string]: LegacyActionsObj }, savedObject) => {
+    const ruleAlertId = savedObject.references.find((reference) => {
+      // Find the first rule alert and assume that is the one we want since we should only ever have 1.
+      return reference.type === 'alert';
+    });
+    // We check to ensure we have found a "ruleAlertId" and hopefully we have.
+    const ruleAlertIdKey = ruleAlertId != null ? ruleAlertId.id : undefined;
+    if (ruleAlertIdKey != null) {
+      const legacyRawActions = transformFromLegacyActions(
+        savedObject.attributes,
+        savedObject.references
+      );
+      acc[ruleAlertIdKey] = {
+        ruleThrottle: savedObject.attributes.ruleThrottle,
+        legacyRuleActions: injectReferencesIntoActions(
+          ruleAlertIdKey,
+          legacyRawActions,
+          savedObject.references
+        ) // remove uuid from action, as this uuid is not persistent
+          .map(({ uuid, ...action }) => action),
+      };
+    } else {
+      logger.error(
+        `Security Solution notification (Legacy) Was expecting to find a reference of type "alert" within ${savedObject.references} but did not. Skipping this notification.`
+      );
+    }
+    return acc;
+  }, {});
+};
+
+/**
+ * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
+ * formats rules with associated SIEM legacy actions, if any legacy actions present
+ * @param rules - list of rules to format
+ * @param params - logger, savedObjectsClient
+ * @returns
+ */
+export const formatLegacyActions = async <T extends Rule>(
+  rules: T[],
+  { logger, savedObjectsClient }: Omit<LegacyGetBulkRuleActionsSavedObject, 'alertIds'>
+): Promise<T[]> => {
+  try {
+    const res = await legacyGetBulkRuleActionsSavedObject({
+      alertIds: rules.map((rule) => rule.id),
+      savedObjectsClient,
+      logger,
+    });
+
+    return rules.map((rule) => {
+      const legacyRuleActionsMatch = res[rule.id];
+      if (!legacyRuleActionsMatch) {
+        return rule;
+      }
+
+      const { legacyRuleActions, ruleThrottle } = legacyRuleActionsMatch;
+      return {
+        ...rule,
+        actions: [...rule.actions, ...legacyRuleActions],
+        throttle: (legacyRuleActions.length ? ruleThrottle : rule.throttle) ?? 'no_actions',
+        notifyWhen: transformToNotifyWhen(ruleThrottle),
+        // muteAll property is disregarded in further rule processing in Security Solution when legacy actions are present.
+        // So it should be safe to set it as false, so it won't be displayed to user as w/o actions see transformFromAlertThrottle method
+        muteAll: legacyRuleActions.length ? false : rule.muteAll,
+      };
+    });
+  } catch (e) {
+    const ruleIds = rules.map((rule) => rule.id).join(', ');
+    logger.error(
+      `formatLegacyActions(): Failed to read legacy actions for SIEM rules ${ruleIds}: ${e.message}`
+    );
+    return rules;
+  }
+};
diff --git a/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/migrate_legacy_actions.test.ts b/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/migrate_legacy_actions.test.ts
new file mode 100644
index 0000000000000..bf67bb5a97191
--- /dev/null
+++ b/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/migrate_legacy_actions.test.ts
@@ -0,0 +1,357 @@
+/*
+ * 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 { AlertConsumers } from '@kbn/rule-data-utils';
+
+import type { SavedObjectReference } from '@kbn/core/server';
+
+import { migrateLegacyActions } from './migrate_legacy_actions';
+import { retrieveMigratedLegacyActions } from './retrieve_migrated_legacy_actions';
+import { injectReferencesIntoActions } from '../../common';
+
+import { validateActions } from '../validate_actions';
+import { RulesClientContext } from '../..';
+import { RawRuleAction, RawRule } from '../../../types';
+
+import { UntypedNormalizedRuleType } from '../../../rule_type_registry';
+import { RecoveredActionGroup } from '../../../../common';
+
+jest.mock('./retrieve_migrated_legacy_actions', () => ({
+  retrieveMigratedLegacyActions: jest.fn(),
+}));
+
+jest.mock('../validate_actions', () => ({
+  validateActions: jest.fn(),
+}));
+
+jest.mock('../../common', () => ({
+  injectReferencesIntoActions: jest.fn(),
+}));
+
+const ruleType: jest.Mocked<UntypedNormalizedRuleType> = {
+  id: 'test',
+  name: 'My test rule',
+  actionGroups: [{ id: 'default', name: 'Default' }, RecoveredActionGroup],
+  defaultActionGroupId: 'default',
+  minimumLicenseRequired: 'basic',
+  isExportable: true,
+  recoveryActionGroup: RecoveredActionGroup,
+  executor: jest.fn(),
+  producer: 'alerts',
+  cancelAlertsOnRuleTimeout: true,
+  ruleTaskTimeout: '5m',
+  getSummarizedAlerts: jest.fn(),
+};
+
+const context = {
+  ruleTypeRegistry: {
+    get: () => ruleType,
+  },
+  logger: {
+    error: jest.fn(),
+  },
+} as unknown as RulesClientContext;
+
+const ruleId = 'rule_id_1';
+
+const attributes = {
+  alertTypeId: 'siem.query',
+  consumer: AlertConsumers.SIEM,
+} as unknown as RawRule;
+
+(retrieveMigratedLegacyActions as jest.Mock).mockResolvedValue({
+  legacyActions: [],
+  legacyActionsReferences: [],
+});
+
+const legacyActionsMock: RawRuleAction[] = [
+  {
+    group: 'default',
+    params: {
+      message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
+      to: ['test@test.com'],
+      subject: 'Test Actions',
+    },
+    actionTypeId: '.email',
+    uuid: '11403909-ca9b-49ba-9d7a-7e5320e68d05',
+    actionRef: 'action_0',
+    frequency: {
+      notifyWhen: 'onThrottleInterval',
+      summary: true,
+      throttle: '1d',
+    },
+  },
+];
+
+const legacyReferencesMock: SavedObjectReference[] = [
+  {
+    id: 'cc85da20-d480-11ed-8e69-1df522116c28',
+    name: 'action_0',
+    type: 'action',
+  },
+];
+
+const existingActionsMock: RawRuleAction[] = [
+  {
+    group: 'default',
+    params: {
+      body: {
+        test_web_hook: 'alert.id - {{alert.id}}',
+      },
+    },
+    actionTypeId: '.webhook',
+    uuid: '6e253775-693c-4dcb-a4f5-ad37d9524ecf',
+    actionRef: 'action_0',
+  },
+];
+
+const referencesMock: SavedObjectReference[] = [
+  {
+    id: 'b2fd3f90-cd81-11ed-9f6d-a746729ca213',
+    name: 'action_0',
+    type: 'action',
+  },
+];
+
+describe('migrateLegacyActions', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should return empty migratedActions when error is thrown within method', async () => {
+    (retrieveMigratedLegacyActions as jest.Mock).mockRejectedValueOnce(new Error('test failure'));
+    const migratedActions = await migrateLegacyActions(context, {
+      ruleId,
+      attributes,
+    });
+
+    expect(migratedActions).toEqual({
+      resultedActions: [],
+      hasLegacyActions: false,
+      resultedReferences: [],
+    });
+    expect(context.logger.error).toHaveBeenCalledWith(
+      `migrateLegacyActions(): Failed to migrate legacy actions for SIEM rule ${ruleId}: test failure`
+    );
+  });
+
+  it('should return earley empty migratedActions when consumer is not SIEM', async () => {
+    (retrieveMigratedLegacyActions as jest.Mock).mockResolvedValue({
+      legacyActions: [],
+      legacyActionsReferences: [],
+    });
+    const migratedActions = await migrateLegacyActions(context, {
+      ruleId,
+      attributes: { ...attributes, consumer: 'mine' },
+    });
+
+    expect(migratedActions).toEqual({
+      resultedActions: [],
+      hasLegacyActions: false,
+      resultedReferences: [],
+    });
+    expect(retrieveMigratedLegacyActions).not.toHaveBeenCalled();
+    expect(validateActions).not.toHaveBeenCalled();
+    expect(injectReferencesIntoActions).not.toHaveBeenCalled();
+  });
+
+  it('should call retrieveMigratedLegacyActions with correct rule id', async () => {
+    (retrieveMigratedLegacyActions as jest.Mock).mockResolvedValue({
+      legacyActions: [],
+      legacyActionsReferences: [],
+    });
+    await migrateLegacyActions(context, { ruleId, attributes });
+
+    expect(retrieveMigratedLegacyActions).toHaveBeenCalledWith(context, { ruleId });
+  });
+
+  it('should not call validateActions and injectReferencesIntoActions if skipActionsValidation=true', async () => {
+    await migrateLegacyActions(context, { ruleId, attributes, skipActionsValidation: true });
+
+    expect(validateActions).not.toHaveBeenCalled();
+    expect(injectReferencesIntoActions).not.toHaveBeenCalled();
+  });
+
+  it('should call validateActions and injectReferencesIntoActions if attributes provided', async () => {
+    (retrieveMigratedLegacyActions as jest.Mock).mockResolvedValueOnce({
+      legacyActions: legacyActionsMock,
+      legacyActionsReferences: legacyReferencesMock,
+    });
+
+    (injectReferencesIntoActions as jest.Mock).mockReturnValue('actions-with-references');
+    await migrateLegacyActions(context, { ruleId, attributes });
+
+    expect(validateActions).toHaveBeenCalledWith(context, ruleType, {
+      ...attributes,
+      actions: 'actions-with-references',
+    });
+
+    expect(injectReferencesIntoActions).toHaveBeenCalledWith(
+      'rule_id_1',
+      [
+        {
+          actionRef: 'action_0',
+          actionTypeId: '.email',
+          group: 'default',
+          params: {
+            message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
+            subject: 'Test Actions',
+            to: ['test@test.com'],
+          },
+          uuid: '11403909-ca9b-49ba-9d7a-7e5320e68d05',
+          frequency: {
+            notifyWhen: 'onThrottleInterval',
+            summary: true,
+            throttle: '1d',
+          },
+        },
+      ],
+      [{ id: 'cc85da20-d480-11ed-8e69-1df522116c28', name: 'action_0', type: 'action' }]
+    );
+  });
+
+  it('should set frequency props from rule level to existing actions', async () => {
+    const result = await migrateLegacyActions(context, {
+      ruleId,
+      actions: existingActionsMock,
+      references: referencesMock,
+      attributes: { ...attributes, throttle: '1h', notifyWhen: 'onThrottleInterval' },
+    });
+
+    expect(result).toHaveProperty('hasLegacyActions', false);
+    expect(result).toHaveProperty('resultedReferences', referencesMock);
+    expect(result).toHaveProperty('resultedActions', [
+      {
+        actionRef: 'action_0',
+        actionTypeId: '.webhook',
+        group: 'default',
+        params: { body: { test_web_hook: 'alert.id - {{alert.id}}' } },
+        uuid: '6e253775-693c-4dcb-a4f5-ad37d9524ecf',
+        frequency: {
+          notifyWhen: 'onThrottleInterval',
+          summary: true,
+          throttle: '1h',
+        },
+      },
+    ]);
+  });
+
+  it('should return correct response when legacy actions empty and existing empty', async () => {
+    const result = await migrateLegacyActions(context, {
+      ruleId,
+      actions: existingActionsMock,
+      references: referencesMock,
+      attributes,
+    });
+
+    expect(result).toHaveProperty('hasLegacyActions', false);
+    expect(result).toHaveProperty('resultedReferences', referencesMock);
+    expect(result).toHaveProperty('resultedActions', [
+      {
+        actionRef: 'action_0',
+        actionTypeId: '.webhook',
+        group: 'default',
+        params: { body: { test_web_hook: 'alert.id - {{alert.id}}' } },
+        uuid: '6e253775-693c-4dcb-a4f5-ad37d9524ecf',
+        frequency: {
+          notifyWhen: 'onActiveAlert',
+          summary: true,
+          throttle: null,
+        },
+      },
+    ]);
+  });
+
+  it('should return correct response when legacy actions empty and existing actions empty', async () => {
+    const result = await migrateLegacyActions(context, {
+      ruleId,
+      attributes,
+    });
+
+    expect(result).toHaveProperty('hasLegacyActions', false);
+    expect(result).toHaveProperty('resultedReferences', []);
+    expect(result).toHaveProperty('resultedActions', []);
+  });
+  it('should return correct response when existing actions empty and legacy present', async () => {
+    (retrieveMigratedLegacyActions as jest.Mock).mockResolvedValueOnce({
+      legacyActions: legacyActionsMock,
+      legacyActionsReferences: legacyReferencesMock,
+    });
+
+    const result = await migrateLegacyActions(context, {
+      ruleId,
+      attributes,
+    });
+
+    expect(result).toHaveProperty('hasLegacyActions', true);
+    expect(result).toHaveProperty('resultedReferences', legacyReferencesMock);
+    expect(result).toHaveProperty('resultedActions', legacyActionsMock);
+  });
+  it('should merge actions and references correctly when existing and legacy actions both present', async () => {
+    (retrieveMigratedLegacyActions as jest.Mock).mockResolvedValueOnce({
+      legacyActions: legacyActionsMock,
+      legacyActionsReferences: legacyReferencesMock,
+    });
+
+    const result = await migrateLegacyActions(context, {
+      ruleId,
+      actions: existingActionsMock,
+      references: referencesMock,
+      attributes,
+    });
+
+    expect(result.resultedReferences[0].name).toBe('action_0');
+    expect(result.resultedReferences[1].name).toBe('action_1');
+
+    expect(result).toHaveProperty('hasLegacyActions', true);
+
+    // ensure references are correct
+    expect(result.resultedReferences[0].name).toBe('action_0');
+    expect(result.resultedReferences[1].name).toBe('action_1');
+    expect(result).toHaveProperty('resultedReferences', [
+      {
+        id: 'b2fd3f90-cd81-11ed-9f6d-a746729ca213',
+        name: 'action_0',
+        type: 'action',
+      },
+      {
+        id: 'cc85da20-d480-11ed-8e69-1df522116c28',
+        name: 'action_1',
+        type: 'action',
+      },
+    ]);
+
+    // ensure actionsRefs are correct
+    expect(result.resultedActions[0].actionRef).toBe('action_0');
+    expect(result.resultedActions[1].actionRef).toBe('action_1');
+    expect(result).toHaveProperty('resultedActions', [
+      {
+        actionRef: 'action_0',
+        actionTypeId: '.webhook',
+        group: 'default',
+        params: { body: { test_web_hook: 'alert.id - {{alert.id}}' } },
+        uuid: '6e253775-693c-4dcb-a4f5-ad37d9524ecf',
+        frequency: {
+          notifyWhen: 'onActiveAlert',
+          summary: true,
+          throttle: null,
+        },
+      },
+      {
+        actionRef: 'action_1',
+        actionTypeId: '.email',
+        frequency: { notifyWhen: 'onThrottleInterval', summary: true, throttle: '1d' },
+        group: 'default',
+        params: {
+          message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
+          subject: 'Test Actions',
+          to: ['test@test.com'],
+        },
+        uuid: '11403909-ca9b-49ba-9d7a-7e5320e68d05',
+      },
+    ]);
+  });
+});
diff --git a/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/migrate_legacy_actions.ts b/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/migrate_legacy_actions.ts
new file mode 100644
index 0000000000000..c092e3fed982b
--- /dev/null
+++ b/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/migrate_legacy_actions.ts
@@ -0,0 +1,113 @@
+/*
+ * 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 { AlertConsumers } from '@kbn/rule-data-utils';
+
+import type { SavedObjectReference } from '@kbn/core/server';
+import type { RulesClientContext } from '../..';
+import { RawRuleAction, RawRule } from '../../../types';
+import { validateActions } from '../validate_actions';
+import { injectReferencesIntoActions } from '../../common';
+import { retrieveMigratedLegacyActions } from './retrieve_migrated_legacy_actions';
+
+type MigrateLegacyActions = (
+  context: RulesClientContext,
+  params: {
+    ruleId: string;
+    references?: SavedObjectReference[];
+    actions?: RawRuleAction[];
+    attributes: RawRule;
+    skipActionsValidation?: boolean;
+  }
+) => Promise<{
+  resultedActions: RawRuleAction[];
+  resultedReferences: SavedObjectReference[];
+  hasLegacyActions: boolean;
+}>;
+
+/**
+ * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
+ * migrates SIEM legacy actions and merges rule actions and references
+ * @param context RulesClient context
+ * @param params
+ * @returns
+ */
+export const migrateLegacyActions: MigrateLegacyActions = async (
+  context: RulesClientContext,
+  { ruleId, actions = [], references = [], attributes, skipActionsValidation }
+) => {
+  try {
+    if (attributes.consumer !== AlertConsumers.SIEM) {
+      return {
+        resultedActions: [],
+        hasLegacyActions: false,
+        resultedReferences: [],
+      };
+    }
+
+    const { legacyActions, legacyActionsReferences } = await retrieveMigratedLegacyActions(
+      context,
+      {
+        ruleId,
+      }
+    );
+
+    // sometimes we don't need to validate legacy actions. For example, when delete rules or update rule from payload
+    if (skipActionsValidation !== true) {
+      const ruleType = context.ruleTypeRegistry.get(attributes.alertTypeId);
+      await validateActions(context, ruleType, {
+        ...attributes,
+        // set to undefined to avoid both per-actin and rule level values clashing
+        throttle: undefined,
+        notifyWhen: undefined,
+        actions: injectReferencesIntoActions(ruleId, legacyActions, legacyActionsReferences),
+      });
+    }
+
+    // fix references for a case when actions present in a rule
+    if (actions.length) {
+      legacyActions.forEach((legacyAction, i) => {
+        const oldReference = legacyAction.actionRef;
+        const legacyReference = legacyActionsReferences.find(({ name }) => name === oldReference);
+        const newReference = `action_${actions.length + i}`;
+        legacyAction.actionRef = newReference;
+
+        if (legacyReference) {
+          legacyReference.name = newReference;
+        }
+      });
+    }
+
+    // put frequencies into existing actions
+    // the situation when both action in rule nad legacy exist should be rare one
+    // but if it happens, we put frequency in existing actions per-action level
+    const existingActionsWithFrequencies: RawRuleAction[] = actions.map((action) => ({
+      ...action,
+      frequency: {
+        summary: true,
+        notifyWhen: attributes.notifyWhen ?? 'onActiveAlert',
+        throttle: attributes.throttle ?? null,
+      },
+    }));
+
+    return {
+      resultedActions: [...existingActionsWithFrequencies, ...legacyActions],
+      hasLegacyActions: legacyActions.length > 0,
+      resultedReferences: [...references, ...legacyActionsReferences],
+    };
+  } catch (e) {
+    context.logger.error(
+      `migrateLegacyActions(): Failed to migrate legacy actions for SIEM rule ${ruleId}: ${e.message}`
+    );
+
+    return {
+      resultedActions: [],
+      hasLegacyActions: false,
+      resultedReferences: [],
+    };
+  }
+};
diff --git a/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock.ts b/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock.ts
new file mode 100644
index 0000000000000..d45c86c3f05a5
--- /dev/null
+++ b/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock.ts
@@ -0,0 +1,368 @@
+/*
+ * 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 {
+  SavedObjectsFindResponse,
+  SavedObjectsFindResult,
+  SavedObjectAttribute,
+} from '@kbn/core/server';
+
+import type { LegacyRuleNotificationAlertType } from './types';
+
+export const migrateLegacyActionsMock = {
+  legacyActions: [],
+  legacyActionsReferences: [],
+};
+
+/**
+ * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
+ */
+export const legacyGetHourlyNotificationResult = (
+  id = '456',
+  ruleId = '123'
+): LegacyRuleNotificationAlertType => ({
+  id,
+  name: 'Notification for Rule Test',
+  tags: [],
+  alertTypeId: 'siem.notifications',
+  consumer: 'siem',
+  params: {
+    ruleAlertId: `${ruleId}`,
+  },
+  schedule: {
+    interval: '1h',
+  },
+  enabled: true,
+  actions: [
+    {
+      group: 'default',
+      params: {
+        message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
+        to: ['test@test.com'],
+        subject: 'Test Actions',
+      },
+      actionTypeId: '.email',
+      id: '99403909-ca9b-49ba-9d7a-7e5320e68d05',
+    },
+  ],
+  throttle: null,
+  notifyWhen: 'onActiveAlert',
+  apiKey: null,
+  apiKeyOwner: 'elastic',
+  createdBy: 'elastic',
+  updatedBy: 'elastic',
+  createdAt: new Date('2020-03-21T11:15:13.530Z'),
+  muteAll: false,
+  mutedInstanceIds: [],
+  scheduledTaskId: '62b3a130-6b70-11ea-9ce9-6b9818c4cbd7',
+  updatedAt: new Date('2020-03-21T12:37:08.730Z'),
+  executionStatus: {
+    status: 'unknown',
+    lastExecutionDate: new Date('2020-08-20T19:23:38Z'),
+  },
+  revision: 0,
+});
+
+/**
+ * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
+ */
+export const legacyGetWeeklyNotificationResult = (
+  id = '456',
+  ruleId = '123'
+): LegacyRuleNotificationAlertType => ({
+  id,
+  name: 'Notification for Rule Test',
+  tags: [],
+  alertTypeId: 'siem.notifications',
+  consumer: 'siem',
+  params: {
+    ruleAlertId: `${ruleId}`,
+  },
+  schedule: {
+    interval: '7d',
+  },
+  enabled: true,
+  actions: [
+    {
+      group: 'default',
+      params: {
+        message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
+        to: ['test@test.com'],
+        subject: 'Test Actions',
+      },
+      actionTypeId: '.email',
+      id: '99403909-ca9b-49ba-9d7a-7e5320e68d05',
+    },
+  ],
+  throttle: null,
+  notifyWhen: 'onActiveAlert',
+  apiKey: null,
+  apiKeyOwner: 'elastic',
+  createdBy: 'elastic',
+  updatedBy: 'elastic',
+  createdAt: new Date('2020-03-21T11:15:13.530Z'),
+  muteAll: false,
+  mutedInstanceIds: [],
+  scheduledTaskId: '62b3a130-6b70-11ea-9ce9-6b9818c4cbd7',
+  updatedAt: new Date('2020-03-21T12:37:08.730Z'),
+  executionStatus: {
+    status: 'unknown',
+    lastExecutionDate: new Date('2020-08-20T19:23:38Z'),
+  },
+  revision: 0,
+});
+
+/**
+ * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
+ */
+export const legacyGetDailyNotificationResult = (
+  id = '456',
+  ruleId = '123'
+): LegacyRuleNotificationAlertType => ({
+  id,
+  name: 'Notification for Rule Test',
+  tags: [],
+  alertTypeId: 'siem.notifications',
+  consumer: 'siem',
+  params: {
+    ruleAlertId: `${ruleId}`,
+  },
+  schedule: {
+    interval: '1d',
+  },
+  enabled: true,
+  actions: [
+    {
+      group: 'default',
+      params: {
+        message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
+        to: ['test@test.com'],
+        subject: 'Test Actions',
+      },
+      actionTypeId: '.email',
+      id: '99403909-ca9b-49ba-9d7a-7e5320e68d05',
+    },
+  ],
+  throttle: null,
+  notifyWhen: 'onActiveAlert',
+  apiKey: null,
+  apiKeyOwner: 'elastic',
+  createdBy: 'elastic',
+  updatedBy: 'elastic',
+  createdAt: new Date('2020-03-21T11:15:13.530Z'),
+  muteAll: false,
+  mutedInstanceIds: [],
+  scheduledTaskId: '62b3a130-6b70-11ea-9ce9-6b9818c4cbd7',
+  updatedAt: new Date('2020-03-21T12:37:08.730Z'),
+  executionStatus: {
+    status: 'unknown',
+    lastExecutionDate: new Date('2020-08-20T19:23:38Z'),
+  },
+  revision: 0,
+});
+
+/**
+ * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
+ */
+export const legacyGetSiemNotificationRuleNoActionsSOResult = (
+  ruleId = '123'
+): SavedObjectsFindResult<SavedObjectAttribute> => ({
+  type: 'siem-detection-engine-rule-actions',
+  id: 'ID_OF_LEGACY_SIDECAR_NO_ACTIONS',
+  namespaces: ['default'],
+  attributes: {
+    actions: [],
+    ruleThrottle: 'no_actions',
+    alertThrottle: null,
+  },
+  references: [{ id: ruleId, type: 'alert', name: 'alert_0' }],
+  migrationVersion: {
+    'siem-detection-engine-rule-actions': '7.11.2',
+  },
+  coreMigrationVersion: '7.15.2',
+  updated_at: '2022-03-31T19:06:40.473Z',
+  version: 'WzIzNywxXQ==',
+  score: 0,
+});
+
+/**
+ * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
+ */
+export const legacyGetSiemNotificationRuleEveryRunSOResult = (
+  ruleId = '123'
+): SavedObjectsFindResult<SavedObjectAttribute> => ({
+  type: 'siem-detection-engine-rule-actions',
+  id: 'ID_OF_LEGACY_SIDECAR_RULE_RUN_ACTIONS',
+  namespaces: ['default'],
+  attributes: {
+    actions: [
+      {
+        group: 'default',
+        actionRef: 'action_0',
+        params: {
+          message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
+          to: ['test@test.com'],
+          subject: 'Test Actions',
+        },
+        action_type_id: '.email',
+      },
+    ],
+    ruleThrottle: 'rule',
+    alertThrottle: null,
+  },
+  references: [{ id: ruleId, type: 'alert', name: 'alert_0' }],
+  migrationVersion: {
+    'siem-detection-engine-rule-actions': '7.11.2',
+  },
+  coreMigrationVersion: '7.15.2',
+  updated_at: '2022-03-31T19:06:40.473Z',
+  version: 'WzIzNywxXQ==',
+  score: 0,
+});
+
+/**
+ * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
+ */
+export const legacyGetSiemNotificationRuleHourlyActionsSOResult = (
+  ruleId = '123',
+  connectorId = '456'
+): SavedObjectsFindResult<SavedObjectAttribute> => ({
+  type: 'siem-detection-engine-rule-actions',
+  id: 'ID_OF_LEGACY_SIDECAR_HOURLY_ACTIONS',
+  namespaces: ['default'],
+  attributes: {
+    actions: [
+      {
+        group: 'default',
+        actionRef: 'action_0',
+        params: {
+          message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
+          to: ['test@test.com'],
+          subject: 'Test Actions',
+        },
+        action_type_id: '.email',
+      },
+    ],
+    ruleThrottle: '1h',
+    alertThrottle: '1h',
+  },
+  references: [
+    { id: ruleId, type: 'alert', name: 'alert_0' },
+    { id: connectorId, type: 'action', name: 'action_0' },
+  ],
+  migrationVersion: {
+    'siem-detection-engine-rule-actions': '7.11.2',
+  },
+  coreMigrationVersion: '7.15.2',
+  updated_at: '2022-03-31T19:06:40.473Z',
+  version: 'WzIzNywxXQ==',
+  score: 0,
+});
+
+/**
+ * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
+ */
+export const legacyGetSiemNotificationRuleDailyActionsSOResult = (
+  ruleId = '123',
+  connectorId = '456'
+): SavedObjectsFindResult<SavedObjectAttribute> => ({
+  type: 'siem-detection-engine-rule-actions',
+  id: 'ID_OF_LEGACY_SIDECAR_DAILY_ACTIONS',
+  namespaces: ['default'],
+  attributes: {
+    actions: [
+      {
+        group: 'default',
+        actionRef: 'action_0',
+        params: {
+          message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
+          to: ['test@test.com'],
+          subject: 'Test Actions',
+        },
+        action_type_id: '.email',
+      },
+    ],
+    ruleThrottle: '1d',
+    alertThrottle: '1d',
+  },
+  references: [
+    { id: ruleId, type: 'alert', name: 'alert_0' },
+    { id: connectorId, type: 'action', name: 'action_0' },
+  ],
+  migrationVersion: {
+    'siem-detection-engine-rule-actions': '7.11.2',
+  },
+  coreMigrationVersion: '7.15.2',
+  updated_at: '2022-03-31T19:06:40.473Z',
+  version: 'WzIzNywxXQ==',
+  score: 0,
+});
+
+/**
+ * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
+ */
+export const legacyGetSiemNotificationRuleWeeklyActionsSOResult = (
+  ruleId = '123',
+  connectorId = '456'
+): SavedObjectsFindResult<SavedObjectAttribute> => ({
+  type: 'siem-detection-engine-rule-actions',
+  id: 'ID_OF_LEGACY_SIDECAR_WEEKLY_ACTIONS',
+  namespaces: ['default'],
+  attributes: {
+    actions: [
+      {
+        group: 'default',
+        actionRef: 'action_0',
+        params: {
+          message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
+          to: ['test@test.com'],
+          subject: 'Test Actions',
+        },
+        action_type_id: '.email',
+      },
+    ],
+    ruleThrottle: '7d',
+    alertThrottle: '7d',
+  },
+  references: [
+    { id: ruleId, type: 'alert', name: 'alert_0' },
+    { id: connectorId, type: 'action', name: 'action_0' },
+  ],
+  migrationVersion: {
+    'siem-detection-engine-rule-actions': '7.11.2',
+  },
+  coreMigrationVersion: '7.15.2',
+  updated_at: '2022-03-31T19:06:40.473Z',
+  version: 'WzIzNywxXQ==',
+  score: 0,
+});
+
+const getLegacyActionSOs = (ruleId = '123', connectorId = '456') => ({
+  none: () => legacyGetSiemNotificationRuleNoActionsSOResult(ruleId),
+  rule: () => legacyGetSiemNotificationRuleEveryRunSOResult(ruleId),
+  hourly: () => legacyGetSiemNotificationRuleHourlyActionsSOResult(ruleId, connectorId),
+  daily: () => legacyGetSiemNotificationRuleDailyActionsSOResult(ruleId, connectorId),
+  weekly: () => legacyGetSiemNotificationRuleWeeklyActionsSOResult(ruleId, connectorId),
+});
+
+/**
+ * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
+ */
+export const legacyGetSiemNotificationRuleActionsSOResultWithSingleHit = (
+  actionTypes: Array<'none' | 'rule' | 'daily' | 'hourly' | 'weekly'>,
+  ruleId = '123',
+  connectorId = '456'
+): SavedObjectsFindResponse<SavedObjectAttribute> => {
+  const actions = getLegacyActionSOs(ruleId, connectorId);
+
+  return {
+    page: 1,
+    per_page: 1,
+    total: 1,
+    saved_objects: actionTypes.map((type) => actions[type]()),
+  };
+};
diff --git a/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.test.ts b/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.test.ts
new file mode 100644
index 0000000000000..b49497d086efe
--- /dev/null
+++ b/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.test.ts
@@ -0,0 +1,267 @@
+/*
+ * 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 { RulesClientContext } from '../..';
+import { loggingSystemMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
+
+import {
+  legacyGetDailyNotificationResult,
+  legacyGetHourlyNotificationResult,
+  legacyGetSiemNotificationRuleActionsSOResultWithSingleHit,
+  legacyGetWeeklyNotificationResult,
+} from './retrieve_migrated_legacy_actions.mock';
+
+import { retrieveMigratedLegacyActions } from './retrieve_migrated_legacy_actions';
+
+import { find } from '../../methods/find';
+import { deleteRule } from '../../methods/delete';
+
+jest.mock('../../methods/find', () => {
+  return {
+    find: jest.fn(),
+  };
+});
+
+jest.mock('../../methods/delete', () => {
+  return {
+    deleteRule: jest.fn(),
+  };
+});
+
+const findMock = find as jest.Mock;
+const deleteRuleMock = deleteRule as jest.Mock;
+
+const getEmptyFindResult = () => ({
+  page: 0,
+  per_page: 0,
+  total: 0,
+  data: [],
+});
+
+describe('Legacy rule action migration logic', () => {
+  describe('legacyMigrate', () => {
+    let savedObjectsClient: ReturnType<typeof savedObjectsClientMock.create>;
+    let logger: ReturnType<typeof loggingSystemMock.createLogger>;
+
+    beforeEach(() => {
+      logger = loggingSystemMock.createLogger();
+      savedObjectsClient = savedObjectsClientMock.create();
+    });
+
+    const ruleId = '123';
+    const connectorId = '456';
+
+    test('it does no cleanup or migration if no legacy remnants found', async () => {
+      findMock.mockResolvedValueOnce(getEmptyFindResult());
+      savedObjectsClient.find.mockResolvedValueOnce({
+        total: 0,
+        per_page: 0,
+        page: 1,
+        saved_objects: [],
+      });
+
+      const migratedProperties = await retrieveMigratedLegacyActions(
+        {
+          unsecuredSavedObjectsClient: savedObjectsClient,
+          logger,
+        } as unknown as RulesClientContext,
+        { ruleId }
+      );
+
+      expect(deleteRuleMock).not.toHaveBeenCalled();
+      expect(savedObjectsClient.delete).not.toHaveBeenCalled();
+      expect(migratedProperties).toEqual({ legacyActions: [], legacyActionsReferences: [] });
+    });
+
+    // Even if a rule is created with no actions pre 7.16, a
+    // siem-detection-engine-rule-actions SO is still created
+    test('it migrates a rule with no actions', async () => {
+      // siem.notifications is not created for a rule with no actions
+      findMock.mockResolvedValueOnce(getEmptyFindResult());
+      // siem-detection-engine-rule-actions SO is still created
+      savedObjectsClient.find.mockResolvedValueOnce(
+        legacyGetSiemNotificationRuleActionsSOResultWithSingleHit(['none'], ruleId, connectorId)
+      );
+
+      const migratedProperties = await retrieveMigratedLegacyActions(
+        {
+          unsecuredSavedObjectsClient: savedObjectsClient,
+          logger,
+        } as unknown as RulesClientContext,
+        { ruleId }
+      );
+
+      expect(deleteRuleMock).not.toHaveBeenCalled();
+      expect(savedObjectsClient.delete).toHaveBeenCalledWith(
+        'siem-detection-engine-rule-actions',
+        'ID_OF_LEGACY_SIDECAR_NO_ACTIONS'
+      );
+      expect(migratedProperties).toEqual({ legacyActions: [], legacyActionsReferences: [] });
+    });
+
+    test('it migrates a rule with every rule run action', async () => {
+      // siem.notifications is not created for a rule with actions run every rule run
+      findMock.mockResolvedValueOnce(getEmptyFindResult());
+      // siem-detection-engine-rule-actions SO is still created
+      savedObjectsClient.find.mockResolvedValueOnce(
+        legacyGetSiemNotificationRuleActionsSOResultWithSingleHit(['rule'], ruleId, connectorId)
+      );
+
+      const migratedProperties = await retrieveMigratedLegacyActions(
+        {
+          unsecuredSavedObjectsClient: savedObjectsClient,
+          logger,
+        } as unknown as RulesClientContext,
+        { ruleId }
+      );
+
+      expect(deleteRuleMock).not.toHaveBeenCalled();
+      expect(savedObjectsClient.delete).toHaveBeenCalledWith(
+        'siem-detection-engine-rule-actions',
+        'ID_OF_LEGACY_SIDECAR_RULE_RUN_ACTIONS'
+      );
+
+      expect(migratedProperties).toEqual({ legacyActions: [], legacyActionsReferences: [] });
+    });
+
+    test('it migrates a rule with daily legacy actions', async () => {
+      // siem.notifications is not created for a rule with no actions
+      findMock.mockResolvedValueOnce({
+        page: 1,
+        perPage: 1,
+        total: 1,
+        data: [legacyGetDailyNotificationResult(connectorId, ruleId)],
+      });
+      // siem-detection-engine-rule-actions SO is still created
+      savedObjectsClient.find.mockResolvedValueOnce(
+        legacyGetSiemNotificationRuleActionsSOResultWithSingleHit(['daily'], ruleId, connectorId)
+      );
+
+      const migratedProperties = await retrieveMigratedLegacyActions(
+        {
+          unsecuredSavedObjectsClient: savedObjectsClient,
+          logger,
+        } as unknown as RulesClientContext,
+        { ruleId }
+      );
+
+      expect(deleteRuleMock).toHaveBeenCalledWith(expect.any(Object), { id: '456' });
+      expect(savedObjectsClient.delete).toHaveBeenCalledWith(
+        'siem-detection-engine-rule-actions',
+        'ID_OF_LEGACY_SIDECAR_DAILY_ACTIONS'
+      );
+
+      expect(migratedProperties).toEqual({
+        legacyActions: [
+          {
+            actionRef: 'action_0',
+            actionTypeId: '.email',
+            frequency: { notifyWhen: 'onThrottleInterval', summary: true, throttle: '1d' },
+            group: 'default',
+            params: {
+              message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
+              subject: 'Test Actions',
+              to: ['test@test.com'],
+            },
+            uuid: expect.any(String),
+          },
+        ],
+        legacyActionsReferences: [{ id: '456', name: 'action_0', type: 'action' }],
+      });
+    });
+
+    test('it migrates a rule with hourly legacy actions', async () => {
+      // siem.notifications is not created for a rule with no actions
+      findMock.mockResolvedValueOnce({
+        page: 1,
+        perPage: 1,
+        total: 1,
+        data: [legacyGetHourlyNotificationResult(connectorId, ruleId)],
+      });
+      // siem-detection-engine-rule-actions SO is still created
+      savedObjectsClient.find.mockResolvedValueOnce(
+        legacyGetSiemNotificationRuleActionsSOResultWithSingleHit(['hourly'], ruleId, connectorId)
+      );
+
+      const migratedProperties = await retrieveMigratedLegacyActions(
+        {
+          unsecuredSavedObjectsClient: savedObjectsClient,
+          logger,
+        } as unknown as RulesClientContext,
+        { ruleId }
+      );
+
+      expect(deleteRuleMock).toHaveBeenCalledWith(expect.any(Object), { id: '456' });
+      expect(savedObjectsClient.delete).toHaveBeenCalledWith(
+        'siem-detection-engine-rule-actions',
+        'ID_OF_LEGACY_SIDECAR_HOURLY_ACTIONS'
+      );
+      expect(migratedProperties).toEqual({
+        legacyActions: [
+          {
+            actionRef: 'action_0',
+            actionTypeId: '.email',
+            frequency: { notifyWhen: 'onThrottleInterval', summary: true, throttle: '1h' },
+            group: 'default',
+            params: {
+              message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
+              subject: 'Test Actions',
+              to: ['test@test.com'],
+            },
+            uuid: expect.any(String),
+          },
+        ],
+        legacyActionsReferences: [{ id: '456', name: 'action_0', type: 'action' }],
+      });
+    });
+
+    test('it migrates a rule with weekly legacy actions', async () => {
+      // siem.notifications is not created for a rule with no actions
+      findMock.mockResolvedValueOnce({
+        page: 1,
+        perPage: 1,
+        total: 1,
+        data: [legacyGetWeeklyNotificationResult(connectorId, ruleId)],
+      });
+      // siem-detection-engine-rule-actions SO is still created
+      savedObjectsClient.find.mockResolvedValueOnce(
+        legacyGetSiemNotificationRuleActionsSOResultWithSingleHit(['weekly'], ruleId, connectorId)
+      );
+
+      const migratedProperties = await retrieveMigratedLegacyActions(
+        {
+          unsecuredSavedObjectsClient: savedObjectsClient,
+          logger,
+        } as unknown as RulesClientContext,
+        { ruleId }
+      );
+
+      expect(deleteRuleMock).toHaveBeenCalledWith(expect.any(Object), { id: '456' });
+      expect(savedObjectsClient.delete).toHaveBeenCalledWith(
+        'siem-detection-engine-rule-actions',
+        'ID_OF_LEGACY_SIDECAR_WEEKLY_ACTIONS'
+      );
+      expect(migratedProperties).toEqual({
+        legacyActions: [
+          {
+            actionRef: 'action_0',
+            actionTypeId: '.email',
+            frequency: { notifyWhen: 'onThrottleInterval', summary: true, throttle: '7d' },
+            group: 'default',
+            params: {
+              message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
+              subject: 'Test Actions',
+              to: ['test@test.com'],
+            },
+            uuid: expect.any(String),
+          },
+        ],
+        legacyActionsReferences: [{ id: '456', name: 'action_0', type: 'action' }],
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.ts b/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.ts
new file mode 100644
index 0000000000000..83cd315aaa5a5
--- /dev/null
+++ b/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.ts
@@ -0,0 +1,117 @@
+/*
+ * 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 { SavedObjectReference } from '@kbn/core/server';
+import type { RulesClientContext } from '../..';
+import { RawRuleAction } from '../../../types';
+import { find } from '../../methods/find';
+import { deleteRule } from '../../methods/delete';
+import { LegacyIRuleActionsAttributes, legacyRuleActionsSavedObjectType } from './types';
+import { transformFromLegacyActions } from './transform_legacy_actions';
+
+type RetrieveMigratedLegacyActions = (
+  context: RulesClientContext,
+  { ruleId }: { ruleId: string }
+) => Promise<{ legacyActions: RawRuleAction[]; legacyActionsReferences: SavedObjectReference[] }>;
+
+/**
+ * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
+ * retrieves legacy actions for SIEM rule and deletes associated sidecar SO
+ * @param context RulesClient context
+ * @param params.ruleId - id of rule to be migrated
+ * @returns
+ */
+export const retrieveMigratedLegacyActions: RetrieveMigratedLegacyActions = async (
+  context,
+  { ruleId }
+) => {
+  const { unsecuredSavedObjectsClient } = context;
+  try {
+    if (ruleId == null) {
+      return { legacyActions: [], legacyActionsReferences: [] };
+    }
+
+    /**
+     * On update / patch I'm going to take the actions as they are, better off taking rules client.find (siem.notification) result
+     * and putting that into the actions array of the rule, then set the rules onThrottle property, notifyWhen and throttle from null -> actual value (1hr etc..)
+     * Then use the rules client to delete the siem.notification
+     * Then with the legacy Rule Actions saved object type, just delete it.
+     */
+    // find it using the references array, not params.ruleAlertId
+    const [siemNotification, legacyRuleActionsSO] = await Promise.all([
+      find(context, {
+        options: {
+          filter: 'alert.attributes.alertTypeId:(siem.notifications)',
+          hasReference: {
+            type: 'alert',
+            id: ruleId,
+          },
+        },
+      }),
+      unsecuredSavedObjectsClient.find<LegacyIRuleActionsAttributes>({
+        type: legacyRuleActionsSavedObjectType,
+        hasReference: {
+          type: 'alert',
+          id: ruleId,
+        },
+      }),
+    ]);
+
+    const siemNotificationsExist = siemNotification != null && siemNotification.data.length > 0;
+    const legacyRuleNotificationSOsExist =
+      legacyRuleActionsSO != null && legacyRuleActionsSO.saved_objects.length > 0;
+
+    // Assumption: if no legacy sidecar SO or notification rule types exist
+    // that reference the rule in question, assume rule actions are not legacy
+    if (!siemNotificationsExist && !legacyRuleNotificationSOsExist) {
+      return { legacyActions: [], legacyActionsReferences: [] };
+    }
+
+    await Promise.all([
+      // If the legacy notification rule type ("siem.notification") exist,
+      // migration and cleanup are needed
+      siemNotificationsExist && deleteRule(context, { id: siemNotification.data[0].id }),
+      // Delete the legacy sidecar SO if it exists
+      legacyRuleNotificationSOsExist &&
+        unsecuredSavedObjectsClient.delete(
+          legacyRuleActionsSavedObjectType,
+          legacyRuleActionsSO.saved_objects[0].id
+        ),
+    ]);
+
+    // If legacy notification sidecar ("siem-detection-engine-rule-actions")
+    // exist, migration is needed
+    if (legacyRuleNotificationSOsExist) {
+      // If "siem-detection-engine-rule-actions" notes that `ruleThrottle` is
+      // "no_actions" or "rule", rule has no actions or rule is set to run
+      // action on every rule run. In these cases, sidecar deletion is the only
+      // cleanup needed and updates to the "throttle" and "notifyWhen". "siem.notification" are
+      // not created for these action types
+      if (
+        legacyRuleActionsSO.saved_objects[0].attributes.ruleThrottle === 'no_actions' ||
+        legacyRuleActionsSO.saved_objects[0].attributes.ruleThrottle === 'rule'
+      ) {
+        return { legacyActions: [], legacyActionsReferences: [] };
+      }
+
+      return {
+        legacyActions: transformFromLegacyActions(
+          legacyRuleActionsSO.saved_objects[0].attributes,
+          legacyRuleActionsSO.saved_objects[0].references
+        ),
+        legacyActionsReferences:
+          // only action references need to be saved
+          legacyRuleActionsSO.saved_objects[0].references.filter(({ type }) => type === 'action') ??
+          [],
+      };
+    }
+  } catch (e) {
+    context.logger.debug(`Migration has failed for rule ${ruleId}: ${e.message}`);
+  }
+
+  return { legacyActions: [], legacyActionsReferences: [] };
+};
diff --git a/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/transform_legacy_actions.test.ts b/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/transform_legacy_actions.test.ts
new file mode 100644
index 0000000000000..b23798294b300
--- /dev/null
+++ b/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/transform_legacy_actions.test.ts
@@ -0,0 +1,89 @@
+/*
+ * 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 { SavedObjectReference } from '@kbn/core/server';
+
+import { transformFromLegacyActions } from './transform_legacy_actions';
+import { transformToNotifyWhen } from './transform_to_notify_when';
+import { LegacyIRuleActionsAttributes } from './types';
+
+jest.mock('./transform_to_notify_when', () => ({
+  transformToNotifyWhen: jest.fn(),
+}));
+
+const legacyActionsAttr: LegacyIRuleActionsAttributes = {
+  actions: [
+    {
+      group: 'group_1',
+      params: {},
+      action_type_id: 'action_type_1',
+      actionRef: 'action_0',
+    },
+  ],
+  ruleThrottle: '1d',
+  alertThrottle: '1d',
+};
+
+const references: SavedObjectReference[] = [
+  {
+    name: 'action_0',
+    id: 'action-123',
+    type: 'action',
+  },
+];
+
+describe('transformFromLegacyActions', () => {
+  it('should throw error if if references are empty', () => {
+    const executor = () => {
+      return transformFromLegacyActions(legacyActionsAttr, []);
+    };
+    expect(executor).toThrow('Connector reference id not found.');
+  });
+  it('should return empty list of actions if legacy actions do not have correct references', () => {
+    const actions = transformFromLegacyActions(legacyActionsAttr, [
+      {
+        name: 'alert_0',
+        id: 'alert-1',
+        type: 'alert',
+      },
+    ]);
+
+    expect(actions).toHaveLength(0);
+  });
+
+  it('should return notifyWhen as result of transformToNotifyWhen if it is not null', () => {
+    (transformToNotifyWhen as jest.Mock).mockReturnValueOnce('onActiveAlert');
+    const actions = transformFromLegacyActions(legacyActionsAttr, references);
+
+    expect(transformToNotifyWhen).toHaveBeenCalledWith('1d');
+    expect(actions[0].frequency?.notifyWhen).toBe('onActiveAlert');
+  });
+
+  it('should return notifyWhen as onThrottleInterval when transformToNotifyWhen returns null', () => {
+    (transformToNotifyWhen as jest.Mock).mockReturnValueOnce(null);
+    const actions = transformFromLegacyActions(legacyActionsAttr, references);
+
+    expect(actions[0].frequency?.notifyWhen).toBe('onThrottleInterval');
+  });
+
+  it('should return transformed legacy actions', () => {
+    (transformToNotifyWhen as jest.Mock).mockReturnValue('onThrottleInterval');
+
+    const actions = transformFromLegacyActions(legacyActionsAttr, references);
+
+    expect(actions).toEqual([
+      {
+        actionRef: 'action_0',
+        actionTypeId: 'action_type_1',
+        frequency: { notifyWhen: 'onThrottleInterval', summary: true, throttle: '1d' },
+        group: 'group_1',
+        params: {},
+        uuid: expect.any(String),
+      },
+    ]);
+  });
+});
diff --git a/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/transform_legacy_actions.ts b/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/transform_legacy_actions.ts
new file mode 100644
index 0000000000000..485a32f781695
--- /dev/null
+++ b/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/transform_legacy_actions.ts
@@ -0,0 +1,59 @@
+/*
+ * 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 { v4 } from 'uuid';
+import { isEmpty } from 'lodash/fp';
+import type { SavedObjectReference } from '@kbn/core/server';
+import { RawRuleAction } from '../../../types';
+import { transformToNotifyWhen } from './transform_to_notify_when';
+import { LegacyIRuleActionsAttributes } from './types';
+
+/**
+ * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
+ * transforms siem legacy actions {@link LegacyIRuleActionsAttributes} objects into {@link RawRuleAction}
+ * @param legacyActionsAttr
+ * @param references
+ * @returns array of RawRuleAction
+ */
+export const transformFromLegacyActions = (
+  legacyActionsAttr: LegacyIRuleActionsAttributes,
+  references: SavedObjectReference[]
+): RawRuleAction[] => {
+  const actionReference = references.reduce<Record<string, SavedObjectReference>>(
+    (acc, reference) => {
+      acc[reference.name] = reference;
+      return acc;
+    },
+    {}
+  );
+
+  if (isEmpty(actionReference)) {
+    throw new Error(`Connector reference id not found.`);
+  }
+
+  return legacyActionsAttr.actions.reduce<RawRuleAction[]>((acc, action) => {
+    const { actionRef, action_type_id: actionTypeId, group, params } = action;
+    if (!actionReference[actionRef]) {
+      return acc;
+    }
+    return [
+      ...acc,
+      {
+        group,
+        params,
+        uuid: v4(),
+        actionRef,
+        actionTypeId,
+        frequency: {
+          summary: true,
+          notifyWhen: transformToNotifyWhen(legacyActionsAttr.ruleThrottle) ?? 'onThrottleInterval',
+          throttle: legacyActionsAttr.ruleThrottle,
+        },
+      },
+    ];
+  }, []);
+};
diff --git a/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/transform_to_notify_when.test.ts b/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/transform_to_notify_when.test.ts
new file mode 100644
index 0000000000000..9d3fae5d3cb2c
--- /dev/null
+++ b/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/transform_to_notify_when.test.ts
@@ -0,0 +1,23 @@
+/*
+ * 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 { transformToNotifyWhen } from './transform_to_notify_when';
+
+describe('transformToNotifyWhen', () => {
+  it('should return null when throttle is null OR no_actions', () => {
+    expect(transformToNotifyWhen(null)).toBeNull();
+    expect(transformToNotifyWhen('no_actions')).toBeNull();
+  });
+  it('should return onActiveAlert when throttle is rule', () => {
+    expect(transformToNotifyWhen('rule')).toBe('onActiveAlert');
+  });
+  it('should return onThrottleInterval for other throttle values', () => {
+    expect(transformToNotifyWhen('1h')).toBe('onThrottleInterval');
+    expect(transformToNotifyWhen('1m')).toBe('onThrottleInterval');
+    expect(transformToNotifyWhen('1d')).toBe('onThrottleInterval');
+  });
+});
diff --git a/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/transform_to_notify_when.ts b/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/transform_to_notify_when.ts
new file mode 100644
index 0000000000000..76c43617adc22
--- /dev/null
+++ b/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/transform_to_notify_when.ts
@@ -0,0 +1,25 @@
+/*
+ * 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 { RuleNotifyWhenType } from '../../../../common';
+
+/**
+ * Given a throttle from a "security_solution" rule this will transform it into an "alerting" notifyWhen
+ * on their saved object.
+ * @params throttle The throttle from a "security_solution" rule
+ * @returns The correct "NotifyWhen" for a Kibana alerting.
+ */
+export const transformToNotifyWhen = (
+  throttle: string | null | undefined
+): RuleNotifyWhenType | null => {
+  if (throttle == null || throttle === 'no_actions') {
+    return null; // Although I return null, this does not change the value of the "notifyWhen" and it keeps the current value of "notifyWhen"
+  } else if (throttle === 'rule') {
+    return 'onActiveAlert';
+  } else {
+    return 'onThrottleInterval';
+  }
+};
diff --git a/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/types.ts b/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/types.ts
new file mode 100644
index 0000000000000..487f18807d35b
--- /dev/null
+++ b/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/types.ts
@@ -0,0 +1,50 @@
+/*
+ * 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 { RuleActionParams } from '../../../types';
+import type { RuleTypeParams } from '../../..';
+import type { Rule } from '../../../../common';
+
+/**
+ * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
+ */
+export const legacyRuleActionsSavedObjectType = 'siem-detection-engine-rule-actions';
+
+/**
+ * This is how it is stored on disk in its "raw format" for 7.16+
+ * @deprecated Remove this once the legacy notification/side car is gone
+ */
+export interface LegacyRuleAlertSavedObjectAction {
+  group: string;
+  params: RuleActionParams;
+  action_type_id: string;
+  actionRef: string;
+}
+
+/**
+ * We keep this around to migrate and update data for the old deprecated rule actions saved object mapping but we
+ * do not use it anymore within the code base. Once we feel comfortable that users are upgrade far enough and this is no longer
+ * needed then it will be safe to remove this saved object and all its migrations.
+ * @deprecated Remove this once the legacy notification/side car is gone
+ */
+export interface LegacyIRuleActionsAttributes extends Record<string, unknown> {
+  actions: LegacyRuleAlertSavedObjectAction[];
+  ruleThrottle: string;
+  alertThrottle: string | null;
+}
+
+/**
+ * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
+ */
+interface LegacyRuleNotificationAlertTypeParams extends RuleTypeParams {
+  ruleAlertId: string;
+}
+
+/**
+ * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
+ */
+export type LegacyRuleNotificationAlertType = Rule<LegacyRuleNotificationAlertTypeParams>;
diff --git a/x-pack/plugins/alerting/server/rules_client/methods/bulk_delete.ts b/x-pack/plugins/alerting/server/rules_client/methods/bulk_delete.ts
index 0142fbe9e4ebb..03ce78952e9db 100644
--- a/x-pack/plugins/alerting/server/rules_client/methods/bulk_delete.ts
+++ b/x-pack/plugins/alerting/server/rules_client/methods/bulk_delete.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
+import pMap from 'p-map';
 import { KueryNode, nodeBuilder } from '@kbn/es-query';
 import { SavedObjectsBulkUpdateObject } from '@kbn/core/server';
 import { withSpan } from '@kbn/apm-utils';
@@ -13,7 +13,13 @@ import { convertRuleIdsToKueryNode } from '../../lib';
 import { bulkMarkApiKeysForInvalidation } from '../../invalidate_pending_api_keys/bulk_mark_api_keys_for_invalidation';
 import { ruleAuditEvent, RuleAuditAction } from '../common/audit_events';
 import { tryToRemoveTasks } from '../common';
-import { getAuthorizationFilter, checkAuthorizationAndGetTotal, getAlertFromRaw } from '../lib';
+import { API_KEY_GENERATE_CONCURRENCY } from '../common/constants';
+import {
+  getAuthorizationFilter,
+  checkAuthorizationAndGetTotal,
+  getAlertFromRaw,
+  migrateLegacyActions,
+} from '../lib';
 import {
   retryIfBulkOperationConflicts,
   buildKueryNodeFilter,
@@ -166,6 +172,20 @@ const bulkDeleteWithOCC = async (
   });
   const rules = rulesToDelete.filter((rule) => deletedRuleIds.includes(rule.id));
 
+  // migrate legacy actions only for SIEM rules
+  await pMap(
+    rules,
+    async (rule) => {
+      await migrateLegacyActions(context, {
+        ruleId: rule.id,
+        attributes: rule.attributes as RawRule,
+        skipActionsValidation: true,
+      });
+    },
+    // max concurrency for bulk edit operations, that is limited by api key generations, should be sufficient for bulk migrations
+    { concurrency: API_KEY_GENERATE_CONCURRENCY }
+  );
+
   return {
     errors,
     rules,
diff --git a/x-pack/plugins/alerting/server/rules_client/methods/bulk_disable.ts b/x-pack/plugins/alerting/server/rules_client/methods/bulk_disable.ts
index 06efa425eccef..5ec0ae99ca99c 100644
--- a/x-pack/plugins/alerting/server/rules_client/methods/bulk_disable.ts
+++ b/x-pack/plugins/alerting/server/rules_client/methods/bulk_disable.ts
@@ -4,7 +4,6 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
 import { KueryNode, nodeBuilder } from '@kbn/es-query';
 import { SavedObjectsBulkUpdateObject } from '@kbn/core/server';
 import { withSpan } from '@kbn/apm-utils';
@@ -25,6 +24,7 @@ import {
   getAlertFromRaw,
   recoverRuleAlerts,
   updateMeta,
+  migrateLegacyActions,
 } from '../lib';
 import { BulkOptions, BulkOperationError, RulesClientContext } from '../types';
 import { tryToRemoveTasks } from '../common';
@@ -119,8 +119,22 @@ const bulkDisableRulesWithOCC = async (
               ruleNameToRuleIdMapping[rule.id] = rule.attributes.name;
             }
 
+            const migratedActions = await migrateLegacyActions(context, {
+              ruleId: rule.id,
+              actions: rule.attributes.actions,
+              references: rule.references,
+              attributes: rule.attributes,
+            });
+
             const updatedAttributes = updateMeta(context, {
               ...rule.attributes,
+              ...(migratedActions.hasLegacyActions
+                ? {
+                    actions: migratedActions.resultedActions,
+                    throttle: undefined,
+                    notifyWhen: undefined,
+                  }
+                : {}),
               enabled: false,
               scheduledTaskId:
                 rule.attributes.scheduledTaskId === rule.id
@@ -135,6 +149,9 @@ const bulkDisableRulesWithOCC = async (
               attributes: {
                 ...updatedAttributes,
               },
+              ...(migratedActions.hasLegacyActions
+                ? { references: migratedActions.resultedReferences }
+                : {}),
             });
 
             context.auditLogger?.log(
diff --git a/x-pack/plugins/alerting/server/rules_client/methods/bulk_edit.ts b/x-pack/plugins/alerting/server/rules_client/methods/bulk_edit.ts
index a3d845af2c0af..dfe4ecc952bf6 100644
--- a/x-pack/plugins/alerting/server/rules_client/methods/bulk_edit.ts
+++ b/x-pack/plugins/alerting/server/rules_client/methods/bulk_edit.ts
@@ -69,6 +69,8 @@ import {
   NormalizedAlertActionWithGeneratedValues,
 } from '../types';
 
+import { migrateLegacyActions } from '../lib';
+
 export type BulkEditFields = keyof Pick<
   Rule,
   'actions' | 'tags' | 'schedule' | 'throttle' | 'notifyWhen' | 'snoozeSchedule' | 'apiKey'
@@ -449,6 +451,19 @@ async function updateRuleAttributesAndParamsInMemory<Params extends RuleTypePara
 
     await ensureAuthorizationForBulkUpdate(context, operations, rule);
 
+    // migrate legacy actions only for SIEM rules
+    const migratedActions = await migrateLegacyActions(context, {
+      ruleId: rule.id,
+      actions: rule.attributes.actions,
+      references: rule.references,
+      attributes: rule.attributes,
+    });
+
+    if (migratedActions.hasLegacyActions) {
+      rule.attributes.actions = migratedActions.resultedActions;
+      rule.references = migratedActions.resultedReferences;
+    }
+
     const { attributes, ruleActions, hasUpdateApiKeyOperation, isAttributesUpdateSkipped } =
       await getUpdatedAttributesFromOperations(context, operations, rule, ruleType);
 
@@ -625,7 +640,9 @@ async function getUpdatedAttributesFromOperations(
 
         // TODO https://github.com/elastic/kibana/issues/148414
         // If any action-level frequencies get pushed into a SIEM rule, strip their frequencies
-        const firstFrequency = updatedOperation.value[0]?.frequency;
+        const firstFrequency = updatedOperation.value.find(
+          (action) => action?.frequency
+        )?.frequency;
         if (rule.attributes.consumer === AlertConsumers.SIEM && firstFrequency) {
           ruleActions.actions = ruleActions.actions.map((action) => omit(action, 'frequency'));
           if (!attributes.notifyWhen) {
diff --git a/x-pack/plugins/alerting/server/rules_client/methods/bulk_enable.ts b/x-pack/plugins/alerting/server/rules_client/methods/bulk_enable.ts
index 7273855379a1c..570ad3d5abc56 100644
--- a/x-pack/plugins/alerting/server/rules_client/methods/bulk_enable.ts
+++ b/x-pack/plugins/alerting/server/rules_client/methods/bulk_enable.ts
@@ -4,7 +4,6 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
 import pMap from 'p-map';
 import { KueryNode, nodeBuilder } from '@kbn/es-query';
 import { SavedObjectsBulkUpdateObject } from '@kbn/core/server';
@@ -26,6 +25,7 @@ import {
   scheduleTask,
   updateMeta,
   createNewAPIKeySet,
+  migrateLegacyActions,
 } from '../lib';
 import { RulesClientContext, BulkOperationError, BulkOptions } from '../types';
 
@@ -143,6 +143,13 @@ const bulkEnableRulesWithOCC = async (
               ruleNameToRuleIdMapping[rule.id] = rule.attributes.name;
             }
 
+            const migratedActions = await migrateLegacyActions(context, {
+              ruleId: rule.id,
+              actions: rule.attributes.actions,
+              references: rule.references,
+              attributes: rule.attributes,
+            });
+
             const updatedAttributes = updateMeta(context, {
               ...rule.attributes,
               ...(!rule.attributes.apiKey &&
@@ -152,6 +159,13 @@ const bulkEnableRulesWithOCC = async (
                   username,
                   shouldUpdateApiKey: true,
                 }))),
+              ...(migratedActions.hasLegacyActions
+                ? {
+                    actions: migratedActions.resultedActions,
+                    throttle: undefined,
+                    notifyWhen: undefined,
+                  }
+                : {}),
               enabled: true,
               updatedBy: username,
               updatedAt: new Date().toISOString(),
@@ -187,6 +201,9 @@ const bulkEnableRulesWithOCC = async (
                 ...updatedAttributes,
                 ...(scheduledTaskId ? { scheduledTaskId } : undefined),
               },
+              ...(migratedActions.hasLegacyActions
+                ? { references: migratedActions.resultedReferences }
+                : {}),
             });
 
             context.auditLogger?.log(
diff --git a/x-pack/plugins/alerting/server/rules_client/methods/create.ts b/x-pack/plugins/alerting/server/rules_client/methods/create.ts
index 4d2e586dcaade..4bf83043f99af 100644
--- a/x-pack/plugins/alerting/server/rules_client/methods/create.ts
+++ b/x-pack/plugins/alerting/server/rules_client/methods/create.ts
@@ -113,7 +113,7 @@ export async function create<Params extends RuleTypeParams = never>(
 
   // TODO https://github.com/elastic/kibana/issues/148414
   // If any action-level frequencies get pushed into a SIEM rule, strip their frequencies
-  const firstFrequency = data.actions[0]?.frequency;
+  const firstFrequency = data.actions.find((action) => action?.frequency)?.frequency;
   if (data.consumer === AlertConsumers.SIEM && firstFrequency) {
     data.actions = data.actions.map((action) => omit(action, 'frequency'));
     if (!data.notifyWhen) {
diff --git a/x-pack/plugins/alerting/server/rules_client/methods/delete.ts b/x-pack/plugins/alerting/server/rules_client/methods/delete.ts
index ca6feefe3ff9b..605753cfcdfc8 100644
--- a/x-pack/plugins/alerting/server/rules_client/methods/delete.ts
+++ b/x-pack/plugins/alerting/server/rules_client/methods/delete.ts
@@ -5,12 +5,14 @@
  * 2.0.
  */
 
+import { AlertConsumers } from '@kbn/rule-data-utils';
 import { RawRule } from '../../types';
 import { WriteOperations, AlertingAuthorizationEntity } from '../../authorization';
 import { retryIfConflicts } from '../../lib/retry_if_conflicts';
 import { bulkMarkApiKeysForInvalidation } from '../../invalidate_pending_api_keys/bulk_mark_api_keys_for_invalidation';
 import { ruleAuditEvent, RuleAuditAction } from '../common/audit_events';
 import { RulesClientContext } from '../types';
+import { migrateLegacyActions } from '../lib';
 
 export async function deleteRule(context: RulesClientContext, { id }: { id: string }) {
   return await retryIfConflicts(
@@ -64,6 +66,11 @@ async function deleteWithOCC(context: RulesClientContext, { id }: { id: string }
     throw error;
   }
 
+  // migrate legacy actions only for SIEM rules
+  if (attributes.consumer === AlertConsumers.SIEM) {
+    await migrateLegacyActions(context, { ruleId: id, attributes, skipActionsValidation: true });
+  }
+
   context.auditLogger?.log(
     ruleAuditEvent({
       action: RuleAuditAction.DELETE,
diff --git a/x-pack/plugins/alerting/server/rules_client/methods/disable.ts b/x-pack/plugins/alerting/server/rules_client/methods/disable.ts
index bbdb1ade167eb..1382b7d14b111 100644
--- a/x-pack/plugins/alerting/server/rules_client/methods/disable.ts
+++ b/x-pack/plugins/alerting/server/rules_client/methods/disable.ts
@@ -4,13 +4,14 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import type { SavedObjectReference } from '@kbn/core/server';
 
 import { RawRule } from '../../types';
 import { WriteOperations, AlertingAuthorizationEntity } from '../../authorization';
 import { retryIfConflicts } from '../../lib/retry_if_conflicts';
 import { ruleAuditEvent, RuleAuditAction } from '../common/audit_events';
 import { RulesClientContext } from '../types';
-import { recoverRuleAlerts, updateMeta } from '../lib';
+import { recoverRuleAlerts, updateMeta, migrateLegacyActions } from '../lib';
 
 export async function disable(context: RulesClientContext, { id }: { id: string }): Promise<void> {
   return await retryIfConflicts(
@@ -23,6 +24,7 @@ export async function disable(context: RulesClientContext, { id }: { id: string
 async function disableWithOCC(context: RulesClientContext, { id }: { id: string }) {
   let attributes: RawRule;
   let version: string | undefined;
+  let references: SavedObjectReference[];
 
   try {
     const decryptedAlert =
@@ -31,12 +33,14 @@ async function disableWithOCC(context: RulesClientContext, { id }: { id: string
       });
     attributes = decryptedAlert.attributes;
     version = decryptedAlert.version;
+    references = decryptedAlert.references;
   } catch (e) {
     context.logger.error(`disable(): Failed to load API key of alert ${id}: ${e.message}`);
     // Still attempt to load the attributes and version using SOC
     const alert = await context.unsecuredSavedObjectsClient.get<RawRule>('alert', id);
     attributes = alert.attributes;
     version = alert.version;
+    references = alert.references;
   }
 
   await recoverRuleAlerts(context, id, attributes);
@@ -70,6 +74,13 @@ async function disableWithOCC(context: RulesClientContext, { id }: { id: string
   context.ruleTypeRegistry.ensureRuleTypeEnabled(attributes.alertTypeId);
 
   if (attributes.enabled === true) {
+    const migratedActions = await migrateLegacyActions(context, {
+      ruleId: id,
+      actions: attributes.actions,
+      references,
+      attributes,
+    });
+
     await context.unsecuredSavedObjectsClient.update(
       'alert',
       id,
@@ -80,8 +91,16 @@ async function disableWithOCC(context: RulesClientContext, { id }: { id: string
         updatedBy: await context.getUserName(),
         updatedAt: new Date().toISOString(),
         nextRun: null,
+        ...(migratedActions.hasLegacyActions
+          ? { actions: migratedActions.resultedActions, throttle: undefined, notifyWhen: undefined }
+          : {}),
       }),
-      { version }
+      {
+        version,
+        ...(migratedActions.hasLegacyActions
+          ? { references: migratedActions.resultedReferences }
+          : {}),
+      }
     );
 
     // If the scheduledTaskId does not match the rule id, we should
diff --git a/x-pack/plugins/alerting/server/rules_client/methods/enable.ts b/x-pack/plugins/alerting/server/rules_client/methods/enable.ts
index a70b71b7b5116..0cd42f282bcbc 100644
--- a/x-pack/plugins/alerting/server/rules_client/methods/enable.ts
+++ b/x-pack/plugins/alerting/server/rules_client/methods/enable.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
+import type { SavedObjectReference } from '@kbn/core/server';
 import { TaskStatus } from '@kbn/task-manager-plugin/server';
 import { RawRule, IntervalSchedule } from '../../types';
 import { resetMonitoringLastRun, getNextRun } from '../../lib';
@@ -12,7 +12,7 @@ import { WriteOperations, AlertingAuthorizationEntity } from '../../authorizatio
 import { retryIfConflicts } from '../../lib/retry_if_conflicts';
 import { ruleAuditEvent, RuleAuditAction } from '../common/audit_events';
 import { RulesClientContext } from '../types';
-import { updateMeta, createNewAPIKeySet, scheduleTask } from '../lib';
+import { updateMeta, createNewAPIKeySet, scheduleTask, migrateLegacyActions } from '../lib';
 
 export async function enable(context: RulesClientContext, { id }: { id: string }): Promise<void> {
   return await retryIfConflicts(
@@ -26,6 +26,7 @@ async function enableWithOCC(context: RulesClientContext, { id }: { id: string }
   let existingApiKey: string | null = null;
   let attributes: RawRule;
   let version: string | undefined;
+  let references: SavedObjectReference[];
 
   try {
     const decryptedAlert =
@@ -35,12 +36,14 @@ async function enableWithOCC(context: RulesClientContext, { id }: { id: string }
     existingApiKey = decryptedAlert.attributes.apiKey;
     attributes = decryptedAlert.attributes;
     version = decryptedAlert.version;
+    references = decryptedAlert.references;
   } catch (e) {
     context.logger.error(`enable(): Failed to load API key of alert ${id}: ${e.message}`);
     // Still attempt to load the attributes and version using SOC
     const alert = await context.unsecuredSavedObjectsClient.get<RawRule>('alert', id);
     attributes = alert.attributes;
     version = alert.version;
+    references = alert.references;
   }
 
   try {
@@ -76,6 +79,13 @@ async function enableWithOCC(context: RulesClientContext, { id }: { id: string }
   context.ruleTypeRegistry.ensureRuleTypeEnabled(attributes.alertTypeId);
 
   if (attributes.enabled === false) {
+    const migratedActions = await migrateLegacyActions(context, {
+      ruleId: id,
+      actions: attributes.actions,
+      references,
+      attributes,
+    });
+
     const username = await context.getUserName();
     const now = new Date();
 
@@ -107,7 +117,29 @@ async function enableWithOCC(context: RulesClientContext, { id }: { id: string }
     });
 
     try {
-      await context.unsecuredSavedObjectsClient.update('alert', id, updateAttributes, { version });
+      // to mitigate AAD issues(actions property is not used for encrypting API key in partial SO update)
+      // we call create with overwrite=true
+      if (migratedActions.hasLegacyActions) {
+        await context.unsecuredSavedObjectsClient.create<RawRule>(
+          'alert',
+          {
+            ...updateAttributes,
+            actions: migratedActions.resultedActions,
+            throttle: undefined,
+            notifyWhen: undefined,
+          },
+          {
+            id,
+            overwrite: true,
+            version,
+            references: migratedActions.resultedReferences,
+          }
+        );
+      } else {
+        await context.unsecuredSavedObjectsClient.update('alert', id, updateAttributes, {
+          version,
+        });
+      }
     } catch (e) {
       throw e;
     }
diff --git a/x-pack/plugins/alerting/server/rules_client/methods/find.ts b/x-pack/plugins/alerting/server/rules_client/methods/find.ts
index 080c72c624cb3..6493174a61b6a 100644
--- a/x-pack/plugins/alerting/server/rules_client/methods/find.ts
+++ b/x-pack/plugins/alerting/server/rules_client/methods/find.ts
@@ -9,7 +9,8 @@ import Boom from '@hapi/boom';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { pick } from 'lodash';
 import { KueryNode, nodeBuilder } from '@kbn/es-query';
-import { RawRule, RuleTypeParams, SanitizedRule } from '../../types';
+import { AlertConsumers } from '@kbn/rule-data-utils';
+import { RawRule, RuleTypeParams, SanitizedRule, Rule } from '../../types';
 import { AlertingAuthorizationEntity } from '../../authorization';
 import { ruleAuditEvent, RuleAuditAction } from '../common/audit_events';
 import {
@@ -27,6 +28,7 @@ import {
 import { alertingAuthorizationFilterOpts } from '../common/constants';
 import { getAlertFromRaw } from '../lib/get_alert_from_raw';
 import type { IndexType, RulesClientContext } from '../types';
+import { formatLegacyActions } from '../lib';
 
 export interface FindParams {
   options?: FindOptions;
@@ -132,6 +134,8 @@ export async function find<Params extends RuleTypeParams = never>(
     type: 'alert',
   });
 
+  const siemRules: Rule[] = [];
+
   const authorizedData = data.map(({ id, attributes, references }) => {
     try {
       ensureRuleTypeIsAuthorized(
@@ -149,7 +153,8 @@ export async function find<Params extends RuleTypeParams = never>(
       );
       throw error;
     }
-    return getAlertFromRaw<Params>(
+
+    const rule = getAlertFromRaw<Params>(
       context,
       id,
       attributes.alertTypeId,
@@ -159,6 +164,13 @@ export async function find<Params extends RuleTypeParams = never>(
       excludeFromPublicApi,
       includeSnoozeData
     );
+
+    // collect SIEM rule for further formatting legacy actions
+    if (attributes.consumer === AlertConsumers.SIEM) {
+      siemRules.push(rule);
+    }
+
+    return rule;
   });
 
   authorizedData.forEach(({ id }) =>
@@ -170,6 +182,27 @@ export async function find<Params extends RuleTypeParams = never>(
     )
   );
 
+  // format legacy actions for SIEM rules, if there any
+  if (siemRules.length) {
+    const formattedRules = await formatLegacyActions(siemRules, {
+      savedObjectsClient: context.unsecuredSavedObjectsClient,
+      logger: context.logger,
+    });
+
+    const formattedRulesMap = formattedRules.reduce<Record<string, Rule>>((acc, rule) => {
+      acc[rule.id] = rule;
+      return acc;
+    }, {});
+
+    return {
+      page,
+      perPage,
+      total,
+      // replace siem formatted rules
+      data: authorizedData.map((rule) => formattedRulesMap[rule.id] ?? rule),
+    };
+  }
+
   return {
     page,
     perPage,
diff --git a/x-pack/plugins/alerting/server/rules_client/methods/get.ts b/x-pack/plugins/alerting/server/rules_client/methods/get.ts
index 932772f06d209..8b25f990d3cf1 100644
--- a/x-pack/plugins/alerting/server/rules_client/methods/get.ts
+++ b/x-pack/plugins/alerting/server/rules_client/methods/get.ts
@@ -4,12 +4,14 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { AlertConsumers } from '@kbn/rule-data-utils';
 
 import { RawRule, SanitizedRule, RuleTypeParams, SanitizedRuleWithLegacyId } from '../../types';
 import { ReadOperations, AlertingAuthorizationEntity } from '../../authorization';
 import { ruleAuditEvent, RuleAuditAction } from '../common/audit_events';
 import { getAlertFromRaw } from '../lib/get_alert_from_raw';
 import { RulesClientContext } from '../types';
+import { formatLegacyActions } from '../lib';
 
 export interface GetParams {
   id: string;
@@ -51,7 +53,7 @@ export async function get<Params extends RuleTypeParams = never>(
       savedObject: { type: 'alert', id },
     })
   );
-  return getAlertFromRaw<Params>(
+  const rule = getAlertFromRaw<Params>(
     context,
     result.id,
     result.attributes.alertTypeId,
@@ -61,4 +63,16 @@ export async function get<Params extends RuleTypeParams = never>(
     excludeFromPublicApi,
     includeSnoozeData
   );
+
+  // format legacy actions for SIEM rules
+  if (result.attributes.consumer === AlertConsumers.SIEM) {
+    const [migratedRule] = await formatLegacyActions([rule], {
+      savedObjectsClient: context.unsecuredSavedObjectsClient,
+      logger: context.logger,
+    });
+
+    return migratedRule;
+  }
+
+  return rule;
 }
diff --git a/x-pack/plugins/alerting/server/rules_client/methods/resolve.ts b/x-pack/plugins/alerting/server/rules_client/methods/resolve.ts
index 539e4c089d36d..a663b9aac56d1 100644
--- a/x-pack/plugins/alerting/server/rules_client/methods/resolve.ts
+++ b/x-pack/plugins/alerting/server/rules_client/methods/resolve.ts
@@ -5,11 +5,14 @@
  * 2.0.
  */
 
+import { AlertConsumers } from '@kbn/rule-data-utils';
+
 import { RawRule, RuleTypeParams, ResolvedSanitizedRule } from '../../types';
 import { ReadOperations, AlertingAuthorizationEntity } from '../../authorization';
 import { ruleAuditEvent, RuleAuditAction } from '../common/audit_events';
 import { getAlertFromRaw } from '../lib/get_alert_from_raw';
 import { RulesClientContext } from '../types';
+import { formatLegacyActions } from '../lib';
 
 export interface ResolveParams {
   id: string;
@@ -58,6 +61,19 @@ export async function resolve<Params extends RuleTypeParams = never>(
     includeSnoozeData
   );
 
+  // format legacy actions for SIEM rules
+  if (result.attributes.consumer === AlertConsumers.SIEM) {
+    const [migratedRule] = await formatLegacyActions([rule], {
+      savedObjectsClient: context.unsecuredSavedObjectsClient,
+      logger: context.logger,
+    });
+
+    return {
+      ...migratedRule,
+      ...resolveResponse,
+    };
+  }
+
   return {
     ...rule,
     ...resolveResponse,
diff --git a/x-pack/plugins/alerting/server/rules_client/methods/update.ts b/x-pack/plugins/alerting/server/rules_client/methods/update.ts
index d2b57d44fc528..4703cd5b92b28 100644
--- a/x-pack/plugins/alerting/server/rules_client/methods/update.ts
+++ b/x-pack/plugins/alerting/server/rules_client/methods/update.ts
@@ -33,6 +33,7 @@ import {
   addGeneratedActionValues,
   incrementRevision,
   createNewAPIKeySet,
+  migrateLegacyActions,
 } from '../lib';
 
 export interface UpdateOptions<Params extends RuleTypeParams> {
@@ -115,10 +116,24 @@ async function updateWithOCC<Params extends RuleTypeParams>(
 
   context.ruleTypeRegistry.ensureRuleTypeEnabled(alertSavedObject.attributes.alertTypeId);
 
+  const migratedActions = await migrateLegacyActions(context, {
+    ruleId: id,
+    attributes: alertSavedObject.attributes,
+  });
+
   const updateResult = await updateAlert<Params>(
     context,
     { id, data, allowMissingConnectorSecrets, shouldIncrementRevision },
-    alertSavedObject
+    migratedActions.hasLegacyActions
+      ? {
+          ...alertSavedObject,
+          attributes: {
+            ...alertSavedObject.attributes,
+            notifyWhen: undefined,
+            throttle: undefined,
+          },
+        }
+      : alertSavedObject
   );
 
   await Promise.all([
@@ -173,7 +188,7 @@ async function updateAlert<Params extends RuleTypeParams>(
 
   // TODO https://github.com/elastic/kibana/issues/148414
   // If any action-level frequencies get pushed into a SIEM rule, strip their frequencies
-  const firstFrequency = data.actions[0]?.frequency;
+  const firstFrequency = data.actions.find((action) => action?.frequency)?.frequency;
   if (attributes.consumer === AlertConsumers.SIEM && firstFrequency) {
     data.actions = data.actions.map((action) => omit(action, 'frequency'));
     if (!attributes.notifyWhen) {
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/bulk_delete.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/bulk_delete.test.ts
index 8e9f1a79b8de0..74808613f869d 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/bulk_delete.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/bulk_delete.test.ts
@@ -25,7 +25,20 @@ import {
   enabledRule2,
   returnedRule1,
   returnedRule2,
+  siemRule1,
 } from './test_helpers';
+import { migrateLegacyActions } from '../lib';
+
+jest.mock('../lib/siem_legacy_actions/migrate_legacy_actions', () => {
+  return {
+    migrateLegacyActions: jest.fn(),
+  };
+});
+(migrateLegacyActions as jest.Mock).mockResolvedValue({
+  hasLegacyActions: false,
+  resultedActions: [],
+  resultedReferences: [],
+});
 
 jest.mock('../../invalidate_pending_api_keys/bulk_mark_api_keys_for_invalidation', () => ({
   bulkMarkApiKeysForInvalidation: jest.fn(),
@@ -453,6 +466,46 @@ describe('bulkDelete', () => {
     });
   });
 
+  describe('legacy actions migration for SIEM', () => {
+    test('should call migrateLegacyActions', async () => {
+      encryptedSavedObjects.createPointInTimeFinderDecryptedAsInternalUser = jest
+        .fn()
+        .mockResolvedValueOnce({
+          close: jest.fn(),
+          find: function* asyncGenerator() {
+            yield { saved_objects: [enabledRule1, enabledRule2, siemRule1] };
+          },
+        });
+
+      unsecuredSavedObjectsClient.bulkDelete.mockResolvedValue({
+        statuses: [
+          { id: enabledRule1.id, type: 'alert', success: true },
+          { id: enabledRule2.id, type: 'alert', success: true },
+          { id: siemRule1.id, type: 'alert', success: true },
+        ],
+      });
+
+      await rulesClient.bulkDeleteRules({ filter: 'fake_filter' });
+
+      expect(migrateLegacyActions).toHaveBeenCalledTimes(3);
+      expect(migrateLegacyActions).toHaveBeenCalledWith(expect.any(Object), {
+        ruleId: enabledRule1.id,
+        skipActionsValidation: true,
+        attributes: enabledRule1.attributes,
+      });
+      expect(migrateLegacyActions).toHaveBeenCalledWith(expect.any(Object), {
+        ruleId: enabledRule2.id,
+        skipActionsValidation: true,
+        attributes: enabledRule2.attributes,
+      });
+      expect(migrateLegacyActions).toHaveBeenCalledWith(expect.any(Object), {
+        ruleId: siemRule1.id,
+        skipActionsValidation: true,
+        attributes: siemRule1.attributes,
+      });
+    });
+  });
+
   describe('auditLogger', () => {
     jest.spyOn(auditLogger, 'log').mockImplementation();
 
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/bulk_disable.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/bulk_disable.test.ts
index 03c637adaae00..18cc4492be8c9 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/bulk_disable.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/bulk_disable.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
+import { AlertConsumers } from '@kbn/rule-data-utils';
 import { RulesClient, ConstructorOptions } from '../rules_client';
 import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
@@ -29,7 +29,16 @@ import {
   savedObjectWith500Error,
   returnedDisabledRule1,
   returnedDisabledRule2,
+  siemRule1,
+  siemRule2,
 } from './test_helpers';
+import { migrateLegacyActions } from '../lib';
+
+jest.mock('../lib/siem_legacy_actions/migrate_legacy_actions', () => {
+  return {
+    migrateLegacyActions: jest.fn(),
+  };
+});
 
 jest.mock('../../invalidate_pending_api_keys/bulk_mark_api_keys_for_invalidation', () => ({
   bulkMarkApiKeysForInvalidation: jest.fn(),
@@ -126,6 +135,11 @@ describe('bulkDisableRules', () => {
     });
     mockCreatePointInTimeFinderAsInternalUser();
     mockUnsecuredSavedObjectFind(2);
+    (migrateLegacyActions as jest.Mock).mockResolvedValue({
+      hasLegacyActions: false,
+      resultedActions: [],
+      resultedReferences: [],
+    });
   });
 
   test('should disable two rule', async () => {
@@ -598,4 +612,49 @@ describe('bulkDisableRules', () => {
       );
     });
   });
+
+  describe('legacy actions migration for SIEM', () => {
+    test('should call migrateLegacyActions', async () => {
+      encryptedSavedObjects.createPointInTimeFinderDecryptedAsInternalUser = jest
+        .fn()
+        .mockResolvedValueOnce({
+          close: jest.fn(),
+          find: function* asyncGenerator() {
+            yield { saved_objects: [enabledRule1, enabledRule2, siemRule1, siemRule2] };
+          },
+        });
+
+      unsecuredSavedObjectsClient.bulkCreate.mockResolvedValue({
+        saved_objects: [enabledRule1, enabledRule2, siemRule1, siemRule2],
+      });
+
+      await rulesClient.bulkDisableRules({ filter: 'fake_filter' });
+
+      expect(migrateLegacyActions).toHaveBeenCalledTimes(4);
+      expect(migrateLegacyActions).toHaveBeenCalledWith(expect.any(Object), {
+        attributes: enabledRule1.attributes,
+        ruleId: enabledRule1.id,
+        actions: [],
+        references: [],
+      });
+      expect(migrateLegacyActions).toHaveBeenCalledWith(expect.any(Object), {
+        attributes: enabledRule2.attributes,
+        ruleId: enabledRule2.id,
+        actions: [],
+        references: [],
+      });
+      expect(migrateLegacyActions).toHaveBeenCalledWith(expect.any(Object), {
+        attributes: expect.objectContaining({ consumer: AlertConsumers.SIEM }),
+        ruleId: siemRule1.id,
+        actions: [],
+        references: [],
+      });
+      expect(migrateLegacyActions).toHaveBeenCalledWith(expect.any(Object), {
+        attributes: expect.objectContaining({ consumer: AlertConsumers.SIEM }),
+        ruleId: siemRule2.id,
+        actions: [],
+        references: [],
+      });
+    });
+  });
 });
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/bulk_edit.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/bulk_edit.test.ts
index b91bb1cae5e3c..c9e9302fb0146 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/bulk_edit.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/bulk_edit.test.ts
@@ -7,6 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 import { v4 as uuidv4 } from 'uuid';
+import { AlertConsumers } from '@kbn/rule-data-utils';
 import { RulesClient, ConstructorOptions } from '../rules_client';
 import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
@@ -21,6 +22,20 @@ import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 import { bulkMarkApiKeysForInvalidation } from '../../invalidate_pending_api_keys/bulk_mark_api_keys_for_invalidation';
 import { NormalizedAlertAction } from '../types';
+import { enabledRule1, enabledRule2, siemRule1, siemRule2 } from './test_helpers';
+import { migrateLegacyActions } from '../lib';
+import { migrateLegacyActionsMock } from '../lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock';
+
+jest.mock('../lib/siem_legacy_actions/migrate_legacy_actions', () => {
+  return {
+    migrateLegacyActions: jest.fn(),
+  };
+});
+(migrateLegacyActions as jest.Mock).mockResolvedValue({
+  hasLegacyActions: false,
+  resultedActions: [],
+  resultedReferences: [],
+});
 
 jest.mock('../../invalidate_pending_api_keys/bulk_mark_api_keys_for_invalidation', () => ({
   bulkMarkApiKeysForInvalidation: jest.fn(),
@@ -196,6 +211,8 @@ describe('bulkEdit()', () => {
       },
       producer: 'alerts',
     });
+
+    (migrateLegacyActions as jest.Mock).mockResolvedValue(migrateLegacyActionsMock);
   });
 
   describe('tags operations', () => {
@@ -2491,4 +2508,53 @@ describe('bulkEdit()', () => {
       expect(taskManager.bulkUpdateSchedules).not.toHaveBeenCalled();
     });
   });
+
+  describe('legacy actions migration for SIEM', () => {
+    test('should call migrateLegacyActions', async () => {
+      encryptedSavedObjects.createPointInTimeFinderDecryptedAsInternalUser = jest
+        .fn()
+        .mockResolvedValueOnce({
+          close: jest.fn(),
+          find: function* asyncGenerator() {
+            yield { saved_objects: [enabledRule1, enabledRule2, siemRule1, siemRule2] };
+          },
+        });
+
+      await rulesClient.bulkEdit({
+        operations: [
+          {
+            field: 'tags',
+            operation: 'set',
+            value: ['test-tag'],
+          },
+        ],
+      });
+
+      expect(migrateLegacyActions).toHaveBeenCalledTimes(4);
+      expect(migrateLegacyActions).toHaveBeenCalledWith(expect.any(Object), {
+        attributes: enabledRule1.attributes,
+        ruleId: enabledRule1.id,
+        actions: [],
+        references: [],
+      });
+      expect(migrateLegacyActions).toHaveBeenCalledWith(expect.any(Object), {
+        attributes: enabledRule2.attributes,
+        ruleId: enabledRule2.id,
+        actions: [],
+        references: [],
+      });
+      expect(migrateLegacyActions).toHaveBeenCalledWith(expect.any(Object), {
+        attributes: expect.objectContaining({ consumer: AlertConsumers.SIEM }),
+        ruleId: siemRule1.id,
+        actions: [],
+        references: [],
+      });
+      expect(migrateLegacyActions).toHaveBeenCalledWith(expect.any(Object), {
+        attributes: expect.objectContaining({ consumer: AlertConsumers.SIEM }),
+        ruleId: siemRule2.id,
+        actions: [],
+        references: [],
+      });
+    });
+  });
 });
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/bulk_enable.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/bulk_enable.test.ts
index b82001e83886c..03f9c06109059 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/bulk_enable.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/bulk_enable.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
+import { AlertConsumers } from '@kbn/rule-data-utils';
 import { RulesClient, ConstructorOptions } from '../rules_client';
 import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
@@ -29,8 +29,17 @@ import {
   savedObjectWith500Error,
   returnedRule1,
   returnedRule2,
+  siemRule1,
+  siemRule2,
 } from './test_helpers';
 import { TaskStatus } from '@kbn/task-manager-plugin/server';
+import { migrateLegacyActions } from '../lib';
+
+jest.mock('../lib/siem_legacy_actions/migrate_legacy_actions', () => {
+  return {
+    migrateLegacyActions: jest.fn(),
+  };
+});
 
 jest.mock('../../invalidate_pending_api_keys/bulk_mark_api_keys_for_invalidation', () => ({
   bulkMarkApiKeysForInvalidation: jest.fn(),
@@ -78,6 +87,11 @@ beforeEach(() => {
       } as unknown as BulkUpdateTaskResult)
   );
   (auditLogger.log as jest.Mock).mockClear();
+  (migrateLegacyActions as jest.Mock).mockResolvedValue({
+    hasLegacyActions: false,
+    resultedActions: [],
+    resultedReferences: [],
+  });
 });
 
 setGlobalDate();
@@ -779,4 +793,43 @@ describe('bulkEnableRules', () => {
       expect(auditLogger.log.mock.calls[0][0]?.event?.outcome).toEqual('failure');
     });
   });
+
+  describe('legacy actions migration for SIEM', () => {
+    test('should call migrateLegacyActions', async () => {
+      encryptedSavedObjects.createPointInTimeFinderDecryptedAsInternalUser = jest
+        .fn()
+        .mockResolvedValueOnce({
+          close: jest.fn(),
+          find: function* asyncGenerator() {
+            yield { saved_objects: [disabledRule1, siemRule1, siemRule2] };
+          },
+        });
+
+      unsecuredSavedObjectsClient.bulkCreate.mockResolvedValue({
+        saved_objects: [disabledRule1, siemRule1, siemRule2],
+      });
+
+      await rulesClient.bulkEnableRules({ filter: 'fake_filter' });
+
+      expect(migrateLegacyActions).toHaveBeenCalledTimes(3);
+      expect(migrateLegacyActions).toHaveBeenCalledWith(expect.any(Object), {
+        attributes: disabledRule1.attributes,
+        ruleId: disabledRule1.id,
+        actions: [],
+        references: [],
+      });
+      expect(migrateLegacyActions).toHaveBeenCalledWith(expect.any(Object), {
+        attributes: expect.objectContaining({ consumer: AlertConsumers.SIEM }),
+        ruleId: siemRule1.id,
+        actions: [],
+        references: [],
+      });
+      expect(migrateLegacyActions).toHaveBeenCalledWith(expect.any(Object), {
+        attributes: expect.objectContaining({ consumer: AlertConsumers.SIEM }),
+        ruleId: siemRule2.id,
+        actions: [],
+        references: [],
+      });
+    });
+  });
 });
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/delete.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/delete.test.ts
index edf03a2d54e42..a8f13dc25869d 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/delete.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/delete.test.ts
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import { AlertConsumers } from '@kbn/rule-data-utils';
+
 import { RulesClient, ConstructorOptions } from '../rules_client';
 import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
@@ -17,6 +19,18 @@ import { ActionsAuthorization } from '@kbn/actions-plugin/server';
 import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup } from './lib';
 import { bulkMarkApiKeysForInvalidation } from '../../invalidate_pending_api_keys/bulk_mark_api_keys_for_invalidation';
+import { migrateLegacyActions } from '../lib';
+
+jest.mock('../lib/siem_legacy_actions/migrate_legacy_actions', () => {
+  return {
+    migrateLegacyActions: jest.fn(),
+  };
+});
+(migrateLegacyActions as jest.Mock).mockResolvedValue({
+  hasLegacyActions: false,
+  resultedActions: [],
+  resultedReferences: [],
+});
 
 jest.mock('../../invalidate_pending_api_keys/bulk_mark_api_keys_for_invalidation', () => ({
   bulkMarkApiKeysForInvalidation: jest.fn(),
@@ -215,6 +229,27 @@ describe('delete()', () => {
     );
   });
 
+  describe('legacy actions migration for SIEM', () => {
+    test('should call migrateLegacyActions', async () => {
+      const existingDecryptedSiemAlert = {
+        ...existingDecryptedAlert,
+        attributes: { ...existingDecryptedAlert.attributes, consumer: AlertConsumers.SIEM },
+      };
+
+      encryptedSavedObjects.getDecryptedAsInternalUser.mockResolvedValueOnce(
+        existingDecryptedSiemAlert
+      );
+
+      await rulesClient.delete({ id: '1' });
+
+      expect(migrateLegacyActions).toHaveBeenCalledWith(expect.any(Object), {
+        ruleId: '1',
+        skipActionsValidation: true,
+        attributes: existingDecryptedSiemAlert.attributes,
+      });
+    });
+  });
+
   describe('authorization', () => {
     test('ensures user is authorised to delete this type of alert under the consumer', async () => {
       await rulesClient.delete({ id: '1' });
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/disable.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/disable.test.ts
index 09dd8f54d01fd..c09b491dbbdcc 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/disable.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/disable.test.ts
@@ -4,6 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { AlertConsumers } from '@kbn/rule-data-utils';
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
 import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
@@ -18,6 +19,14 @@ import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 import { eventLoggerMock } from '@kbn/event-log-plugin/server/event_logger.mock';
 import { TaskStatus } from '@kbn/task-manager-plugin/server';
+import { migrateLegacyActions } from '../lib';
+import { migrateLegacyActionsMock } from '../lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock';
+
+jest.mock('../lib/siem_legacy_actions/migrate_legacy_actions', () => {
+  return {
+    migrateLegacyActions: jest.fn(),
+  };
+});
 
 jest.mock('../../invalidate_pending_api_keys/bulk_mark_api_keys_for_invalidation', () => ({
   bulkMarkApiKeysForInvalidation: jest.fn(),
@@ -122,6 +131,11 @@ describe('disable()', () => {
     rulesClient = new RulesClient(rulesClientParams);
     unsecuredSavedObjectsClient.get.mockResolvedValue(existingRule);
     encryptedSavedObjects.getDecryptedAsInternalUser.mockResolvedValue(existingDecryptedRule);
+    (migrateLegacyActions as jest.Mock).mockResolvedValue({
+      hasLegacyActions: false,
+      resultedActions: [],
+      resultedReferences: [],
+    });
   });
 
   describe('authorization', () => {
@@ -573,4 +587,35 @@ describe('disable()', () => {
     );
     expect(taskManager.bulkDisable).not.toHaveBeenCalled();
   });
+
+  describe('legacy actions migration for SIEM', () => {
+    test('should call migrateLegacyActions', async () => {
+      const existingDecryptedSiemRule = {
+        ...existingDecryptedRule,
+        attributes: { ...existingDecryptedRule.attributes, consumer: AlertConsumers.SIEM },
+      };
+
+      encryptedSavedObjects.getDecryptedAsInternalUser.mockResolvedValue(existingDecryptedSiemRule);
+      (migrateLegacyActions as jest.Mock).mockResolvedValue(migrateLegacyActionsMock);
+
+      await rulesClient.disable({ id: '1' });
+
+      expect(migrateLegacyActions).toHaveBeenCalledWith(expect.any(Object), {
+        attributes: expect.objectContaining({ consumer: AlertConsumers.SIEM }),
+        actions: [
+          {
+            actionRef: '1',
+            actionTypeId: '1',
+            group: 'default',
+            id: '1',
+            params: {
+              foo: true,
+            },
+          },
+        ],
+        references: [],
+        ruleId: '1',
+      });
+    });
+  });
 });
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/enable.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/enable.test.ts
index d15e96f573a84..d7175e9a47b89 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/enable.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/enable.test.ts
@@ -4,6 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { AlertConsumers } from '@kbn/rule-data-utils';
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
 import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
@@ -17,6 +18,14 @@ import { ActionsAuthorization } from '@kbn/actions-plugin/server';
 import { TaskStatus } from '@kbn/task-manager-plugin/server';
 import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
+import { migrateLegacyActions } from '../lib';
+import { migrateLegacyActionsMock } from '../lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock';
+
+jest.mock('../lib/siem_legacy_actions/migrate_legacy_actions', () => {
+  return {
+    migrateLegacyActions: jest.fn(),
+  };
+});
 
 jest.mock('../../invalidate_pending_api_keys/bulk_mark_api_keys_for_invalidation', () => ({
   bulkMarkApiKeysForInvalidation: jest.fn(),
@@ -122,6 +131,11 @@ describe('enable()', () => {
       apiKeysEnabled: false,
     });
     taskManager.get.mockResolvedValue(mockTask);
+    (migrateLegacyActions as jest.Mock).mockResolvedValue({
+      hasLegacyActions: false,
+      resultedActions: [],
+      resultedReferences: [],
+    });
   });
 
   describe('authorization', () => {
@@ -658,4 +672,58 @@ describe('enable()', () => {
       scheduledTaskId: '1',
     });
   });
+
+  describe('legacy actions migration for SIEM', () => {
+    test('should call migrateLegacyActions', async () => {
+      (migrateLegacyActions as jest.Mock).mockResolvedValueOnce({
+        hasLegacyActions: true,
+        resultedActions: ['fake-action-1'],
+        resultedReferences: ['fake-ref-1'],
+      });
+
+      const existingDecryptedSiemRule = {
+        ...existingRule,
+        attributes: { ...existingRule.attributes, consumer: AlertConsumers.SIEM },
+      };
+
+      encryptedSavedObjects.getDecryptedAsInternalUser.mockResolvedValue(existingDecryptedSiemRule);
+      (migrateLegacyActions as jest.Mock).mockResolvedValue(migrateLegacyActionsMock);
+
+      await rulesClient.enable({ id: '1' });
+
+      expect(migrateLegacyActions).toHaveBeenCalledWith(expect.any(Object), {
+        attributes: expect.objectContaining({ consumer: AlertConsumers.SIEM }),
+        actions: [
+          {
+            actionRef: '1',
+            actionTypeId: '1',
+            group: 'default',
+            id: '1',
+            params: {
+              foo: true,
+            },
+          },
+        ],
+        references: [],
+        ruleId: '1',
+      });
+      // to mitigate AAD issues, we call create with overwrite=true and actions related props
+      expect(unsecuredSavedObjectsClient.create).toHaveBeenCalledWith(
+        'alert',
+        expect.objectContaining({
+          ...existingDecryptedSiemRule.attributes,
+          actions: ['fake-action-1'],
+          throttle: undefined,
+          notifyWhen: undefined,
+          enabled: true,
+        }),
+        {
+          id: existingDecryptedSiemRule.id,
+          overwrite: true,
+          references: ['fake-ref-1'],
+          version: existingDecryptedSiemRule.version,
+        }
+      );
+    });
+  });
 });
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/find.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/find.test.ts
index b8eb4d4d0c478..3573508d891cd 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/find.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/find.test.ts
@@ -19,6 +19,14 @@ import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 import { RecoveredActionGroup } from '../../../common';
 import { RegistryRuleType } from '../../rule_type_registry';
+import { enabledRule1, enabledRule2, siemRule1, siemRule2 } from './test_helpers';
+import { formatLegacyActions } from '../lib';
+
+jest.mock('../lib/siem_legacy_actions/format_legacy_actions', () => {
+  return {
+    formatLegacyActions: jest.fn(),
+  };
+});
 
 const taskManager = taskManagerMock.createStart();
 const ruleTypeRegistry = ruleTypeRegistryMock.create();
@@ -806,4 +814,39 @@ describe('find()', () => {
       );
     });
   });
+
+  describe('legacy actions migration for SIEM', () => {
+    test('should call migrateLegacyActions', async () => {
+      const rulesClient = new RulesClient(rulesClientParams);
+
+      (formatLegacyActions as jest.Mock).mockResolvedValueOnce([
+        { ...siemRule1, migrated: true },
+        { ...siemRule2, migrated: true },
+      ]);
+
+      unsecuredSavedObjectsClient.find.mockReset();
+      unsecuredSavedObjectsClient.find.mockResolvedValueOnce({
+        total: 1,
+        per_page: 10,
+        page: 1,
+        saved_objects: [enabledRule1, enabledRule2, siemRule1, siemRule2].map((r) => ({
+          ...r,
+          score: 1,
+        })),
+      });
+
+      const result = await rulesClient.find({ options: {} });
+
+      expect(formatLegacyActions).toHaveBeenCalledTimes(1);
+      expect(formatLegacyActions).toHaveBeenCalledWith(
+        [
+          expect.objectContaining({ id: siemRule1.id }),
+          expect.objectContaining({ id: siemRule2.id }),
+        ],
+        expect.any(Object)
+      );
+      expect(result.data[2]).toEqual(expect.objectContaining({ id: siemRule1.id, migrated: true }));
+      expect(result.data[3]).toEqual(expect.objectContaining({ id: siemRule2.id, migrated: true }));
+    });
+  });
 });
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/get.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/get.test.ts
index 30abf4c661d19..1ca6e664fc359 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/get.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/get.test.ts
@@ -4,6 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { AlertConsumers } from '@kbn/rule-data-utils';
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
 import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
@@ -17,6 +18,13 @@ import { ActionsAuthorization } from '@kbn/actions-plugin/server';
 import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 import { RecoveredActionGroup } from '../../../common';
+import { formatLegacyActions } from '../lib';
+
+jest.mock('../lib/siem_legacy_actions/format_legacy_actions', () => {
+  return {
+    formatLegacyActions: jest.fn(),
+  };
+});
 
 const taskManager = taskManagerMock.createStart();
 const ruleTypeRegistry = ruleTypeRegistryMock.create();
@@ -509,4 +517,72 @@ describe('get()', () => {
       );
     });
   });
+
+  describe('legacy actions migration for SIEM', () => {
+    const rule = {
+      id: '1',
+      type: 'alert',
+      attributes: {
+        alertTypeId: '123',
+        schedule: { interval: '10s' },
+        params: {
+          bar: true,
+        },
+        createdAt: new Date().toISOString(),
+        updatedAt: new Date().toISOString(),
+        actions: [
+          {
+            group: 'default',
+            actionRef: 'action_0',
+            params: {
+              foo: true,
+            },
+          },
+        ],
+        notifyWhen: 'onActiveAlert',
+      },
+      references: [
+        {
+          name: 'action_0',
+          type: 'action',
+          id: '1',
+        },
+      ],
+    };
+
+    test('should call formatLegacyActions if consumer is SIEM', async () => {
+      const rulesClient = new RulesClient(rulesClientParams);
+      unsecuredSavedObjectsClient.get.mockResolvedValueOnce({
+        ...rule,
+        attributes: {
+          ...rule.attributes,
+          consumer: AlertConsumers.SIEM,
+        },
+      });
+      (formatLegacyActions as jest.Mock).mockResolvedValue([
+        {
+          id: 'migrated_rule_mock',
+        },
+      ]);
+
+      const result = await rulesClient.get({ id: '1' });
+
+      expect(formatLegacyActions).toHaveBeenCalledWith(
+        [expect.objectContaining({ id: '1' })],
+        expect.any(Object)
+      );
+
+      expect(result).toEqual({
+        id: 'migrated_rule_mock',
+      });
+    });
+
+    test('should not call formatLegacyActions if consumer is not SIEM', async () => {
+      unsecuredSavedObjectsClient.get.mockResolvedValueOnce(rule);
+      const rulesClient = new RulesClient(rulesClientParams);
+      await rulesClient.get({ id: '1' });
+
+      expect(formatLegacyActions).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/resolve.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/resolve.test.ts
index 6f52da62023e9..bb22b5f6d0d53 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/resolve.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/resolve.test.ts
@@ -4,6 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { AlertConsumers } from '@kbn/rule-data-utils';
 
 import { RulesClient, ConstructorOptions } from '../rules_client';
 import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
@@ -17,6 +18,13 @@ import { ActionsAuthorization } from '@kbn/actions-plugin/server';
 import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 import { RecoveredActionGroup } from '../../../common';
+import { formatLegacyActions } from '../lib';
+
+jest.mock('../lib/siem_legacy_actions/format_legacy_actions', () => {
+  return {
+    formatLegacyActions: jest.fn(),
+  };
+});
 
 const taskManager = taskManagerMock.createStart();
 const ruleTypeRegistry = ruleTypeRegistryMock.create();
@@ -583,4 +591,82 @@ describe('resolve()', () => {
       );
     });
   });
+
+  describe('legacy actions migration for SIEM', () => {
+    const rule = {
+      id: '1',
+      type: 'alert',
+      attributes: {
+        alertTypeId: '123',
+        schedule: { interval: '10s' },
+        params: {
+          bar: true,
+        },
+        createdAt: new Date().toISOString(),
+        updatedAt: new Date().toISOString(),
+        actions: [
+          {
+            group: 'default',
+            actionRef: 'action_0',
+            params: {
+              foo: true,
+            },
+          },
+        ],
+        notifyWhen: 'onActiveAlert',
+      },
+      references: [
+        {
+          name: 'action_0',
+          type: 'action',
+          id: '1',
+        },
+      ],
+    };
+
+    test('should call formatLegacyActions if consumer is SIEM', async () => {
+      const rulesClient = new RulesClient(rulesClientParams);
+      unsecuredSavedObjectsClient.resolve.mockResolvedValueOnce({
+        saved_object: {
+          ...rule,
+          attributes: {
+            ...rule.attributes,
+            consumer: AlertConsumers.SIEM,
+          },
+        },
+        outcome: 'aliasMatch',
+        alias_target_id: '2',
+      });
+      (formatLegacyActions as jest.Mock).mockResolvedValue([
+        {
+          id: 'migrated_rule_mock',
+        },
+      ]);
+
+      const result = await rulesClient.resolve({ id: '1' });
+
+      expect(formatLegacyActions).toHaveBeenCalledWith(
+        [expect.objectContaining({ id: '1' })],
+        expect.any(Object)
+      );
+
+      expect(result).toEqual({
+        id: 'migrated_rule_mock',
+        outcome: 'aliasMatch',
+        alias_target_id: '2',
+      });
+    });
+
+    test('should not call formatLegacyActions if consumer is not SIEM', async () => {
+      unsecuredSavedObjectsClient.resolve.mockResolvedValueOnce({
+        saved_object: rule,
+        outcome: 'aliasMatch',
+        alias_target_id: '2',
+      });
+      const rulesClient = new RulesClient(rulesClientParams);
+      await rulesClient.resolve({ id: '1' });
+
+      expect(formatLegacyActions).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/test_helpers.ts b/x-pack/plugins/alerting/server/rules_client/tests/test_helpers.ts
index 08c037e9410e7..fd4e534838940 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/test_helpers.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/test_helpers.ts
@@ -4,6 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { AlertConsumers } from '@kbn/rule-data-utils';
 
 import type { SavedObject } from '@kbn/core-saved-objects-server';
 
@@ -41,6 +42,20 @@ export const defaultRule = {
   version: '1',
 };
 
+export const siemRule1 = {
+  ...defaultRule,
+  attributes: {
+    ...defaultRule.attributes,
+    consumer: AlertConsumers.SIEM,
+  },
+  id: 'siem-id1',
+};
+
+export const siemRule2 = {
+  ...siemRule1,
+  id: 'siem-id2',
+};
+
 export const enabledRule1 = {
   ...defaultRule,
   attributes: {
diff --git a/x-pack/plugins/alerting/server/rules_client/tests/update.test.ts b/x-pack/plugins/alerting/server/rules_client/tests/update.test.ts
index 6fcc0cb915a36..b76d0607f22a8 100644
--- a/x-pack/plugins/alerting/server/rules_client/tests/update.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client/tests/update.test.ts
@@ -7,6 +7,7 @@
 
 import { v4 as uuidv4 } from 'uuid';
 import { schema } from '@kbn/config-schema';
+import { AlertConsumers } from '@kbn/rule-data-utils';
 import { RulesClient, ConstructorOptions } from '../rules_client';
 import { savedObjectsClientMock, loggingSystemMock } from '@kbn/core/server/mocks';
 import { taskManagerMock } from '@kbn/task-manager-plugin/server/mocks';
@@ -22,6 +23,13 @@ import { TaskStatus } from '@kbn/task-manager-plugin/server';
 import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
 import { getBeforeSetup, setGlobalDate } from './lib';
 import { bulkMarkApiKeysForInvalidation } from '../../invalidate_pending_api_keys/bulk_mark_api_keys_for_invalidation';
+import { migrateLegacyActions } from '../lib';
+
+jest.mock('../lib/siem_legacy_actions/migrate_legacy_actions', () => {
+  return {
+    migrateLegacyActions: jest.fn(),
+  };
+});
 
 jest.mock('@kbn/core-saved-objects-utils-server', () => {
   const actual = jest.requireActual('@kbn/core-saved-objects-utils-server');
@@ -164,6 +172,11 @@ describe('update()', () => {
       },
       producer: 'alerts',
     });
+    (migrateLegacyActions as jest.Mock).mockResolvedValue({
+      hasLegacyActions: false,
+      resultedActions: [],
+      resultedReferences: [],
+    });
   });
 
   test('updates given parameters', async () => {
@@ -2734,6 +2747,64 @@ describe('update()', () => {
     );
   });
 
+  describe('legacy actions migration for SIEM', () => {
+    beforeEach(() => {
+      unsecuredSavedObjectsClient.create.mockResolvedValueOnce({
+        id: '1',
+        type: 'alert',
+        attributes: {
+          enabled: true,
+          schedule: { interval: '1m' },
+          params: {
+            bar: true,
+          },
+          actions: [],
+          notifyWhen: 'onActiveAlert',
+          scheduledTaskId: 'task-123',
+          createdAt: new Date().toISOString(),
+          updatedAt: new Date().toISOString(),
+        },
+        references: [],
+      });
+    });
+
+    test('should call migrateLegacyActions', async () => {
+      const existingDecryptedSiemAlert = {
+        ...existingDecryptedAlert,
+        attributes: { ...existingDecryptedAlert, consumer: AlertConsumers.SIEM },
+      };
+
+      encryptedSavedObjects.getDecryptedAsInternalUser.mockResolvedValueOnce(
+        existingDecryptedSiemAlert
+      );
+
+      actionsClient.getBulk.mockReset();
+      actionsClient.isPreconfigured.mockReset();
+
+      await rulesClient.update({
+        id: '1',
+        data: {
+          schedule: { interval: '1m' },
+          name: 'abc',
+          tags: ['foo'],
+          params: {
+            bar: true,
+            risk_score: 40,
+            severity: 'low',
+          },
+          throttle: null,
+          notifyWhen: 'onActiveAlert',
+          actions: [],
+        },
+      });
+
+      expect(migrateLegacyActions).toHaveBeenCalledWith(expect.any(Object), {
+        ruleId: '1',
+        attributes: existingDecryptedSiemAlert.attributes,
+      });
+    });
+  });
+
   it('calls the authentication API key function if the user is authenticated using an api key', async () => {
     rulesClientParams.isAuthenticationTypeAPIKey.mockReturnValueOnce(true);
     rulesClientParams.getAuthenticationAPIKey.mockReturnValueOnce({
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/install_prebuilt_rules_and_timelines/route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/install_prebuilt_rules_and_timelines/route.test.ts
index af6fca55078fb..38e98266aee7a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/install_prebuilt_rules_and_timelines/route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/install_prebuilt_rules_and_timelines/route.test.ts
@@ -19,17 +19,6 @@ import type { ExceptionListClient } from '@kbn/lists-plugin/server';
 import { installPrepackagedTimelines } from '../../../../timeline/routes/prepackaged_timelines/install_prepackaged_timelines';
 import { elasticsearchClientMock } from '@kbn/core-elasticsearch-client-server-mocks';
 import { getQueryRuleParams } from '../../../rule_schema/mocks';
-import { legacyMigrate } from '../../../rule_management';
-
-jest.mock('../../../rule_management/logic/rule_actions/legacy_action_migration', () => {
-  const actual = jest.requireActual(
-    '../../../rule_management/logic/rule_actions/legacy_action_migration'
-  );
-  return {
-    ...actual,
-    legacyMigrate: jest.fn(),
-  };
-});
 
 jest.mock('../../logic/rule_assets/prebuilt_rule_assets_client', () => {
   return {
@@ -105,8 +94,6 @@ describe('add_prepackaged_rules_route', () => {
       errors: [],
     });
 
-    (legacyMigrate as jest.Mock).mockResolvedValue(getRuleMock(getQueryRuleParams()));
-
     context.core.elasticsearch.client.asCurrentUser.search.mockResolvedValue(
       elasticsearchClientMock.createSuccessTransportRequestPromise(getBasicEmptySearchResponse())
     );
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/rule_objects/update_prebuilt_rules.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/rule_objects/update_prebuilt_rules.test.ts
index 13e91b1bc2dfa..5afe5a4753c10 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/rule_objects/update_prebuilt_rules.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/rule_objects/update_prebuilt_rules.test.ts
@@ -14,21 +14,10 @@ import {
 import { updatePrebuiltRules } from './update_prebuilt_rules';
 import { patchRules } from '../../../rule_management/logic/crud/patch_rules';
 import { getPrebuiltRuleMock, getPrebuiltThreatMatchRuleMock } from '../../mocks';
-import { legacyMigrate } from '../../../rule_management';
-import { getQueryRuleParams, getThreatRuleParams } from '../../../rule_schema/mocks';
+import { getThreatRuleParams } from '../../../rule_schema/mocks';
 
 jest.mock('../../../rule_management/logic/crud/patch_rules');
 
-jest.mock('../../../rule_management/logic/rule_actions/legacy_action_migration', () => {
-  const actual = jest.requireActual(
-    '../../../rule_management/logic/rule_actions/legacy_action_migration'
-  );
-  return {
-    ...actual,
-    legacyMigrate: jest.fn(),
-  };
-});
-
 describe('updatePrebuiltRules', () => {
   let rulesClient: ReturnType<typeof rulesClientMock.create>;
   let savedObjectsClient: ReturnType<typeof savedObjectsClientMock.create>;
@@ -36,8 +25,6 @@ describe('updatePrebuiltRules', () => {
   beforeEach(() => {
     rulesClient = rulesClientMock.create();
     savedObjectsClient = savedObjectsClientMock.create();
-
-    (legacyMigrate as jest.Mock).mockResolvedValue(getRuleMock(getQueryRuleParams()));
   });
 
   it('should omit actions and enabled when calling patchRules', async () => {
@@ -82,7 +69,6 @@ describe('updatePrebuiltRules', () => {
       ...getFindResultWithSingleHit(),
       data: [getRuleMock(getThreatRuleParams())],
     });
-    (legacyMigrate as jest.Mock).mockResolvedValue(getRuleMock(getThreatRuleParams()));
 
     await updatePrebuiltRules(rulesClient, savedObjectsClient, [
       { ...prepackagedRule, ...updatedThreatParams },
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/rule_objects/update_prebuilt_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/rule_objects/update_prebuilt_rules.ts
index 407ffac13e48c..cbd9f32069a95 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/rule_objects/update_prebuilt_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/rule_objects/update_prebuilt_rules.ts
@@ -12,7 +12,6 @@ import type { RulesClient, PartialRule } from '@kbn/alerting-plugin/server';
 import { transformAlertToRuleAction } from '../../../../../../common/detection_engine/transform_actions';
 import { MAX_RULES_TO_UPDATE_IN_PARALLEL } from '../../../../../../common/constants';
 
-import { legacyMigrate } from '../../../rule_management';
 import { createRules } from '../../../rule_management/logic/crud/create_rules';
 import { readRules } from '../../../rule_management/logic/crud/read_rules';
 import { patchRules } from '../../../rule_management/logic/crud/patch_rules';
@@ -62,22 +61,16 @@ const createPromises = (
       id: undefined,
     });
 
-    const migratedRule = await legacyMigrate({
-      rulesClient,
-      savedObjectsClient,
-      rule: existingRule,
-    });
-
-    if (!migratedRule) {
+    if (!existingRule) {
       throw new PrepackagedRulesError(`Failed to find rule ${rule.rule_id}`, 500);
     }
 
     // If we're trying to change the type of a prepackaged rule, we need to delete the old one
     // and replace it with the new rule, keeping the enabled setting, actions, throttle, id,
     // and exception lists from the old rule
-    if (rule.type !== migratedRule.params.type) {
+    if (rule.type !== existingRule.params.type) {
       await deleteRules({
-        ruleId: migratedRule.id,
+        ruleId: existingRule.id,
         rulesClient,
       });
 
@@ -87,14 +80,14 @@ const createPromises = (
           ...rule,
           // Force the prepackaged rule to use the enabled state from the existing rule,
           // regardless of what the prepackaged rule says
-          enabled: migratedRule.enabled,
-          actions: migratedRule.actions.map(transformAlertToRuleAction),
+          enabled: existingRule.enabled,
+          actions: existingRule.actions.map(transformAlertToRuleAction),
         },
       });
     } else {
       return patchRules({
         rulesClient,
-        existingRule: migratedRule,
+        existingRule,
         nextParams: {
           ...rule,
           // Force enabled to use the enabled state from the existing rule by passing in undefined to patchRules
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts
index a9fb2781129e9..d8ac197423f8e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts
@@ -6,7 +6,7 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { SavedObjectsFindResponse, SavedObjectsFindResult } from '@kbn/core/server';
+import type { SavedObjectsFindResponse } from '@kbn/core/server';
 import { ALERT_WORKFLOW_STATUS } from '@kbn/rule-data-utils';
 import { ruleTypeMappings } from '@kbn/securitysolution-rules';
 import type { SanitizedRule, ResolvedSanitizedRule } from '@kbn/alerting-plugin/common';
@@ -42,10 +42,7 @@ import { getFinalizeSignalsMigrationSchemaMock } from '../../../../../common/det
 import { getSignalsMigrationStatusSchemaMock } from '../../../../../common/detection_engine/schemas/request/get_signals_migration_status_schema.mock';
 
 // eslint-disable-next-line no-restricted-imports
-import type {
-  LegacyRuleNotificationAlertType,
-  LegacyIRuleActionsAttributes,
-} from '../../rule_actions_legacy';
+import type { LegacyRuleNotificationAlertType } from '../../rule_actions_legacy';
 import type { HapiReadableStream } from '../../rule_management/logic/import/hapi_readable_stream';
 import type { RuleAlertType, RuleParams } from '../../rule_schema';
 import { getQueryRuleParams } from '../../rule_schema/mocks';
@@ -556,153 +553,6 @@ export const legacyGetNotificationResult = ({
   revision: 0,
 });
 
-/**
- * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
- */
-export const legacyGetHourlyNotificationResult = (
-  id = '456',
-  ruleId = '123'
-): LegacyRuleNotificationAlertType => ({
-  id,
-  name: 'Notification for Rule Test',
-  tags: [],
-  alertTypeId: 'siem.notifications',
-  consumer: 'siem',
-  params: {
-    ruleAlertId: `${ruleId}`,
-  },
-  schedule: {
-    interval: '1h',
-  },
-  enabled: true,
-  actions: [
-    {
-      group: 'default',
-      params: {
-        message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
-        to: ['test@test.com'],
-        subject: 'Test Actions',
-      },
-      actionTypeId: '.email',
-      id: '99403909-ca9b-49ba-9d7a-7e5320e68d05',
-    },
-  ],
-  throttle: null,
-  notifyWhen: 'onActiveAlert',
-  apiKey: null,
-  apiKeyOwner: 'elastic',
-  createdBy: 'elastic',
-  updatedBy: 'elastic',
-  createdAt: new Date('2020-03-21T11:15:13.530Z'),
-  muteAll: false,
-  mutedInstanceIds: [],
-  scheduledTaskId: '62b3a130-6b70-11ea-9ce9-6b9818c4cbd7',
-  updatedAt: new Date('2020-03-21T12:37:08.730Z'),
-  executionStatus: {
-    status: 'unknown',
-    lastExecutionDate: new Date('2020-08-20T19:23:38Z'),
-  },
-  revision: 0,
-});
-
-/**
- * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
- */
-export const legacyGetDailyNotificationResult = (
-  id = '456',
-  ruleId = '123'
-): LegacyRuleNotificationAlertType => ({
-  id,
-  name: 'Notification for Rule Test',
-  tags: [],
-  alertTypeId: 'siem.notifications',
-  consumer: 'siem',
-  params: {
-    ruleAlertId: `${ruleId}`,
-  },
-  schedule: {
-    interval: '1d',
-  },
-  enabled: true,
-  actions: [
-    {
-      group: 'default',
-      params: {
-        message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
-        to: ['test@test.com'],
-        subject: 'Test Actions',
-      },
-      actionTypeId: '.email',
-      id: '99403909-ca9b-49ba-9d7a-7e5320e68d05',
-    },
-  ],
-  throttle: null,
-  notifyWhen: 'onActiveAlert',
-  apiKey: null,
-  apiKeyOwner: 'elastic',
-  createdBy: 'elastic',
-  updatedBy: 'elastic',
-  createdAt: new Date('2020-03-21T11:15:13.530Z'),
-  muteAll: false,
-  mutedInstanceIds: [],
-  scheduledTaskId: '62b3a130-6b70-11ea-9ce9-6b9818c4cbd7',
-  updatedAt: new Date('2020-03-21T12:37:08.730Z'),
-  executionStatus: {
-    status: 'unknown',
-    lastExecutionDate: new Date('2020-08-20T19:23:38Z'),
-  },
-  revision: 0,
-});
-
-/**
- * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
- */
-export const legacyGetWeeklyNotificationResult = (
-  id = '456',
-  ruleId = '123'
-): LegacyRuleNotificationAlertType => ({
-  id,
-  name: 'Notification for Rule Test',
-  tags: [],
-  alertTypeId: 'siem.notifications',
-  consumer: 'siem',
-  params: {
-    ruleAlertId: `${ruleId}`,
-  },
-  schedule: {
-    interval: '7d',
-  },
-  enabled: true,
-  actions: [
-    {
-      group: 'default',
-      params: {
-        message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
-        to: ['test@test.com'],
-        subject: 'Test Actions',
-      },
-      actionTypeId: '.email',
-      id: '99403909-ca9b-49ba-9d7a-7e5320e68d05',
-    },
-  ],
-  throttle: null,
-  notifyWhen: 'onActiveAlert',
-  apiKey: null,
-  apiKeyOwner: 'elastic',
-  createdBy: 'elastic',
-  updatedBy: 'elastic',
-  createdAt: new Date('2020-03-21T11:15:13.530Z'),
-  muteAll: false,
-  mutedInstanceIds: [],
-  scheduledTaskId: '62b3a130-6b70-11ea-9ce9-6b9818c4cbd7',
-  updatedAt: new Date('2020-03-21T12:37:08.730Z'),
-  executionStatus: {
-    status: 'unknown',
-    lastExecutionDate: new Date('2020-08-20T19:23:38Z'),
-  },
-  revision: 0,
-});
-
 /**
  * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
  */
@@ -714,205 +564,3 @@ export const legacyGetFindNotificationsResultWithSingleHit = (
   total: 1,
   data: [legacyGetNotificationResult({ ruleId })],
 });
-
-/**
- * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
- */
-export const legacyGetSiemNotificationRuleNoActionsSOResult = (
-  ruleId = '123'
-): SavedObjectsFindResult<LegacyIRuleActionsAttributes> => ({
-  type: 'siem-detection-engine-rule-actions',
-  id: 'ID_OF_LEGACY_SIDECAR_NO_ACTIONS',
-  namespaces: ['default'],
-  attributes: {
-    actions: [],
-    ruleThrottle: 'no_actions',
-    alertThrottle: null,
-  },
-  references: [{ id: ruleId, type: 'alert', name: 'alert_0' }],
-  migrationVersion: {
-    'siem-detection-engine-rule-actions': '7.11.2',
-  },
-  coreMigrationVersion: '7.15.2',
-  updated_at: '2022-03-31T19:06:40.473Z',
-  version: 'WzIzNywxXQ==',
-  score: 0,
-});
-
-/**
- * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
- */
-export const legacyGetSiemNotificationRuleEveryRunSOResult = (
-  ruleId = '123'
-): SavedObjectsFindResult<LegacyIRuleActionsAttributes> => ({
-  type: 'siem-detection-engine-rule-actions',
-  id: 'ID_OF_LEGACY_SIDECAR_RULE_RUN_ACTIONS',
-  namespaces: ['default'],
-  attributes: {
-    actions: [
-      {
-        group: 'default',
-        actionRef: 'action_0',
-        params: {
-          message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
-          to: ['test@test.com'],
-          subject: 'Test Actions',
-        },
-        action_type_id: '.email',
-      },
-    ],
-    ruleThrottle: 'rule',
-    alertThrottle: null,
-  },
-  references: [{ id: ruleId, type: 'alert', name: 'alert_0' }],
-  migrationVersion: {
-    'siem-detection-engine-rule-actions': '7.11.2',
-  },
-  coreMigrationVersion: '7.15.2',
-  updated_at: '2022-03-31T19:06:40.473Z',
-  version: 'WzIzNywxXQ==',
-  score: 0,
-});
-
-/**
- * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
- */
-export const legacyGetSiemNotificationRuleHourlyActionsSOResult = (
-  ruleId = '123',
-  connectorId = '456'
-): SavedObjectsFindResult<LegacyIRuleActionsAttributes> => ({
-  type: 'siem-detection-engine-rule-actions',
-  id: 'ID_OF_LEGACY_SIDECAR_HOURLY_ACTIONS',
-  namespaces: ['default'],
-  attributes: {
-    actions: [
-      {
-        group: 'default',
-        actionRef: 'action_0',
-        params: {
-          message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
-          to: ['test@test.com'],
-          subject: 'Test Actions',
-        },
-        action_type_id: '.email',
-      },
-    ],
-    ruleThrottle: '1h',
-    alertThrottle: '1h',
-  },
-  references: [
-    { id: ruleId, type: 'alert', name: 'alert_0' },
-    { id: connectorId, type: 'action', name: 'action_0' },
-  ],
-  migrationVersion: {
-    'siem-detection-engine-rule-actions': '7.11.2',
-  },
-  coreMigrationVersion: '7.15.2',
-  updated_at: '2022-03-31T19:06:40.473Z',
-  version: 'WzIzNywxXQ==',
-  score: 0,
-});
-
-/**
- * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
- */
-export const legacyGetSiemNotificationRuleDailyActionsSOResult = (
-  ruleId = '123',
-  connectorId = '456'
-): SavedObjectsFindResult<LegacyIRuleActionsAttributes> => ({
-  type: 'siem-detection-engine-rule-actions',
-  id: 'ID_OF_LEGACY_SIDECAR_DAILY_ACTIONS',
-  namespaces: ['default'],
-  attributes: {
-    actions: [
-      {
-        group: 'default',
-        actionRef: 'action_0',
-        params: {
-          message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
-          to: ['test@test.com'],
-          subject: 'Test Actions',
-        },
-        action_type_id: '.email',
-      },
-    ],
-    ruleThrottle: '1d',
-    alertThrottle: '1d',
-  },
-  references: [
-    { id: ruleId, type: 'alert', name: 'alert_0' },
-    { id: connectorId, type: 'action', name: 'action_0' },
-  ],
-  migrationVersion: {
-    'siem-detection-engine-rule-actions': '7.11.2',
-  },
-  coreMigrationVersion: '7.15.2',
-  updated_at: '2022-03-31T19:06:40.473Z',
-  version: 'WzIzNywxXQ==',
-  score: 0,
-});
-
-/**
- * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
- */
-export const legacyGetSiemNotificationRuleWeeklyActionsSOResult = (
-  ruleId = '123',
-  connectorId = '456'
-): SavedObjectsFindResult<LegacyIRuleActionsAttributes> => ({
-  type: 'siem-detection-engine-rule-actions',
-  id: 'ID_OF_LEGACY_SIDECAR_WEEKLY_ACTIONS',
-  namespaces: ['default'],
-  attributes: {
-    actions: [
-      {
-        group: 'default',
-        actionRef: 'action_0',
-        params: {
-          message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
-          to: ['test@test.com'],
-          subject: 'Test Actions',
-        },
-        action_type_id: '.email',
-      },
-    ],
-    ruleThrottle: '7d',
-    alertThrottle: '7d',
-  },
-  references: [
-    { id: ruleId, type: 'alert', name: 'alert_0' },
-    { id: connectorId, type: 'action', name: 'action_0' },
-  ],
-  migrationVersion: {
-    'siem-detection-engine-rule-actions': '7.11.2',
-  },
-  coreMigrationVersion: '7.15.2',
-  updated_at: '2022-03-31T19:06:40.473Z',
-  version: 'WzIzNywxXQ==',
-  score: 0,
-});
-
-const getLegacyActionSOs = (ruleId = '123', connectorId = '456') => ({
-  none: () => legacyGetSiemNotificationRuleNoActionsSOResult(ruleId),
-  rule: () => legacyGetSiemNotificationRuleEveryRunSOResult(ruleId),
-  hourly: () => legacyGetSiemNotificationRuleHourlyActionsSOResult(ruleId, connectorId),
-  daily: () => legacyGetSiemNotificationRuleDailyActionsSOResult(ruleId, connectorId),
-  weekly: () => legacyGetSiemNotificationRuleWeeklyActionsSOResult(ruleId, connectorId),
-});
-
-/**
- * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
- */
-export const legacyGetSiemNotificationRuleActionsSOResultWithSingleHit = (
-  actionTypes: Array<'none' | 'rule' | 'daily' | 'hourly' | 'weekly'>,
-  ruleId = '123',
-  connectorId = '456'
-): SavedObjectsFindResponse<LegacyIRuleActionsAttributes> => {
-  const actions = getLegacyActionSOs(ruleId, connectorId);
-
-  return {
-    page: 1,
-    per_page: 1,
-    total: 1,
-    saved_objects: actionTypes.map((type) => actions[type]()),
-  };
-};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/index.ts
index 22d3c347eef85..fddf872583040 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/index.ts
@@ -21,8 +21,6 @@ export { scheduleNotificationActions } from './logic/notifications/schedule_noti
 export { scheduleThrottledNotificationActions } from './logic/notifications/schedule_throttle_notification_actions';
 export { getNotificationResultsLink } from './logic/notifications/utils';
 
-// eslint-disable-next-line no-restricted-imports
-export { legacyGetBulkRuleActionsSavedObject } from './logic/rule_actions/legacy_get_bulk_rule_actions_saved_object';
 // eslint-disable-next-line no-restricted-imports
 export type { LegacyRulesActionsSavedObject } from './logic/rule_actions/legacy_get_rule_actions_saved_object';
 // eslint-disable-next-line no-restricted-imports
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_get_bulk_rule_actions_saved_object.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_get_bulk_rule_actions_saved_object.ts
deleted file mode 100644
index 300d5307c1773..0000000000000
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_get_bulk_rule_actions_saved_object.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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 { chunk } from 'lodash';
-import type { SavedObjectsFindOptionsReference, Logger } from '@kbn/core/server';
-
-import type { RuleExecutorServices } from '@kbn/alerting-plugin/server';
-// eslint-disable-next-line no-restricted-imports
-import { legacyRuleActionsSavedObjectType } from './legacy_saved_object_mappings';
-// eslint-disable-next-line no-restricted-imports
-import type { LegacyIRuleActionsAttributesSavedObjectAttributes } from './legacy_types';
-// eslint-disable-next-line no-restricted-imports
-import { legacyGetRuleActionsFromSavedObject } from './legacy_utils';
-// eslint-disable-next-line no-restricted-imports
-import type { LegacyRulesActionsSavedObject } from './legacy_get_rule_actions_saved_object';
-import { initPromisePool } from '../../../../../utils/promise_pool';
-
-/**
- * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
- */
-interface LegacyGetBulkRuleActionsSavedObject {
-  alertIds: string[];
-  savedObjectsClient: RuleExecutorServices['savedObjectsClient'];
-  logger: Logger;
-}
-
-/**
- * @deprecated Once we are confident all rules relying on side-car actions SO's have been migrated to SO references we should remove this function
- */
-export const legacyGetBulkRuleActionsSavedObject = async ({
-  alertIds,
-  savedObjectsClient,
-  logger,
-}: LegacyGetBulkRuleActionsSavedObject): Promise<Record<string, LegacyRulesActionsSavedObject>> => {
-  const references = alertIds.map<SavedObjectsFindOptionsReference>((alertId) => ({
-    id: alertId,
-    type: 'alert',
-  }));
-  const { results, errors } = await initPromisePool({
-    concurrency: 1,
-    items: chunk(references, 1000),
-    executor: (referencesChunk) =>
-      savedObjectsClient
-        .find<LegacyIRuleActionsAttributesSavedObjectAttributes>({
-          type: legacyRuleActionsSavedObjectType,
-          perPage: 10000,
-          hasReference: referencesChunk,
-        })
-        .catch((error) => {
-          logger.error(
-            `Error fetching rule actions: ${error instanceof Error ? error.message : String(error)}`
-          );
-          throw error;
-        }),
-  });
-  if (errors.length) {
-    throw new AggregateError(errors, 'Error fetching rule actions');
-  }
-
-  const savedObjects = results.flatMap(({ result }) => result.saved_objects);
-  return savedObjects.reduce(
-    (acc: { [key: string]: LegacyRulesActionsSavedObject }, savedObject) => {
-      const ruleAlertId = savedObject.references.find((reference) => {
-        // Find the first rule alert and assume that is the one we want since we should only ever have 1.
-        return reference.type === 'alert';
-      });
-      // We check to ensure we have found a "ruleAlertId" and hopefully we have.
-      const ruleAlertIdKey = ruleAlertId != null ? ruleAlertId.id : undefined;
-      if (ruleAlertIdKey != null) {
-        acc[ruleAlertIdKey] = legacyGetRuleActionsFromSavedObject(savedObject, logger);
-      } else {
-        logger.error(
-          `Security Solution notification (Legacy) Was expecting to find a reference of type "alert" within ${savedObject.references} but did not. Skipping this notification.`
-        );
-      }
-      return acc;
-    },
-    {}
-  );
-};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_actions/route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_actions/route.test.ts
index a7034123e7a96..ea49f53eacdd3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_actions/route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_actions/route.test.ts
@@ -17,7 +17,6 @@ import {
   getBulkActionEditRequest,
   getFindResultWithSingleHit,
   getFindResultWithMultiHits,
-  getRuleMock,
 } from '../../../../routes/__mocks__/request_responses';
 import { requestContextMock, serverMock, requestMock } from '../../../../routes/__mocks__';
 import { performBulkActionRoute } from './route';
@@ -27,21 +26,10 @@ import {
 } from '../../../../../../../common/detection_engine/rule_management/mocks';
 import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { readRules } from '../../../logic/crud/read_rules';
-// eslint-disable-next-line no-restricted-imports
-import { legacyMigrate } from '../../../logic/rule_actions/legacy_action_migration';
-import { getQueryRuleParams } from '../../../../rule_schema/mocks';
 
 jest.mock('../../../../../machine_learning/authz');
 jest.mock('../../../logic/crud/read_rules', () => ({ readRules: jest.fn() }));
 
-jest.mock('../../../logic/rule_actions/legacy_action_migration', () => {
-  const actual = jest.requireActual('../../../logic/rule_actions/legacy_action_migration');
-  return {
-    ...actual,
-    legacyMigrate: jest.fn(),
-  };
-});
-
 describe('Perform bulk action route', () => {
   const readRulesMock = readRules as jest.Mock;
   let server: ReturnType<typeof serverMock.create>;
@@ -55,7 +43,6 @@ describe('Perform bulk action route', () => {
     logger = loggingSystemMock.createLogger();
     ({ clients, context } = requestContextMock.createTools());
     ml = mlServicesMock.createSetupContract();
-    (legacyMigrate as jest.Mock).mockResolvedValue(getRuleMock(getQueryRuleParams()));
 
     clients.rulesClient.find.mockResolvedValue(getFindResultWithSingleHit());
     performBulkActionRoute(server.router, ml, logger);
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_actions/route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_actions/route.ts
index aa040d3e94239..27b9111b0434d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_actions/route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_actions/route.ts
@@ -8,17 +8,12 @@
 import { truncate } from 'lodash';
 import moment from 'moment';
 import { BadRequestError, transformError } from '@kbn/securitysolution-es-utils';
-import type {
-  IKibanaResponse,
-  KibanaResponseFactory,
-  Logger,
-  SavedObjectsClientContract,
-} from '@kbn/core/server';
+import type { IKibanaResponse, KibanaResponseFactory, Logger } from '@kbn/core/server';
 
 import type { RulesClient, BulkOperationError } from '@kbn/alerting-plugin/server';
-import type { SanitizedRule, BulkActionSkipResult } from '@kbn/alerting-plugin/common';
+import type { BulkActionSkipResult } from '@kbn/alerting-plugin/common';
 import { AbortError } from '@kbn/kibana-utils-plugin/common';
-import type { RuleAlertType, RuleParams } from '../../../../rule_schema';
+import type { RuleAlertType } from '../../../../rule_schema';
 import type { BulkActionsDryRunErrCode } from '../../../../../../../common/constants';
 import {
   DETECTION_ENGINE_RULES_BULK_ACTION,
@@ -52,8 +47,6 @@ import { readRules } from '../../../logic/crud/read_rules';
 import { getExportByObjectIds } from '../../../logic/export/get_export_by_object_ids';
 import { buildSiemResponse } from '../../../../routes/utils';
 import { internalRuleToAPIResponse } from '../../../normalization/rule_converters';
-// eslint-disable-next-line no-restricted-imports
-import { legacyMigrate } from '../../../logic/rule_actions/legacy_action_migration';
 import { bulkEditRules } from '../../../logic/bulk_actions/bulk_edit_rules';
 import type { DryRunError } from '../../../logic/bulk_actions/dry_run';
 import {
@@ -234,39 +227,6 @@ const fetchRulesByQueryOrIds = async ({
   };
 };
 
-/**
- * Helper method to migrate any legacy actions a rule may have. If no actions or no legacy actions
- * no migration is performed.
- * @params rulesClient
- * @params savedObjectsClient
- * @params rule - rule to be migrated
- * @returns The migrated rule
- */
-export const migrateRuleActions = async ({
-  rulesClient,
-  savedObjectsClient,
-  rule,
-}: {
-  rulesClient: RulesClient;
-  savedObjectsClient: SavedObjectsClientContract;
-  rule: RuleAlertType;
-}): Promise<SanitizedRule<RuleParams>> => {
-  const migratedRule = await legacyMigrate({
-    rulesClient,
-    savedObjectsClient,
-    rule,
-  });
-
-  // This should only be hit if `rule` passed into `legacyMigrate`
-  // is `null` or `rule.id` is null which right now, as typed, should not occur
-  // but catching if does, in which case something upstream would be breaking down
-  if (migratedRule == null) {
-    throw new Error(`An error occurred processing rule with id:${rule.id}`);
-  }
-
-  return migratedRule;
-};
-
 export const performBulkActionRoute = (
   router: SecuritySolutionPluginRouter,
   ml: SetupPlugins['ml'],
@@ -359,31 +319,10 @@ export const performBulkActionRoute = (
             mlAuthz,
           });
 
-          // migrate legacy rule actions
-          const migrationOutcome = await initPromisePool({
-            concurrency: MAX_RULES_TO_UPDATE_IN_PARALLEL,
-            items: rules,
-            executor: async (rule) => {
-              // actions only get fired when rule running, so we should be fine to migrate only enabled
-              if (rule.enabled) {
-                return migrateRuleActions({
-                  rulesClient,
-                  savedObjectsClient,
-                  rule,
-                });
-              } else {
-                return rule;
-              }
-            },
-            abortSignal: abortController.signal,
-          });
-
           return buildBulkResponse(response, {
-            updated: migrationOutcome.results
-              .filter(({ result }) => result)
-              .map(({ result }) => result),
+            updated: rules,
             skipped,
-            errors: [...errors, ...migrationOutcome.errors],
+            errors,
           });
         }
 
@@ -413,18 +352,12 @@ export const performBulkActionRoute = (
                   return rule;
                 }
 
-                const migratedRule = await migrateRuleActions({
-                  rulesClient,
-                  savedObjectsClient,
-                  rule,
-                });
-
-                if (!migratedRule.enabled) {
-                  await rulesClient.enable({ id: migratedRule.id });
+                if (!rule.enabled) {
+                  await rulesClient.enable({ id: rule.id });
                 }
 
                 return {
-                  ...migratedRule,
+                  ...rule,
                   enabled: true,
                 };
               },
@@ -446,18 +379,12 @@ export const performBulkActionRoute = (
                   return rule;
                 }
 
-                const migratedRule = await migrateRuleActions({
-                  rulesClient,
-                  savedObjectsClient,
-                  rule,
-                });
-
-                if (migratedRule.enabled) {
-                  await rulesClient.disable({ id: migratedRule.id });
+                if (rule.enabled) {
+                  await rulesClient.disable({ id: rule.id });
                 }
 
                 return {
-                  ...migratedRule,
+                  ...rule,
                   enabled: false,
                 };
               },
@@ -478,14 +405,8 @@ export const performBulkActionRoute = (
                   return null;
                 }
 
-                const migratedRule = await migrateRuleActions({
-                  rulesClient,
-                  savedObjectsClient,
-                  rule,
-                });
-
                 await deleteRules({
-                  ruleId: migratedRule.id,
+                  ruleId: rule.id,
                   rulesClient,
                 });
 
@@ -509,18 +430,14 @@ export const performBulkActionRoute = (
                 if (isDryRun) {
                   return rule;
                 }
-                const migratedRule = await migrateRuleActions({
-                  rulesClient,
-                  savedObjectsClient,
-                  rule,
-                });
+
                 let shouldDuplicateExceptions = true;
                 if (body.duplicate !== undefined) {
                   shouldDuplicateExceptions = body.duplicate.include_exceptions;
                 }
 
                 const duplicateRuleToCreate = await duplicateRule({
-                  rule: migratedRule,
+                  rule,
                 });
 
                 const createdRule = await rulesClient.create({
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_delete_rules/route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_delete_rules/route.ts
index 7864fb0bbb3d3..f1842e0bb76d4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_delete_rules/route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_delete_rules/route.ts
@@ -30,8 +30,6 @@ import {
 } from '../../../../routes/utils';
 import { deleteRules } from '../../../logic/crud/delete_rules';
 import { readRules } from '../../../logic/crud/read_rules';
-// eslint-disable-next-line no-restricted-imports
-import { legacyMigrate } from '../../../logic/rule_actions/legacy_action_migration';
 import { getDeprecatedBulkEndpointHeader, logDeprecatedBulkEndpoint } from '../../deprecation';
 
 type Config = RouteConfig<unknown, unknown, BulkDeleteRulesRequestBody, 'delete' | 'post'>;
@@ -64,7 +62,6 @@ export const bulkDeleteRulesRoute = (router: SecuritySolutionPluginRouter, logge
     const ctx = await context.resolve(['core', 'securitySolution', 'alerting']);
 
     const rulesClient = ctx.alerting.getRulesClient();
-    const savedObjectsClient = ctx.core.savedObjects.client;
 
     const rules = await Promise.all(
       request.body.map(async (payloadRule) => {
@@ -81,21 +78,16 @@ export const bulkDeleteRulesRoute = (router: SecuritySolutionPluginRouter, logge
 
         try {
           const rule = await readRules({ rulesClient, id, ruleId });
-          const migratedRule = await legacyMigrate({
-            rulesClient,
-            savedObjectsClient,
-            rule,
-          });
-          if (!migratedRule) {
+          if (!rule) {
             return getIdBulkError({ id, ruleId });
           }
 
           await deleteRules({
-            ruleId: migratedRule.id,
+            ruleId: rule.id,
             rulesClient,
           });
 
-          return transformValidateBulkError(idOrRuleIdOrUnknown, migratedRule);
+          return transformValidateBulkError(idOrRuleIdOrUnknown, rule);
         } catch (err) {
           return transformBulkError(idOrRuleIdOrUnknown, err);
         }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_patch_rules/route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_patch_rules/route.test.ts
index 2082aa51815fd..802763872cbd3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_patch_rules/route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_patch_rules/route.test.ts
@@ -23,19 +23,9 @@ import { bulkPatchRulesRoute } from './route';
 import { getCreateRulesSchemaMock } from '../../../../../../../common/detection_engine/rule_schema/mocks';
 import { getMlRuleParams, getQueryRuleParams } from '../../../../rule_schema/mocks';
 import { loggingSystemMock } from '@kbn/core/server/mocks';
-// eslint-disable-next-line no-restricted-imports
-import { legacyMigrate } from '../../../logic/rule_actions/legacy_action_migration';
 
 jest.mock('../../../../../machine_learning/authz');
 
-jest.mock('../../../logic/rule_actions/legacy_action_migration', () => {
-  const actual = jest.requireActual('../../../logic/rule_actions/legacy_action_migration');
-  return {
-    ...actual,
-    legacyMigrate: jest.fn(),
-  };
-});
-
 describe('Bulk patch rules route', () => {
   let server: ReturnType<typeof serverMock.create>;
   let { clients, context } = requestContextMock.createTools();
@@ -50,8 +40,6 @@ describe('Bulk patch rules route', () => {
     clients.rulesClient.find.mockResolvedValue(getFindResultWithSingleHit()); // rule exists
     clients.rulesClient.update.mockResolvedValue(getRuleMock(getQueryRuleParams())); // update succeeds
 
-    (legacyMigrate as jest.Mock).mockResolvedValue(getRuleMock(getQueryRuleParams()));
-
     bulkPatchRulesRoute(server.router, ml, logger);
   });
 
@@ -66,7 +54,6 @@ describe('Bulk patch rules route', () => {
 
     test('returns an error in the response when updating a single rule that does not exist', async () => {
       clients.rulesClient.find.mockResolvedValue(getEmptyFindResult());
-      (legacyMigrate as jest.Mock).mockResolvedValue(null);
       const response = await server.inject(
         getPatchBulkRequest(),
         requestContextMock.convertContext(context)
@@ -86,7 +73,6 @@ describe('Bulk patch rules route', () => {
         ...getFindResultWithSingleHit(),
         data: [getRuleMock(getMlRuleParams())],
       });
-      (legacyMigrate as jest.Mock).mockResolvedValueOnce(getRuleMock(getMlRuleParams()));
       const request = requestMock.create({
         method: 'patch',
         path: `${DETECTION_ENGINE_RULES_URL}/bulk_update`,
@@ -167,8 +153,6 @@ describe('Bulk patch rules route', () => {
 
   describe('request validation', () => {
     test('rejects payloads with no ID', async () => {
-      (legacyMigrate as jest.Mock).mockResolvedValue(null);
-
       const request = requestMock.create({
         method: 'patch',
         path: DETECTION_ENGINE_RULES_BULK_UPDATE,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_patch_rules/route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_patch_rules/route.ts
index 2aa1f46c9b9d6..39507d050987c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_patch_rules/route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_patch_rules/route.ts
@@ -24,8 +24,6 @@ import { getIdBulkError } from '../../../utils/utils';
 import { transformValidateBulkError } from '../../../utils/validate';
 import { patchRules } from '../../../logic/crud/patch_rules';
 import { readRules } from '../../../logic/crud/read_rules';
-// eslint-disable-next-line no-restricted-imports
-import { legacyMigrate } from '../../../logic/rule_actions/legacy_action_migration';
 import { getDeprecatedBulkEndpointHeader, logDeprecatedBulkEndpoint } from '../../deprecation';
 import { validateRuleDefaultExceptionList } from '../../../logic/exceptions/validate_rule_default_exception_list';
 import { validateRulesWithDuplicatedDefaultExceptionsList } from '../../../logic/exceptions/validate_rules_with_duplicated_default_exceptions_list';
@@ -98,14 +96,8 @@ export const bulkPatchRulesRoute = (
               ruleId: payloadRule.id,
             });
 
-            const migratedRule = await legacyMigrate({
-              rulesClient,
-              savedObjectsClient,
-              rule: existingRule,
-            });
-
             const rule = await patchRules({
-              existingRule: migratedRule,
+              existingRule,
               rulesClient,
               nextParams: payloadRule,
             });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_update_rules/route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_update_rules/route.test.ts
index 5c8433b3e87fb..54fd9671078da 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_update_rules/route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_update_rules/route.test.ts
@@ -21,19 +21,9 @@ import type { BulkError } from '../../../../routes/utils';
 import { getCreateRulesSchemaMock } from '../../../../../../../common/detection_engine/rule_schema/mocks';
 import { getQueryRuleParams } from '../../../../rule_schema/mocks';
 import { loggingSystemMock } from '@kbn/core/server/mocks';
-// eslint-disable-next-line no-restricted-imports
-import { legacyMigrate } from '../../../logic/rule_actions/legacy_action_migration';
 
 jest.mock('../../../../../machine_learning/authz');
 
-jest.mock('../../../logic/rule_actions/legacy_action_migration', () => {
-  const actual = jest.requireActual('../../../logic/rule_actions/legacy_action_migration');
-  return {
-    ...actual,
-    legacyMigrate: jest.fn(),
-  };
-});
-
 describe('Bulk update rules route', () => {
   let server: ReturnType<typeof serverMock.create>;
   let { clients, context } = requestContextMock.createTools();
@@ -50,8 +40,6 @@ describe('Bulk update rules route', () => {
 
     clients.appClient.getSignalsIndex.mockReturnValue('.siem-signals-test-index');
 
-    (legacyMigrate as jest.Mock).mockResolvedValue(getRuleMock(getQueryRuleParams()));
-
     bulkUpdateRulesRoute(server.router, ml, logger);
   });
 
@@ -66,7 +54,6 @@ describe('Bulk update rules route', () => {
 
     test('returns 200 as a response when updating a single rule that does not exist', async () => {
       clients.rulesClient.find.mockResolvedValue(getEmptyFindResult());
-      (legacyMigrate as jest.Mock).mockResolvedValue(null);
 
       const expected: BulkError[] = [
         {
@@ -130,8 +117,6 @@ describe('Bulk update rules route', () => {
 
   describe('request validation', () => {
     test('rejects payloads with no ID', async () => {
-      (legacyMigrate as jest.Mock).mockResolvedValue(null);
-
       const noIdRequest = requestMock.create({
         method: 'put',
         path: DETECTION_ENGINE_RULES_BULK_UPDATE,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_update_rules/route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_update_rules/route.ts
index d186abecf7b38..9a8ce4a2cd595 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_update_rules/route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_update_rules/route.ts
@@ -28,8 +28,6 @@ import {
   createBulkErrorObject,
 } from '../../../../routes/utils';
 import { updateRules } from '../../../logic/crud/update_rules';
-// eslint-disable-next-line no-restricted-imports
-import { legacyMigrate } from '../../../logic/rule_actions/legacy_action_migration';
 import { readRules } from '../../../logic/crud/read_rules';
 import { getDeprecatedBulkEndpointHeader, logDeprecatedBulkEndpoint } from '../../deprecation';
 import { validateRuleDefaultExceptionList } from '../../../logic/exceptions/validate_rule_default_exception_list';
@@ -103,15 +101,9 @@ export const bulkUpdateRulesRoute = (
               ruleId: payloadRule.id,
             });
 
-            const migratedRule = await legacyMigrate({
-              rulesClient,
-              savedObjectsClient,
-              rule: existingRule,
-            });
-
             const rule = await updateRules({
               rulesClient,
-              existingRule: migratedRule,
+              existingRule,
               ruleUpdate: payloadRule,
             });
             if (rule != null) {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/delete_rule/route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/delete_rule/route.test.ts
index 5f5e81a6c3960..11dd8946419f9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/delete_rule/route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/delete_rule/route.test.ts
@@ -13,21 +13,10 @@ import {
   getFindResultWithSingleHit,
   getDeleteRequestById,
   getEmptySavedObjectsResponse,
-  getRuleMock,
 } from '../../../../routes/__mocks__/request_responses';
 import { requestContextMock, serverMock, requestMock } from '../../../../routes/__mocks__';
 import { deleteRuleRoute } from './route';
 import { getQueryRuleParams } from '../../../../rule_schema/mocks';
-// eslint-disable-next-line no-restricted-imports
-import { legacyMigrate } from '../../../logic/rule_actions/legacy_action_migration';
-
-jest.mock('../../../logic/rule_actions/legacy_action_migration', () => {
-  const actual = jest.requireActual('../../../logic/rule_actions/legacy_action_migration');
-  return {
-    ...actual,
-    legacyMigrate: jest.fn(),
-  };
-});
 
 describe('Delete rule route', () => {
   let server: ReturnType<typeof serverMock.create>;
@@ -40,8 +29,6 @@ describe('Delete rule route', () => {
     clients.rulesClient.find.mockResolvedValue(getFindResultWithSingleHit());
     clients.savedObjectsClient.find.mockResolvedValue(getEmptySavedObjectsResponse());
 
-    (legacyMigrate as jest.Mock).mockResolvedValue(getRuleMock(getQueryRuleParams()));
-
     deleteRuleRoute(server.router);
   });
 
@@ -67,7 +54,7 @@ describe('Delete rule route', () => {
 
     test('returns 404 when deleting a single rule that does not exist with a valid actionClient and alertClient', async () => {
       clients.rulesClient.find.mockResolvedValue(getEmptyFindResult());
-      (legacyMigrate as jest.Mock).mockResolvedValue(null);
+
       const response = await server.inject(
         getDeleteRequest(),
         requestContextMock.convertContext(context)
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/delete_rule/route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/delete_rule/route.ts
index b4044e3dd9914..4c8a61d91543c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/delete_rule/route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/delete_rule/route.ts
@@ -19,8 +19,6 @@ import { buildSiemResponse } from '../../../../routes/utils';
 
 import { deleteRules } from '../../../logic/crud/delete_rules';
 import { readRules } from '../../../logic/crud/read_rules';
-// eslint-disable-next-line no-restricted-imports
-import { legacyMigrate } from '../../../logic/rule_actions/legacy_action_migration';
 import { getIdError, transform } from '../../../utils/utils';
 
 export const deleteRuleRoute = (router: SecuritySolutionPluginRouter) => {
@@ -46,16 +44,10 @@ export const deleteRuleRoute = (router: SecuritySolutionPluginRouter) => {
 
         const ctx = await context.resolve(['core', 'securitySolution', 'alerting']);
         const rulesClient = ctx.alerting.getRulesClient();
-        const savedObjectsClient = ctx.core.savedObjects.client;
 
         const rule = await readRules({ rulesClient, id, ruleId });
-        const migratedRule = await legacyMigrate({
-          rulesClient,
-          savedObjectsClient,
-          rule,
-        });
 
-        if (!migratedRule) {
+        if (!rule) {
           const error = getIdError({ id, ruleId });
           return siemResponse.error({
             body: error.message,
@@ -64,11 +56,11 @@ export const deleteRuleRoute = (router: SecuritySolutionPluginRouter) => {
         }
 
         await deleteRules({
-          ruleId: migratedRule.id,
+          ruleId: rule.id,
           rulesClient,
         });
 
-        const transformed = transform(migratedRule);
+        const transformed = transform(rule);
         if (transformed == null) {
           return siemResponse.error({ statusCode: 500, body: 'failed to transform alert' });
         } else {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/find_rules/route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/find_rules/route.ts
index 8654a9dafd245..59b1842f4ee62 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/find_rules/route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/find_rules/route.ts
@@ -21,9 +21,6 @@ import { buildSiemResponse } from '../../../../routes/utils';
 import { buildRouteValidation } from '../../../../../../utils/build_validation/route_validation';
 import { transformFindAlerts } from '../../../utils/utils';
 
-// eslint-disable-next-line no-restricted-imports
-import { legacyGetBulkRuleActionsSavedObject } from '../../../../rule_actions_legacy';
-
 export const findRulesRoute = (router: SecuritySolutionPluginRouter, logger: Logger) => {
   router.get(
     {
@@ -49,7 +46,6 @@ export const findRulesRoute = (router: SecuritySolutionPluginRouter, logger: Log
         const { query } = request;
         const ctx = await context.resolve(['core', 'securitySolution', 'alerting']);
         const rulesClient = ctx.alerting.getRulesClient();
-        const savedObjectsClient = ctx.core.savedObjects.client;
 
         const rules = await findRules({
           rulesClient,
@@ -61,15 +57,7 @@ export const findRulesRoute = (router: SecuritySolutionPluginRouter, logger: Log
           fields: query.fields,
         });
 
-        const ruleIds = rules.data.map((rule) => rule.id);
-
-        const ruleActions = await legacyGetBulkRuleActionsSavedObject({
-          alertIds: ruleIds,
-          savedObjectsClient,
-          logger,
-        });
-
-        const transformed = transformFindAlerts(rules, ruleActions);
+        const transformed = transformFindAlerts(rules);
         if (transformed == null) {
           return siemResponse.error({ statusCode: 500, body: 'Internal error transforming' });
         } else {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/patch_rule/route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/patch_rule/route.test.ts
index 07ae6a84df003..f2786446056d5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/patch_rule/route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/patch_rule/route.test.ts
@@ -22,21 +22,11 @@ import {
 } from '../../../../routes/__mocks__/request_responses';
 
 import { getMlRuleParams, getQueryRuleParams } from '../../../../rule_schema/mocks';
-// eslint-disable-next-line no-restricted-imports
-import { legacyMigrate } from '../../../logic/rule_actions/legacy_action_migration';
 
 import { patchRuleRoute } from './route';
 
 jest.mock('../../../../../machine_learning/authz');
 
-jest.mock('../../../logic/rule_actions/legacy_action_migration', () => {
-  const actual = jest.requireActual('../../../logic/rule_actions/legacy_action_migration');
-  return {
-    ...actual,
-    legacyMigrate: jest.fn(),
-  };
-});
-
 describe('Patch rule route', () => {
   let server: ReturnType<typeof serverMock.create>;
   let { clients, context } = requestContextMock.createTools();
@@ -51,8 +41,6 @@ describe('Patch rule route', () => {
     clients.rulesClient.find.mockResolvedValue(getFindResultWithSingleHit()); // existing rule
     clients.rulesClient.update.mockResolvedValue(getRuleMock(getQueryRuleParams())); // successful update
 
-    (legacyMigrate as jest.Mock).mockResolvedValue(getRuleMock(getQueryRuleParams()));
-
     patchRuleRoute(server.router, ml);
   });
 
@@ -67,7 +55,6 @@ describe('Patch rule route', () => {
 
     test('returns 404 when updating a single rule that does not exist', async () => {
       clients.rulesClient.find.mockResolvedValue(getEmptyFindResult());
-      (legacyMigrate as jest.Mock).mockResolvedValue(null);
       const response = await server.inject(
         getPatchRequest(),
         requestContextMock.convertContext(context)
@@ -80,7 +67,6 @@ describe('Patch rule route', () => {
     });
 
     test('returns error if requesting a non-rule', async () => {
-      (legacyMigrate as jest.Mock).mockResolvedValue(null);
       clients.rulesClient.find.mockResolvedValue(nonRuleFindResult());
       const response = await server.inject(
         getPatchRequest(),
@@ -114,7 +100,6 @@ describe('Patch rule route', () => {
         ...getFindResultWithSingleHit(),
         data: [getRuleMock(getMlRuleParams())],
       });
-      (legacyMigrate as jest.Mock).mockResolvedValueOnce(getRuleMock(getMlRuleParams()));
       const request = requestMock.create({
         method: 'patch',
         path: DETECTION_ENGINE_RULES_URL,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/patch_rule/route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/patch_rule/route.ts
index a06c36a1502ea..caf9ea5ce5e17 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/patch_rule/route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/patch_rule/route.ts
@@ -24,8 +24,6 @@ import { readRules } from '../../../logic/crud/read_rules';
 import { patchRules } from '../../../logic/crud/patch_rules';
 import { checkDefaultRuleExceptionListReferences } from '../../../logic/exceptions/check_for_default_rule_exception_list';
 import { validateRuleDefaultExceptionList } from '../../../logic/exceptions/validate_rule_default_exception_list';
-// eslint-disable-next-line no-restricted-imports
-import { legacyMigrate } from '../../../logic/rule_actions/legacy_action_migration';
 import { getIdError } from '../../../utils/utils';
 import { transformValidate } from '../../../utils/validate';
 
@@ -83,15 +81,9 @@ export const patchRuleRoute = (router: SecuritySolutionPluginRouter, ml: SetupPl
           ruleId: params.id,
         });
 
-        const migratedRule = await legacyMigrate({
-          rulesClient,
-          savedObjectsClient,
-          rule: existingRule,
-        });
-
         const rule = await patchRules({
           rulesClient,
-          existingRule: migratedRule,
+          existingRule,
           nextParams: params,
         });
         if (rule != null && rule.enabled != null && rule.name != null) {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/read_rule/route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/read_rule/route.ts
index eca9636842074..64e1daec632ba 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/read_rule/route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/read_rule/route.ts
@@ -20,8 +20,6 @@ import { buildSiemResponse } from '../../../../routes/utils';
 import { getIdError, transform } from '../../../utils/utils';
 
 import { readRules } from '../../../logic/crud/read_rules';
-// eslint-disable-next-line no-restricted-imports
-import { legacyGetRuleActionsSavedObject } from '../../../../rule_actions_legacy';
 
 export const readRuleRoute = (router: SecuritySolutionPluginRouter, logger: Logger) => {
   router.get(
@@ -45,7 +43,6 @@ export const readRuleRoute = (router: SecuritySolutionPluginRouter, logger: Logg
 
       try {
         const rulesClient = (await context.alerting).getRulesClient();
-        const savedObjectsClient = (await context.core).savedObjects.client;
 
         const rule = await readRules({
           id,
@@ -53,13 +50,7 @@ export const readRuleRoute = (router: SecuritySolutionPluginRouter, logger: Logg
           ruleId,
         });
         if (rule != null) {
-          const legacyRuleActions = await legacyGetRuleActionsSavedObject({
-            savedObjectsClient,
-            ruleAlertId: rule.id,
-            logger,
-          });
-
-          const transformed = transform(rule, legacyRuleActions);
+          const transformed = transform(rule);
           if (transformed == null) {
             return siemResponse.error({ statusCode: 500, body: 'Internal error transforming' });
           } else {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/update_rule/route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/update_rule/route.test.ts
index 4502e08fb950d..627786be080d9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/update_rule/route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/update_rule/route.test.ts
@@ -20,19 +20,9 @@ import { DETECTION_ENGINE_RULES_URL } from '../../../../../../../common/constant
 import { updateRuleRoute } from './route';
 import { getUpdateRulesSchemaMock } from '../../../../../../../common/detection_engine/rule_schema/mocks';
 import { getQueryRuleParams } from '../../../../rule_schema/mocks';
-// eslint-disable-next-line no-restricted-imports
-import { legacyMigrate } from '../../../logic/rule_actions/legacy_action_migration';
 
 jest.mock('../../../../../machine_learning/authz');
 
-jest.mock('../../../logic/rule_actions/legacy_action_migration', () => {
-  const actual = jest.requireActual('../../../logic/rule_actions/legacy_action_migration');
-  return {
-    ...actual,
-    legacyMigrate: jest.fn(),
-  };
-});
-
 describe('Update rule route', () => {
   let server: ReturnType<typeof serverMock.create>;
   let { clients, context } = requestContextMock.createTools();
@@ -48,8 +38,6 @@ describe('Update rule route', () => {
     clients.rulesClient.update.mockResolvedValue(getRuleMock(getQueryRuleParams())); // successful update
     clients.appClient.getSignalsIndex.mockReturnValue('.siem-signals-test-index');
 
-    (legacyMigrate as jest.Mock).mockResolvedValue(getRuleMock(getQueryRuleParams()));
-
     updateRuleRoute(server.router, ml);
   });
 
@@ -64,7 +52,7 @@ describe('Update rule route', () => {
 
     test('returns 404 when updating a single rule that does not exist', async () => {
       clients.rulesClient.find.mockResolvedValue(getEmptyFindResult());
-      (legacyMigrate as jest.Mock).mockResolvedValue(null);
+
       const response = await server.inject(
         getUpdateRequest(),
         requestContextMock.convertContext(context)
@@ -78,7 +66,6 @@ describe('Update rule route', () => {
     });
 
     test('returns error when updating non-rule', async () => {
-      (legacyMigrate as jest.Mock).mockResolvedValue(null);
       clients.rulesClient.find.mockResolvedValue(nonRuleFindResult());
       const response = await server.inject(
         getUpdateRequest(),
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/update_rule/route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/update_rule/route.ts
index 1f171b15df6e7..ceef8ab9d6e02 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/update_rule/route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/update_rule/route.ts
@@ -20,8 +20,7 @@ import { getIdError } from '../../../utils/utils';
 import { transformValidate } from '../../../utils/validate';
 import { updateRules } from '../../../logic/crud/update_rules';
 import { buildRouteValidation } from '../../../../../../utils/build_validation/route_validation';
-// eslint-disable-next-line no-restricted-imports
-import { legacyMigrate } from '../../../logic/rule_actions/legacy_action_migration';
+
 import { readRules } from '../../../logic/crud/read_rules';
 import { checkDefaultRuleExceptionListReferences } from '../../../logic/exceptions/check_for_default_rule_exception_list';
 import { validateRuleDefaultExceptionList } from '../../../logic/exceptions/validate_rule_default_exception_list';
@@ -72,14 +71,9 @@ export const updateRuleRoute = (router: SecuritySolutionPluginRouter, ml: SetupP
           id: request.body.id,
         });
 
-        const migratedRule = await legacyMigrate({
-          rulesClient,
-          savedObjectsClient,
-          rule: existingRule,
-        });
         const rule = await updateRules({
           rulesClient,
-          existingRule: migratedRule,
+          existingRule,
           ruleUpdate: request.body,
         });
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/index.ts
index f2a694c8df046..7e379651b2faf 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/index.ts
@@ -7,10 +7,6 @@
 
 export * from './api/register_routes';
 
-// TODO: https://github.com/elastic/kibana/pull/142950
-// eslint-disable-next-line no-restricted-imports
-export { legacyMigrate } from './logic/rule_actions/legacy_action_migration';
-
 // TODO: https://github.com/elastic/kibana/pull/142950
 // TODO: Revisit and consider moving to the rule_schema subdomain
 export {
@@ -18,3 +14,5 @@ export {
   typeSpecificCamelToSnake,
   convertCreateAPIToInternalSchema,
 } from './normalization/rule_converters';
+
+export { transformFromAlertThrottle, transformToNotifyWhen } from './normalization/rule_actions';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/export/get_export_all.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/export/get_export_all.ts
index 8346359156508..0962e9bf2f313 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/export/get_export_all.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/export/get_export_all.ts
@@ -17,9 +17,6 @@ import { transformAlertsToRules, transformRuleToExportableFormat } from '../../u
 import { getRuleExceptionsForExport } from './get_export_rule_exceptions';
 import { getRuleActionConnectorsForExport } from './get_export_rule_action_connectors';
 
-// eslint-disable-next-line no-restricted-imports
-import { legacyGetBulkRuleActionsSavedObject } from '../../../rule_actions_legacy';
-
 export const getExportAll = async (
   rulesClient: RulesClient,
   exceptionsClient: ExceptionListClient | undefined,
@@ -35,15 +32,8 @@ export const getExportAll = async (
   actionConnectors: string;
 }> => {
   const ruleAlertTypes = await getNonPackagedRules({ rulesClient });
-  const alertIds = ruleAlertTypes.map((rule) => rule.id);
+  const rules = transformAlertsToRules(ruleAlertTypes);
 
-  // Gather actions
-  const legacyActions = await legacyGetBulkRuleActionsSavedObject({
-    alertIds,
-    savedObjectsClient,
-    logger,
-  });
-  const rules = transformAlertsToRules(ruleAlertTypes, legacyActions);
   const exportRules = rules.map((r) => transformRuleToExportableFormat(r));
 
   // Gather exceptions
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/export/get_export_by_object_ids.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/export/get_export_by_object_ids.ts
index 9672312fc3ed8..492fe15b8c228 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/export/get_export_by_object_ids.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/export/get_export_by_object_ids.ts
@@ -22,8 +22,6 @@ import { transformRuleToExportableFormat } from '../../utils/utils';
 import { getRuleExceptionsForExport } from './get_export_rule_exceptions';
 import { getRuleActionConnectorsForExport } from './get_export_rule_action_connectors';
 
-// eslint-disable-next-line no-restricted-imports
-import { legacyGetBulkRuleActionsSavedObject } from '../../../rule_actions_legacy';
 import { internalRuleToAPIResponse } from '../../normalization/rule_converters';
 import type { RuleResponse } from '../../../../../../common/detection_engine/rule_schema';
 
@@ -123,12 +121,6 @@ export const getRulesFromObjects = async (
     sortField: undefined,
     sortOrder: undefined,
   });
-  const alertIds = rules.data.map((rule) => rule.id);
-  const legacyActions = await legacyGetBulkRuleActionsSavedObject({
-    alertIds,
-    savedObjectsClient,
-    logger,
-  });
 
   const alertsAndErrors = objects.map(({ rule_id: ruleId }) => {
     const matchingRule = rules.data.find((rule) => rule.params.ruleId === ruleId);
@@ -139,9 +131,7 @@ export const getRulesFromObjects = async (
     ) {
       return {
         statusCode: 200,
-        rule: transformRuleToExportableFormat(
-          internalRuleToAPIResponse(matchingRule, legacyActions[matchingRule.id])
-        ),
+        rule: transformRuleToExportableFormat(internalRuleToAPIResponse(matchingRule)),
       };
     } else {
       return {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/import/import_rules_utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/import/import_rules_utils.ts
index 89ec68ff79bb1..d38b48bf9181f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/import/import_rules_utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/import/import_rules_utils.ts
@@ -16,8 +16,6 @@ import type { RulesClient } from '@kbn/alerting-plugin/server';
 import type { ExceptionListClient } from '@kbn/lists-plugin/server';
 
 import type { RuleToImport } from '../../../../../../common/detection_engine/rule_management';
-// eslint-disable-next-line no-restricted-imports
-import { legacyMigrate } from '../rule_actions/legacy_action_migration';
 import type { ImportRuleResponse } from '../../../routes/utils';
 import { createBulkErrorObject } from '../../../routes/utils';
 import { createRules } from '../crud/create_rules';
@@ -128,14 +126,9 @@ export const importRules = async ({
                     status_code: 200,
                   });
                 } else if (rule != null && overwriteRules) {
-                  const migratedRule = await legacyMigrate({
-                    rulesClient,
-                    savedObjectsClient,
-                    rule,
-                  });
                   await patchRules({
                     rulesClient,
-                    existingRule: migratedRule,
+                    existingRule: rule,
                     nextParams: {
                       ...parsedRule,
                       exceptions_list: [...exceptions],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/rule_actions/legacy_action_migration.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/rule_actions/legacy_action_migration.test.ts
deleted file mode 100644
index f8332d5c3f3b1..0000000000000
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/rule_actions/legacy_action_migration.test.ts
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
- * 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 { requestContextMock } from '../../../routes/__mocks__';
-import {
-  getEmptyFindResult,
-  legacyGetDailyNotificationResult,
-  legacyGetHourlyNotificationResult,
-  legacyGetSiemNotificationRuleActionsSOResultWithSingleHit,
-  legacyGetWeeklyNotificationResult,
-} from '../../../routes/__mocks__/request_responses';
-
-import type { RuleAlertType } from '../../../rule_schema';
-
-// eslint-disable-next-line no-restricted-imports
-import { legacyMigrate, getUpdatedActionsParams } from './legacy_action_migration';
-
-const getRuleLegacyActions = (): RuleAlertType =>
-  ({
-    id: '123',
-    notifyWhen: 'onThrottleInterval',
-    name: 'Simple Rule Query',
-    tags: ['__internal_rule_id:ruleId', '__internal_immutable:false'],
-    alertTypeId: 'siem.queryRule',
-    consumer: 'siem',
-    enabled: true,
-    throttle: '1h',
-    apiKeyOwner: 'elastic',
-    createdBy: 'elastic',
-    updatedBy: 'elastic',
-    muteAll: false,
-    mutedInstanceIds: [],
-    monitoring: { execution: { history: [], calculated_metrics: { success_ratio: 0 } } },
-    mapped_params: { risk_score: 1, severity: '60-high' },
-    schedule: { interval: '5m' },
-    actions: [],
-    params: {
-      author: [],
-      description: 'Simple Rule Query',
-      ruleId: 'ruleId',
-      falsePositives: [],
-      from: 'now-6m',
-      immutable: false,
-      outputIndex: '.siem-signals-default',
-      maxSignals: 100,
-      riskScore: 1,
-      riskScoreMapping: [],
-      severity: 'high',
-      severityMapping: [],
-      threat: [],
-      to: 'now',
-      references: [],
-      version: 1,
-      exceptionsList: [],
-      type: 'query',
-      language: 'kuery',
-      index: ['auditbeat-*'],
-      query: 'user.name: root or user.name: admin',
-    },
-    snoozeEndTime: null,
-    updatedAt: '2022-03-31T21:47:25.695Z',
-    createdAt: '2022-03-31T21:47:16.379Z',
-    scheduledTaskId: '21bb9b60-b13c-11ec-99d0-asdfasdfasf',
-    executionStatus: {
-      status: 'pending',
-      lastExecutionDate: '2022-03-31T21:47:25.695Z',
-      lastDuration: 0,
-    },
-  } as unknown as RuleAlertType);
-
-describe('Legacy rule action migration logic', () => {
-  describe('legacyMigrate', () => {
-    const ruleId = '123';
-    const connectorId = '456';
-    const { clients } = requestContextMock.createTools();
-
-    beforeEach(() => {
-      jest.resetAllMocks();
-    });
-
-    test('it does no cleanup or migration if no legacy reminants found', async () => {
-      clients.rulesClient.find.mockResolvedValueOnce(getEmptyFindResult());
-      clients.savedObjectsClient.find.mockResolvedValueOnce({
-        page: 0,
-        per_page: 0,
-        total: 0,
-        saved_objects: [],
-      });
-
-      const rule = {
-        ...getRuleLegacyActions(),
-        id: ruleId,
-        actions: [],
-        throttle: null,
-        notifyWhen: 'onActiveAlert',
-        muteAll: true,
-      } as RuleAlertType;
-
-      const migratedRule = await legacyMigrate({
-        rulesClient: clients.rulesClient,
-        savedObjectsClient: clients.savedObjectsClient,
-        rule,
-      });
-
-      expect(clients.rulesClient.delete).not.toHaveBeenCalled();
-      expect(clients.savedObjectsClient.delete).not.toHaveBeenCalled();
-      expect(migratedRule).toEqual(rule);
-    });
-
-    // Even if a rule is created with no actions pre 7.16, a
-    // siem-detection-engine-rule-actions SO is still created
-    test('it migrates a rule with no actions', async () => {
-      // siem.notifications is not created for a rule with no actions
-      clients.rulesClient.find.mockResolvedValueOnce(getEmptyFindResult());
-      // siem-detection-engine-rule-actions SO is still created
-      clients.savedObjectsClient.find.mockResolvedValueOnce(
-        legacyGetSiemNotificationRuleActionsSOResultWithSingleHit(['none'], ruleId, connectorId)
-      );
-
-      const migratedRule = await legacyMigrate({
-        rulesClient: clients.rulesClient,
-        savedObjectsClient: clients.savedObjectsClient,
-        rule: {
-          ...getRuleLegacyActions(),
-          id: ruleId,
-          actions: [],
-          throttle: null,
-          notifyWhen: 'onActiveAlert',
-          muteAll: true,
-        },
-      });
-
-      expect(clients.rulesClient.delete).not.toHaveBeenCalled();
-      expect(clients.savedObjectsClient.delete).toHaveBeenCalledWith(
-        'siem-detection-engine-rule-actions',
-        'ID_OF_LEGACY_SIDECAR_NO_ACTIONS'
-      );
-      expect(migratedRule?.actions).toEqual([]);
-      expect(migratedRule?.throttle).toBeNull();
-      expect(migratedRule?.muteAll).toBeTruthy();
-      expect(migratedRule?.notifyWhen).toEqual('onActiveAlert');
-    });
-
-    test('it migrates a rule with every rule run action', async () => {
-      // siem.notifications is not created for a rule with actions run every rule run
-      clients.rulesClient.find.mockResolvedValueOnce(getEmptyFindResult());
-      // siem-detection-engine-rule-actions SO is still created
-      clients.savedObjectsClient.find.mockResolvedValueOnce(
-        legacyGetSiemNotificationRuleActionsSOResultWithSingleHit(['rule'], ruleId, connectorId)
-      );
-
-      const migratedRule = await legacyMigrate({
-        rulesClient: clients.rulesClient,
-        savedObjectsClient: clients.savedObjectsClient,
-        rule: {
-          ...getRuleLegacyActions(),
-          id: ruleId,
-          actions: [
-            {
-              actionTypeId: '.email',
-              params: {
-                subject: 'Test Actions',
-                to: ['test@test.com'],
-                message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
-              },
-              id: connectorId,
-              group: 'default',
-            },
-          ],
-          throttle: null,
-          notifyWhen: 'onActiveAlert',
-          muteAll: false,
-        },
-      });
-
-      expect(clients.rulesClient.delete).not.toHaveBeenCalled();
-      expect(clients.savedObjectsClient.delete).toHaveBeenCalledWith(
-        'siem-detection-engine-rule-actions',
-        'ID_OF_LEGACY_SIDECAR_RULE_RUN_ACTIONS'
-      );
-      expect(migratedRule?.actions).toEqual([
-        {
-          id: connectorId,
-          actionTypeId: '.email',
-          group: 'default',
-          params: {
-            message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
-            subject: 'Test Actions',
-            to: ['test@test.com'],
-          },
-        },
-      ]);
-      expect(migratedRule?.notifyWhen).toEqual('onActiveAlert');
-      expect(migratedRule?.throttle).toBeNull();
-      expect(migratedRule?.muteAll).toBeFalsy();
-    });
-
-    test('it migrates a rule with daily legacy actions', async () => {
-      // siem.notifications is not created for a rule with no actions
-      clients.rulesClient.find.mockResolvedValueOnce({
-        page: 1,
-        perPage: 1,
-        total: 1,
-        data: [legacyGetDailyNotificationResult(connectorId, ruleId)],
-      });
-      // siem-detection-engine-rule-actions SO is still created
-      clients.savedObjectsClient.find.mockResolvedValueOnce(
-        legacyGetSiemNotificationRuleActionsSOResultWithSingleHit(['daily'], ruleId, connectorId)
-      );
-
-      const migratedRule = await legacyMigrate({
-        rulesClient: clients.rulesClient,
-        savedObjectsClient: clients.savedObjectsClient,
-        rule: {
-          ...getRuleLegacyActions(),
-          id: ruleId,
-          actions: [],
-          throttle: null,
-          notifyWhen: 'onActiveAlert',
-        },
-      });
-
-      expect(clients.rulesClient.delete).toHaveBeenCalledWith({ id: '456' });
-      expect(clients.savedObjectsClient.delete).toHaveBeenCalledWith(
-        'siem-detection-engine-rule-actions',
-        'ID_OF_LEGACY_SIDECAR_DAILY_ACTIONS'
-      );
-      expect(migratedRule?.actions).toEqual([
-        {
-          actionTypeId: '.email',
-          group: 'default',
-          id: connectorId,
-          params: {
-            message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
-            to: ['test@test.com'],
-            subject: 'Test Actions',
-          },
-        },
-      ]);
-      expect(migratedRule?.throttle).toEqual('1d');
-      expect(migratedRule?.notifyWhen).toEqual('onThrottleInterval');
-      expect(migratedRule?.muteAll).toBeFalsy();
-    });
-
-    test('it migrates a rule with hourly legacy actions', async () => {
-      // siem.notifications is not created for a rule with no actions
-      clients.rulesClient.find.mockResolvedValueOnce({
-        page: 1,
-        perPage: 1,
-        total: 1,
-        data: [legacyGetHourlyNotificationResult(connectorId, ruleId)],
-      });
-      // siem-detection-engine-rule-actions SO is still created
-      clients.savedObjectsClient.find.mockResolvedValueOnce(
-        legacyGetSiemNotificationRuleActionsSOResultWithSingleHit(['hourly'], ruleId, connectorId)
-      );
-
-      const migratedRule = await legacyMigrate({
-        rulesClient: clients.rulesClient,
-        savedObjectsClient: clients.savedObjectsClient,
-        rule: {
-          ...getRuleLegacyActions(),
-          id: ruleId,
-          actions: [],
-          throttle: null,
-          notifyWhen: 'onActiveAlert',
-        },
-      });
-
-      expect(clients.rulesClient.delete).toHaveBeenCalledWith({ id: '456' });
-      expect(clients.savedObjectsClient.delete).toHaveBeenCalledWith(
-        'siem-detection-engine-rule-actions',
-        'ID_OF_LEGACY_SIDECAR_HOURLY_ACTIONS'
-      );
-      expect(migratedRule?.actions).toEqual([
-        {
-          actionTypeId: '.email',
-          group: 'default',
-          id: connectorId,
-          params: {
-            message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
-            to: ['test@test.com'],
-            subject: 'Test Actions',
-          },
-        },
-      ]);
-      expect(migratedRule?.throttle).toEqual('1h');
-      expect(migratedRule?.notifyWhen).toEqual('onThrottleInterval');
-      expect(migratedRule?.muteAll).toBeFalsy();
-    });
-
-    test('it migrates a rule with weekly legacy actions', async () => {
-      // siem.notifications is not created for a rule with no actions
-      clients.rulesClient.find.mockResolvedValueOnce({
-        page: 1,
-        perPage: 1,
-        total: 1,
-        data: [legacyGetWeeklyNotificationResult(connectorId, ruleId)],
-      });
-      // siem-detection-engine-rule-actions SO is still created
-      clients.savedObjectsClient.find.mockResolvedValueOnce(
-        legacyGetSiemNotificationRuleActionsSOResultWithSingleHit(['weekly'], ruleId, connectorId)
-      );
-
-      const migratedRule = await legacyMigrate({
-        rulesClient: clients.rulesClient,
-        savedObjectsClient: clients.savedObjectsClient,
-        rule: {
-          ...getRuleLegacyActions(),
-          id: ruleId,
-          actions: [],
-          throttle: null,
-          notifyWhen: 'onActiveAlert',
-        },
-      });
-
-      expect(clients.rulesClient.delete).toHaveBeenCalledWith({ id: '456' });
-      expect(clients.savedObjectsClient.delete).toHaveBeenCalledWith(
-        'siem-detection-engine-rule-actions',
-        'ID_OF_LEGACY_SIDECAR_WEEKLY_ACTIONS'
-      );
-      expect(migratedRule?.actions).toEqual([
-        {
-          actionTypeId: '.email',
-          group: 'default',
-          id: connectorId,
-          params: {
-            message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
-            to: ['test@test.com'],
-            subject: 'Test Actions',
-          },
-        },
-      ]);
-      expect(migratedRule?.throttle).toEqual('7d');
-      expect(migratedRule?.notifyWhen).toEqual('onThrottleInterval');
-      expect(migratedRule?.muteAll).toBeFalsy();
-    });
-  });
-
-  describe('getUpdatedActionsParams', () => {
-    it('updates one action', () => {
-      const { id, ...rule } = {
-        ...getRuleLegacyActions(),
-        id: '123',
-        actions: [],
-        throttle: null,
-        notifyWhen: 'onActiveAlert',
-      } as RuleAlertType;
-
-      expect(
-        getUpdatedActionsParams({
-          rule: {
-            ...rule,
-            id,
-          },
-          ruleThrottle: '1h',
-          actions: [
-            {
-              actionRef: 'action_0',
-              group: 'default',
-              params: {
-                message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
-                to: ['a@a.com'],
-                subject: 'Test Actions',
-              },
-              action_type_id: '.email',
-            },
-          ],
-          references: [
-            {
-              id: '61ec7a40-b076-11ec-bb3f-1f063f8e06cf',
-              type: 'alert',
-              name: 'alert_0',
-            },
-            {
-              id: '1234',
-              type: 'action',
-              name: 'action_0',
-            },
-          ],
-        })
-      ).toEqual({
-        ...rule,
-        actions: [
-          {
-            actionTypeId: '.email',
-            group: 'default',
-            id: '1234',
-            params: {
-              message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
-              subject: 'Test Actions',
-              to: ['a@a.com'],
-            },
-          },
-        ],
-        throttle: '1h',
-        notifyWhen: 'onThrottleInterval',
-      });
-    });
-
-    it('updates multiple actions', () => {
-      const { id, ...rule } = {
-        ...getRuleLegacyActions(),
-        id: '123',
-        actions: [],
-        throttle: null,
-        notifyWhen: 'onActiveAlert',
-      } as RuleAlertType;
-
-      expect(
-        getUpdatedActionsParams({
-          rule: {
-            ...rule,
-            id,
-          },
-          ruleThrottle: '1h',
-          actions: [
-            {
-              actionRef: 'action_0',
-              group: 'default',
-              params: {
-                message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
-                to: ['test@test.com'],
-                subject: 'Rule email',
-              },
-              action_type_id: '.email',
-            },
-            {
-              actionRef: 'action_1',
-              group: 'default',
-              params: {
-                message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
-              },
-              action_type_id: '.slack',
-            },
-          ],
-          references: [
-            {
-              id: '064e3160-b076-11ec-bb3f-1f063f8e06cf',
-              type: 'alert',
-              name: 'alert_0',
-            },
-            {
-              id: 'c95cb100-b075-11ec-bb3f-1f063f8e06cf',
-              type: 'action',
-              name: 'action_0',
-            },
-            {
-              id: '207fa0e0-c04e-11ec-8a52-4fb92379525a',
-              type: 'action',
-              name: 'action_1',
-            },
-          ],
-        })
-      ).toEqual({
-        ...rule,
-        actions: [
-          {
-            actionTypeId: '.email',
-            group: 'default',
-            id: 'c95cb100-b075-11ec-bb3f-1f063f8e06cf',
-            params: {
-              message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
-              subject: 'Rule email',
-              to: ['test@test.com'],
-            },
-          },
-          {
-            actionTypeId: '.slack',
-            group: 'default',
-            id: '207fa0e0-c04e-11ec-8a52-4fb92379525a',
-            params: {
-              message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
-            },
-          },
-        ],
-        throttle: '1h',
-        notifyWhen: 'onThrottleInterval',
-      });
-    });
-  });
-});
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/rule_actions/legacy_action_migration.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/rule_actions/legacy_action_migration.ts
deleted file mode 100644
index 8c69edc33064b..0000000000000
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/rule_actions/legacy_action_migration.ts
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * 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 { isEmpty } from 'lodash/fp';
-
-import type { RuleAction } from '@kbn/alerting-plugin/common';
-import type { RulesClient } from '@kbn/alerting-plugin/server';
-import type { SavedObjectReference, SavedObjectsClientContract } from '@kbn/core/server';
-
-import { withSecuritySpan } from '../../../../../utils/with_security_span';
-import type { RuleAlertType } from '../../../rule_schema';
-
-// eslint-disable-next-line no-restricted-imports
-import { legacyRuleActionsSavedObjectType } from '../../../rule_actions_legacy';
-// eslint-disable-next-line no-restricted-imports
-import type {
-  LegacyIRuleActionsAttributes,
-  LegacyRuleAlertSavedObjectAction,
-} from '../../../rule_actions_legacy';
-
-import { transformToAlertThrottle, transformToNotifyWhen } from '../../normalization/rule_actions';
-
-export interface LegacyMigrateParams {
-  rulesClient: RulesClient;
-  savedObjectsClient: SavedObjectsClientContract;
-  rule: RuleAlertType | null | undefined;
-}
-
-/**
- * Determines if rule needs to be migrated from legacy actions
- * and returns necessary pieces for the updated rule
- */
-export const legacyMigrate = async ({
-  rulesClient,
-  savedObjectsClient,
-  rule,
-}: LegacyMigrateParams): Promise<RuleAlertType | null | undefined> =>
-  withSecuritySpan('legacyMigrate', async () => {
-    if (rule == null || rule.id == null) {
-      return rule;
-    }
-    /**
-     * On update / patch I'm going to take the actions as they are, better off taking rules client.find (siem.notification) result
-     * and putting that into the actions array of the rule, then set the rules onThrottle property, notifyWhen and throttle from null -> actual value (1hr etc..)
-     * Then use the rules client to delete the siem.notification
-     * Then with the legacy Rule Actions saved object type, just delete it.
-     */
-    // find it using the references array, not params.ruleAlertId
-    const [siemNotification, legacyRuleActionsSO] = await Promise.all([
-      rulesClient.find({
-        options: {
-          filter: 'alert.attributes.alertTypeId:(siem.notifications)',
-          hasReference: {
-            type: 'alert',
-            id: rule.id,
-          },
-        },
-      }),
-      savedObjectsClient.find<LegacyIRuleActionsAttributes>({
-        type: legacyRuleActionsSavedObjectType,
-        hasReference: {
-          type: 'alert',
-          id: rule.id,
-        },
-      }),
-    ]);
-
-    const siemNotificationsExist = siemNotification != null && siemNotification.data.length > 0;
-    const legacyRuleNotificationSOsExist =
-      legacyRuleActionsSO != null && legacyRuleActionsSO.saved_objects.length > 0;
-
-    // Assumption: if no legacy sidecar SO or notification rule types exist
-    // that reference the rule in question, assume rule actions are not legacy
-    if (!siemNotificationsExist && !legacyRuleNotificationSOsExist) {
-      return rule;
-    }
-    // If the legacy notification rule type ("siem.notification") exist,
-    // migration and cleanup are needed
-    if (siemNotificationsExist) {
-      await rulesClient.delete({ id: siemNotification.data[0].id });
-    }
-    // If legacy notification sidecar ("siem-detection-engine-rule-actions")
-    // exist, migration and cleanup are needed
-    if (legacyRuleNotificationSOsExist) {
-      // Delete the legacy sidecar SO
-      await savedObjectsClient.delete(
-        legacyRuleActionsSavedObjectType,
-        legacyRuleActionsSO.saved_objects[0].id
-      );
-
-      // If "siem-detection-engine-rule-actions" notes that `ruleThrottle` is
-      // "no_actions" or "rule", rule has no actions or rule is set to run
-      // action on every rule run. In these cases, sidecar deletion is the only
-      // cleanup needed and updates to the "throttle" and "notifyWhen". "siem.notification" are
-      // not created for these action types
-      if (
-        legacyRuleActionsSO.saved_objects[0].attributes.ruleThrottle === 'no_actions' ||
-        legacyRuleActionsSO.saved_objects[0].attributes.ruleThrottle === 'rule'
-      ) {
-        return rule;
-      }
-
-      // Use "legacyRuleActionsSO" instead of "siemNotification" as "siemNotification" is not created
-      // until a rule is run and added to task manager. That means that if by chance a user has a rule
-      // with actions which they have yet to enable, the actions would be lost. Instead,
-      // "legacyRuleActionsSO" is created on rule creation (pre 7.15) and we can rely on it to be there
-      const migratedRule = getUpdatedActionsParams({
-        rule,
-        ruleThrottle: legacyRuleActionsSO.saved_objects[0].attributes.ruleThrottle,
-        actions: legacyRuleActionsSO.saved_objects[0].attributes.actions,
-        references: legacyRuleActionsSO.saved_objects[0].references,
-      });
-
-      await rulesClient.update({
-        id: rule.id,
-        data: migratedRule,
-      });
-
-      return { id: rule.id, ...migratedRule };
-    }
-  });
-
-/**
- * Translate legacy action sidecar action to rule action
- */
-export const getUpdatedActionsParams = ({
-  rule,
-  ruleThrottle,
-  actions,
-  references,
-}: {
-  rule: RuleAlertType;
-  ruleThrottle: string | null;
-  actions: LegacyRuleAlertSavedObjectAction[];
-  references: SavedObjectReference[];
-}): Omit<RuleAlertType, 'id'> => {
-  const { id, ...restOfRule } = rule;
-
-  const actionReference = references.reduce<Record<string, SavedObjectReference>>(
-    (acc, reference) => {
-      acc[reference.name] = reference;
-      return acc;
-    },
-    {}
-  );
-
-  if (isEmpty(actionReference)) {
-    throw new Error(
-      `An error occurred migrating legacy action for rule with id:${id}. Connector reference id not found.`
-    );
-  }
-  // If rule has an action on any other interval (other than on every
-  // rule run), need to move the action info from the sidecar/legacy action
-  // into the rule itself
-  return {
-    ...restOfRule,
-    actions: actions.reduce<RuleAction[]>((acc, action) => {
-      const { actionRef, action_type_id: actionTypeId, ...resOfAction } = action;
-      if (!actionReference[actionRef]) {
-        return acc;
-      }
-      return [
-        ...acc,
-        {
-          ...resOfAction,
-          id: actionReference[actionRef].id,
-          actionTypeId,
-        },
-      ];
-    }, []),
-    throttle: transformToAlertThrottle(ruleThrottle),
-    notifyWhen: transformToNotifyWhen(ruleThrottle),
-  };
-};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/normalization/rule_actions.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/normalization/rule_actions.test.ts
index 419e84d4d8373..d0d5edad970f0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/normalization/rule_actions.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/normalization/rule_actions.test.ts
@@ -5,20 +5,14 @@
  * 2.0.
  */
 
-import type { RuleAction } from '@kbn/alerting-plugin/common';
-
 import {
   NOTIFICATION_THROTTLE_NO_ACTIONS,
   NOTIFICATION_THROTTLE_RULE,
 } from '../../../../../common/constants';
 
-import type { RuleResponse } from '../../../../../common/detection_engine/rule_schema';
-// eslint-disable-next-line no-restricted-imports
-import type { LegacyRuleActions } from '../../rule_actions_legacy';
 import type { RuleAlertType } from '../../rule_schema';
 
 import {
-  transformActions,
   transformFromAlertThrottle,
   transformToAlertThrottle,
   transformToNotifyWhen,
@@ -88,307 +82,73 @@ describe('Rule actions normalization', () => {
   describe('transformFromAlertThrottle', () => {
     test('muteAll returns "NOTIFICATION_THROTTLE_NO_ACTIONS" even with notifyWhen set and actions has an array element', () => {
       expect(
-        transformFromAlertThrottle(
-          {
-            muteAll: true,
-            notifyWhen: 'onActiveAlert',
-            actions: [
-              {
-                group: 'group',
-                id: 'id-123',
-                actionTypeId: 'id-456',
-                params: {},
-              },
-            ],
-          } as RuleAlertType,
-          undefined
-        )
+        transformFromAlertThrottle({
+          muteAll: true,
+          notifyWhen: 'onActiveAlert',
+          actions: [
+            {
+              group: 'group',
+              id: 'id-123',
+              actionTypeId: 'id-456',
+              params: {},
+            },
+          ],
+        } as RuleAlertType)
       ).toEqual(NOTIFICATION_THROTTLE_NO_ACTIONS);
     });
 
     test('returns "NOTIFICATION_THROTTLE_NO_ACTIONS" if actions is an empty array and we do not have a throttle', () => {
       expect(
-        transformFromAlertThrottle(
-          {
-            muteAll: false,
-            notifyWhen: 'onActiveAlert',
-            actions: [],
-          } as unknown as RuleAlertType,
-          undefined
-        )
+        transformFromAlertThrottle({
+          muteAll: false,
+          notifyWhen: 'onActiveAlert',
+          actions: [],
+        } as unknown as RuleAlertType)
       ).toEqual(NOTIFICATION_THROTTLE_NO_ACTIONS);
     });
 
     test('returns "NOTIFICATION_THROTTLE_NO_ACTIONS" if actions is an empty array and we have a throttle', () => {
       expect(
-        transformFromAlertThrottle(
-          {
-            muteAll: false,
-            notifyWhen: 'onThrottleInterval',
-            actions: [],
-            throttle: '1d',
-          } as unknown as RuleAlertType,
-          undefined
-        )
+        transformFromAlertThrottle({
+          muteAll: false,
+          notifyWhen: 'onThrottleInterval',
+          actions: [],
+          throttle: '1d',
+        } as unknown as RuleAlertType)
       ).toEqual(NOTIFICATION_THROTTLE_NO_ACTIONS);
     });
 
     test('it returns "NOTIFICATION_THROTTLE_RULE" if "notifyWhen" is set, muteAll is false and we have an actions array', () => {
       expect(
-        transformFromAlertThrottle(
-          {
-            muteAll: false,
-            notifyWhen: 'onActiveAlert',
-            actions: [
-              {
-                group: 'group',
-                id: 'id-123',
-                actionTypeId: 'id-456',
-                params: {},
-              },
-            ],
-          } as RuleAlertType,
-          undefined
-        )
+        transformFromAlertThrottle({
+          muteAll: false,
+          notifyWhen: 'onActiveAlert',
+          actions: [
+            {
+              group: 'group',
+              id: 'id-123',
+              actionTypeId: 'id-456',
+              params: {},
+            },
+          ],
+        } as RuleAlertType)
       ).toEqual(NOTIFICATION_THROTTLE_RULE);
     });
 
     test('it returns "NOTIFICATION_THROTTLE_RULE" if "notifyWhen" and "throttle" are not set, but we have an actions array', () => {
       expect(
-        transformFromAlertThrottle(
-          {
-            muteAll: false,
-            actions: [
-              {
-                group: 'group',
-                id: 'id-123',
-                actionTypeId: 'id-456',
-                params: {},
-              },
-            ],
-          } as RuleAlertType,
-          undefined
-        )
-      ).toEqual(NOTIFICATION_THROTTLE_RULE);
-    });
-
-    test('it will use the "rule" and not the "legacyRuleActions" if the rule and actions is defined', () => {
-      const legacyRuleActions: LegacyRuleActions = {
-        id: 'id_1',
-        ruleThrottle: '',
-        alertThrottle: '',
-        actions: [
-          {
-            id: 'id_2',
-            group: 'group',
-            action_type_id: 'actionTypeId',
-            params: {},
-          },
-        ],
-      };
-
-      expect(
-        transformFromAlertThrottle(
-          {
-            muteAll: true,
-            notifyWhen: 'onActiveAlert',
-            actions: [
-              {
-                group: 'group',
-                id: 'id-123',
-                actionTypeId: 'id-456',
-                params: {},
-              },
-            ],
-          } as RuleAlertType,
-          legacyRuleActions
-        )
-      ).toEqual(NOTIFICATION_THROTTLE_NO_ACTIONS);
-    });
-
-    test('it will use the "legacyRuleActions" and not the "rule" if the rule actions is an empty array', () => {
-      const legacyRuleActions: LegacyRuleActions = {
-        id: 'id_1',
-        ruleThrottle: NOTIFICATION_THROTTLE_RULE,
-        alertThrottle: null,
-        actions: [
-          {
-            id: 'id_2',
-            group: 'group',
-            action_type_id: 'actionTypeId',
-            params: {},
-          },
-        ],
-      };
-
-      expect(
-        transformFromAlertThrottle(
-          {
-            muteAll: true,
-            notifyWhen: 'onActiveAlert',
-            actions: [],
-          } as unknown as RuleAlertType,
-          legacyRuleActions
-        )
-      ).toEqual(NOTIFICATION_THROTTLE_RULE);
-    });
-
-    test('it will use the "legacyRuleActions" and not the "rule" if the rule actions is a null', () => {
-      const legacyRuleActions: LegacyRuleActions = {
-        id: 'id_1',
-        ruleThrottle: NOTIFICATION_THROTTLE_RULE,
-        alertThrottle: null,
-        actions: [
-          {
-            id: 'id_2',
-            group: 'group',
-            action_type_id: 'actionTypeId',
-            params: {},
-          },
-        ],
-      };
-
-      expect(
-        transformFromAlertThrottle(
-          {
-            muteAll: true,
-            notifyWhen: 'onActiveAlert',
-            actions: null,
-          } as unknown as RuleAlertType,
-          legacyRuleActions
-        )
+        transformFromAlertThrottle({
+          muteAll: false,
+          actions: [
+            {
+              group: 'group',
+              id: 'id-123',
+              actionTypeId: 'id-456',
+              params: {},
+            },
+          ],
+        } as RuleAlertType)
       ).toEqual(NOTIFICATION_THROTTLE_RULE);
     });
   });
-
-  describe('transformActions', () => {
-    test('It transforms two alert actions', () => {
-      const alertAction: RuleAction[] = [
-        {
-          id: 'id_1',
-          group: 'group',
-          actionTypeId: 'actionTypeId',
-          params: {},
-        },
-        {
-          id: 'id_2',
-          group: 'group',
-          actionTypeId: 'actionTypeId',
-          params: {},
-        },
-      ];
-
-      const transformed = transformActions(alertAction, null);
-      expect(transformed).toEqual<RuleResponse['actions']>([
-        {
-          id: 'id_1',
-          group: 'group',
-          action_type_id: 'actionTypeId',
-          params: {},
-        },
-        {
-          id: 'id_2',
-          group: 'group',
-          action_type_id: 'actionTypeId',
-          params: {},
-        },
-      ]);
-    });
-
-    test('It transforms two alert actions but not a legacyRuleActions if this is also passed in', () => {
-      const alertAction: RuleAction[] = [
-        {
-          id: 'id_1',
-          group: 'group',
-          actionTypeId: 'actionTypeId',
-          params: {},
-        },
-        {
-          id: 'id_2',
-          group: 'group',
-          actionTypeId: 'actionTypeId',
-          params: {},
-        },
-      ];
-      const legacyRuleActions: LegacyRuleActions = {
-        id: 'id_1',
-        ruleThrottle: '',
-        alertThrottle: '',
-        actions: [
-          {
-            id: 'id_2',
-            group: 'group',
-            action_type_id: 'actionTypeId',
-            params: {},
-          },
-        ],
-      };
-      const transformed = transformActions(alertAction, legacyRuleActions);
-      expect(transformed).toEqual<RuleResponse['actions']>([
-        {
-          id: 'id_1',
-          group: 'group',
-          action_type_id: 'actionTypeId',
-          params: {},
-        },
-        {
-          id: 'id_2',
-          group: 'group',
-          action_type_id: 'actionTypeId',
-          params: {},
-        },
-      ]);
-    });
-
-    test('It will transform the legacyRuleActions if the alertAction is an empty array', () => {
-      const alertAction: RuleAction[] = [];
-      const legacyRuleActions: LegacyRuleActions = {
-        id: 'id_1',
-        ruleThrottle: '',
-        alertThrottle: '',
-        actions: [
-          {
-            id: 'id_2',
-            group: 'group',
-            action_type_id: 'actionTypeId',
-            params: {},
-          },
-        ],
-      };
-      const transformed = transformActions(alertAction, legacyRuleActions);
-      expect(transformed).toEqual<RuleResponse['actions']>([
-        {
-          id: 'id_2',
-          group: 'group',
-          action_type_id: 'actionTypeId',
-          params: {},
-        },
-      ]);
-    });
-
-    test('It will transform the legacyRuleActions if the alertAction is undefined', () => {
-      const legacyRuleActions: LegacyRuleActions = {
-        id: 'id_1',
-        ruleThrottle: '',
-        alertThrottle: '',
-        actions: [
-          {
-            id: 'id_2',
-            group: 'group',
-            action_type_id: 'actionTypeId',
-            params: {},
-          },
-        ],
-      };
-      const transformed = transformActions(undefined, legacyRuleActions);
-      expect(transformed).toEqual<RuleResponse['actions']>([
-        {
-          id: 'id_2',
-          group: 'group',
-          action_type_id: 'actionTypeId',
-          params: {},
-        },
-      ]);
-    });
-  });
 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/normalization/rule_actions.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/normalization/rule_actions.ts
index bc2cb970ba7f3..51dbe9d80f986 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/normalization/rule_actions.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/normalization/rule_actions.ts
@@ -5,17 +5,13 @@
  * 2.0.
  */
 
-import type { RuleAction, RuleNotifyWhenType } from '@kbn/alerting-plugin/common';
+import type { RuleNotifyWhenType } from '@kbn/alerting-plugin/common';
 
 import {
   NOTIFICATION_THROTTLE_NO_ACTIONS,
   NOTIFICATION_THROTTLE_RULE,
 } from '../../../../../common/constants';
 
-import type { RuleResponse } from '../../../../../common/detection_engine/rule_schema';
-import { transformAlertToRuleAction } from '../../../../../common/detection_engine/transform_actions';
-// eslint-disable-next-line no-restricted-imports
-import type { LegacyRuleActions } from '../../rule_actions_legacy';
 import type { RuleAlertType } from '../../rule_schema';
 
 /**
@@ -60,28 +56,18 @@ export const transformToAlertThrottle = (throttle: string | null | undefined): s
  * on it to which should not be typical but possible due to the split nature of the API's, this will prefer the
  * usage of the non-legacy version. Eventually the "legacyRuleActions" should be removed.
  * @param throttle The throttle from a  "alerting" Saved Object (SO)
- * @param legacyRuleActions Legacy "side car" rule actions that if it detects it being passed it in will transform using it.
  * @returns The "security_solution" throttle
  */
-export const transformFromAlertThrottle = (
-  rule: RuleAlertType,
-  legacyRuleActions: LegacyRuleActions | null | undefined
-): string => {
-  if (legacyRuleActions == null || (rule.actions != null && rule.actions.length > 0)) {
-    if (rule.muteAll || rule.actions.length === 0) {
-      return NOTIFICATION_THROTTLE_NO_ACTIONS;
-    } else if (rule.notifyWhen == null) {
-      return transformFromFirstActionThrottle(rule);
-    } else if (rule.notifyWhen === 'onActiveAlert') {
-      return NOTIFICATION_THROTTLE_RULE;
-    } else if (rule.throttle == null) {
-      return NOTIFICATION_THROTTLE_NO_ACTIONS;
-    } else {
-      return rule.throttle;
-    }
-  } else {
-    return legacyRuleActions.ruleThrottle;
+export const transformFromAlertThrottle = (rule: RuleAlertType): string => {
+  if (rule.muteAll || rule.actions.length === 0) {
+    return NOTIFICATION_THROTTLE_NO_ACTIONS;
+  } else if (rule.notifyWhen == null) {
+    return transformFromFirstActionThrottle(rule);
+  } else if (rule.notifyWhen === 'onActiveAlert') {
+    return NOTIFICATION_THROTTLE_RULE;
   }
+
+  return rule.throttle ?? NOTIFICATION_THROTTLE_NO_ACTIONS;
 };
 
 function transformFromFirstActionThrottle(rule: RuleAlertType) {
@@ -90,25 +76,3 @@ function transformFromFirstActionThrottle(rule: RuleAlertType) {
     return NOTIFICATION_THROTTLE_RULE;
   return frequency.throttle;
 }
-
-/**
- * Given a set of actions from an "alerting" Saved Object (SO) this will transform it into a "security_solution" alert action.
- * If this detects any legacy rule actions it will transform it. If both are sent in which is not typical but possible due to
- * the split nature of the API's this will prefer the usage of the non-legacy version. Eventually the "legacyRuleActions" should
- * be removed.
- * @param alertAction The alert action form a "alerting" Saved Object (SO).
- * @param legacyRuleActions Legacy "side car" rule actions that if it detects it being passed it in will transform using it.
- * @returns The actions of the RuleResponse
- */
-export const transformActions = (
-  alertAction: RuleAction[] | undefined,
-  legacyRuleActions: LegacyRuleActions | null | undefined
-): RuleResponse['actions'] => {
-  if (alertAction != null && alertAction.length !== 0) {
-    return alertAction.map((action) => transformAlertToRuleAction(action));
-  } else if (legacyRuleActions != null) {
-    return legacyRuleActions.actions;
-  } else {
-    return [];
-  }
-};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/normalization/rule_converters.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/normalization/rule_converters.ts
index 618514dfbab4a..7296e90bf73e7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/normalization/rule_converters.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/normalization/rule_converters.ts
@@ -42,6 +42,7 @@ import {
   transformAlertToRuleResponseAction,
   transformRuleToAlertAction,
   transformRuleToAlertResponseAction,
+  transformAlertToRuleAction,
 } from '../../../../../common/detection_engine/transform_actions';
 
 import {
@@ -51,8 +52,6 @@ import {
 
 import { assertUnreachable } from '../../../../../common/utility_types';
 
-// eslint-disable-next-line no-restricted-imports
-import type { LegacyRuleActions } from '../../rule_actions_legacy';
 import type {
   InternalRuleCreate,
   RuleParams,
@@ -75,7 +74,6 @@ import type {
   NewTermsSpecificRuleParams,
 } from '../../rule_schema';
 import {
-  transformActions,
   transformFromAlertThrottle,
   transformToAlertThrottle,
   transformToNotifyWhen,
@@ -646,8 +644,7 @@ export const commonParamsCamelToSnake = (params: BaseRuleParams) => {
 };
 
 export const internalRuleToAPIResponse = (
-  rule: SanitizedRule<RuleParams> | ResolvedSanitizedRule<RuleParams>,
-  legacyRuleActions?: LegacyRuleActions | null
+  rule: SanitizedRule<RuleParams> | ResolvedSanitizedRule<RuleParams>
 ): RuleResponse => {
   const executionSummary = createRuleExecutionSummary(rule);
 
@@ -675,8 +672,8 @@ export const internalRuleToAPIResponse = (
     // Type specific security solution rule params
     ...typeSpecificCamelToSnake(rule.params),
     // Actions
-    throttle: transformFromAlertThrottle(rule, legacyRuleActions),
-    actions: transformActions(rule.actions, legacyRuleActions),
+    throttle: transformFromAlertThrottle(rule),
+    actions: rule.actions.map(transformAlertToRuleAction),
     // Execution summary
     execution_summary: executionSummary ?? undefined,
   };
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/utils.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/utils.test.ts
index 91cdfc0e8a37b..8e82965f2b5f9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/utils.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/utils.test.ts
@@ -35,12 +35,6 @@ import { createBulkErrorObject } from '../../routes/utils';
 import type { RuleAlertType } from '../../rule_schema';
 import { getMlRuleParams, getQueryRuleParams, getThreatRuleParams } from '../../rule_schema/mocks';
 
-// eslint-disable-next-line no-restricted-imports
-import type {
-  LegacyRuleAlertAction,
-  LegacyRulesActionsSavedObject,
-} from '../../rule_actions_legacy';
-
 import { createRulesAndExceptionsStreamFromNdJson } from '../logic/import/create_rules_stream_from_ndjson';
 import type { RuleExceptionsPromiseFromStreams } from '../logic/import/import_rules_utils';
 import { internalRuleToAPIResponse } from '../normalization/rule_converters';
@@ -277,41 +271,17 @@ describe('utils', () => {
 
   describe('transformFindAlerts', () => {
     test('outputs empty data set when data set is empty correct', () => {
-      const output = transformFindAlerts({ data: [], page: 1, perPage: 0, total: 0 }, {});
+      const output = transformFindAlerts({ data: [], page: 1, perPage: 0, total: 0 });
       expect(output).toEqual({ data: [], page: 1, perPage: 0, total: 0 });
     });
 
     test('outputs 200 if the data is of type siem alert', () => {
-      const output = transformFindAlerts(
-        {
-          page: 1,
-          perPage: 0,
-          total: 0,
-          data: [getRuleMock(getQueryRuleParams())],
-        },
-        {}
-      );
-      const expected = getOutputRuleAlertForRest();
-      expect(output).toEqual({
+      const output = transformFindAlerts({
         page: 1,
         perPage: 0,
         total: 0,
-        data: [expected],
+        data: [getRuleMock(getQueryRuleParams())],
       });
-    });
-
-    test('outputs 200 if the data is of type siem alert and has undefined for the legacyRuleActions', () => {
-      const output = transformFindAlerts(
-        {
-          page: 1,
-          perPage: 0,
-          total: 0,
-          data: [getRuleMock(getQueryRuleParams())],
-        },
-        {
-          '123': undefined,
-        }
-      );
       const expected = getOutputRuleAlertForRest();
       expect(output).toEqual({
         page: 1,
@@ -320,58 +290,18 @@ describe('utils', () => {
         data: [expected],
       });
     });
-
-    test('outputs 200 if the data is of type siem alert and has a legacy rule action', () => {
-      const actions: LegacyRuleAlertAction[] = [
-        {
-          id: '456',
-          params: {},
-          group: '',
-          action_type_id: 'action_123',
-        },
-      ];
-
-      const legacyRuleActions: Record<string, LegacyRulesActionsSavedObject | undefined> = {
-        [getRuleMock(getQueryRuleParams()).id]: {
-          id: '123',
-          actions,
-          alertThrottle: '1h',
-          ruleThrottle: '1h',
-        },
-      };
-      const output = transformFindAlerts(
-        {
-          page: 1,
-          perPage: 0,
-          total: 0,
-          data: [getRuleMock(getQueryRuleParams())],
-        },
-        legacyRuleActions
-      );
-      const expected = {
-        ...getOutputRuleAlertForRest(),
-        throttle: '1h',
-        actions,
-      };
-      expect(output).toEqual({
-        page: 1,
-        perPage: 0,
-        total: 0,
-        data: [expected],
-      });
-    });
   });
 
   describe('transform', () => {
     test('outputs 200 if the data is of type siem alert', () => {
-      const output = transform(getRuleMock(getQueryRuleParams()), undefined);
+      const output = transform(getRuleMock(getQueryRuleParams()));
       const expected = getOutputRuleAlertForRest();
       expect(output).toEqual(expected);
     });
 
     test('returns 500 if the data is not of type siem alert', () => {
       const unsafeCast = { data: [{ random: 1 }] } as unknown as PartialRule;
-      const output = transform(unsafeCast, undefined);
+      const output = transform(unsafeCast);
       expect(output).toBeNull();
     });
   });
@@ -462,12 +392,12 @@ describe('utils', () => {
 
   describe('transformAlertsToRules', () => {
     test('given an empty array returns an empty array', () => {
-      expect(transformAlertsToRules([], {})).toEqual([]);
+      expect(transformAlertsToRules([])).toEqual([]);
     });
 
     test('given single alert will return the alert transformed', () => {
       const result1 = getRuleMock(getQueryRuleParams());
-      const transformed = transformAlertsToRules([result1], {});
+      const transformed = transformAlertsToRules([result1]);
       const expected = getOutputRuleAlertForRest();
       expect(transformed).toEqual([expected]);
     });
@@ -478,7 +408,7 @@ describe('utils', () => {
       result2.id = 'some other id';
       result2.params.ruleId = 'some other id';
 
-      const transformed = transformAlertsToRules([result1, result2], {});
+      const transformed = transformAlertsToRules([result1, result2]);
       const expected1 = getOutputRuleAlertForRest();
       const expected2 = getOutputRuleAlertForRest();
       expected2.id = 'some other id';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/utils.ts
index 3f65a49795d75..9d455e0fad519 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/utils.ts
@@ -21,8 +21,6 @@ import type {
   AlertSuppressionCamel,
 } from '../../../../../common/detection_engine/rule_schema';
 
-// eslint-disable-next-line no-restricted-imports
-import type { LegacyRulesActionsSavedObject } from '../../rule_actions_legacy';
 import type { RuleAlertType, RuleParams } from '../../rule_schema';
 import { isAlertType } from '../../rule_schema';
 import type { BulkError, OutputError } from '../../routes/utils';
@@ -91,11 +89,8 @@ export const getIdBulkError = ({
   }
 };
 
-export const transformAlertsToRules = (
-  rules: RuleAlertType[],
-  legacyRuleActions: Record<string, LegacyRulesActionsSavedObject>
-): RuleResponse[] => {
-  return rules.map((rule) => internalRuleToAPIResponse(rule, legacyRuleActions[rule.id]));
+export const transformAlertsToRules = (rules: RuleAlertType[]): RuleResponse[] => {
+  return rules.map((rule) => internalRuleToAPIResponse(rule));
 };
 
 /**
@@ -116,8 +111,7 @@ export const transformRuleToExportableFormat = (
 };
 
 export const transformFindAlerts = (
-  ruleFindResults: FindResult<RuleParams>,
-  legacyRuleActions: Record<string, LegacyRulesActionsSavedObject | undefined>
+  ruleFindResults: FindResult<RuleParams>
 ): {
   page: number;
   perPage: number;
@@ -129,17 +123,14 @@ export const transformFindAlerts = (
     perPage: ruleFindResults.perPage,
     total: ruleFindResults.total,
     data: ruleFindResults.data.map((rule) => {
-      return internalRuleToAPIResponse(rule, legacyRuleActions[rule.id]);
+      return internalRuleToAPIResponse(rule);
     }),
   };
 };
 
-export const transform = (
-  rule: PartialRule<RuleParams>,
-  legacyRuleActions?: LegacyRulesActionsSavedObject | null
-): RuleResponse | null => {
+export const transform = (rule: PartialRule<RuleParams>): RuleResponse | null => {
   if (isAlertType(rule)) {
-    return internalRuleToAPIResponse(rule, legacyRuleActions);
+    return internalRuleToAPIResponse(rule);
   }
 
   return null;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/validate.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/validate.test.ts
index 71ccb07d03cb3..bae75363ff49a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/validate.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/validate.test.ts
@@ -84,7 +84,7 @@ describe('validate', () => {
   describe('transformValidate', () => {
     test('it should do a validation correctly of a partial alert', () => {
       const ruleAlert = getRuleMock(getQueryRuleParams());
-      const [validated, errors] = transformValidate(ruleAlert, null);
+      const [validated, errors] = transformValidate(ruleAlert);
       expect(validated).toEqual(ruleOutput());
       expect(errors).toEqual(null);
     });
@@ -93,7 +93,7 @@ describe('validate', () => {
       const ruleAlert = getRuleMock(getQueryRuleParams());
       // @ts-expect-error
       delete ruleAlert.name;
-      const [validated, errors] = transformValidate(ruleAlert, null);
+      const [validated, errors] = transformValidate(ruleAlert);
       expect(validated).toEqual(null);
       expect(errors).toEqual('Invalid value "undefined" supplied to "name"');
     });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/validate.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/validate.ts
index 5ae9efb4501d5..f7bf2f7413a46 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/validate.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/validate.ts
@@ -14,15 +14,12 @@ import { isAlertType } from '../../rule_schema';
 import type { BulkError } from '../../routes/utils';
 import { createBulkErrorObject } from '../../routes/utils';
 import { transform } from './utils';
-// eslint-disable-next-line no-restricted-imports
-import type { LegacyRulesActionsSavedObject } from '../../rule_actions_legacy';
 import { internalRuleToAPIResponse } from '../normalization/rule_converters';
 
 export const transformValidate = (
-  rule: PartialRule<RuleParams>,
-  legacyRuleActions?: LegacyRulesActionsSavedObject | null
+  rule: PartialRule<RuleParams>
 ): [RuleResponse | null, string | null] => {
-  const transformed = transform(rule, legacyRuleActions);
+  const transformed = transform(rule);
   if (transformed == null) {
     return [null, 'Internal error transforming'];
   } else {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group1/delete_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group1/delete_rules.ts
index 2c39672b0956c..a394bef16cd22 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/group1/delete_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/group1/delete_rules.ts
@@ -24,12 +24,14 @@ import {
   getWebHookAction,
   removeServerGeneratedProperties,
   removeServerGeneratedPropertiesIncludingRuleId,
+  getLegacyActionSO,
 } from '../../utils';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
   const supertest = getService('supertest');
   const log = getService('log');
+  const es = getService('es');
 
   describe('delete_rules', () => {
     describe('deleting rules', () => {
@@ -195,6 +197,13 @@ export default ({ getService }: FtrProviderContext): void => {
         // Add a legacy rule action to the body of the rule
         await createLegacyRuleAction(supertest, createRuleBody.id, hookAction.id);
 
+        // check for legacy sidecar action
+        const sidecarActionsResults = await getLegacyActionSO(es);
+        expect(sidecarActionsResults.hits.hits.length).to.eql(1);
+        expect(sidecarActionsResults.hits.hits[0]?._source?.references[0].id).to.eql(
+          createRuleBody.id
+        );
+
         await supertest
           .delete(`${DETECTION_ENGINE_RULES_URL}?id=${createRuleBody.id}`)
           .set('kbn-xsrf', 'true')
@@ -216,6 +225,10 @@ export default ({ getService }: FtrProviderContext): void => {
 
         // Expect that we have exactly 0 legacy rules after the deletion
         expect(bodyAfterDelete.total).to.eql(0);
+
+        // legacy sidecar action should be gone
+        const sidecarActionsPostResults = await getLegacyActionSO(es);
+        expect(sidecarActionsPostResults.hits.hits.length).to.eql(0);
       });
     });
   });
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group1/delete_rules_bulk.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group1/delete_rules_bulk.ts
index 8b06e70a5fd63..fa83ceb9a19b1 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/group1/delete_rules_bulk.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/group1/delete_rules_bulk.ts
@@ -24,12 +24,14 @@ import {
   getWebHookAction,
   removeServerGeneratedProperties,
   removeServerGeneratedPropertiesIncludingRuleId,
+  getLegacyActionSO,
 } from '../../utils';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
   const supertest = getService('supertest');
   const log = getService('log');
+  const es = getService('es');
 
   describe('delete_rules_bulk', () => {
     describe('deprecations', () => {
@@ -387,6 +389,13 @@ export default ({ getService }: FtrProviderContext): void => {
         // Add a legacy rule action to the body of the rule
         await createLegacyRuleAction(supertest, createRuleBody.id, hookAction.id);
 
+        // check for legacy sidecar action
+        const sidecarActionsResults = await getLegacyActionSO(es);
+        expect(sidecarActionsResults.hits.hits.length).to.eql(1);
+        expect(sidecarActionsResults.hits.hits[0]?._source?.references[0].id).to.eql(
+          createRuleBody.id
+        );
+
         // bulk delete the rule
         await supertest
           .delete(DETECTION_ENGINE_RULES_BULK_DELETE)
@@ -410,6 +419,10 @@ export default ({ getService }: FtrProviderContext): void => {
 
         // Expect that we have exactly 0 legacy rules after the deletion
         expect(bodyAfterDelete.total).to.eql(0);
+
+        // legacy sidecar action should be gone
+        const sidecarActionsPostResults = await getLegacyActionSO(es);
+        expect(sidecarActionsPostResults.hits.hits.length).to.eql(0);
       });
     });
   });
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/import_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/import_rules.ts
index 7672153845e0a..3e00904c66b93 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/import_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/import_rules.ts
@@ -29,6 +29,9 @@ import {
   getWebHookAction,
   removeServerGeneratedProperties,
   ruleToNdjson,
+  createLegacyRuleAction,
+  getLegacyActionSO,
+  createRule,
 } from '../../utils';
 import { deleteAllExceptions } from '../../../lists_api_integration/utils';
 import { createUserAndRole, deleteUserAndRole } from '../../../common/services/security_solution';
@@ -178,6 +181,7 @@ export default ({ getService }: FtrProviderContext): void => {
   const log = getService('log');
   const esArchiver = getService('esArchiver');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const es = getService('es');
 
   describe('import_rules', () => {
     describe('importing rules with different roles', () => {
@@ -718,6 +722,45 @@ export default ({ getService }: FtrProviderContext): void => {
         expect(bodyToCompare).to.eql(ruleOutput);
       });
 
+      it('should migrate legacy actions in existing rule if overwrite is set to true', async () => {
+        const simpleRule = getSimpleRule('rule-1');
+
+        const [connector, createdRule] = await Promise.all([
+          supertest
+            .post(`/api/actions/connector`)
+            .set('kbn-xsrf', 'foo')
+            .send({
+              name: 'My action',
+              connector_type_id: '.slack',
+              secrets: {
+                webhookUrl: 'http://localhost:1234',
+              },
+            }),
+          createRule(supertest, log, simpleRule),
+        ]);
+        await createLegacyRuleAction(supertest, createdRule.id, connector.body.id);
+
+        // check for legacy sidecar action
+        const sidecarActionsResults = await getLegacyActionSO(es);
+        expect(sidecarActionsResults.hits.hits.length).to.eql(1);
+        expect(sidecarActionsResults.hits.hits[0]?._source?.references[0].id).to.eql(
+          createdRule.id
+        );
+
+        simpleRule.name = 'some other name';
+        const ndjson = ruleToNdjson(simpleRule);
+
+        await supertest
+          .post(`${DETECTION_ENGINE_RULES_URL}/_import?overwrite=true`)
+          .set('kbn-xsrf', 'true')
+          .attach('file', ndjson, 'rules.ndjson')
+          .expect(200);
+
+        // legacy sidecar action should be gone
+        const sidecarActionsPostResults = await getLegacyActionSO(es);
+        expect(sidecarActionsPostResults.hits.hits.length).to.eql(0);
+      });
+
       it('should report a conflict if there is an attempt to import a rule with a rule_id that already exists, but still have some successes with other rules', async () => {
         await supertest
           .post(`${DETECTION_ENGINE_RULES_URL}/_import`)
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/legacy_actions_migrations.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/legacy_actions_migrations.ts
index ac187485c4509..6ba7871b1dbf5 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/legacy_actions_migrations.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/legacy_actions_migrations.ts
@@ -75,8 +75,8 @@ export default ({ getService }: FtrProviderContext) => {
       expect(sidecarActionsSOAfterMigration.hits.hits.length).to.eql(0);
 
       expect(ruleSO?.alert.actions).to.eql([]);
-      expect(ruleSO?.alert.throttle).to.eql(null);
-      expect(ruleSO?.alert.notifyWhen).to.eql('onActiveAlert');
+      expect(ruleSO?.alert.throttle).to.eql('no_actions');
+      expect(ruleSO?.alert.notifyWhen).to.eql('onThrottleInterval');
     });
 
     it('migrates legacy actions for rule with action run on every run', async () => {
@@ -123,8 +123,19 @@ export default ({ getService }: FtrProviderContext) => {
           },
           uuid: ruleSO?.alert.actions[0].uuid,
         },
+        {
+          actionRef: 'action_1',
+          actionTypeId: '.email',
+          group: 'default',
+          params: {
+            message: 'Rule {{context.rule.name}} generated {{state.signals_count}} alerts',
+            subject: 'Test Actions',
+            to: ['test@test.com'],
+          },
+          uuid: ruleSO?.alert.actions[1].uuid,
+        },
       ]);
-      expect(ruleSO?.alert.throttle).to.eql(null);
+      expect(ruleSO?.alert.throttle).to.eql('rule');
       expect(ruleSO?.alert.notifyWhen).to.eql('onActiveAlert');
       expect(ruleSO?.references).to.eql([
         {
@@ -132,6 +143,11 @@ export default ({ getService }: FtrProviderContext) => {
           name: 'action_0',
           type: 'action',
         },
+        {
+          id: 'c95cb100-b075-11ec-bb3f-1f063f8e06cf',
+          name: 'action_1',
+          type: 'action',
+        },
       ]);
     });
 
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/patch_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/patch_rules.ts
index 1fcd785820240..98b64726bbaca 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/patch_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/patch_rules.ts
@@ -23,12 +23,14 @@ import {
   createRule,
   getSimpleMlRule,
   createLegacyRuleAction,
+  getLegacyActionSO,
 } from '../../utils';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
   const supertest = getService('supertest');
   const log = getService('log');
+  const es = getService('es');
 
   describe('patch_rules', () => {
     describe('patch rules', () => {
@@ -351,6 +353,11 @@ export default ({ getService }: FtrProviderContext) => {
         ]);
         await createLegacyRuleAction(supertest, rule.id, connector.body.id);
 
+        // check for legacy sidecar action
+        const sidecarActionsResults = await getLegacyActionSO(es);
+        expect(sidecarActionsResults.hits.hits.length).to.eql(1);
+        expect(sidecarActionsResults.hits.hits[0]?._source?.references[0].id).to.eql(rule.id);
+
         // patch disable the rule
         const patchResponse = await supertest
           .patch(DETECTION_ENGINE_RULES_URL)
@@ -373,8 +380,12 @@ export default ({ getService }: FtrProviderContext) => {
           },
         ];
         outputRule.throttle = '1h';
-        outputRule.revision = 2; // Expected revision is 2 as call to `createLegacyRuleAction()` does two separate rules updates for `notifyWhen` & `actions` field
+        outputRule.revision = 1;
         expect(bodyToCompare).to.eql(outputRule);
+
+        // legacy sidecar action should be gone
+        const sidecarActionsPostResults = await getLegacyActionSO(es);
+        expect(sidecarActionsPostResults.hits.hits.length).to.eql(0);
       });
 
       it('should give a 404 if it is given a fake id', async () => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/patch_rules_bulk.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/patch_rules_bulk.ts
index e7437f91bc69b..1a26b17bca42e 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/patch_rules_bulk.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/patch_rules_bulk.ts
@@ -22,12 +22,14 @@ import {
   removeServerGeneratedPropertiesIncludingRuleId,
   createRule,
   createLegacyRuleAction,
+  getLegacyActionSO,
 } from '../../utils';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
   const supertest = getService('supertest');
   const log = getService('log');
+  const es = getService('es');
 
   describe('patch_rules_bulk', () => {
     describe('deprecations', () => {
@@ -169,6 +171,14 @@ export default ({ getService }: FtrProviderContext) => {
           createLegacyRuleAction(supertest, rule1.id, connector.body.id),
           createLegacyRuleAction(supertest, rule2.id, connector.body.id),
         ]);
+
+        // check for legacy sidecar action
+        const sidecarActionsResults = await getLegacyActionSO(es);
+        expect(sidecarActionsResults.hits.hits.length).to.eql(2);
+        expect(
+          sidecarActionsResults.hits.hits.map((hit) => hit?._source?.references[0].id).sort()
+        ).to.eql([rule1.id, rule2.id].sort());
+
         // patch a simple rule's name
         const { body } = await supertest
           .patch(DETECTION_ENGINE_RULES_BULK_UPDATE)
@@ -179,6 +189,10 @@ export default ({ getService }: FtrProviderContext) => {
           ])
           .expect(200);
 
+        // legacy sidecar action should be gone
+        const sidecarActionsPostResults = await getLegacyActionSO(es);
+        expect(sidecarActionsPostResults.hits.hits.length).to.eql(0);
+
         // @ts-expect-error
         body.forEach((response) => {
           const bodyToCompare = removeServerGeneratedProperties(response);
@@ -196,7 +210,7 @@ export default ({ getService }: FtrProviderContext) => {
             },
           ];
           outputRule.throttle = '1h';
-          outputRule.revision = 2; // Expected revision is 2 as call to `createLegacyRuleAction()` does two separate rules updates for `notifyWhen` & `actions` field
+          outputRule.revision = 1;
           expect(bodyToCompare).to.eql(outputRule);
         });
       });
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/perform_bulk_action.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/perform_bulk_action.ts
index 3d39b62355732..c77ac5f142f92 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/perform_bulk_action.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/perform_bulk_action.ts
@@ -33,6 +33,7 @@ import {
   getWebHookAction,
   installMockPrebuiltRules,
   removeServerGeneratedProperties,
+  waitForRuleSuccess,
 } from '../../utils';
 
 // eslint-disable-next-line import/no-default-export
@@ -40,6 +41,7 @@ export default ({ getService }: FtrProviderContext): void => {
   const supertest = getService('supertest');
   const es = getService('es');
   const log = getService('log');
+  const esArchiver = getService('esArchiver');
 
   const postBulkAction = () =>
     supertest.post(DETECTION_ENGINE_RULES_BULK_ACTION).set('kbn-xsrf', 'true');
@@ -72,11 +74,13 @@ export default ({ getService }: FtrProviderContext): void => {
   describe('perform_bulk_action', () => {
     beforeEach(async () => {
       await createSignalsIndex(supertest, log);
+      await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
     });
 
     afterEach(async () => {
       await deleteSignalsIndex(supertest, log);
       await deleteAllRules(supertest, log);
+      await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
     });
 
     it('should export rules', async () => {
@@ -329,6 +333,8 @@ export default ({ getService }: FtrProviderContext): void => {
           uuid: ruleBody.actions[0].uuid,
         },
       ]);
+      // we want to ensure rule is executing successfully, to prevent any AAD issues related to partial update of rule SO
+      await waitForRuleSuccess({ id: rule1.id, supertest, log });
     });
 
     it('should disable rules', async () => {
@@ -428,7 +434,7 @@ export default ({ getService }: FtrProviderContext): void => {
       expect(rulesResponse.total).to.eql(2);
     });
 
-    it('should duplicate rule with a legacy action and migrate new rules action', async () => {
+    it('should duplicate rule with a legacy action', async () => {
       const ruleId = 'ruleId';
       const [connector, ruleToDuplicate] = await Promise.all([
         supertest
@@ -465,10 +471,6 @@ export default ({ getService }: FtrProviderContext): void => {
       // Check that the duplicated rule is returned with the response
       expect(body.attributes.results.created[0].name).to.eql(`${ruleToDuplicate.name} [Duplicate]`);
 
-      // legacy sidecar action should be gone
-      const sidecarActionsPostResults = await getLegacyActionSO(es);
-      expect(sidecarActionsPostResults.hits.hits.length).to.eql(0);
-
       // Check that the updates have been persisted
       const { body: rulesResponse } = await supertest
         .get(`${DETECTION_ENGINE_RULES_URL}/_find`)
@@ -478,6 +480,7 @@ export default ({ getService }: FtrProviderContext): void => {
       expect(rulesResponse.total).to.eql(2);
 
       rulesResponse.data.forEach((rule: RuleResponse) => {
+        const uuid = rule.actions[0].uuid;
         expect(rule.actions).to.eql([
           {
             action_type_id: '.slack',
@@ -487,7 +490,7 @@ export default ({ getService }: FtrProviderContext): void => {
               message:
                 'Hourly\nRule {{context.rule.name}} generated {{state.signals_count}} alerts',
             },
-            uuid: rule.actions[0].uuid,
+            ...(uuid ? { uuid } : {}),
           },
         ]);
       });
@@ -1091,7 +1094,6 @@ export default ({ getService }: FtrProviderContext): void => {
             },
           ],
         });
-
         expect(setTagsBody.attributes.summary).to.eql({
           failed: 0,
           skipped: 0,
@@ -1515,6 +1517,76 @@ export default ({ getService }: FtrProviderContext): void => {
 
             expect(readRule.actions).to.eql([]);
           });
+
+          it('should migrate legacy actions on edit when actions edited', async () => {
+            const ruleId = 'ruleId';
+            const [connector, createdRule] = await Promise.all([
+              supertest
+                .post(`/api/actions/connector`)
+                .set('kbn-xsrf', 'foo')
+                .send({
+                  name: 'My action',
+                  connector_type_id: '.slack',
+                  secrets: {
+                    webhookUrl: 'http://localhost:1234',
+                  },
+                }),
+              createRule(supertest, log, getSimpleRule(ruleId, true)),
+            ]);
+            // create a new connector
+            const webHookConnector = await createWebHookConnector();
+
+            await createLegacyRuleAction(supertest, createdRule.id, connector.body.id);
+
+            // check for legacy sidecar action
+            const sidecarActionsResults = await getLegacyActionSO(es);
+            expect(sidecarActionsResults.hits.hits.length).to.eql(1);
+            expect(sidecarActionsResults.hits.hits[0]?._source?.references[0].id).to.eql(
+              createdRule.id
+            );
+
+            const { body } = await postBulkAction()
+              .send({
+                ids: [createdRule.id],
+                action: BulkActionType.edit,
+                [BulkActionType.edit]: [
+                  {
+                    type: BulkActionEditType.set_rule_actions,
+                    value: {
+                      throttle: '1h',
+                      actions: [
+                        {
+                          ...webHookActionMock,
+                          id: webHookConnector.id,
+                        },
+                      ],
+                    },
+                  },
+                ],
+              })
+              .expect(200);
+
+            const expectedRuleActions = [
+              {
+                ...webHookActionMock,
+                id: webHookConnector.id,
+                action_type_id: '.webhook',
+                uuid: body.attributes.results.updated[0].actions[0].uuid,
+              },
+            ];
+
+            // Check that the updated rule is returned with the response
+            expect(body.attributes.results.updated[0].actions).to.eql(expectedRuleActions);
+
+            // Check that the updates have been persisted
+            const { body: readRule } = await fetchRule(ruleId).expect(200);
+
+            expect(readRule.actions).to.eql(expectedRuleActions);
+
+            // Sidecar should be removed
+            const sidecarActionsPostResults = await getLegacyActionSO(es);
+            expect(sidecarActionsPostResults.hits.hits.length).to.eql(0);
+          });
         });
 
         describe('add_rule_actions', () => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/update_rules.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/update_rules.ts
index f48562b991b62..8396f72a9bb08 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/update_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/update_rules.ts
@@ -27,12 +27,14 @@ import {
   getSimpleRule,
   createLegacyRuleAction,
   getThresholdRuleForSignalTesting,
+  getLegacyActionSO,
 } from '../../utils';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
   const supertest = getService('supertest');
   const log = getService('log');
+  const es = getService('es');
 
   describe('update_rules', () => {
     describe('update rules', () => {
@@ -207,6 +209,13 @@ export default ({ getService }: FtrProviderContext) => {
         ]);
         await createLegacyRuleAction(supertest, createRuleBody.id, connector.body.id);
 
+        // check for legacy sidecar action
+        const sidecarActionsResults = await getLegacyActionSO(es);
+        expect(sidecarActionsResults.hits.hits.length).to.eql(1);
+        expect(sidecarActionsResults.hits.hits[0]?._source?.references[0].id).to.eql(
+          createRuleBody.id
+        );
+
         const action1 = {
           group: 'default',
           id: connector.body.id,
@@ -233,7 +242,7 @@ export default ({ getService }: FtrProviderContext) => {
 
         const outputRule = getSimpleRuleOutputWithoutRuleId();
         outputRule.name = 'some other name';
-        outputRule.revision = 2; // Migration of action results in additional revision increment (change to `notifyWhen`), so expected revision is 2
+        outputRule.revision = 1;
         outputRule.actions = [
           {
             action_type_id: '.slack',
@@ -249,6 +258,10 @@ export default ({ getService }: FtrProviderContext) => {
         outputRule.throttle = '1d';
 
         expect(bodyToCompare).to.eql(outputRule);
+
+        // legacy sidecar action should be gone
+        const sidecarActionsPostResults = await getLegacyActionSO(es);
+        expect(sidecarActionsPostResults.hits.hits.length).to.eql(0);
       });
 
       it('should update a single rule property of name using the auto-generated id', async () => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/update_rules_bulk.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/update_rules_bulk.ts
index 8c32cf71874a6..0c8dcacd0ebbf 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/update_rules_bulk.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/update_rules_bulk.ts
@@ -24,12 +24,14 @@ import {
   createRule,
   getSimpleRule,
   createLegacyRuleAction,
+  getLegacyActionSO,
 } from '../../utils';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext) => {
   const supertest = getService('supertest');
   const log = getService('log');
+  const es = getService('es');
 
   describe('update_rules_bulk', () => {
     describe('deprecations', () => {
@@ -148,6 +150,13 @@ export default ({ getService }: FtrProviderContext) => {
           createLegacyRuleAction(supertest, rule2.id, connector.body.id),
         ]);
 
+        // check for legacy sidecar action
+        const sidecarActionsResults = await getLegacyActionSO(es);
+        expect(sidecarActionsResults.hits.hits.length).to.eql(2);
+        expect(
+          sidecarActionsResults.hits.hits.map((hit) => hit?._source?.references[0].id).sort()
+        ).to.eql([rule1.id, rule2.id].sort());
+
         const updatedRule1 = getSimpleRuleUpdate('rule-1');
         updatedRule1.name = 'some other name';
         updatedRule1.actions = [action1];
@@ -165,11 +174,15 @@ export default ({ getService }: FtrProviderContext) => {
           .send([updatedRule1, updatedRule2])
           .expect(200);
 
+        // legacy sidecar action should be gone
+        const sidecarActionsPostResults = await getLegacyActionSO(es);
+        expect(sidecarActionsPostResults.hits.hits.length).to.eql(0);
+
         body.forEach((response) => {
           const bodyToCompare = removeServerGeneratedProperties(response);
           const outputRule = getSimpleRuleOutput(response.rule_id);
           outputRule.name = 'some other name';
-          outputRule.revision = 2;
+          outputRule.revision = 1;
           outputRule.actions = [
             {
               action_type_id: '.slack',
@@ -232,7 +245,7 @@ export default ({ getService }: FtrProviderContext) => {
         body.forEach((response) => {
           const outputRule = getSimpleRuleOutput(response.rule_id);
           outputRule.name = 'some other name';
-          outputRule.revision = 2;
+          outputRule.revision = 1;
           outputRule.actions = [];
           outputRule.throttle = 'no_actions';
           const bodyToCompare = removeServerGeneratedProperties(response);
diff --git a/x-pack/test/detection_engine_api_integration/utils/wait_for_rule_status.ts b/x-pack/test/detection_engine_api_integration/utils/wait_for_rule_status.ts
index 25824769857d7..9eb08337427d9 100644
--- a/x-pack/test/detection_engine_api_integration/utils/wait_for_rule_status.ts
+++ b/x-pack/test/detection_engine_api_integration/utils/wait_for_rule_status.ts
@@ -70,3 +70,6 @@ export const waitForRuleSuccess = (params: WaitForRuleStatusParams): Promise<voi
 
 export const waitForRulePartialFailure = (params: WaitForRuleStatusParams): Promise<void> =>
   waitForRuleStatus(RuleExecutionStatus['partial failure'], params);
+
+export const waitForRuleFailure = (params: WaitForRuleStatusParams): Promise<void> =>
+  waitForRuleStatus(RuleExecutionStatus.failed, params);

From 4e5ad09b3ae34ac0f140bacc30e5ebae0b7411a5 Mon Sep 17 00:00:00 2001
From: Dmitrii Shevchenko <dmitrii.shevchenko@elastic.co>
Date: Wed, 19 Apr 2023 13:16:24 +0200
Subject: [PATCH 063/100] [Security Solution] Handle missing base versions
 during rule upgrade (#154571)

**Resolves: https://github.com/elastic/kibana/issues/152836**
**Resolves: https://github.com/elastic/kibana/issues/148183**
**Resolves partially: https://github.com/elastic/kibana/issues/148189**
---
 .../response_schema.ts                        |  3 -
 .../review_rule_upgrade/response_schema.ts    |  9 ---
 .../diff/three_way_diff/three_way_diff.ts     | 14 +++-
 .../three_way_diff/three_way_diff_outcome.ts  | 14 +++-
 .../api/get_prebuilt_rules_status/route.ts    |  4 +-
 .../api/review_rule_installation/route.ts     |  2 +-
 .../api/review_rule_upgrade/route.ts          | 28 +++----
 .../logic/diff/calculate_rule_diff.ts         | 11 +--
 .../algorithms/simple_diff_algorithm.ts       | 24 +++---
 .../calculation/calculate_rule_fields_diff.ts | 74 ++++++++++---------
 .../calculation/diff_calculation_helpers.ts   |  8 +-
 11 files changed, 106 insertions(+), 85 deletions(-)

diff --git a/x-pack/plugins/security_solution/common/detection_engine/prebuilt_rules/api/get_prebuilt_rules_status/response_schema.ts b/x-pack/plugins/security_solution/common/detection_engine/prebuilt_rules/api/get_prebuilt_rules_status/response_schema.ts
index ea131df38375d..a60311f40b0a2 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/prebuilt_rules/api/get_prebuilt_rules_status/response_schema.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/prebuilt_rules/api/get_prebuilt_rules_status/response_schema.ts
@@ -15,9 +15,6 @@ export interface GetPrebuiltRulesStatusResponseBody {
 }
 
 export interface PrebuiltRulesStatusStats {
-  /** Total number of existing (known) prebuilt rules */
-  num_prebuilt_rules_total: number;
-
   /** Number of installed prebuilt rules */
   num_prebuilt_rules_installed: number;
 
diff --git a/x-pack/plugins/security_solution/common/detection_engine/prebuilt_rules/api/review_rule_upgrade/response_schema.ts b/x-pack/plugins/security_solution/common/detection_engine/prebuilt_rules/api/review_rule_upgrade/response_schema.ts
index 97a4cee4c993f..35994a7963956 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/prebuilt_rules/api/review_rule_upgrade/response_schema.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/prebuilt_rules/api/review_rule_upgrade/response_schema.ts
@@ -25,17 +25,8 @@ export interface RuleUpgradeStatsForReview {
   /** Number of installed prebuilt rules available for upgrade (stock + customized) */
   num_rules_to_upgrade_total: number;
 
-  /** Number of installed prebuilt rules available for upgrade which are stock (non-customized) */
-  num_rules_to_upgrade_not_customized: number;
-
-  /** Number of installed prebuilt rules available for upgrade which are customized by the user */
-  num_rules_to_upgrade_customized: number;
-
   /** A union of all tags of all rules available for upgrade */
   tags: RuleTagArray;
-
-  /** A union of all fields "to be upgraded" across all the rules available for upgrade. An array of field names. */
-  fields: string[];
 }
 
 export interface RuleUpgradeInfoForReview {
diff --git a/x-pack/plugins/security_solution/common/detection_engine/prebuilt_rules/model/diff/three_way_diff/three_way_diff.ts b/x-pack/plugins/security_solution/common/detection_engine/prebuilt_rules/model/diff/three_way_diff/three_way_diff.ts
index 521b31dc4ea15..3b6831709ced9 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/prebuilt_rules/model/diff/three_way_diff/three_way_diff.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/prebuilt_rules/model/diff/three_way_diff/three_way_diff.ts
@@ -8,14 +8,26 @@
 import type { ThreeWayDiffOutcome } from './three_way_diff_outcome';
 import type { ThreeWayMergeOutcome } from './three_way_merge_outcome';
 
+/**
+ * A symbol that represents a missing value and used when a base version of a
+ * rule is not available. We need a mechanism that helps us distinguish two
+ * situations:
+ * - the base version is found, and its value is `undefined` or `null`
+ * - the base version is not found
+ *
+ */
+export const MissingVersion = Symbol('MissingVersion');
+export type MissingVersion = typeof MissingVersion;
+
 /**
  * Three versions of a value to pass to a diff algorithm.
  */
 export interface ThreeVersionsOf<TValue> {
   /**
    * Corresponds to the stock version of the currently installed prebuilt rule.
+   * This field is optional because the base version is not always available in the package.
    */
-  base_version: TValue;
+  base_version: TValue | MissingVersion;
 
   /**
    * Corresponds exactly to the currently installed prebuilt rule:
diff --git a/x-pack/plugins/security_solution/common/detection_engine/prebuilt_rules/model/diff/three_way_diff/three_way_diff_outcome.ts b/x-pack/plugins/security_solution/common/detection_engine/prebuilt_rules/model/diff/three_way_diff/three_way_diff_outcome.ts
index 07d3fb526c209..fd36a69dbde3c 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/prebuilt_rules/model/diff/three_way_diff/three_way_diff_outcome.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/prebuilt_rules/model/diff/three_way_diff/three_way_diff_outcome.ts
@@ -6,6 +6,7 @@
  */
 
 import { isEqual } from 'lodash';
+import { MissingVersion } from './three_way_diff';
 
 /**
  * Result of comparing three versions of a value against each other.
@@ -29,7 +30,7 @@ export enum ThreeWayDiffOutcome {
 }
 
 export const determineDiffOutcome = <TValue>(
-  baseVersion: TValue,
+  baseVersion: TValue | MissingVersion,
   currentVersion: TValue,
   targetVersion: TValue
 ): ThreeWayDiffOutcome => {
@@ -37,6 +38,17 @@ export const determineDiffOutcome = <TValue>(
   const baseEqlTarget = isEqual(baseVersion, targetVersion);
   const currentEqlTarget = isEqual(currentVersion, targetVersion);
 
+  if (baseVersion === MissingVersion) {
+    /**
+     * We couldn't find the base version of the rule in the package so further
+     * version comparison is not possible. We assume that the rule is not
+     * customized and the value can be updated if there's an update.
+     */
+    return currentEqlTarget
+      ? ThreeWayDiffOutcome.StockValueNoUpdate
+      : ThreeWayDiffOutcome.StockValueCanUpdate;
+  }
+
   if (baseEqlCurrent) {
     return currentEqlTarget
       ? ThreeWayDiffOutcome.StockValueNoUpdate
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/get_prebuilt_rules_status/route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/get_prebuilt_rules_status/route.ts
index 1926320114a17..d1bdcfc80e757 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/get_prebuilt_rules_status/route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/get_prebuilt_rules_status/route.ts
@@ -73,11 +73,9 @@ export const getPrebuiltRulesStatusRoute = (router: SecuritySolutionPluginRouter
 };
 
 const calculateRuleStats = (buckets: VersionBuckets): PrebuiltRulesStatusStats => {
-  const { latestVersions, installedVersions, latestVersionsToInstall, installedVersionsToUpgrade } =
-    buckets;
+  const { installedVersions, latestVersionsToInstall, installedVersionsToUpgrade } = buckets;
 
   return {
-    num_prebuilt_rules_total: latestVersions.length,
     num_prebuilt_rules_installed: installedVersions.length,
     num_prebuilt_rules_to_install: latestVersionsToInstall.length,
     num_prebuilt_rules_to_upgrade: installedVersionsToUpgrade.length,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/review_rule_installation/route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/review_rule_installation/route.ts
index 74d9c6ee80030..8eb8b91af8fbb 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/review_rule_installation/route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/review_rule_installation/route.ts
@@ -79,7 +79,7 @@ export const reviewRuleInstallationRoute = (router: SecuritySolutionPluginRouter
 
 const getAggregatedTags = (rules: PrebuiltRuleAsset[]): string[] => {
   const set = new Set<string>(rules.flatMap((rule) => rule.tags || []));
-  return Array.from(set.values());
+  return Array.from(set.values()).sort((a, b) => a.localeCompare(b));
 };
 
 const calculateRuleStats = (
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/review_rule_upgrade/route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/review_rule_upgrade/route.ts
index 3b52cc102110e..626ee8f0bbf7a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/review_rule_upgrade/route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/review_rule_upgrade/route.ts
@@ -30,6 +30,7 @@ import { buildSiemResponse } from '../../../routes/utils';
 import { createPrebuiltRuleAssetsClient } from '../../logic/rule_assets/prebuilt_rule_assets_client';
 import { createPrebuiltRuleObjectsClient } from '../../logic/rule_objects/prebuilt_rule_objects_client';
 import { getVersionBuckets } from '../../model/rule_versions/get_version_buckets';
+import { invariant } from '../../../../../../common/utils/invariant';
 
 export const reviewRuleUpgradeRoute = (router: SecuritySolutionPluginRouter) => {
   router.post(
@@ -114,28 +115,27 @@ const getRuleDiffCalculationArgs = (
     const baseRule = baseRulesMap.get(ruleId);
     const latestRule = latestRulesMap.get(ruleId);
 
-    // TODO: https://github.com/elastic/kibana/issues/148189
-    // Make base versions optional for diff calculation. We need to support this in order to be able
-    // to still show diffs for rule assets coming from packages without historical versions.
-    if (installedRule != null && baseRule != null && latestRule != null) {
-      result.push({
-        currentVersion: installedRule,
-        baseVersion: baseRule,
-        targetVersion: latestRule,
-      });
-    }
+    // baseRule can be undefined if the rule has no historical versions, but other versions should always be present
+    invariant(installedRule != null, `installedRule is not found for rule_id: ${ruleId}`);
+    invariant(latestRule != null, `latestRule is not found for rule_id: ${ruleId}`);
+
+    result.push({
+      currentVersion: installedRule,
+      baseVersion: baseRule,
+      targetVersion: latestRule,
+    });
   });
 
   return result;
 };
 
 const calculateRuleStats = (results: CalculateRuleDiffResult[]): RuleUpgradeStatsForReview => {
+  const allTags = new Set<string>(
+    results.flatMap((result) => result.ruleVersions.input.current.tags)
+  );
   return {
     num_rules_to_upgrade_total: results.length,
-    num_rules_to_upgrade_not_customized: results.length,
-    num_rules_to_upgrade_customized: 0,
-    tags: [],
-    fields: [],
+    tags: [...allTags].sort((a, b) => a.localeCompare(b)),
   };
 };
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/calculate_rule_diff.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/calculate_rule_diff.ts
index 026589ad0ca0d..061c1d1082bdd 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/calculate_rule_diff.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/calculate_rule_diff.ts
@@ -8,6 +8,7 @@
 import type { DiffableRule } from '../../../../../../common/detection_engine/prebuilt_rules/model/diff/diffable_rule/diffable_rule';
 import type { FullRuleDiff } from '../../../../../../common/detection_engine/prebuilt_rules/model/diff/rule_diff/rule_diff';
 import type { ThreeWayDiff } from '../../../../../../common/detection_engine/prebuilt_rules/model/diff/three_way_diff/three_way_diff';
+import { MissingVersion } from '../../../../../../common/detection_engine/prebuilt_rules/model/diff/three_way_diff/three_way_diff';
 import type { RuleResponse } from '../../../../../../common/detection_engine/rule_schema';
 import type { PrebuiltRuleAsset } from '../../model/rule_assets/prebuilt_rule_asset';
 
@@ -16,7 +17,7 @@ import { convertRuleToDiffable } from './normalization/convert_rule_to_diffable'
 
 export interface CalculateRuleDiffArgs {
   currentVersion: RuleResponse;
-  baseVersion: PrebuiltRuleAsset;
+  baseVersion?: PrebuiltRuleAsset;
   targetVersion: PrebuiltRuleAsset;
 }
 
@@ -25,12 +26,12 @@ export interface CalculateRuleDiffResult {
   ruleVersions: {
     input: {
       current: RuleResponse;
-      base: PrebuiltRuleAsset;
+      base?: PrebuiltRuleAsset;
       target: PrebuiltRuleAsset;
     };
     output: {
       current: DiffableRule;
-      base: DiffableRule;
+      base?: DiffableRule;
       target: DiffableRule;
     };
   };
@@ -60,12 +61,12 @@ export const calculateRuleDiff = (args: CalculateRuleDiffArgs): CalculateRuleDif
 
   const { baseVersion, currentVersion, targetVersion } = args;
 
-  const diffableBaseVersion = convertRuleToDiffable(baseVersion);
+  const diffableBaseVersion = baseVersion ? convertRuleToDiffable(baseVersion) : undefined;
   const diffableCurrentVersion = convertRuleToDiffable(currentVersion);
   const diffableTargetVersion = convertRuleToDiffable(targetVersion);
 
   const fieldsDiff = calculateRuleFieldsDiff({
-    base_version: diffableBaseVersion,
+    base_version: diffableBaseVersion || MissingVersion,
     current_version: diffableCurrentVersion,
     target_version: diffableTargetVersion,
   });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/calculation/algorithms/simple_diff_algorithm.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/calculation/algorithms/simple_diff_algorithm.ts
index 699f8f20bcf1f..90a55ee3d6eff 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/calculation/algorithms/simple_diff_algorithm.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/calculation/algorithms/simple_diff_algorithm.ts
@@ -29,12 +29,11 @@ export const simpleDiffAlgorithm = <TValue>(
   const diffOutcome = determineDiffOutcome(baseVersion, currentVersion, targetVersion);
   const valueCanUpdate = determineIfValueCanUpdate(diffOutcome);
 
-  const { mergeOutcome, mergedVersion } = mergeVersions(
-    baseVersion,
+  const { mergeOutcome, mergedVersion } = mergeVersions({
     currentVersion,
     targetVersion,
-    diffOutcome
-  );
+    diffOutcome,
+  });
 
   return {
     base_version: baseVersion,
@@ -54,12 +53,17 @@ interface MergeResult<TValue> {
   mergedVersion: TValue;
 }
 
-const mergeVersions = <TValue>(
-  baseVersion: TValue,
-  currentVersion: TValue,
-  targetVersion: TValue,
-  diffOutcome: ThreeWayDiffOutcome
-): MergeResult<TValue> => {
+interface MergeArgs<TValue> {
+  currentVersion: TValue;
+  targetVersion: TValue;
+  diffOutcome: ThreeWayDiffOutcome;
+}
+
+const mergeVersions = <TValue>({
+  currentVersion,
+  targetVersion,
+  diffOutcome,
+}: MergeArgs<TValue>): MergeResult<TValue> => {
   switch (diffOutcome) {
     case ThreeWayDiffOutcome.StockValueNoUpdate:
     case ThreeWayDiffOutcome.CustomizedValueNoUpdate:
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/calculation/calculate_rule_fields_diff.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/calculation/calculate_rule_fields_diff.ts
index bb7a83ff20b23..abd084c1789e4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/calculation/calculate_rule_fields_diff.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/calculation/calculate_rule_fields_diff.ts
@@ -33,6 +33,7 @@ import type {
 
 import type { FieldsDiffAlgorithmsFor } from '../../../../../../../common/detection_engine/prebuilt_rules/model/diff/rule_diff/fields_diff';
 import type { ThreeVersionsOf } from '../../../../../../../common/detection_engine/prebuilt_rules/model/diff/three_way_diff/three_way_diff';
+import { MissingVersion } from '../../../../../../../common/detection_engine/prebuilt_rules/model/diff/three_way_diff/three_way_diff';
 import { calculateFieldsDiffFor } from './diff_calculation_helpers';
 import { simpleDiffAlgorithm } from './algorithms/simple_diff_algorithm';
 
@@ -47,15 +48,16 @@ const TARGET_TYPE_ERROR = `Target version can't be of different rule type`;
 export const calculateRuleFieldsDiff = (
   ruleVersions: ThreeVersionsOf<DiffableRule>
 ): RuleFieldsDiff => {
-  validateRuleVersions(ruleVersions);
-
   const commonFieldsDiff = calculateCommonFieldsDiff(ruleVersions);
   // eslint-disable-next-line @typescript-eslint/naming-convention
   const { base_version, current_version, target_version } = ruleVersions;
+  const hasBaseVersion = base_version !== MissingVersion;
 
   switch (current_version.type) {
     case 'query': {
-      invariant(base_version.type === 'query', BASE_TYPE_ERROR);
+      if (hasBaseVersion) {
+        invariant(base_version.type === 'query', BASE_TYPE_ERROR);
+      }
       invariant(target_version.type === 'query', TARGET_TYPE_ERROR);
       return {
         ...commonFieldsDiff,
@@ -63,7 +65,9 @@ export const calculateRuleFieldsDiff = (
       };
     }
     case 'saved_query': {
-      invariant(base_version.type === 'saved_query', BASE_TYPE_ERROR);
+      if (hasBaseVersion) {
+        invariant(base_version.type === 'saved_query', BASE_TYPE_ERROR);
+      }
       invariant(target_version.type === 'saved_query', TARGET_TYPE_ERROR);
       return {
         ...commonFieldsDiff,
@@ -71,7 +75,9 @@ export const calculateRuleFieldsDiff = (
       };
     }
     case 'eql': {
-      invariant(base_version.type === 'eql', BASE_TYPE_ERROR);
+      if (hasBaseVersion) {
+        invariant(base_version.type === 'eql', BASE_TYPE_ERROR);
+      }
       invariant(target_version.type === 'eql', TARGET_TYPE_ERROR);
       return {
         ...commonFieldsDiff,
@@ -79,7 +85,9 @@ export const calculateRuleFieldsDiff = (
       };
     }
     case 'threat_match': {
-      invariant(base_version.type === 'threat_match', BASE_TYPE_ERROR);
+      if (hasBaseVersion) {
+        invariant(base_version.type === 'threat_match', BASE_TYPE_ERROR);
+      }
       invariant(target_version.type === 'threat_match', TARGET_TYPE_ERROR);
       return {
         ...commonFieldsDiff,
@@ -87,7 +95,9 @@ export const calculateRuleFieldsDiff = (
       };
     }
     case 'threshold': {
-      invariant(base_version.type === 'threshold', BASE_TYPE_ERROR);
+      if (hasBaseVersion) {
+        invariant(base_version.type === 'threshold', BASE_TYPE_ERROR);
+      }
       invariant(target_version.type === 'threshold', TARGET_TYPE_ERROR);
       return {
         ...commonFieldsDiff,
@@ -95,7 +105,9 @@ export const calculateRuleFieldsDiff = (
       };
     }
     case 'machine_learning': {
-      invariant(base_version.type === 'machine_learning', BASE_TYPE_ERROR);
+      if (hasBaseVersion) {
+        invariant(base_version.type === 'machine_learning', BASE_TYPE_ERROR);
+      }
       invariant(target_version.type === 'machine_learning', TARGET_TYPE_ERROR);
       return {
         ...commonFieldsDiff,
@@ -103,7 +115,9 @@ export const calculateRuleFieldsDiff = (
       };
     }
     case 'new_terms': {
-      invariant(base_version.type === 'new_terms', BASE_TYPE_ERROR);
+      if (hasBaseVersion) {
+        invariant(base_version.type === 'new_terms', BASE_TYPE_ERROR);
+      }
       invariant(target_version.type === 'new_terms', TARGET_TYPE_ERROR);
       return {
         ...commonFieldsDiff,
@@ -116,20 +130,10 @@ export const calculateRuleFieldsDiff = (
   }
 };
 
-const validateRuleVersions = (ruleVersions: ThreeVersionsOf<DiffableRule>): void => {
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  const { base_version, current_version, target_version } = ruleVersions;
-  const types = new Set<string>([base_version.type, current_version.type, target_version.type]);
-
-  if (types.size > 1) {
-    throw new Error('Cannot change rule type during rule upgrade');
-  }
-};
-
 const calculateCommonFieldsDiff = (
-  fieldsVersions: ThreeVersionsOf<DiffableCommonFields>
+  ruleVersions: ThreeVersionsOf<DiffableCommonFields>
 ): CommonFieldsDiff => {
-  return calculateFieldsDiffFor(fieldsVersions, commonFieldsDiffAlgorithms);
+  return calculateFieldsDiffFor(ruleVersions, commonFieldsDiffAlgorithms);
 };
 
 const commonFieldsDiffAlgorithms: FieldsDiffAlgorithmsFor<DiffableCommonFields> = {
@@ -164,9 +168,9 @@ const commonFieldsDiffAlgorithms: FieldsDiffAlgorithmsFor<DiffableCommonFields>
 };
 
 const calculateCustomQueryFieldsDiff = (
-  fieldsVersions: ThreeVersionsOf<DiffableCustomQueryFields>
+  ruleVersions: ThreeVersionsOf<DiffableCustomQueryFields>
 ): CustomQueryFieldsDiff => {
-  return calculateFieldsDiffFor(fieldsVersions, customQueryFieldsDiffAlgorithms);
+  return calculateFieldsDiffFor(ruleVersions, customQueryFieldsDiffAlgorithms);
 };
 
 const customQueryFieldsDiffAlgorithms: FieldsDiffAlgorithmsFor<DiffableCustomQueryFields> = {
@@ -177,9 +181,9 @@ const customQueryFieldsDiffAlgorithms: FieldsDiffAlgorithmsFor<DiffableCustomQue
 };
 
 const calculateSavedQueryFieldsDiff = (
-  fieldsVersions: ThreeVersionsOf<DiffableSavedQueryFields>
+  ruleVersions: ThreeVersionsOf<DiffableSavedQueryFields>
 ): SavedQueryFieldsDiff => {
-  return calculateFieldsDiffFor(fieldsVersions, savedQueryFieldsDiffAlgorithms);
+  return calculateFieldsDiffFor(ruleVersions, savedQueryFieldsDiffAlgorithms);
 };
 
 const savedQueryFieldsDiffAlgorithms: FieldsDiffAlgorithmsFor<DiffableSavedQueryFields> = {
@@ -190,9 +194,9 @@ const savedQueryFieldsDiffAlgorithms: FieldsDiffAlgorithmsFor<DiffableSavedQuery
 };
 
 const calculateEqlFieldsDiff = (
-  fieldsVersions: ThreeVersionsOf<DiffableEqlFields>
+  ruleVersions: ThreeVersionsOf<DiffableEqlFields>
 ): EqlFieldsDiff => {
-  return calculateFieldsDiffFor(fieldsVersions, eqlFieldsDiffAlgorithms);
+  return calculateFieldsDiffFor(ruleVersions, eqlFieldsDiffAlgorithms);
 };
 
 const eqlFieldsDiffAlgorithms: FieldsDiffAlgorithmsFor<DiffableEqlFields> = {
@@ -205,9 +209,9 @@ const eqlFieldsDiffAlgorithms: FieldsDiffAlgorithmsFor<DiffableEqlFields> = {
 };
 
 const calculateThreatMatchFieldsDiff = (
-  fieldsVersions: ThreeVersionsOf<DiffableThreatMatchFields>
+  ruleVersions: ThreeVersionsOf<DiffableThreatMatchFields>
 ): ThreatMatchFieldsDiff => {
-  return calculateFieldsDiffFor(fieldsVersions, threatMatchFieldsDiffAlgorithms);
+  return calculateFieldsDiffFor(ruleVersions, threatMatchFieldsDiffAlgorithms);
 };
 
 const threatMatchFieldsDiffAlgorithms: FieldsDiffAlgorithmsFor<DiffableThreatMatchFields> = {
@@ -223,9 +227,9 @@ const threatMatchFieldsDiffAlgorithms: FieldsDiffAlgorithmsFor<DiffableThreatMat
 };
 
 const calculateThresholdFieldsDiff = (
-  fieldsVersions: ThreeVersionsOf<DiffableThresholdFields>
+  ruleVersions: ThreeVersionsOf<DiffableThresholdFields>
 ): ThresholdFieldsDiff => {
-  return calculateFieldsDiffFor(fieldsVersions, thresholdFieldsDiffAlgorithms);
+  return calculateFieldsDiffFor(ruleVersions, thresholdFieldsDiffAlgorithms);
 };
 
 const thresholdFieldsDiffAlgorithms: FieldsDiffAlgorithmsFor<DiffableThresholdFields> = {
@@ -236,9 +240,9 @@ const thresholdFieldsDiffAlgorithms: FieldsDiffAlgorithmsFor<DiffableThresholdFi
 };
 
 const calculateMachineLearningFieldsDiff = (
-  fieldsVersions: ThreeVersionsOf<DiffableMachineLearningFields>
+  ruleVersions: ThreeVersionsOf<DiffableMachineLearningFields>
 ): MachineLearningFieldsDiff => {
-  return calculateFieldsDiffFor(fieldsVersions, machineLearningFieldsDiffAlgorithms);
+  return calculateFieldsDiffFor(ruleVersions, machineLearningFieldsDiffAlgorithms);
 };
 
 const machineLearningFieldsDiffAlgorithms: FieldsDiffAlgorithmsFor<DiffableMachineLearningFields> =
@@ -249,9 +253,9 @@ const machineLearningFieldsDiffAlgorithms: FieldsDiffAlgorithmsFor<DiffableMachi
   };
 
 const calculateNewTermsFieldsDiff = (
-  fieldsVersions: ThreeVersionsOf<DiffableNewTermsFields>
+  ruleVersions: ThreeVersionsOf<DiffableNewTermsFields>
 ): NewTermsFieldsDiff => {
-  return calculateFieldsDiffFor(fieldsVersions, newTermsFieldsDiffAlgorithms);
+  return calculateFieldsDiffFor(ruleVersions, newTermsFieldsDiffAlgorithms);
 };
 
 const newTermsFieldsDiffAlgorithms: FieldsDiffAlgorithmsFor<DiffableNewTermsFields> = {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/calculation/diff_calculation_helpers.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/calculation/diff_calculation_helpers.ts
index eb1b6e2d38aca..d36c33cf5d890 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/calculation/diff_calculation_helpers.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/calculation/diff_calculation_helpers.ts
@@ -11,13 +11,14 @@ import type {
   FieldsDiffAlgorithmsFor,
 } from '../../../../../../../common/detection_engine/prebuilt_rules/model/diff/rule_diff/fields_diff';
 import type { ThreeVersionsOf } from '../../../../../../../common/detection_engine/prebuilt_rules/model/diff/three_way_diff/three_way_diff';
+import { MissingVersion } from '../../../../../../../common/detection_engine/prebuilt_rules/model/diff/three_way_diff/three_way_diff';
 
 export const calculateFieldsDiffFor = <TObject extends object>(
-  objectVersions: ThreeVersionsOf<TObject>,
+  ruleVersions: ThreeVersionsOf<TObject>,
   fieldsDiffAlgorithms: FieldsDiffAlgorithmsFor<TObject>
 ): FieldsDiff<TObject> => {
   const result = mapValues(fieldsDiffAlgorithms, (calculateFieldDiff, fieldName) => {
-    const fieldVersions = pickField(fieldName as keyof TObject, objectVersions);
+    const fieldVersions = pickField(fieldName as keyof TObject, ruleVersions);
     const fieldDiff = calculateFieldDiff(fieldVersions);
     return fieldDiff;
   });
@@ -31,7 +32,8 @@ const pickField = <TObject extends object>(
   versions: ThreeVersionsOf<TObject>
 ): ThreeVersionsOf<TObject[typeof fieldName]> => {
   return {
-    base_version: versions.base_version[fieldName],
+    base_version:
+      versions.base_version !== MissingVersion ? versions.base_version[fieldName] : MissingVersion,
     current_version: versions.current_version[fieldName],
     target_version: versions.target_version[fieldName],
   };

From ec39987b995b8460e1e47db6096a719da86f6318 Mon Sep 17 00:00:00 2001
From: Coen Warmer <coen.warmer@gmail.com>
Date: Wed, 19 Apr 2023 13:41:02 +0200
Subject: [PATCH 064/100] [SLO] Add SloRulesBadge to SloListItem (#155187)

---
 .../hooks/slo/use_fetch_rules_for_slo.ts      | 90 +++++++++++++++++++
 .../components/badges/slo_badges.stories.tsx  |  3 +-
 .../slos/components/badges/slo_badges.tsx     | 12 ++-
 .../slo_indicator_type_badge.stories.tsx      |  2 +-
 .../badges/slo_rules_badge.stories.tsx        | 35 ++++++++
 .../components/badges/slo_rules_badge.tsx     | 41 +++++++++
 .../badges/slo_time_window_badge.stories.tsx  |  2 +-
 .../pages/slos/components/slo_list_item.tsx   | 29 ++++--
 .../pages/slos/components/slo_list_items.tsx  | 18 ++--
 9 files changed, 211 insertions(+), 21 deletions(-)
 create mode 100644 x-pack/plugins/observability/public/hooks/slo/use_fetch_rules_for_slo.ts
 create mode 100644 x-pack/plugins/observability/public/pages/slos/components/badges/slo_rules_badge.stories.tsx
 create mode 100644 x-pack/plugins/observability/public/pages/slos/components/badges/slo_rules_badge.tsx

diff --git a/x-pack/plugins/observability/public/hooks/slo/use_fetch_rules_for_slo.ts b/x-pack/plugins/observability/public/hooks/slo/use_fetch_rules_for_slo.ts
new file mode 100644
index 0000000000000..0c0b5a7108952
--- /dev/null
+++ b/x-pack/plugins/observability/public/hooks/slo/use_fetch_rules_for_slo.ts
@@ -0,0 +1,90 @@
+/*
+ * 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 {
+  QueryObserverResult,
+  RefetchOptions,
+  RefetchQueryFilters,
+  useQuery,
+} from '@tanstack/react-query';
+import { Rule } from '@kbn/triggers-actions-ui-plugin/public';
+import { useKibana } from '../../utils/kibana_react';
+
+type SloId = string;
+
+interface Params {
+  sloIds: SloId[];
+}
+
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+export type SloRule = { sloId: string; name: string };
+
+interface RuleApiResponse {
+  page: number;
+  total: number;
+  per_page: number;
+  data: Array<Rule<SloRule>>;
+}
+
+export interface UseFetchRulesForSloResponse {
+  isInitialLoading: boolean;
+  isLoading: boolean;
+  isRefetching: boolean;
+  isSuccess: boolean;
+  isError: boolean;
+  data: Record<string, Array<Rule<SloRule>>> | undefined;
+  refetch: <TPageData>(
+    options?: (RefetchOptions & RefetchQueryFilters<TPageData>) | undefined
+  ) => Promise<QueryObserverResult<Record<string, Array<Rule<SloRule>>> | undefined, unknown>>;
+}
+
+export function useFetchRulesForSlo({ sloIds = [] }: Params): UseFetchRulesForSloResponse {
+  const { http } = useKibana().services;
+
+  const { isInitialLoading, isLoading, isError, isSuccess, isRefetching, data, refetch } = useQuery(
+    {
+      queryKey: ['fetchRulesForSlo', sloIds],
+      queryFn: async () => {
+        try {
+          const body = JSON.stringify({
+            filter: `alert.attributes.params.sloId:(${sloIds.join(' or ')})`,
+            fields: ['params.sloId', 'name'],
+            per_page: 1000,
+          });
+
+          const response = await http.post<RuleApiResponse>(`/internal/alerting/rules/_find`, {
+            body,
+          });
+
+          const init = sloIds.reduce((acc, sloId) => ({ ...acc, [sloId]: [] }), {});
+
+          return response.data.reduce(
+            (acc, rule) => ({
+              ...acc,
+              [rule.params.sloId]: acc[rule.params.sloId].concat(rule),
+            }),
+            init as Record<string, Array<Rule<SloRule>>>
+          );
+        } catch (error) {
+          // ignore error for retrieving slos
+        }
+      },
+      enabled: Boolean(sloIds),
+      refetchOnWindowFocus: false,
+    }
+  );
+
+  return {
+    data,
+    isLoading,
+    isInitialLoading,
+    isRefetching,
+    isSuccess,
+    isError,
+    refetch,
+  };
+}
diff --git a/x-pack/plugins/observability/public/pages/slos/components/badges/slo_badges.stories.tsx b/x-pack/plugins/observability/public/pages/slos/components/badges/slo_badges.stories.tsx
index 50430e0f6bd0b..267ebac0ce9b4 100644
--- a/x-pack/plugins/observability/public/pages/slos/components/badges/slo_badges.stories.tsx
+++ b/x-pack/plugins/observability/public/pages/slos/components/badges/slo_badges.stories.tsx
@@ -15,7 +15,7 @@ import { SloBadges as Component, Props } from './slo_badges';
 
 export default {
   component: Component,
-  title: 'app/SLO/ListPage/Badges/SloBadges',
+  title: 'app/SLO/Badges/SloBadges',
   decorators: [KibanaReactStorybookDecorator],
 };
 
@@ -27,6 +27,7 @@ const Template: ComponentStory<typeof Component> = (props: Props) => (
 
 const defaultProps = {
   slo: buildForecastedSlo(),
+  rules: [],
 };
 
 export const SloBadges = Template.bind({});
diff --git a/x-pack/plugins/observability/public/pages/slos/components/badges/slo_badges.tsx b/x-pack/plugins/observability/public/pages/slos/components/badges/slo_badges.tsx
index 93d0c70a6858c..15d36f3525ed1 100644
--- a/x-pack/plugins/observability/public/pages/slos/components/badges/slo_badges.tsx
+++ b/x-pack/plugins/observability/public/pages/slos/components/badges/slo_badges.tsx
@@ -8,25 +8,31 @@
 import React from 'react';
 import { EuiFlexGroup } from '@elastic/eui';
 import { SLOWithSummaryResponse } from '@kbn/slo-schema';
+import { Rule } from '@kbn/triggers-actions-ui-plugin/public';
 
 import { SloIndicatorTypeBadge } from './slo_indicator_type_badge';
 import { SloStatusBadge } from '../../../../components/slo/slo_status_badge';
+import { SloActiveAlertsBadge } from '../../../../components/slo/slo_status_badge/slo_active_alerts_badge';
 import { SloTimeWindowBadge } from './slo_time_window_badge';
 import type { ActiveAlerts } from '../../../../hooks/slo/use_fetch_active_alerts';
-import { SloActiveAlertsBadge } from '../../../../components/slo/slo_status_badge/slo_active_alerts_badge';
+import type { SloRule } from '../../../../hooks/slo/use_fetch_rules_for_slo';
+import { SloRulesBadge } from './slo_rules_badge';
 
 export interface Props {
-  slo: SLOWithSummaryResponse;
   activeAlerts?: ActiveAlerts;
+  rules: Array<Rule<SloRule>> | undefined;
+  slo: SLOWithSummaryResponse;
+  onClickRuleBadge: () => void;
 }
 
-export function SloBadges({ slo, activeAlerts }: Props) {
+export function SloBadges({ activeAlerts, rules, slo, onClickRuleBadge }: Props) {
   return (
     <EuiFlexGroup direction="row" responsive={false} gutterSize="s" alignItems="center">
       <SloStatusBadge slo={slo} />
       <SloIndicatorTypeBadge slo={slo} />
       <SloTimeWindowBadge slo={slo} />
       <SloActiveAlertsBadge activeAlerts={activeAlerts} />
+      <SloRulesBadge rules={rules} onClick={onClickRuleBadge} />
     </EuiFlexGroup>
   );
 }
diff --git a/x-pack/plugins/observability/public/pages/slos/components/badges/slo_indicator_type_badge.stories.tsx b/x-pack/plugins/observability/public/pages/slos/components/badges/slo_indicator_type_badge.stories.tsx
index fa451706de164..c8536bdc93ddd 100644
--- a/x-pack/plugins/observability/public/pages/slos/components/badges/slo_indicator_type_badge.stories.tsx
+++ b/x-pack/plugins/observability/public/pages/slos/components/badges/slo_indicator_type_badge.stories.tsx
@@ -20,7 +20,7 @@ import { buildSlo } from '../../../../data/slo/slo';
 
 export default {
   component: Component,
-  title: 'app/SLO/ListPage/Badges/SloIndicatorTypeBadge',
+  title: 'app/SLO/Badges/SloIndicatorTypeBadge',
   decorators: [KibanaReactStorybookDecorator],
 };
 
diff --git a/x-pack/plugins/observability/public/pages/slos/components/badges/slo_rules_badge.stories.tsx b/x-pack/plugins/observability/public/pages/slos/components/badges/slo_rules_badge.stories.tsx
new file mode 100644
index 0000000000000..c97be672356f5
--- /dev/null
+++ b/x-pack/plugins/observability/public/pages/slos/components/badges/slo_rules_badge.stories.tsx
@@ -0,0 +1,35 @@
+/*
+ * 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 { ComponentStory } from '@storybook/react';
+
+import { EuiFlexGroup } from '@elastic/eui';
+import { Rule } from '@kbn/triggers-actions-ui-plugin/public';
+import { SloRule } from '../../../../hooks/slo/use_fetch_rules_for_slo';
+import { KibanaReactStorybookDecorator } from '../../../../utils/kibana_react.storybook_decorator';
+import { SloRulesBadge as Component, Props } from './slo_rules_badge';
+
+export default {
+  component: Component,
+  title: 'app/SLO/Badges/SloRulesBadge',
+  decorators: [KibanaReactStorybookDecorator],
+};
+
+const Template: ComponentStory<typeof Component> = (props: Props) => (
+  <EuiFlexGroup gutterSize="s">
+    <Component {...props} />
+  </EuiFlexGroup>
+);
+
+export const WithNoRule = Template.bind({});
+WithNoRule.args = { rules: [] };
+
+export const WithLoadingRule = Template.bind({});
+WithLoadingRule.args = { rules: undefined };
+export const WithRule = Template.bind({});
+WithRule.args = { rules: [{ name: 'rulename' }] as Array<Rule<SloRule>> };
diff --git a/x-pack/plugins/observability/public/pages/slos/components/badges/slo_rules_badge.tsx b/x-pack/plugins/observability/public/pages/slos/components/badges/slo_rules_badge.tsx
new file mode 100644
index 0000000000000..c60617152cb00
--- /dev/null
+++ b/x-pack/plugins/observability/public/pages/slos/components/badges/slo_rules_badge.tsx
@@ -0,0 +1,41 @@
+/*
+ * 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 { EuiBadge, EuiIcon, EuiToolTip } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { Rule } from '@kbn/triggers-actions-ui-plugin/public';
+import { SloRule } from '../../../../hooks/slo/use_fetch_rules_for_slo';
+
+export interface Props {
+  rules: Array<Rule<SloRule>> | undefined;
+  onClick: () => void;
+}
+
+export function SloRulesBadge({ rules, onClick }: Props) {
+  return rules === undefined || rules.length > 0 ? null : (
+    <EuiToolTip
+      position="top"
+      content={i18n.translate('xpack.observability.slo.slo.rulesBadge.popover', {
+        defaultMessage:
+          'There are no rules configured for this SLO yet. You will not receive alerts when SLO is breached.',
+      })}
+      display="block"
+    >
+      <EuiBadge
+        color=""
+        css={{ cursor: 'pointer' }}
+        onClick={onClick}
+        onClickAriaLabel={i18n.translate('xpack.observability.slo.slo.rulesBadge.label', {
+          defaultMessage: 'Create new rule',
+        })}
+      >
+        <EuiIcon color="danger" type="warning" />
+      </EuiBadge>
+    </EuiToolTip>
+  );
+}
diff --git a/x-pack/plugins/observability/public/pages/slos/components/badges/slo_time_window_badge.stories.tsx b/x-pack/plugins/observability/public/pages/slos/components/badges/slo_time_window_badge.stories.tsx
index 7f534e831f9fb..4298c8a28aa11 100644
--- a/x-pack/plugins/observability/public/pages/slos/components/badges/slo_time_window_badge.stories.tsx
+++ b/x-pack/plugins/observability/public/pages/slos/components/badges/slo_time_window_badge.stories.tsx
@@ -15,7 +15,7 @@ import { buildSlo } from '../../../../data/slo/slo';
 
 export default {
   component: Component,
-  title: 'app/SLO/ListPage/Badges/SloTimeWindowBadge',
+  title: 'app/SLO/Badges/SloTimeWindowBadge',
   decorators: [KibanaReactStorybookDecorator],
 };
 
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 6c8e44bec189d..ffe07cbb9a902 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
@@ -6,7 +6,7 @@
  */
 
 import React, { useState } from 'react';
-import { useIsMutating } from '@tanstack/react-query';
+import { useIsMutating, useQueryClient } from '@tanstack/react-query';
 import {
   EuiButtonIcon,
   EuiContextMenuItem,
@@ -21,7 +21,7 @@ import {
 import { i18n } from '@kbn/i18n';
 
 import { HistoricalSummaryResponse, SLOWithSummaryResponse } from '@kbn/slo-schema';
-import { ActiveAlerts } from '../../../hooks/slo/use_fetch_active_alerts';
+import type { Rule } from '@kbn/triggers-actions-ui-plugin/public';
 import { useCapabilities } from '../../../hooks/slo/use_capabilities';
 import { useKibana } from '../../../utils/kibana_react';
 import { useCloneSlo } from '../../../hooks/slo/use_clone_slo';
@@ -36,9 +36,12 @@ import {
 import { SLO_BURN_RATE_RULE_ID } from '../../../../common/constants';
 import { sloFeatureId } from '../../../../common';
 import { paths } from '../../../config/paths';
+import type { ActiveAlerts } from '../../../hooks/slo/use_fetch_active_alerts';
+import type { SloRule } from '../../../hooks/slo/use_fetch_rules_for_slo';
 
 export interface SloListItemProps {
   slo: SLOWithSummaryResponse;
+  rules: Array<Rule<SloRule>> | undefined;
   historicalSummary?: HistoricalSummaryResponse[];
   historicalSummaryLoading: boolean;
   activeAlerts?: ActiveAlerts;
@@ -46,6 +49,7 @@ export interface SloListItemProps {
 
 export function SloListItem({
   slo,
+  rules,
   historicalSummary = [],
   historicalSummaryLoading,
   activeAlerts,
@@ -56,6 +60,7 @@ export function SloListItem({
     triggersActionsUi: { getAddRuleFlyout: AddRuleFlyout },
   } = useKibana().services;
   const { hasWriteCapabilities } = useCapabilities();
+  const queryClient = useQueryClient();
 
   const filteredRuleTypes = useGetFilteredRuleTypes();
 
@@ -83,6 +88,10 @@ export function SloListItem({
     setIsAddRuleFlyoutOpen(true);
   };
 
+  const handleSavedRule = async () => {
+    queryClient.invalidateQueries(['fetchRulesForSlo']);
+  };
+
   const handleClone = () => {
     const newSlo = transformValuesToCreateSLOInput(
       transformSloResponseToCreateSloInput({ ...slo, name: `[Copy] ${slo.name}` })!
@@ -125,7 +134,12 @@ export function SloListItem({
                     </EuiLink>
                   </EuiText>
                 </EuiFlexItem>
-                <SloBadges slo={slo} activeAlerts={activeAlerts} />
+                <SloBadges
+                  activeAlerts={activeAlerts}
+                  rules={rules}
+                  slo={slo}
+                  onClickRuleBadge={handleCreateRule}
+                />
               </EuiFlexGroup>
             </EuiFlexItem>
 
@@ -220,21 +234,22 @@ export function SloListItem({
         </EuiFlexItem>
       </EuiFlexGroup>
 
-      {isDeleteConfirmationModalOpen ? (
-        <SloDeleteConfirmationModal slo={slo} onCancel={handleDeleteCancel} />
-      ) : null}
-
       {isAddRuleFlyoutOpen ? (
         <AddRuleFlyout
           consumer={sloFeatureId}
           filteredRuleTypes={filteredRuleTypes}
           ruleTypeId={SLO_BURN_RATE_RULE_ID}
           initialValues={{ name: `${slo.name} Burn Rate rule`, params: { sloId: slo.id } }}
+          onSave={handleSavedRule}
           onClose={() => {
             setIsAddRuleFlyoutOpen(false);
           }}
         />
       ) : null}
+
+      {isDeleteConfirmationModalOpen ? (
+        <SloDeleteConfirmationModal slo={slo} onCancel={handleDeleteCancel} />
+      ) : null}
     </EuiPanel>
   );
 }
diff --git a/x-pack/plugins/observability/public/pages/slos/components/slo_list_items.tsx b/x-pack/plugins/observability/public/pages/slos/components/slo_list_items.tsx
index cf95af3101c13..2f6f71612788e 100644
--- a/x-pack/plugins/observability/public/pages/slos/components/slo_list_items.tsx
+++ b/x-pack/plugins/observability/public/pages/slos/components/slo_list_items.tsx
@@ -7,8 +7,9 @@
 import React from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 
-import { SLOWithSummaryResponse } from '@kbn/slo-schema';
+import type { SLOWithSummaryResponse } from '@kbn/slo-schema';
 import { useFetchActiveAlerts } from '../../../hooks/slo/use_fetch_active_alerts';
+import { useFetchRulesForSlo } from '../../../hooks/slo/use_fetch_rules_for_slo';
 import { useFetchHistoricalSummary } from '../../../hooks/slo/use_fetch_historical_summary';
 import { SloListItem } from './slo_list_item';
 import { SloListEmpty } from './slo_list_empty';
@@ -21,12 +22,12 @@ export interface Props {
 }
 
 export function SloListItems({ sloList, loading, error }: Props) {
-  const { isLoading: historicalSummaryLoading, sloHistoricalSummaryResponse } =
-    useFetchHistoricalSummary({ sloIds: sloList.map((slo) => slo.id) });
+  const sloIds = sloList.map((slo) => slo.id);
 
-  const { data: activeAlertsBySlo } = useFetchActiveAlerts({
-    sloIds: sloList.map((slo) => slo.id),
-  });
+  const { data: activeAlertsBySlo } = useFetchActiveAlerts({ sloIds });
+  const { data: rulesBySlo } = useFetchRulesForSlo({ sloIds });
+  const { isLoading: historicalSummaryLoading, sloHistoricalSummaryResponse } =
+    useFetchHistoricalSummary({ sloIds });
 
   if (!loading && !error && sloList.length === 0) {
     return <SloListEmpty />;
@@ -40,10 +41,11 @@ export function SloListItems({ sloList, loading, error }: Props) {
       {sloList.map((slo) => (
         <EuiFlexItem key={slo.id}>
           <SloListItem
-            slo={slo}
+            activeAlerts={activeAlertsBySlo[slo.id]}
+            rules={rulesBySlo?.[slo.id]}
             historicalSummary={sloHistoricalSummaryResponse?.[slo.id]}
             historicalSummaryLoading={historicalSummaryLoading}
-            activeAlerts={activeAlertsBySlo[slo.id]}
+            slo={slo}
           />
         </EuiFlexItem>
       ))}

From 25df1feee3c3567aeaa21bbbbe804e497aa01107 Mon Sep 17 00:00:00 2001
From: jennypavlova <dzheni.pavlova@elastic.co>
Date: Wed, 19 Apr 2023 14:21:26 +0200
Subject: [PATCH 065/100] [Infrastructure UI] Hosts View: Filtering by metadata
 functionality (#155170)

Closes #151010

## Summary

This PR adds filtering functionality to the metadata table. After some
discussions there are changes in the design - see the [last
comments](https://github.com/elastic/kibana/issues/151010#issuecomment-1513005095)

## Additional changes

As the filters will change the order I changed the id to not depend on
the table index anymore (used os instead) inside [hosts table

](https://github.com/elastic/kibana/pull/155170/files#diff-168ba138bc6696100078e3e9cbc438ed7646d6336e9ef85a9c88553c9d8956f5)

## Testing
- Open the single host view for one of the hosts available in the table
- Inside the flyout select the Metadata tab
- Click on any of the available filter icons to add a filter
- Check if the filter is applied and a toast is displayed
- Click on the same filter icon to remove it and check that it is
removed
- If there are other filters applied they should combined with the
metadata filters (so if filter A is added and then a metadata filter is
applied both filters should be visible)



https://user-images.githubusercontent.com/14139027/232837814-7292c7ec-8b63-4172-bcd9-2d49daf3b145.mov
---
 .../metadata/add_metadata_filter_button.tsx   | 120 ++++++++++++++++++
 .../metadata/build_metadata_filter.ts         |  46 +++++++
 .../host_details_flyout/metadata/table.tsx    |  13 +-
 .../hosts/hooks/use_hosts_table.test.ts       |   4 +-
 .../metrics/hosts/hooks/use_hosts_table.tsx   |   4 +-
 .../test/functional/apps/infra/hosts_view.ts  |  17 ++-
 .../page_objects/infra_hosts_view.ts          |  19 +++
 7 files changed, 217 insertions(+), 6 deletions(-)
 create mode 100644 x-pack/plugins/infra/public/pages/metrics/hosts/components/host_details_flyout/metadata/add_metadata_filter_button.tsx
 create mode 100644 x-pack/plugins/infra/public/pages/metrics/hosts/components/host_details_flyout/metadata/build_metadata_filter.ts

diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/components/host_details_flyout/metadata/add_metadata_filter_button.tsx b/x-pack/plugins/infra/public/pages/metrics/hosts/components/host_details_flyout/metadata/add_metadata_filter_button.tsx
new file mode 100644
index 0000000000000..51277427b6352
--- /dev/null
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/components/host_details_flyout/metadata/add_metadata_filter_button.tsx
@@ -0,0 +1,120 @@
+/*
+ * 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, { useMemo } from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiToolTip, EuiButtonIcon } from '@elastic/eui';
+import { buildMetadataFilter } from './build_metadata_filter';
+import { useMetricsDataViewContext } from '../../../hooks/use_data_view';
+import { useUnifiedSearchContext } from '../../../hooks/use_unified_search';
+import { useKibanaContextForPlugin } from '../../../../../../hooks/use_kibana';
+
+interface AddMetadataFilterButtonProps {
+  item: {
+    name: string;
+    value: string | string[] | undefined;
+  };
+}
+
+const filterAddedToastTitle = i18n.translate(
+  'xpack.infra.hostsViewPage.flyout.metadata.filterAdded',
+  {
+    defaultMessage: 'Filter was added',
+  }
+);
+
+export const AddMetadataFilterButton = ({ item }: AddMetadataFilterButtonProps) => {
+  const { dataView } = useMetricsDataViewContext();
+  const { searchCriteria } = useUnifiedSearchContext();
+
+  const {
+    services: {
+      data: {
+        query: { filterManager: filterManagerService },
+      },
+      notifications: { toasts: toastsService },
+    },
+  } = useKibanaContextForPlugin();
+
+  const existingFilter = useMemo(
+    () => searchCriteria.filters.find((filter) => filter.meta.key === item.name),
+    [item.name, searchCriteria.filters]
+  );
+
+  const handleAddFilter = () => {
+    const newFilter = buildMetadataFilter({
+      field: item.name,
+      value: item.value ?? '',
+      dataView,
+      negate: false,
+    });
+    if (newFilter) {
+      filterManagerService.addFilters(newFilter);
+      toastsService.addSuccess({
+        title: filterAddedToastTitle,
+        toastLifeTimeMs: 10000,
+      });
+    }
+  };
+
+  if (existingFilter) {
+    return (
+      <span>
+        <EuiToolTip
+          content={i18n.translate(
+            'xpack.infra.hostsViewPage.flyout.metadata.setRemoveFilterTooltip',
+            {
+              defaultMessage: 'Remove filter',
+            }
+          )}
+        >
+          <EuiButtonIcon
+            size="s"
+            color="text"
+            iconType="filter"
+            display="base"
+            data-test-subj="hostsView-flyout-metadata-remove-filter"
+            aria-label={i18n.translate(
+              'xpack.infra.hostsViewPage.flyout.metadata.filterAriaLabel',
+              {
+                defaultMessage: 'Filter',
+              }
+            )}
+            onClick={() => filterManagerService.removeFilter(existingFilter)}
+          />
+        </EuiToolTip>
+      </span>
+    );
+  }
+
+  return (
+    <span>
+      <EuiToolTip
+        content={i18n.translate(
+          'xpack.infra.hostsViewPage.flyout.metadata.setFilterByValueTooltip',
+          {
+            defaultMessage: 'Filter by value',
+          }
+        )}
+      >
+        <EuiButtonIcon
+          color="primary"
+          size="s"
+          iconType="filter"
+          data-test-subj="hostsView-flyout-metadata-add-filter"
+          aria-label={i18n.translate(
+            'xpack.infra.hostsViewPage.flyout.metadata.AddFilterAriaLabel',
+            {
+              defaultMessage: 'Add Filter',
+            }
+          )}
+          onClick={handleAddFilter}
+        />
+      </EuiToolTip>
+    </span>
+  );
+};
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/components/host_details_flyout/metadata/build_metadata_filter.ts b/x-pack/plugins/infra/public/pages/metrics/hosts/components/host_details_flyout/metadata/build_metadata_filter.ts
new file mode 100644
index 0000000000000..8464d34073414
--- /dev/null
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/components/host_details_flyout/metadata/build_metadata_filter.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { buildPhrasesFilter, buildPhraseFilter, FilterStateStore } from '@kbn/es-query';
+import type { DataView } from '@kbn/data-views-plugin/common';
+
+export function buildMetadataFilter({
+  field,
+  value,
+  dataView,
+  negate = false,
+}: {
+  value: string | Array<string | number>;
+  negate: boolean;
+  field: string;
+  dataView: DataView | undefined;
+}) {
+  if (!dataView) {
+    return null;
+  }
+  const indexField = dataView.getFieldByName(field)!;
+  const areMultipleValues = Array.isArray(value) && value.length > 1;
+  const filter = areMultipleValues
+    ? buildPhrasesFilter(indexField, value, dataView)
+    : buildPhraseFilter(indexField, Array.isArray(value) ? value[0] : value, dataView);
+
+  filter.meta.type = areMultipleValues ? 'phrases' : 'phrase';
+  filter.$state = { store: 'appState' as FilterStateStore.APP_STATE };
+
+  filter.meta.value = Array.isArray(value)
+    ? !areMultipleValues
+      ? `${value[0]}`
+      : undefined
+    : value;
+
+  filter.meta.key = field;
+  filter.meta.alias = null;
+  filter.meta.negate = negate;
+  filter.meta.disabled = false;
+
+  return filter;
+}
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/components/host_details_flyout/metadata/table.tsx b/x-pack/plugins/infra/public/pages/metrics/hosts/components/host_details_flyout/metadata/table.tsx
index 25aa38cdcb7c5..4cc037335c773 100644
--- a/x-pack/plugins/infra/public/pages/metrics/hosts/components/host_details_flyout/metadata/table.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/components/host_details_flyout/metadata/table.tsx
@@ -20,6 +20,7 @@ import useToggle from 'react-use/lib/useToggle';
 import { debounce } from 'lodash';
 import { Query } from '@elastic/eui';
 import { useHostFlyoutOpen } from '../../../hooks/use_host_flyout_open_url_state';
+import { AddMetadataFilterButton } from './add_metadata_filter_button';
 
 interface Row {
   name: string;
@@ -117,10 +118,19 @@ export const Table = (props: Props) => {
       {
         field: 'value',
         name: VALUE_LABEL,
-        width: '65%',
+        width: '55%',
         sortable: false,
         render: (_name: string, item: Row) => <ExpandableContent values={item.value} />,
       },
+      {
+        field: 'value',
+        name: 'Actions',
+        sortable: false,
+        showOnHover: true,
+        render: (_name: string, item: Row) => {
+          return <AddMetadataFilterButton item={item} />;
+        },
+      },
     ],
     []
   );
@@ -132,6 +142,7 @@ export const Table = (props: Props) => {
       responsive={false}
       columns={columns}
       items={rows}
+      rowProps={{ className: 'euiTableRow-hasActions' }}
       search={search}
       loading={loading}
       error={searchError ? `${searchError.message}` : ''}
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/hooks/use_hosts_table.test.ts b/x-pack/plugins/infra/public/pages/metrics/hosts/hooks/use_hosts_table.test.ts
index 0085b9b923140..4ae8823adaf2e 100644
--- a/x-pack/plugins/infra/public/pages/metrics/hosts/hooks/use_hosts_table.test.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/hooks/use_hosts_table.test.ts
@@ -74,7 +74,7 @@ describe('useHostTable hook', () => {
         name: 'host-0',
         os: '-',
         ip: '',
-        id: 'host-0-0',
+        id: 'host-0--',
         title: {
           cloudProvider: 'aws',
           name: 'host-0',
@@ -105,7 +105,7 @@ describe('useHostTable hook', () => {
         name: 'host-1',
         os: 'macOS',
         ip: '243.86.94.22',
-        id: 'host-1-1',
+        id: 'host-1-macOS',
         title: {
           cloudProvider: null,
           name: 'host-1',
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/hooks/use_hosts_table.tsx b/x-pack/plugins/infra/public/pages/metrics/hosts/hooks/use_hosts_table.tsx
index a898c46316648..0b7021b97f84c 100644
--- a/x-pack/plugins/infra/public/pages/metrics/hosts/hooks/use_hosts_table.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/hooks/use_hosts_table.tsx
@@ -50,8 +50,8 @@ const formatMetric = (type: SnapshotMetricInput['type'], value: number | undefin
 };
 
 const buildItemsList = (nodes: SnapshotNode[]) => {
-  return nodes.map(({ metrics, path, name }, index) => ({
-    id: `${name}-${index}`,
+  return nodes.map(({ metrics, path, name }) => ({
+    id: `${name}-${path.at(-1)?.os ?? '-'}`,
     name,
     os: path.at(-1)?.os ?? '-',
     ip: path.at(-1)?.ip ?? '',
diff --git a/x-pack/test/functional/apps/infra/hosts_view.ts b/x-pack/test/functional/apps/infra/hosts_view.ts
index 9ef3909691172..b22bb934109dc 100644
--- a/x-pack/test/functional/apps/infra/hosts_view.ts
+++ b/x-pack/test/functional/apps/infra/hosts_view.ts
@@ -239,9 +239,24 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         await logoutAndDeleteReadOnlyUser();
       });
 
-      it('should render metadata tab', async () => {
+      it('should render metadata tab, add and remove filter', async () => {
         const metadataTab = await pageObjects.infraHostsView.getMetadataTabName();
         expect(metadataTab).to.contain('Metadata');
+
+        await pageObjects.infraHostsView.clickAddMetadataFilter();
+        await pageObjects.infraHome.waitForLoading();
+
+        // Add Filter
+        const addedFilter = await pageObjects.infraHostsView.getAppliedFilter();
+        expect(addedFilter).to.contain('host.architecture: arm64');
+        const removeFilterExists = await pageObjects.infraHostsView.getRemoveFilterExist();
+        expect(removeFilterExists).to.be(true);
+
+        // Remove filter
+        await pageObjects.infraHostsView.clickRemoveMetadataFilter();
+        await pageObjects.infraHome.waitForLoading();
+        const removeFilterShouldNotExist = await pageObjects.infraHostsView.getRemoveFilterExist();
+        expect(removeFilterShouldNotExist).to.be(false);
       });
 
       it('should navigate to Uptime after click', async () => {
diff --git a/x-pack/test/functional/page_objects/infra_hosts_view.ts b/x-pack/test/functional/page_objects/infra_hosts_view.ts
index cc8582e43d08b..ae0cc601f8cc7 100644
--- a/x-pack/test/functional/page_objects/infra_hosts_view.ts
+++ b/x-pack/test/functional/page_objects/infra_hosts_view.ts
@@ -44,6 +44,14 @@ export function InfraHostsViewProvider({ getService }: FtrProviderContext) {
       return testSubjects.click('hostsView-flyout-apm-services-link');
     },
 
+    async clickAddMetadataFilter() {
+      return testSubjects.click('hostsView-flyout-metadata-add-filter');
+    },
+
+    async clickRemoveMetadataFilter() {
+      return testSubjects.click('hostsView-flyout-metadata-remove-filter');
+    },
+
     async getHostsLandingPageDisabled() {
       const container = await testSubjects.find('hostView-no-enable-access');
       const containerText = await container.getVisibleText();
@@ -142,6 +150,17 @@ export function InfraHostsViewProvider({ getService }: FtrProviderContext) {
       return tabTitle.getVisibleText();
     },
 
+    async getAppliedFilter() {
+      const filter = await testSubjects.find(
+        "filter-badge-'host.architecture: arm64' filter filter-enabled filter-key-host.architecture filter-value-arm64 filter-unpinned filter-id-0"
+      );
+      return filter.getVisibleText();
+    },
+
+    async getRemoveFilterExist() {
+      return testSubjects.exists('hostsView-flyout-metadata-remove-filter');
+    },
+
     async getProcessesTabContentTitle(index: number) {
       const processesListElements = await testSubjects.findAll('infraProcessesSummaryTableItem');
       return processesListElements[index].findByCssSelector('dt');

From fdf5cdf2d4bba63be9fff79600c2915886978a5f Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad31comp@gmail.com>
Date: Wed, 19 Apr 2023 14:39:26 +0200
Subject: [PATCH 066/100] [Synthetics] Waterfall tooltip formatting (#155240)

---
 .../network_data/data_formatting.test.ts      | 38 +++++++++----------
 .../common/network_data/data_formatting.ts    |  2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/step_details_page/common/network_data/data_formatting.test.ts b/x-pack/plugins/synthetics/public/apps/synthetics/components/step_details_page/common/network_data/data_formatting.test.ts
index 814785ed6fe6b..1e1112603e67f 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/step_details_page/common/network_data/data_formatting.test.ts
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/step_details_page/common/network_data/data_formatting.test.ts
@@ -247,7 +247,7 @@ describe('getSeriesAndDomain', () => {
             "showTooltip": true,
             "tooltipProps": Object {
               "colour": "#b0c9e0",
-              "value": "Queued / Blocked: 0.854ms",
+              "value": "Queued / Blocked: 0.9ms",
             },
           },
           "x": 0,
@@ -262,7 +262,7 @@ describe('getSeriesAndDomain', () => {
             "showTooltip": true,
             "tooltipProps": Object {
               "colour": "#aad9cc",
-              "value": "DNS: 3.560ms",
+              "value": "DNS: 4ms",
             },
           },
           "x": 0,
@@ -277,7 +277,7 @@ describe('getSeriesAndDomain', () => {
             "showTooltip": true,
             "tooltipProps": Object {
               "colour": "#c8b8dc",
-              "value": "Connecting: 25.721ms",
+              "value": "Connecting: 26ms",
             },
           },
           "x": 0,
@@ -292,7 +292,7 @@ describe('getSeriesAndDomain', () => {
             "showTooltip": true,
             "tooltipProps": Object {
               "colour": "#e5c7d7",
-              "value": "TLS: 55.387ms",
+              "value": "TLS: 55ms",
             },
           },
           "x": 0,
@@ -307,7 +307,7 @@ describe('getSeriesAndDomain', () => {
             "showTooltip": true,
             "tooltipProps": Object {
               "colour": "#f3b3a6",
-              "value": "Sending request: 0.360ms",
+              "value": "Sending request: 0.4ms",
             },
           },
           "x": 0,
@@ -322,7 +322,7 @@ describe('getSeriesAndDomain', () => {
             "showTooltip": true,
             "tooltipProps": Object {
               "colour": "#e7664c",
-              "value": "Waiting (TTFB): 34.578ms",
+              "value": "Waiting (TTFB): 35ms",
             },
           },
           "x": 0,
@@ -337,7 +337,7 @@ describe('getSeriesAndDomain', () => {
             "showTooltip": true,
             "tooltipProps": Object {
               "colour": "#9170b8",
-              "value": "Content downloading (CSS): 0.552ms",
+              "value": "Content downloading (CSS): 0.6ms",
             },
           },
           "x": 0,
@@ -352,7 +352,7 @@ describe('getSeriesAndDomain', () => {
             "showTooltip": true,
             "tooltipProps": Object {
               "colour": "#b0c9e0",
-              "value": "Queued / Blocked: 84.546ms",
+              "value": "Queued / Blocked: 85ms",
             },
           },
           "x": 1,
@@ -367,7 +367,7 @@ describe('getSeriesAndDomain', () => {
             "showTooltip": true,
             "tooltipProps": Object {
               "colour": "#f3b3a6",
-              "value": "Sending request: 0.239ms",
+              "value": "Sending request: 0.2ms",
             },
           },
           "x": 1,
@@ -382,7 +382,7 @@ describe('getSeriesAndDomain', () => {
             "showTooltip": true,
             "tooltipProps": Object {
               "colour": "#e7664c",
-              "value": "Waiting (TTFB): 52.561ms",
+              "value": "Waiting (TTFB): 53ms",
             },
           },
           "x": 1,
@@ -397,7 +397,7 @@ describe('getSeriesAndDomain', () => {
             "showTooltip": true,
             "tooltipProps": Object {
               "colour": "#da8b45",
-              "value": "Content downloading (JS): 3.068ms",
+              "value": "Content downloading (JS): 3ms",
             },
           },
           "x": 1,
@@ -420,7 +420,7 @@ describe('getSeriesAndDomain', () => {
             "showTooltip": true,
             "tooltipProps": Object {
               "colour": "#b0c9e0",
-              "value": "Queued / Blocked: 0.854ms",
+              "value": "Queued / Blocked: 0.9ms",
             },
           },
           "x": 0,
@@ -435,7 +435,7 @@ describe('getSeriesAndDomain', () => {
             "showTooltip": true,
             "tooltipProps": Object {
               "colour": "#aad9cc",
-              "value": "DNS: 3.560ms",
+              "value": "DNS: 4ms",
             },
           },
           "x": 0,
@@ -450,7 +450,7 @@ describe('getSeriesAndDomain', () => {
             "showTooltip": true,
             "tooltipProps": Object {
               "colour": "#c8b8dc",
-              "value": "Connecting: 25.721ms",
+              "value": "Connecting: 26ms",
             },
           },
           "x": 0,
@@ -465,7 +465,7 @@ describe('getSeriesAndDomain', () => {
             "showTooltip": true,
             "tooltipProps": Object {
               "colour": "#e5c7d7",
-              "value": "TLS: 55.387ms",
+              "value": "TLS: 55ms",
             },
           },
           "x": 0,
@@ -480,7 +480,7 @@ describe('getSeriesAndDomain', () => {
             "showTooltip": true,
             "tooltipProps": Object {
               "colour": "#f3b3a6",
-              "value": "Sending request: 0.360ms",
+              "value": "Sending request: 0.4ms",
             },
           },
           "x": 0,
@@ -495,7 +495,7 @@ describe('getSeriesAndDomain', () => {
             "showTooltip": true,
             "tooltipProps": Object {
               "colour": "#e7664c",
-              "value": "Waiting (TTFB): 34.578ms",
+              "value": "Waiting (TTFB): 35ms",
             },
           },
           "x": 0,
@@ -510,7 +510,7 @@ describe('getSeriesAndDomain', () => {
             "showTooltip": true,
             "tooltipProps": Object {
               "colour": "#9170b8",
-              "value": "Content downloading (CSS): 0.552ms",
+              "value": "Content downloading (CSS): 0.6ms",
             },
           },
           "x": 0,
@@ -524,7 +524,7 @@ describe('getSeriesAndDomain', () => {
             "showTooltip": true,
             "tooltipProps": Object {
               "colour": "#da8b45",
-              "value": "Content downloading (JS): 2.793ms",
+              "value": "Content downloading (JS): 3ms",
             },
           },
           "x": 1,
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/step_details_page/common/network_data/data_formatting.ts b/x-pack/plugins/synthetics/public/apps/synthetics/components/step_details_page/common/network_data/data_formatting.ts
index 11f8a6ddbd43b..356b7ec1381ca 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/step_details_page/common/network_data/data_formatting.ts
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/step_details_page/common/network_data/data_formatting.ts
@@ -55,7 +55,7 @@ const getFriendlyTooltipValue = ({
     const formattedMimeType: MimeType = MimeTypesMap[mimeType];
     label += ` (${FriendlyMimetypeLabels[formattedMimeType] || mimeType})`;
   }
-  return `${label}: ${formatValueForDisplay(value)}ms`;
+  return `${label}: ${formatValueForDisplay(value, value > 1 ? 0 : 1)}ms`;
 };
 export const isHighlightedItem = (
   item: NetworkEvent,

From 7e633bb063051f60e5c26a1ed9fa243c2cd5b1bb Mon Sep 17 00:00:00 2001
From: Chris Cowan <chris@elastic.co>
Date: Wed, 19 Apr 2023 07:03:23 -0600
Subject: [PATCH 067/100] [SLO] Add slo.id and slo.version to Alert-as-data
 index (#155198)

---
 .../common/field_names/infra_metrics.ts       |  3 +++
 .../lib/rules/slo_burn_rate/executor.test.ts  |  3 +++
 .../lib/rules/slo_burn_rate/executor.ts       |  3 +++
 .../lib/rules/slo_burn_rate/field_map.ts      | 23 +++++++++++++++++++
 .../lib/rules/slo_burn_rate/register.ts       |  3 ++-
 x-pack/plugins/observability/server/plugin.ts |  9 +++++---
 6 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 x-pack/plugins/observability/server/lib/rules/slo_burn_rate/field_map.ts

diff --git a/x-pack/plugins/observability/common/field_names/infra_metrics.ts b/x-pack/plugins/observability/common/field_names/infra_metrics.ts
index 26683dd2a206e..52d6d5d72f151 100644
--- a/x-pack/plugins/observability/common/field_names/infra_metrics.ts
+++ b/x-pack/plugins/observability/common/field_names/infra_metrics.ts
@@ -9,3 +9,6 @@ export const SYSTEM_CPU_PERCENTAGE_FIELD = 'system.cpu.total.norm.pct';
 export const SYSTEM_MEMORY_PERCENTAGE_FIELD = 'system.memory.used.pct';
 export const DOCKER_CPU_PERCENTAGE_FIELD = 'docker.cpu.total.pct';
 export const K8S_POD_CPU_PERCENTAGE_FIELD = 'kubernetes.pod.cpu.usage.node.pct';
+
+export const SLO_ID_FIELD = 'slo.id';
+export const SLO_REVISION_FIELD = 'slo.revision';
diff --git a/x-pack/plugins/observability/server/lib/rules/slo_burn_rate/executor.test.ts b/x-pack/plugins/observability/server/lib/rules/slo_burn_rate/executor.test.ts
index 25f0916f18c18..3249a3640e027 100644
--- a/x-pack/plugins/observability/server/lib/rules/slo_burn_rate/executor.test.ts
+++ b/x-pack/plugins/observability/server/lib/rules/slo_burn_rate/executor.test.ts
@@ -37,6 +37,7 @@ import {
   BurnRateRuleParams,
   AlertStates,
 } from './types';
+import { SLO_ID_FIELD, SLO_REVISION_FIELD } from '../../../../common/field_names/infra_metrics';
 
 const commonEsResponse = {
   took: 100,
@@ -254,6 +255,8 @@ describe('BurnRateRuleExecutor', () => {
           'The burn rate for the past 1h is 2 and for the past 5m is 2. Alert when above 2 for both windows',
         [ALERT_EVALUATION_THRESHOLD]: 2,
         [ALERT_EVALUATION_VALUE]: 2,
+        [SLO_ID_FIELD]: slo.id,
+        [SLO_REVISION_FIELD]: slo.revision,
       },
     });
     expect(alertMock.scheduleActions).toBeCalledWith(
diff --git a/x-pack/plugins/observability/server/lib/rules/slo_burn_rate/executor.ts b/x-pack/plugins/observability/server/lib/rules/slo_burn_rate/executor.ts
index bb7679447d367..33e988b2902af 100644
--- a/x-pack/plugins/observability/server/lib/rules/slo_burn_rate/executor.ts
+++ b/x-pack/plugins/observability/server/lib/rules/slo_burn_rate/executor.ts
@@ -17,6 +17,7 @@ import { ExecutorType } from '@kbn/alerting-plugin/server';
 import { addSpaceIdToPath } from '@kbn/spaces-plugin/server';
 import { IBasePath } from '@kbn/core/server';
 
+import { SLO_ID_FIELD, SLO_REVISION_FIELD } from '../../../../common/field_names/infra_metrics';
 import { Duration, toDurationUnit } from '../../../domain/models';
 import { DefaultSLIClient, KibanaSavedObjectsSLORepository } from '../../../services/slo';
 import { computeBurnRate } from '../../../domain/services';
@@ -125,6 +126,8 @@ export const getRuleExecutor = ({
           [ALERT_REASON]: reason,
           [ALERT_EVALUATION_THRESHOLD]: params.burnRateThreshold,
           [ALERT_EVALUATION_VALUE]: Math.min(longWindowBurnRate, shortWindowBurnRate),
+          [SLO_ID_FIELD]: slo.id,
+          [SLO_REVISION_FIELD]: slo.revision,
         },
       });
 
diff --git a/x-pack/plugins/observability/server/lib/rules/slo_burn_rate/field_map.ts b/x-pack/plugins/observability/server/lib/rules/slo_burn_rate/field_map.ts
new file mode 100644
index 0000000000000..eaff284654155
--- /dev/null
+++ b/x-pack/plugins/observability/server/lib/rules/slo_burn_rate/field_map.ts
@@ -0,0 +1,23 @@
+/*
+ * 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 { SLO_ID_FIELD, SLO_REVISION_FIELD } from '../../../../common/field_names/infra_metrics';
+
+export const sloRuleFieldMap = {
+  [SLO_ID_FIELD]: {
+    type: 'keyword',
+    array: false,
+    required: false,
+  },
+  [SLO_REVISION_FIELD]: {
+    type: 'long',
+    array: false,
+    required: false,
+  },
+};
+
+export type SLORuleFieldMap = typeof sloRuleFieldMap;
diff --git a/x-pack/plugins/observability/server/lib/rules/slo_burn_rate/register.ts b/x-pack/plugins/observability/server/lib/rules/slo_burn_rate/register.ts
index 8b666bfc263ad..91c0b9f8c8ffd 100644
--- a/x-pack/plugins/observability/server/lib/rules/slo_burn_rate/register.ts
+++ b/x-pack/plugins/observability/server/lib/rules/slo_burn_rate/register.ts
@@ -16,6 +16,7 @@ import { SLO_RULE_REGISTRATION_CONTEXT } from '../../../common/constants';
 
 import { SLO_BURN_RATE_RULE_ID } from '../../../../common/constants';
 import { ALERT_ACTION, getRuleExecutor } from './executor';
+import { sloRuleFieldMap } from './field_map';
 
 const durationSchema = schema.object({
   value: schema.number(),
@@ -63,7 +64,7 @@ export function sloBurnRateRuleType(
     },
     alerts: {
       context: SLO_RULE_REGISTRATION_CONTEXT,
-      mappings: { fieldMap: legacyExperimentalFieldMap },
+      mappings: { fieldMap: { ...legacyExperimentalFieldMap, ...sloRuleFieldMap } },
       useEcs: true,
       useLegacyAlerts: true,
     },
diff --git a/x-pack/plugins/observability/server/plugin.ts b/x-pack/plugins/observability/server/plugin.ts
index 2e79509fbef4a..9fdf113cc64af 100644
--- a/x-pack/plugins/observability/server/plugin.ts
+++ b/x-pack/plugins/observability/server/plugin.ts
@@ -23,7 +23,6 @@ import {
   getApiTags as getCasesApiTags,
 } from '@kbn/cases-plugin/common';
 import { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
-import { ECS_COMPONENT_TEMPLATE_NAME } from '@kbn/alerting-plugin/server';
 import type { GuidedOnboardingPluginSetup } from '@kbn/guided-onboarding-plugin/server';
 
 import { mappingFromFieldMap } from '@kbn/alerting-plugin/common';
@@ -47,6 +46,7 @@ import { SLO_RULE_REGISTRATION_CONTEXT } from './common/constants';
 import { registerRuleTypes } from './lib/rules/register_rule_types';
 import { SLO_BURN_RATE_RULE_ID } from '../common/constants';
 import { registerSloUsageCollector } from './lib/collectors/register';
+import { sloRuleFieldMap } from './lib/rules/slo_burn_rate/field_map';
 
 export type ObservabilityPluginSetup = ReturnType<ObservabilityPlugin['setup']>;
 
@@ -223,11 +223,14 @@ export class ObservabilityPlugin implements Plugin<ObservabilityPluginSetup> {
       feature: sloFeatureId,
       registrationContext: SLO_RULE_REGISTRATION_CONTEXT,
       dataset: Dataset.alerts,
-      componentTemplateRefs: [ECS_COMPONENT_TEMPLATE_NAME],
+      componentTemplateRefs: [],
       componentTemplates: [
         {
           name: 'mappings',
-          mappings: mappingFromFieldMap(legacyExperimentalFieldMap, 'strict'),
+          mappings: mappingFromFieldMap(
+            { ...legacyExperimentalFieldMap, ...sloRuleFieldMap },
+            'strict'
+          ),
         },
       ],
     });

From d1dff0b2c78c633011644efb86f5cf421c28692d Mon Sep 17 00:00:00 2001
From: Oliver Gupte <ogupte@users.noreply.github.com>
Date: Wed, 19 Apr 2023 09:31:15 -0400
Subject: [PATCH 068/100] [APM] Fleet migration support for bundled APM package
 (#153159)

Closes #149342.

It accomplishes this by returning the ArchivePackage, unzipped bundled
package that includes most of the same fields as the RegistryPackage.
These fields are used in APM to support the fleet migration workflow.
---
 .buildkite/ftr_configs.yml                    |   1 +
 .../app/settings/schema/schema_overview.tsx   |   2 +-
 .../routes/fleet/get_latest_apm_package.ts    |  15 +-
 .../routes/fleet/run_migration_check.ts       |  20 +-
 .../create_apm_users/authentication.ts        |  11 ++
 .../services/epm/package_service.mock.ts      |   1 +
 .../services/epm/package_service.test.ts      |  19 ++
 .../server/services/epm/package_service.ts    |  10 +
 .../test/apm_api_integration/cloud/config.ts  |  10 +
 .../test/apm_api_integration/common/config.ts |   7 +-
 .../test/apm_api_integration/configs/index.ts |   8 +
 .../tests/fleet/apm_package_policy_setup.ts   |  10 +-
 .../tests/fleet/migration_check.spec.ts       | 172 ++++++++++++++++++
 13 files changed, 274 insertions(+), 12 deletions(-)
 create mode 100644 x-pack/test/apm_api_integration/cloud/config.ts
 create mode 100644 x-pack/test/apm_api_integration/tests/fleet/migration_check.spec.ts

diff --git a/.buildkite/ftr_configs.yml b/.buildkite/ftr_configs.yml
index baee9753ce56c..ed9b81dba9667 100644
--- a/.buildkite/ftr_configs.yml
+++ b/.buildkite/ftr_configs.yml
@@ -184,6 +184,7 @@ enabled:
   - x-pack/test/api_integration/apis/uptime/config.ts
   - x-pack/test/api_integration/apis/watcher/config.ts
   - x-pack/test/apm_api_integration/basic/config.ts
+  - x-pack/test/apm_api_integration/cloud/config.ts
   - x-pack/test/apm_api_integration/rules/config.ts
   - x-pack/test/apm_api_integration/trial/config.ts
   - x-pack/test/banners_functional/config.ts
diff --git a/x-pack/plugins/apm/public/components/app/settings/schema/schema_overview.tsx b/x-pack/plugins/apm/public/components/app/settings/schema/schema_overview.tsx
index be52301aaaa43..8e30f70c8de61 100644
--- a/x-pack/plugins/apm/public/components/app/settings/schema/schema_overview.tsx
+++ b/x-pack/plugins/apm/public/components/app/settings/schema/schema_overview.tsx
@@ -248,7 +248,7 @@ function getDisabledReason({
       )
     );
   }
-  if (!hasCloudAgentPolicy) {
+  if (hasRequiredRole && !hasCloudAgentPolicy) {
     reasons.push(
       i18n.translate(
         'xpack.apm.settings.schema.disabledReason.hasCloudAgentPolicy',
diff --git a/x-pack/plugins/apm/server/routes/fleet/get_latest_apm_package.ts b/x-pack/plugins/apm/server/routes/fleet/get_latest_apm_package.ts
index 671b4d56dad94..43528c037222e 100644
--- a/x-pack/plugins/apm/server/routes/fleet/get_latest_apm_package.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/get_latest_apm_package.ts
@@ -17,12 +17,19 @@ export async function getLatestApmPackage({
   request: KibanaRequest;
 }) {
   const packageClient = fleetPluginStart.packageService.asScoped(request);
-  const { name, version } = await packageClient.fetchFindLatestPackage(
+  const latestPackage = await packageClient.fetchFindLatestPackage(
     APM_PACKAGE_NAME
   );
-  const registryPackage = await packageClient.getPackage(name, version);
-  const { title, policy_templates: policyTemplates } =
-    registryPackage.packageInfo;
+  const packageInfo =
+    'buffer' in latestPackage
+      ? (await packageClient.readBundledPackage(latestPackage)).packageInfo
+      : latestPackage;
+  const {
+    name,
+    version,
+    title,
+    policy_templates: policyTemplates,
+  } = packageInfo;
   const firstTemplate = policyTemplates?.[0];
   const policyTemplateInputVars =
     firstTemplate && 'inputs' in firstTemplate
diff --git a/x-pack/plugins/apm/server/routes/fleet/run_migration_check.ts b/x-pack/plugins/apm/server/routes/fleet/run_migration_check.ts
index 3d1a2d740df6e..072d280200850 100644
--- a/x-pack/plugins/apm/server/routes/fleet/run_migration_check.ts
+++ b/x-pack/plugins/apm/server/routes/fleet/run_migration_check.ts
@@ -49,6 +49,17 @@ export async function runMigrationCheck({
   ]);
 
   const hasRequiredRole = isSuperuser({ securityPluginStart, request });
+  if (!hasRequiredRole) {
+    return {
+      has_cloud_agent_policy: false,
+      has_cloud_apm_package_policy: false,
+      cloud_apm_migration_enabled: cloudApmMigrationEnabled,
+      has_required_role: false,
+      cloud_apm_package_policy: undefined,
+      has_apm_integrations: false,
+      latest_apm_package_version: '',
+    };
+  }
   const cloudAgentPolicy = hasRequiredRole
     ? await getCloudAgentPolicy({
         savedObjectsClient,
@@ -57,14 +68,15 @@ export async function runMigrationCheck({
     : undefined;
   const apmPackagePolicy = getApmPackagePolicy(cloudAgentPolicy);
   const coreStart = await core.start();
-  const packagePolicies = await getApmPackagePolicies({
-    coreStart,
-    fleetPluginStart,
-  });
   const latestApmPackage = await getLatestApmPackage({
     fleetPluginStart,
     request,
   });
+
+  const packagePolicies = await getApmPackagePolicies({
+    coreStart,
+    fleetPluginStart,
+  });
   return {
     has_cloud_agent_policy: !!cloudAgentPolicy,
     has_cloud_apm_package_policy: !!apmPackagePolicy,
diff --git a/x-pack/plugins/apm/server/test_helpers/create_apm_users/authentication.ts b/x-pack/plugins/apm/server/test_helpers/create_apm_users/authentication.ts
index f4ea0629f848b..fedc98151ce40 100644
--- a/x-pack/plugins/apm/server/test_helpers/create_apm_users/authentication.ts
+++ b/x-pack/plugins/apm/server/test_helpers/create_apm_users/authentication.ts
@@ -16,6 +16,7 @@ export enum ApmUsername {
   apmManageOwnAgentKeys = 'apm_manage_own_agent_keys',
   apmManageOwnAndCreateAgentKeys = 'apm_manage_own_and_create_agent_keys',
   apmMonitorClusterAndIndices = 'apm_monitor_cluster_and_indices',
+  apmManageServiceAccount = 'apm_manage_service_account',
 }
 
 export enum ApmCustomRolename {
@@ -24,6 +25,7 @@ export enum ApmCustomRolename {
   apmManageOwnAgentKeys = 'apm_manage_own_agent_keys',
   apmManageOwnAndCreateAgentKeys = 'apm_manage_own_and_create_agent_keys',
   apmMonitorClusterAndIndices = 'apm_monitor_cluster_and_indices',
+  apmManageServiceAccount = 'apm_manage_service_account',
 }
 
 export const customRoles = {
@@ -88,6 +90,11 @@ export const customRoles = {
       cluster: ['monitor'],
     },
   },
+  [ApmCustomRolename.apmManageServiceAccount]: {
+    elasticsearch: {
+      cluster: ['manage_service_account'],
+    },
+  },
 };
 
 export const users: Record<
@@ -123,6 +130,10 @@ export const users: Record<
     builtInRoleNames: ['viewer'],
     customRoleNames: [ApmCustomRolename.apmMonitorClusterAndIndices],
   },
+  [ApmUsername.apmManageServiceAccount]: {
+    builtInRoleNames: ['editor'],
+    customRoleNames: [ApmCustomRolename.apmManageServiceAccount],
+  },
 };
 
 export const APM_TEST_PASSWORD = 'changeme';
diff --git a/x-pack/plugins/fleet/server/services/epm/package_service.mock.ts b/x-pack/plugins/fleet/server/services/epm/package_service.mock.ts
index 69e1217b0493c..4007ad7545ece 100644
--- a/x-pack/plugins/fleet/server/services/epm/package_service.mock.ts
+++ b/x-pack/plugins/fleet/server/services/epm/package_service.mock.ts
@@ -11,6 +11,7 @@ const createClientMock = (): jest.Mocked<PackageClient> => ({
   getInstallation: jest.fn(),
   ensureInstalledPackage: jest.fn(),
   fetchFindLatestPackage: jest.fn(),
+  readBundledPackage: jest.fn(),
   getPackage: jest.fn(),
   getPackages: jest.fn(),
   reinstallEsAssets: jest.fn(),
diff --git a/x-pack/plugins/fleet/server/services/epm/package_service.test.ts b/x-pack/plugins/fleet/server/services/epm/package_service.test.ts
index 779f0dad02c8c..aa6f8c81111f5 100644
--- a/x-pack/plugins/fleet/server/services/epm/package_service.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/package_service.test.ts
@@ -26,6 +26,7 @@ import * as epmPackagesGet from './packages/get';
 import * as epmPackagesInstall from './packages/install';
 import * as epmRegistry from './registry';
 import * as epmTransformsInstall from './elasticsearch/transform/install';
+import * as epmArchiveParse from './archive/parse';
 
 const testKeys = [
   'getInstallation',
@@ -33,6 +34,7 @@ const testKeys = [
   'fetchFindLatestPackage',
   'getPackage',
   'reinstallEsAssets',
+  'readBundledPackage',
 ];
 
 function getTest(
@@ -144,6 +146,23 @@ function getTest(
         ],
       };
       break;
+    case testKeys[5]:
+      const bundledPackage = { name: 'package name', version: '8.0.0', buffer: Buffer.from([]) };
+      test = {
+        method: mocks.packageClient.readBundledPackage.bind(mocks.packageClient),
+        args: [bundledPackage],
+        spy: jest.spyOn(epmArchiveParse, 'generatePackageInfoFromArchiveBuffer'),
+        spyArgs: [bundledPackage.buffer, 'application/zip'],
+        spyResponse: {
+          packageInfo: { name: 'readBundledPackage test' },
+          paths: ['/some/test/path'],
+        },
+        expectedReturnValue: {
+          packageInfo: { name: 'readBundledPackage test' },
+          paths: ['/some/test/path'],
+        },
+      };
+      break;
     default:
       throw new Error('invalid test key');
   }
diff --git a/x-pack/plugins/fleet/server/services/epm/package_service.ts b/x-pack/plugins/fleet/server/services/epm/package_service.ts
index b0dd6e9dc38b4..4e820df7a99fc 100644
--- a/x-pack/plugins/fleet/server/services/epm/package_service.ts
+++ b/x-pack/plugins/fleet/server/services/epm/package_service.ts
@@ -32,6 +32,7 @@ import { installTransforms, isTransform } from './elasticsearch/transform/instal
 import type { FetchFindLatestPackageOptions } from './registry';
 import { fetchFindLatestPackageOrThrow, getPackage } from './registry';
 import { ensureInstalledPackage, getInstallation, getPackages } from './packages';
+import { generatePackageInfoFromArchiveBuffer } from './archive';
 
 export type InstalledAssetType = EsAssetReference;
 
@@ -54,6 +55,10 @@ export interface PackageClient {
     options?: FetchFindLatestPackageOptions
   ): Promise<RegistryPackage | BundledPackage>;
 
+  readBundledPackage(
+    bundledPackage: BundledPackage
+  ): Promise<{ packageInfo: ArchivePackage; paths: string[] }>;
+
   getPackage(
     packageName: string,
     packageVersion: string
@@ -137,6 +142,11 @@ class PackageClientImpl implements PackageClient {
     return fetchFindLatestPackageOrThrow(packageName, options);
   }
 
+  public async readBundledPackage(bundledPackage: BundledPackage) {
+    await this.#runPreflight();
+    return generatePackageInfoFromArchiveBuffer(bundledPackage.buffer, 'application/zip');
+  }
+
   public async getPackage(
     packageName: string,
     packageVersion: string,
diff --git a/x-pack/test/apm_api_integration/cloud/config.ts b/x-pack/test/apm_api_integration/cloud/config.ts
new file mode 100644
index 0000000000000..06421969888b5
--- /dev/null
+++ b/x-pack/test/apm_api_integration/cloud/config.ts
@@ -0,0 +1,10 @@
+/*
+ * 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 { configs } from '../configs';
+
+export default configs.cloud;
diff --git a/x-pack/test/apm_api_integration/common/config.ts b/x-pack/test/apm_api_integration/common/config.ts
index b1991a837335c..27c615cf4dbe4 100644
--- a/x-pack/test/apm_api_integration/common/config.ts
+++ b/x-pack/test/apm_api_integration/common/config.ts
@@ -56,7 +56,8 @@ type ApmApiClientKey =
   | 'noMlAccessUser'
   | 'manageOwnAgentKeysUser'
   | 'createAndAllAgentKeysUser'
-  | 'monitorClusterAndIndicesUser';
+  | 'monitorClusterAndIndicesUser'
+  | 'manageServiceAccount';
 
 export type ApmApiClient = Record<ApmApiClientKey, Awaited<ReturnType<typeof getApmApiClient>>>;
 
@@ -146,6 +147,10 @@ export function createTestConfig(
               kibanaServer,
               username: ApmUsername.apmMonitorClusterAndIndices,
             }),
+            manageServiceAccount: await getApmApiClient({
+              kibanaServer,
+              username: ApmUsername.apmManageServiceAccount,
+            }),
           };
         },
         ml: MachineLearningAPIProvider,
diff --git a/x-pack/test/apm_api_integration/configs/index.ts b/x-pack/test/apm_api_integration/configs/index.ts
index eed3a3c9f2443..72dbace5e686b 100644
--- a/x-pack/test/apm_api_integration/configs/index.ts
+++ b/x-pack/test/apm_api_integration/configs/index.ts
@@ -37,6 +37,14 @@ const apmFtrConfigs = {
       'logging.loggers': [apmDebugLogger],
     },
   },
+  cloud: {
+    license: 'basic' as const,
+    kibanaConfig: {
+      'xpack.apm.agent.migrations.enabled': 'true',
+      'xpack.apm.forceSyntheticSource': 'true',
+      'logging.loggers': [apmDebugLogger],
+    },
+  },
 };
 
 export type APMFtrConfigName = keyof typeof apmFtrConfigs;
diff --git a/x-pack/test/apm_api_integration/tests/fleet/apm_package_policy_setup.ts b/x-pack/test/apm_api_integration/tests/fleet/apm_package_policy_setup.ts
index 34c9fabe143eb..aeb2f00fb9360 100644
--- a/x-pack/test/apm_api_integration/tests/fleet/apm_package_policy_setup.ts
+++ b/x-pack/test/apm_api_integration/tests/fleet/apm_package_policy_setup.ts
@@ -11,7 +11,7 @@ export function setupFleet(bettertest: BetterTest) {
   return bettertest({ pathname: '/api/fleet/setup', method: 'post' });
 }
 
-export async function createAgentPolicy(bettertest: BetterTest) {
+export async function createAgentPolicy(bettertest: BetterTest, id?: string) {
   const agentPolicyResponse = await bettertest<{ item: AgentPolicy }>({
     pathname: '/api/fleet/agent_policies',
     method: 'post',
@@ -19,6 +19,7 @@ export async function createAgentPolicy(bettertest: BetterTest) {
     body: {
       name: 'test_agent_policy',
       description: '',
+      id,
       namespace: 'default',
       monitoring_enabled: ['logs', 'metrics'],
     },
@@ -27,7 +28,11 @@ export async function createAgentPolicy(bettertest: BetterTest) {
   return agentPolicyResponse.body.item.id;
 }
 
-export async function createPackagePolicy(bettertest: BetterTest, agentPolicyId: string) {
+export async function createPackagePolicy(
+  bettertest: BetterTest,
+  agentPolicyId: string,
+  id?: string
+) {
   // Get version of available APM package
   const apmPackageResponse = await bettertest<{ item: any }>({
     pathname: `/api/fleet/epm/packages/apm`,
@@ -43,6 +48,7 @@ export async function createPackagePolicy(bettertest: BetterTest, agentPolicyId:
       description: '',
       namespace: 'default',
       policy_id: agentPolicyId,
+      id,
       enabled: true,
       inputs: [{ type: 'apm', policy_template: 'apmserver', enabled: true, streams: [], vars: {} }],
       package: { name: 'apm', title: 'Elastic APM', version: apmPackageVersion },
diff --git a/x-pack/test/apm_api_integration/tests/fleet/migration_check.spec.ts b/x-pack/test/apm_api_integration/tests/fleet/migration_check.spec.ts
new file mode 100644
index 0000000000000..1f89f65c536b9
--- /dev/null
+++ b/x-pack/test/apm_api_integration/tests/fleet/migration_check.spec.ts
@@ -0,0 +1,172 @@
+/*
+ * 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 '../../common/ftr_provider_context';
+import {
+  createAgentPolicy,
+  createPackagePolicy,
+  deleteAgentPolicy,
+  deletePackagePolicy,
+  setupFleet,
+} from './apm_package_policy_setup';
+import { getBettertest } from '../../common/bettertest';
+
+export default function ApiTest(ftrProviderContext: FtrProviderContext) {
+  const { getService } = ftrProviderContext;
+  const registry = getService('registry');
+  const supertest = getService('supertest');
+  const bettertest = getBettertest(supertest);
+  const apmApiClient = getService('apmApiClient');
+
+  registry.when('Fleet migration check - basic', { config: 'basic', archives: [] }, () => {
+    before(async () => {
+      await setupFleet(bettertest);
+    });
+
+    describe('cloud_apm_migration_enabled', () => {
+      it('should be false when when config not set', async () => {
+        const { body } = await bettertest({
+          pathname: '/internal/apm/fleet/migration_check',
+        });
+        expect(body).to.have.property('cloud_apm_migration_enabled', false);
+      });
+    });
+  });
+
+  registry.when('Fleet migration check - cloud', { config: 'cloud', archives: [] }, () => {
+    before(async () => {
+      await setupFleet(bettertest);
+    });
+
+    describe('migration check properties', () => {
+      it('should contain all expected properties', async () => {
+        const { status, body } = await bettertest({
+          pathname: '/internal/apm/fleet/migration_check',
+        });
+        expect(status).to.equal(200);
+        expect(body).to.have.property('has_cloud_agent_policy');
+        expect(body).to.have.property('has_cloud_apm_package_policy');
+        expect(body).to.have.property('cloud_apm_migration_enabled');
+        expect(body).to.have.property('has_required_role');
+        expect(body).to.have.property('has_apm_integrations');
+        expect(body).to.have.property('latest_apm_package_version');
+      });
+    });
+
+    describe('cloud_apm_migration_enabled', () => {
+      it('should be true when when config is set', async () => {
+        const { body } = await bettertest({
+          pathname: '/internal/apm/fleet/migration_check',
+        });
+        expect(body).to.have.property('cloud_apm_migration_enabled', true);
+      });
+    });
+
+    describe('has_cloud_agent_policy', () => {
+      it('should be false when cloud agent policy does not exist', async () => {
+        const { body } = await bettertest({
+          pathname: '/internal/apm/fleet/migration_check',
+        });
+        expect(body).to.have.property('has_cloud_agent_policy', false);
+      });
+      describe('with Cloud agent policy', () => {
+        before(async () => {
+          await createAgentPolicy(bettertest, 'policy-elastic-agent-on-cloud');
+        });
+        after(async () => {
+          await deleteAgentPolicy(bettertest, 'policy-elastic-agent-on-cloud');
+        });
+        it('should be true when cloud agent policy exists', async () => {
+          const { body } = await bettertest({
+            pathname: '/internal/apm/fleet/migration_check',
+          });
+          expect(body).to.have.property('has_cloud_agent_policy', true);
+        });
+      });
+    });
+
+    describe('has_cloud_apm_package_policy', () => {
+      before(async () => {
+        await createAgentPolicy(bettertest, 'policy-elastic-agent-on-cloud');
+      });
+      after(async () => {
+        await deleteAgentPolicy(bettertest, 'policy-elastic-agent-on-cloud');
+      });
+      it('should be false when the Cloud APM package policy does not exist', async () => {
+        const { body } = await bettertest({
+          pathname: '/internal/apm/fleet/migration_check',
+        });
+        expect(body).to.have.property('has_cloud_apm_package_policy', false);
+        expect(body).to.not.have.property('cloud_apm_package_policy');
+        expect(body).to.have.property('has_apm_integrations', false);
+      });
+      describe('with Cloud APM package policy', () => {
+        before(async () => {
+          await createPackagePolicy(bettertest, 'policy-elastic-agent-on-cloud', 'apm');
+        });
+        after(async () => {
+          await deletePackagePolicy(bettertest, 'apm');
+        });
+        it('should be true when the Cloud APM package policy exists', async () => {
+          const { body } = await bettertest({
+            pathname: '/internal/apm/fleet/migration_check',
+          });
+          expect(body).to.have.property('has_cloud_apm_package_policy', true);
+          expect(body).to.have.property('cloud_apm_package_policy');
+          expect(body).to.have.property('has_apm_integrations', true);
+        });
+      });
+    });
+
+    describe('has_apm_integrations', () => {
+      before(async () => {
+        await createAgentPolicy(bettertest, 'test-agent-policy');
+      });
+      after(async () => {
+        await deleteAgentPolicy(bettertest, 'test-agent-policy');
+      });
+      it('should be false when no APM package policies exist', async () => {
+        const { body } = await bettertest({
+          pathname: '/internal/apm/fleet/migration_check',
+        });
+        expect(body).to.have.property('has_apm_integrations', false);
+        expect(body).to.have.property('has_cloud_apm_package_policy', false);
+      });
+      describe('with custom APM package policy', () => {
+        before(async () => {
+          await createPackagePolicy(bettertest, 'test-agent-policy', 'test-apm-package-policy');
+        });
+        after(async () => {
+          await deletePackagePolicy(bettertest, 'test-apm-package-policy');
+        });
+        it('should be true when any APM package policy exists', async () => {
+          const { body } = await bettertest({
+            pathname: '/internal/apm/fleet/migration_check',
+          });
+          expect(body).to.have.property('has_apm_integrations', true);
+          expect(body).to.have.property('has_cloud_apm_package_policy', false);
+        });
+      });
+    });
+
+    describe('has_required_role', () => {
+      it('should be true when user is superuser', async () => {
+        const { body } = await bettertest({
+          pathname: '/internal/apm/fleet/migration_check',
+        });
+        expect(body).to.have.property('has_required_role', true);
+      });
+      it('should be false when user is not superuser', async () => {
+        const { body } = await apmApiClient.manageServiceAccount({
+          endpoint: 'GET /internal/apm/fleet/migration_check',
+        });
+        expect(body).to.have.property('has_required_role', false);
+      });
+    });
+  });
+}

From 0283b7abd3ca3ef322b0559baf3c9370b2ad203c Mon Sep 17 00:00:00 2001
From: Walter Rafelsberger <walter.rafelsberger@elastic.co>
Date: Wed, 19 Apr 2023 15:51:31 +0200
Subject: [PATCH 069/100] [ML] AIOps: Adds execution context to client side
 `data.search` requests (#154891)

Part of https://github.com/elastic/kibana/issues/147378. This PR adds
context information to data.search requests so that they appear in the
search slow log.
---
 .../ml/route_utils/src/create_execution_context.ts    |  3 ++-
 x-pack/packages/ml/route_utils/tsconfig.json          |  1 +
 .../explain_log_rate_spikes_page.tsx                  |  1 +
 .../log_categorization/log_categorization_page.tsx    |  1 +
 .../aiops/public/hooks/use_aiops_app_context.ts       |  3 ++-
 x-pack/plugins/aiops/public/hooks/use_data.ts         | 11 +++++++++++
 .../application/aiops/change_point_detection.tsx      |  1 +
 .../application/aiops/explain_log_rate_spikes.tsx     |  1 +
 .../public/application/aiops/log_categorization.tsx   |  1 +
 9 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/x-pack/packages/ml/route_utils/src/create_execution_context.ts b/x-pack/packages/ml/route_utils/src/create_execution_context.ts
index 2aa12d3a13a9c..aa274fb199ed3 100644
--- a/x-pack/packages/ml/route_utils/src/create_execution_context.ts
+++ b/x-pack/packages/ml/route_utils/src/create_execution_context.ts
@@ -6,6 +6,7 @@
  */
 
 import type { CoreStart } from '@kbn/core/server';
+import type { KibanaExecutionContext } from '@kbn/core-execution-context-common';
 
 /**
  * Creates an execution context to be passed on as part of ES queries.
@@ -22,7 +23,7 @@ export function createExecutionContext(
   name: string,
   id?: string,
   type = 'application'
-) {
+): KibanaExecutionContext {
   const labels = coreStart.executionContext.getAsLabels();
   const page = labels.page as string;
   return {
diff --git a/x-pack/packages/ml/route_utils/tsconfig.json b/x-pack/packages/ml/route_utils/tsconfig.json
index ece6bfd9e321a..d7a348f37f8e8 100644
--- a/x-pack/packages/ml/route_utils/tsconfig.json
+++ b/x-pack/packages/ml/route_utils/tsconfig.json
@@ -17,5 +17,6 @@
   ],
   "kbn_references": [
     "@kbn/core",
+    "@kbn/core-execution-context-common",
   ]
 }
diff --git a/x-pack/plugins/aiops/public/components/explain_log_rate_spikes/explain_log_rate_spikes_page.tsx b/x-pack/plugins/aiops/public/components/explain_log_rate_spikes/explain_log_rate_spikes_page.tsx
index 86082d64e0e27..80640f59901bc 100644
--- a/x-pack/plugins/aiops/public/components/explain_log_rate_spikes/explain_log_rate_spikes_page.tsx
+++ b/x-pack/plugins/aiops/public/components/explain_log_rate_spikes/explain_log_rate_spikes_page.tsx
@@ -114,6 +114,7 @@ export const ExplainLogRateSpikesPage: FC = () => {
     { selectedDataView: dataView, selectedSavedSearch },
     aiopsListState,
     setGlobalState,
+    'explain_log_rage_spikes',
     currentSelectedSignificantTerm,
     currentSelectedGroup
   );
diff --git a/x-pack/plugins/aiops/public/components/log_categorization/log_categorization_page.tsx b/x-pack/plugins/aiops/public/components/log_categorization/log_categorization_page.tsx
index feb6ef9c9b31c..b673d8a498a21 100644
--- a/x-pack/plugins/aiops/public/components/log_categorization/log_categorization_page.tsx
+++ b/x-pack/plugins/aiops/public/components/log_categorization/log_categorization_page.tsx
@@ -111,6 +111,7 @@ export const LogCategorizationPage: FC = () => {
     { selectedDataView: dataView, selectedSavedSearch },
     aiopsListState,
     setGlobalState,
+    'log_categorization',
     undefined,
     undefined,
     BAR_TARGET
diff --git a/x-pack/plugins/aiops/public/hooks/use_aiops_app_context.ts b/x-pack/plugins/aiops/public/hooks/use_aiops_app_context.ts
index 92ea33c18e2d3..b9500ecbb6495 100644
--- a/x-pack/plugins/aiops/public/hooks/use_aiops_app_context.ts
+++ b/x-pack/plugins/aiops/public/hooks/use_aiops_app_context.ts
@@ -8,7 +8,6 @@
 import { createContext, useContext } from 'react';
 
 import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
-
 import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import type { ChartsPluginStart } from '@kbn/charts-plugin/public';
@@ -17,6 +16,7 @@ import type { SharePluginStart } from '@kbn/share-plugin/public';
 import type {
   CoreStart,
   CoreSetup,
+  ExecutionContextStart,
   HttpStart,
   IUiSettingsClient,
   ThemeServiceStart,
@@ -26,6 +26,7 @@ import type { LensPublicStart } from '@kbn/lens-plugin/public';
 export interface AiopsAppDependencies {
   application: CoreStart['application'];
   data: DataPublicPluginStart;
+  executionContext: ExecutionContextStart;
   charts: ChartsPluginStart;
   fieldFormats: FieldFormatsStart;
   http: HttpStart;
diff --git a/x-pack/plugins/aiops/public/hooks/use_data.ts b/x-pack/plugins/aiops/public/hooks/use_data.ts
index 82db675a94c4f..c390582ccae1a 100644
--- a/x-pack/plugins/aiops/public/hooks/use_data.ts
+++ b/x-pack/plugins/aiops/public/hooks/use_data.ts
@@ -8,12 +8,15 @@
 import { useEffect, useMemo, useState } from 'react';
 import { merge } from 'rxjs';
 
+import { useExecutionContext } from '@kbn/kibana-react-plugin/public';
 import type { DataView } from '@kbn/data-views-plugin/public';
 import type { SignificantTerm } from '@kbn/ml-agg-utils';
 import type { SavedSearch } from '@kbn/discover-plugin/public';
 import type { Dictionary } from '@kbn/ml-url-state';
 import { mlTimefilterRefresh$, useTimefilter } from '@kbn/ml-date-picker';
 
+import { PLUGIN_ID } from '../../common';
+
 import type { DocumentStatsSearchStrategyParams } from '../get_document_stats';
 import type { AiOpsIndexBasedAppState } from '../components/explain_log_rate_spikes/explain_log_rate_spikes_app_state';
 import { getEsQueryFromSavedSearch } from '../application/utils/search_utils';
@@ -33,17 +36,25 @@ export const useData = (
   }: { selectedDataView: DataView; selectedSavedSearch: SavedSearch | null },
   aiopsListState: AiOpsIndexBasedAppState,
   onUpdate: (params: Dictionary<unknown>) => void,
+  contextId: string,
   selectedSignificantTerm?: SignificantTerm,
   selectedGroup?: GroupTableItem | null,
   barTarget: number = DEFAULT_BAR_TARGET
 ) => {
   const {
+    executionContext,
     uiSettings,
     data: {
       query: { filterManager },
     },
   } = useAiopsAppContext();
 
+  useExecutionContext(executionContext, {
+    name: PLUGIN_ID,
+    type: 'application',
+    id: contextId,
+  });
+
   const [lastRefresh, setLastRefresh] = useState(0);
 
   /** Prepare required params to pass to search strategy **/
diff --git a/x-pack/plugins/ml/public/application/aiops/change_point_detection.tsx b/x-pack/plugins/ml/public/application/aiops/change_point_detection.tsx
index 77642001757ab..f98e9a3d3c852 100644
--- a/x-pack/plugins/ml/public/application/aiops/change_point_detection.tsx
+++ b/x-pack/plugins/ml/public/application/aiops/change_point_detection.tsx
@@ -49,6 +49,7 @@ export const ChangePointDetectionPage: FC = () => {
           appDependencies={pick(services, [
             'application',
             'data',
+            'executionContext',
             'charts',
             'fieldFormats',
             'http',
diff --git a/x-pack/plugins/ml/public/application/aiops/explain_log_rate_spikes.tsx b/x-pack/plugins/ml/public/application/aiops/explain_log_rate_spikes.tsx
index 031297c55929a..ce1f54c64143e 100644
--- a/x-pack/plugins/ml/public/application/aiops/explain_log_rate_spikes.tsx
+++ b/x-pack/plugins/ml/public/application/aiops/explain_log_rate_spikes.tsx
@@ -49,6 +49,7 @@ export const ExplainLogRateSpikesPage: FC = () => {
           appDependencies={pick(services, [
             'application',
             'data',
+            'executionContext',
             'charts',
             'fieldFormats',
             'http',
diff --git a/x-pack/plugins/ml/public/application/aiops/log_categorization.tsx b/x-pack/plugins/ml/public/application/aiops/log_categorization.tsx
index cdc0c079d541c..468afb044cb75 100644
--- a/x-pack/plugins/ml/public/application/aiops/log_categorization.tsx
+++ b/x-pack/plugins/ml/public/application/aiops/log_categorization.tsx
@@ -49,6 +49,7 @@ export const LogCategorizationPage: FC = () => {
           appDependencies={pick(services, [
             'application',
             'data',
+            'executionContext',
             'charts',
             'fieldFormats',
             'http',

From fce3664397fe71db2062d0c77e64af8204b18357 Mon Sep 17 00:00:00 2001
From: Carlos Crespo <crespocarlos@users.noreply.github.com>
Date: Wed, 19 Apr 2023 16:04:51 +0200
Subject: [PATCH 070/100] [Infrastructure UI] KPI charts with Lens Embeddable
 (#154903)

## Summary

This PR replaces all but Host Count metric charts with Lens and aligns
the formulas used in Lens with the formulas used in the Snapshot API.

The Hosts Count was not converted yet, because Snapshot API
[post-process the results and filters out hosts that don't have metrics
and come from
APM](https://github.com/elastic/kibana/blob/47c71b30253cf1bdd1339af5f471a6d747871c64/x-pack/plugins/infra/server/routes/snapshot/lib/transform_metrics_ui_response.ts#L61).
I decided to keep it unchanged until we start using a new API, which
won't have that step.

In order to avoid multiple requests going to the server simultaneously,
I introduced an intersection observer in the Lens chart component. It
will make them only trigger a request once the user has scrolled over a
chart component. This aims to prevent the occurrence of
`circuit_breaking_exception` exceptions when async_search has to process
too much data.

### Differences between Lens and current KPI charts

<img width="533" alt="image"
src="https://user-images.githubusercontent.com/2767137/232526591-4812059e-ba1f-4e59-a060-820570230084.png">

Currently, Lens doesn't provide an option for adding a suffix to the
metric value nor set a max number of decimal places. (e.g (e.g 3.8 Mbit
**/s**)

### For reviewer

Unfortunately, it's a big PR. Everything in the `lens/formulas` folder
is just related to the metric formulas that are reused between KPIs and
Metrics Charts.

The core of the changes is in the `lens/visualization_types` folder. It
contains the details on how to build different objects to render either
a metric type of chart or a lineXY one.

I have also aligned `cpu` and `memory` formulas with what we have in the
Inventory Model. When comparing the current KPI with the new ones in
Lens Embeddable, the results were not matching.

---------

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../public/common/visualizations/constants.ts |  36 ++++
 .../public/common/visualizations/index.ts     |  27 ++-
 ...ualization.ts => build_lens_attributes.ts} |  10 +-
 .../visualizations/lens/formulas/host/cpu.ts  |  36 ++++
 .../lens/formulas/host/diskio_read.ts         |  23 +++
 .../lens/formulas/host/diskio_write.ts        |  23 +++
 .../lens/formulas/host/host_count.ts          |  23 +++
 .../lens/formulas/host/index.ts               |  16 ++
 .../visualizations/lens/formulas/host/load.ts |  76 +++++++++
 .../lens/formulas/host/memory.ts              |  34 ++++
 .../lens/formulas/host/memory_available.ts    |  23 +++
 .../visualizations/lens/formulas/host/rx.ts   |  24 +++
 .../visualizations/lens/formulas/host/tx.ts   |  24 +++
 .../lens/formulas/host/utils.ts               |  21 +++
 .../common/visualizations/lens/hosts/cpu.ts   |  97 -----------
 .../visualizations/lens/hosts/diskio_read.ts  |  93 -----------
 .../visualizations/lens/hosts/diskio_write.ts |  94 -----------
 .../common/visualizations/lens/hosts/index.ts |  15 --
 .../common/visualizations/lens/hosts/load.ts  | 144 ----------------
 .../visualizations/lens/hosts/memory.ts       |  97 -----------
 .../lens/hosts/memory_available.ts            |  91 -----------
 .../common/visualizations/lens/hosts/rx.ts    |  92 -----------
 .../common/visualizations/lens/hosts/tx.ts    |  92 -----------
 .../common/visualizations/lens/types.ts       |  19 ---
 .../common/visualizations/lens/utils.ts       |  71 +++-----
 .../lens/visualization_types/index.ts         |   9 +
 .../lens/visualization_types/line_chart.ts    | 154 ++++++++++++++++++
 .../lens/visualization_types/metric_chart.ts  | 139 ++++++++++++++++
 .../public/common/visualizations/types.ts     |  63 +++++++
 .../public/hooks/use_intersection_once.ts     |  25 +++
 .../public/hooks/use_lens_attributes.test.ts  |  46 ++++--
 .../infra/public/hooks/use_lens_attributes.ts |  71 +++++---
 .../hosts/components/chart/lens_wrapper.tsx   |  93 +++++++++++
 .../metric_chart_wrapper.tsx}                 |  70 +++++---
 .../hosts/components/hosts_container.tsx      |   4 +-
 .../metrics/hosts/components/hosts_table.tsx  |   2 +-
 .../components/kpi_charts/kpi_charts.tsx      | 154 ------------------
 .../hosts/components/kpi_charts/tile.tsx      |  32 ----
 .../{kpi_charts => kpis}/hosts_tile.tsx       |   6 +-
 .../hosts/components/kpis/kpi_grid.tsx        | 115 +++++++++++++
 .../metrics/hosts/components/kpis/tile.tsx    | 137 ++++++++++++++++
 .../components/tabs/metrics/metric_chart.tsx  |  57 +++----
 x-pack/plugins/infra/public/types.ts          |   8 +-
 .../translations/translations/fr-FR.json      |  10 +-
 .../translations/translations/ja-JP.json      |  10 +-
 .../translations/translations/zh-CN.json      |  10 +-
 .../test/functional/apps/infra/hosts_view.ts  |  12 +-
 47 files changed, 1301 insertions(+), 1227 deletions(-)
 create mode 100644 x-pack/plugins/infra/public/common/visualizations/constants.ts
 rename x-pack/plugins/infra/public/common/visualizations/lens/{lens_visualization.ts => build_lens_attributes.ts} (69%)
 create mode 100644 x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/cpu.ts
 create mode 100644 x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/diskio_read.ts
 create mode 100644 x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/diskio_write.ts
 create mode 100644 x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/host_count.ts
 create mode 100644 x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/index.ts
 create mode 100644 x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/load.ts
 create mode 100644 x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/memory.ts
 create mode 100644 x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/memory_available.ts
 create mode 100644 x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/rx.ts
 create mode 100644 x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/tx.ts
 create mode 100644 x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/utils.ts
 delete mode 100644 x-pack/plugins/infra/public/common/visualizations/lens/hosts/cpu.ts
 delete mode 100644 x-pack/plugins/infra/public/common/visualizations/lens/hosts/diskio_read.ts
 delete mode 100644 x-pack/plugins/infra/public/common/visualizations/lens/hosts/diskio_write.ts
 delete mode 100644 x-pack/plugins/infra/public/common/visualizations/lens/hosts/index.ts
 delete mode 100644 x-pack/plugins/infra/public/common/visualizations/lens/hosts/load.ts
 delete mode 100644 x-pack/plugins/infra/public/common/visualizations/lens/hosts/memory.ts
 delete mode 100644 x-pack/plugins/infra/public/common/visualizations/lens/hosts/memory_available.ts
 delete mode 100644 x-pack/plugins/infra/public/common/visualizations/lens/hosts/rx.ts
 delete mode 100644 x-pack/plugins/infra/public/common/visualizations/lens/hosts/tx.ts
 delete mode 100644 x-pack/plugins/infra/public/common/visualizations/lens/types.ts
 create mode 100644 x-pack/plugins/infra/public/common/visualizations/lens/visualization_types/index.ts
 create mode 100644 x-pack/plugins/infra/public/common/visualizations/lens/visualization_types/line_chart.ts
 create mode 100644 x-pack/plugins/infra/public/common/visualizations/lens/visualization_types/metric_chart.ts
 create mode 100644 x-pack/plugins/infra/public/common/visualizations/types.ts
 create mode 100644 x-pack/plugins/infra/public/hooks/use_intersection_once.ts
 create mode 100644 x-pack/plugins/infra/public/pages/metrics/hosts/components/chart/lens_wrapper.tsx
 rename x-pack/plugins/infra/public/pages/metrics/hosts/components/{kpi_charts/kpi_chart.tsx => chart/metric_chart_wrapper.tsx} (65%)
 delete mode 100644 x-pack/plugins/infra/public/pages/metrics/hosts/components/kpi_charts/kpi_charts.tsx
 delete mode 100644 x-pack/plugins/infra/public/pages/metrics/hosts/components/kpi_charts/tile.tsx
 rename x-pack/plugins/infra/public/pages/metrics/hosts/components/{kpi_charts => kpis}/hosts_tile.tsx (81%)
 create mode 100644 x-pack/plugins/infra/public/pages/metrics/hosts/components/kpis/kpi_grid.tsx
 create mode 100644 x-pack/plugins/infra/public/pages/metrics/hosts/components/kpis/tile.tsx

diff --git a/x-pack/plugins/infra/public/common/visualizations/constants.ts b/x-pack/plugins/infra/public/common/visualizations/constants.ts
new file mode 100644
index 0000000000000..3ea98953c3c4c
--- /dev/null
+++ b/x-pack/plugins/infra/public/common/visualizations/constants.ts
@@ -0,0 +1,36 @@
+/*
+ * 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 {
+  cpu,
+  diskIORead,
+  diskIOWrite,
+  load,
+  memory,
+  memoryAvailable,
+  rx,
+  tx,
+  hostCount,
+} from './lens/formulas/host';
+import { LineChart, MetricChart } from './lens/visualization_types';
+
+export const hostLensFormulas = {
+  cpu,
+  diskIORead,
+  diskIOWrite,
+  hostCount,
+  load,
+  memory,
+  memoryAvailable,
+  rx,
+  tx,
+};
+
+export const visualizationTypes = {
+  lineChart: LineChart,
+  metricChart: MetricChart,
+};
diff --git a/x-pack/plugins/infra/public/common/visualizations/index.ts b/x-pack/plugins/infra/public/common/visualizations/index.ts
index 9f933baa0edc6..cba62658e2e8a 100644
--- a/x-pack/plugins/infra/public/common/visualizations/index.ts
+++ b/x-pack/plugins/infra/public/common/visualizations/index.ts
@@ -5,19 +5,18 @@
  * 2.0.
  */
 
-import { CPU, Load, Memory, MemoryAvailable, RX, TX, DiskIORead, DiskIOWrite } from './lens/hosts';
+export type {
+  HostsLensFormulas,
+  LineChartOptions,
+  LensChartConfig,
+  LensLineChartConfig,
+  MetricChartOptions,
+  HostsLensMetricChartFormulas,
+  HostsLensLineChartFormulas,
+  LensOptions,
+  LensAttributes,
+} from './types';
 
-export { buildLensAttributes } from './lens/lens_visualization';
+export { hostLensFormulas, visualizationTypes } from './constants';
 
-export const hostMetricsLensAttributes = {
-  cpu: CPU,
-  load: Load,
-  memory: Memory,
-  memoryAvailable: MemoryAvailable,
-  rx: RX,
-  tx: TX,
-  diskIORead: DiskIORead,
-  diskIOWrite: DiskIOWrite,
-};
-
-export type HostLensAttributesTypes = keyof typeof hostMetricsLensAttributes;
+export { buildLensAttributes } from './lens/build_lens_attributes';
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/lens_visualization.ts b/x-pack/plugins/infra/public/common/visualizations/lens/build_lens_attributes.ts
similarity index 69%
rename from x-pack/plugins/infra/public/common/visualizations/lens/lens_visualization.ts
rename to x-pack/plugins/infra/public/common/visualizations/lens/build_lens_attributes.ts
index 46f33718d405c..6c5adb7bce203 100644
--- a/x-pack/plugins/infra/public/common/visualizations/lens/lens_visualization.ts
+++ b/x-pack/plugins/infra/public/common/visualizations/lens/build_lens_attributes.ts
@@ -4,10 +4,11 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { LensAttributes } from '../../../types';
-import type { ILensVisualization } from './types';
+import type { LensAttributes, TVisualization, VisualizationAttributes } from '../types';
 
-export const buildLensAttributes = (visualization: ILensVisualization): LensAttributes => {
+export const buildLensAttributes = <T extends VisualizationAttributes<TVisualization>>(
+  visualization: T
+): LensAttributes => {
   return {
     title: visualization.getTitle(),
     visualizationType: visualization.getVisualizationType(),
@@ -18,7 +19,8 @@ export const buildLensAttributes = (visualization: ILensVisualization): LensAttr
           layers: visualization.getLayers(),
         },
       },
-      filters: [],
+      internalReferences: visualization.getReferences(),
+      filters: visualization.getFilters(),
       query: { language: 'kuery', query: '' },
       visualization: visualization.getVisualizationState(),
       adHocDataViews: visualization.getAdhocDataView(),
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/cpu.ts b/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/cpu.ts
new file mode 100644
index 0000000000000..f4d60c15a5317
--- /dev/null
+++ b/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/cpu.ts
@@ -0,0 +1,36 @@
+/*
+ * 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 { LensChartConfig, LensLineChartConfig } from '../../../types';
+import { getFilters } from './utils';
+
+export const cpuLineChart: LensLineChartConfig = {
+  extraVisualizationState: {
+    yLeftExtent: {
+      mode: 'custom',
+      lowerBound: 0,
+      upperBound: 1,
+    },
+  },
+};
+
+export const cpu: LensChartConfig = {
+  title: 'CPU Usage',
+  formula: {
+    formula:
+      '(average(system.cpu.user.pct) + average(system.cpu.system.pct)) / max(system.cpu.cores)',
+    format: {
+      id: 'percent',
+      params: {
+        decimals: 0,
+      },
+    },
+  },
+  getFilters,
+
+  lineChartConfig: cpuLineChart,
+};
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/diskio_read.ts b/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/diskio_read.ts
new file mode 100644
index 0000000000000..344cff8a82f4a
--- /dev/null
+++ b/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/diskio_read.ts
@@ -0,0 +1,23 @@
+/*
+ * 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 { LensChartConfig } from '../../../types';
+import { getFilters } from './utils';
+
+export const diskIORead: LensChartConfig = {
+  title: 'Disk Read IOPS',
+  formula: {
+    formula: "counter_rate(max(system.diskio.read.bytes), kql='system.diskio.read.bytes: *')",
+    format: {
+      id: 'bytes',
+      params: {
+        decimals: 1,
+      },
+    },
+  },
+  getFilters,
+};
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/diskio_write.ts b/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/diskio_write.ts
new file mode 100644
index 0000000000000..f0d1d2cd718b2
--- /dev/null
+++ b/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/diskio_write.ts
@@ -0,0 +1,23 @@
+/*
+ * 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 { LensChartConfig } from '../../../types';
+import { getFilters } from './utils';
+
+export const diskIOWrite: LensChartConfig = {
+  title: 'Disk Write IOPS',
+  formula: {
+    formula: "counter_rate(max(system.diskio.write.bytes), kql='system.diskio.write.bytes: *')",
+    format: {
+      id: 'bytes',
+      params: {
+        decimals: 1,
+      },
+    },
+  },
+  getFilters,
+};
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/host_count.ts b/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/host_count.ts
new file mode 100644
index 0000000000000..4f0d230176368
--- /dev/null
+++ b/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/host_count.ts
@@ -0,0 +1,23 @@
+/*
+ * 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 { LensChartConfig } from '../../../types';
+import { getFilters } from './utils';
+
+export const hostCount: LensChartConfig = {
+  title: 'Hosts',
+  formula: {
+    formula: 'unique_count(host.name)',
+    format: {
+      id: 'number',
+      params: {
+        decimals: 0,
+      },
+    },
+  },
+  getFilters,
+};
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/index.ts b/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/index.ts
new file mode 100644
index 0000000000000..8b15f4308cebc
--- /dev/null
+++ b/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/index.ts
@@ -0,0 +1,16 @@
+/*
+ * 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 { cpu } from './cpu';
+export { diskIORead } from './diskio_read';
+export { diskIOWrite } from './diskio_write';
+export { hostCount } from './host_count';
+export { load } from './load';
+export { memory } from './memory';
+export { memoryAvailable } from './memory_available';
+export { rx } from './rx';
+export { tx } from './tx';
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/load.ts b/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/load.ts
new file mode 100644
index 0000000000000..c4e349fe01aaf
--- /dev/null
+++ b/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/load.ts
@@ -0,0 +1,76 @@
+/*
+ * 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 { ReferenceBasedIndexPatternColumn } from '@kbn/lens-plugin/public/datasources/form_based/operations/definitions/column_types';
+import type { LensChartConfig, LensLineChartConfig } from '../../../types';
+import { getFilters } from './utils';
+
+const REFERENCE_LAYER = 'referenceLayer';
+
+export const loadLineChart: LensLineChartConfig = {
+  extraLayers: {
+    [REFERENCE_LAYER]: {
+      linkToLayers: [],
+      columnOrder: ['referenceColumn'],
+      columns: {
+        referenceColumn: {
+          label: 'Reference',
+          dataType: 'number',
+          operationType: 'static_value',
+          isStaticValue: true,
+          isBucketed: false,
+          scale: 'ratio',
+          params: {
+            value: 1,
+            format: {
+              id: 'percent',
+              params: {
+                decimals: 0,
+              },
+            },
+          },
+          references: [],
+          customLabel: true,
+        } as ReferenceBasedIndexPatternColumn,
+      },
+      sampling: 1,
+      incompleteColumns: {},
+    },
+  },
+  extraVisualizationState: {
+    layers: [
+      {
+        layerId: REFERENCE_LAYER,
+        layerType: 'referenceLine',
+        accessors: ['referenceColumn'],
+        yConfig: [
+          {
+            forAccessor: 'referenceColumn',
+            axisMode: 'left',
+            color: '#6092c0',
+          },
+        ],
+      },
+    ],
+  },
+  extraReference: REFERENCE_LAYER,
+};
+
+export const load: LensChartConfig = {
+  title: 'Normalized Load',
+  formula: {
+    formula: 'average(system.load.1) / max(system.load.cores)',
+    format: {
+      id: 'percent',
+      params: {
+        decimals: 0,
+      },
+    },
+  },
+  getFilters,
+  lineChartConfig: loadLineChart,
+};
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/memory.ts b/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/memory.ts
new file mode 100644
index 0000000000000..413b9aa99001f
--- /dev/null
+++ b/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/memory.ts
@@ -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 type { LensChartConfig, LensLineChartConfig } from '../../../types';
+import { getFilters } from './utils';
+
+const memoryLineChart: LensLineChartConfig = {
+  extraVisualizationState: {
+    yLeftExtent: {
+      mode: 'custom',
+      lowerBound: 0,
+      upperBound: 1,
+    },
+  },
+};
+
+export const memory: LensChartConfig = {
+  title: 'Memory',
+  formula: {
+    formula: 'average(system.memory.actual.used.pct)',
+    format: {
+      id: 'percent',
+      params: {
+        decimals: 0,
+      },
+    },
+  },
+  lineChartConfig: memoryLineChart,
+  getFilters,
+};
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/memory_available.ts b/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/memory_available.ts
new file mode 100644
index 0000000000000..69cea10f423ef
--- /dev/null
+++ b/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/memory_available.ts
@@ -0,0 +1,23 @@
+/*
+ * 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 { LensChartConfig } from '../../../types';
+import { getFilters } from './utils';
+
+export const memoryAvailable: LensChartConfig = {
+  title: 'Memory Available',
+  formula: {
+    formula: 'max(system.memory.total) - average(system.memory.actual.used.bytes)',
+    format: {
+      id: 'bytes',
+      params: {
+        decimals: 1,
+      },
+    },
+  },
+  getFilters,
+};
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/rx.ts b/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/rx.ts
new file mode 100644
index 0000000000000..b396dffb979e6
--- /dev/null
+++ b/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/rx.ts
@@ -0,0 +1,24 @@
+/*
+ * 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 { LensChartConfig } from '../../../types';
+import { getFilters } from './utils';
+
+export const rx: LensChartConfig = {
+  title: 'Network Inbound (RX)',
+  formula: {
+    formula:
+      "average(host.network.ingress.bytes) * 8 / (max(metricset.period, kql='host.network.ingress.bytes: *') / 1000)",
+    format: {
+      id: 'bits',
+      params: {
+        decimals: 1,
+      },
+    },
+  },
+  getFilters,
+};
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/tx.ts b/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/tx.ts
new file mode 100644
index 0000000000000..f9f97a8ed9112
--- /dev/null
+++ b/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/tx.ts
@@ -0,0 +1,24 @@
+/*
+ * 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 { LensChartConfig } from '../../../types';
+import { getFilters } from './utils';
+
+export const tx: LensChartConfig = {
+  title: 'Network Outbound (TX)',
+  formula: {
+    formula:
+      "average(host.network.egress.bytes) * 8 / (max(metricset.period, kql='host.network.egress.bytes: *') / 1000)",
+    format: {
+      id: 'bits',
+      params: {
+        decimals: 1,
+      },
+    },
+  },
+  getFilters,
+};
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/utils.ts b/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/utils.ts
new file mode 100644
index 0000000000000..c0b16ca705b13
--- /dev/null
+++ b/x-pack/plugins/infra/public/common/visualizations/lens/formulas/host/utils.ts
@@ -0,0 +1,21 @@
+/*
+ * 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 { DataViewBase } from '@kbn/es-query';
+
+export const getFilters = ({ id }: Pick<DataViewBase, 'id'>) => [
+  {
+    meta: {
+      index: id,
+    },
+    query: {
+      exists: {
+        field: 'host.name',
+      },
+    },
+  },
+];
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/hosts/cpu.ts b/x-pack/plugins/infra/public/common/visualizations/lens/hosts/cpu.ts
deleted file mode 100644
index 00ed6c799dda0..0000000000000
--- a/x-pack/plugins/infra/public/common/visualizations/lens/hosts/cpu.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * 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 {
-  FormBasedLayer,
-  FormulaPublicApi,
-  PersistedIndexPatternLayer,
-  XYState,
-} from '@kbn/lens-plugin/public';
-import type { DataView } from '@kbn/data-views-plugin/public';
-import {
-  DEFAULT_LAYER_ID,
-  getAdhocDataView,
-  getBreakdownColumn,
-  getDefaultReferences,
-  getHistogramColumn,
-  getXYVisualizationState,
-} from '../utils';
-import type { LensOptions } from '../../../../types';
-import type { ILensVisualization } from '../types';
-
-const BREAKDOWN_COLUMN_NAME = 'hosts_aggs_breakdown';
-const HISTOGRAM_COLUMN_NAME = 'x_date_histogram';
-
-export class CPU implements ILensVisualization {
-  constructor(
-    private dataView: DataView,
-    private options: LensOptions,
-    private formula: FormulaPublicApi
-  ) {}
-
-  getTitle(): string {
-    return 'CPU Usage';
-  }
-
-  getVisualizationType(): string {
-    return 'lnsXY';
-  }
-
-  getLayers = (): Record<string, Omit<FormBasedLayer, 'indexPatternId'>> => {
-    const baseLayer: PersistedIndexPatternLayer = {
-      columnOrder: [BREAKDOWN_COLUMN_NAME, HISTOGRAM_COLUMN_NAME],
-      columns: {
-        ...getBreakdownColumn(BREAKDOWN_COLUMN_NAME, 'host.name', this.options.breakdownSize),
-        ...getHistogramColumn(HISTOGRAM_COLUMN_NAME, this.dataView.timeFieldName ?? '@timestamp'),
-      },
-    };
-
-    const dataLayer = this.formula.insertOrReplaceFormulaColumn(
-      'y_cpu_usage',
-      {
-        formula: 'average(system.cpu.total.norm.pct)',
-        format: {
-          id: 'percent',
-          params: {
-            decimals: 0,
-          },
-        },
-      },
-      baseLayer,
-      this.dataView
-    );
-
-    if (!dataLayer) {
-      throw new Error('Error generating the data layer for the chart');
-    }
-
-    return { [DEFAULT_LAYER_ID]: dataLayer };
-  };
-  getVisualizationState = (): XYState => {
-    return getXYVisualizationState({
-      layers: [
-        {
-          layerId: DEFAULT_LAYER_ID,
-          seriesType: 'line',
-          accessors: ['y_cpu_usage'],
-          yConfig: [],
-          layerType: 'data',
-          xAccessor: HISTOGRAM_COLUMN_NAME,
-          splitAccessor: BREAKDOWN_COLUMN_NAME,
-        },
-      ],
-      yLeftExtent: {
-        mode: 'custom',
-        lowerBound: 0,
-        upperBound: 1,
-      },
-    });
-  };
-
-  getReferences = () => getDefaultReferences(this.dataView, DEFAULT_LAYER_ID);
-  getAdhocDataView = () => getAdhocDataView(this.dataView);
-}
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/hosts/diskio_read.ts b/x-pack/plugins/infra/public/common/visualizations/lens/hosts/diskio_read.ts
deleted file mode 100644
index 768ae9a640075..0000000000000
--- a/x-pack/plugins/infra/public/common/visualizations/lens/hosts/diskio_read.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * 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 {
-  FormBasedLayer,
-  FormulaPublicApi,
-  PersistedIndexPatternLayer,
-  XYState,
-} from '@kbn/lens-plugin/public';
-import type { DataView } from '@kbn/data-views-plugin/public';
-import type { LensOptions } from '../../../../types';
-import {
-  DEFAULT_LAYER_ID,
-  getAdhocDataView,
-  getBreakdownColumn,
-  getDefaultReferences,
-  getHistogramColumn,
-  getXYVisualizationState,
-} from '../utils';
-import type { ILensVisualization } from '../types';
-
-const BREAKDOWN_COLUMN_NAME = 'hosts_aggs_breakdown';
-const HISTOGRAM_COLUMN_NAME = 'x_date_histogram';
-
-export class DiskIORead implements ILensVisualization {
-  constructor(
-    private dataView: DataView,
-    private options: LensOptions,
-    private formula: FormulaPublicApi
-  ) {}
-
-  getTitle(): string {
-    return 'Disk Read IOPS';
-  }
-
-  getVisualizationType(): string {
-    return 'lnsXY';
-  }
-
-  getLayers = (): Record<string, Omit<FormBasedLayer, 'indexPatternId'>> => {
-    const baseLayer: PersistedIndexPatternLayer = {
-      columnOrder: [BREAKDOWN_COLUMN_NAME, HISTOGRAM_COLUMN_NAME],
-      columns: {
-        ...getBreakdownColumn(BREAKDOWN_COLUMN_NAME, 'host.name', this.options.breakdownSize),
-        ...getHistogramColumn(HISTOGRAM_COLUMN_NAME, this.dataView.timeFieldName ?? '@timestamp'),
-      },
-    };
-
-    const dataLayer = this.formula.insertOrReplaceFormulaColumn(
-      'y_diskio_read',
-      {
-        formula: "counter_rate(max(system.diskio.read.bytes), kql='system.diskio.read.bytes >= 0')",
-        format: {
-          id: 'bytes',
-          params: {
-            decimals: 1,
-          },
-        },
-      },
-      baseLayer,
-      this.dataView
-    );
-
-    if (!dataLayer) {
-      throw new Error('Error generating the data layer for the chart');
-    }
-
-    return { [DEFAULT_LAYER_ID]: dataLayer };
-  };
-
-  getVisualizationState = (): XYState => {
-    return getXYVisualizationState({
-      layers: [
-        {
-          layerId: DEFAULT_LAYER_ID,
-          seriesType: 'line',
-          accessors: ['y_diskio_read'],
-          yConfig: [],
-          layerType: 'data',
-          xAccessor: HISTOGRAM_COLUMN_NAME,
-          splitAccessor: BREAKDOWN_COLUMN_NAME,
-        },
-      ],
-    });
-  };
-
-  getReferences = () => getDefaultReferences(this.dataView, DEFAULT_LAYER_ID);
-  getAdhocDataView = () => getAdhocDataView(this.dataView);
-}
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/hosts/diskio_write.ts b/x-pack/plugins/infra/public/common/visualizations/lens/hosts/diskio_write.ts
deleted file mode 100644
index ae6bd12fd026c..0000000000000
--- a/x-pack/plugins/infra/public/common/visualizations/lens/hosts/diskio_write.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * 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 {
-  FormBasedLayer,
-  FormulaPublicApi,
-  PersistedIndexPatternLayer,
-  XYState,
-} from '@kbn/lens-plugin/public';
-import type { DataView } from '@kbn/data-views-plugin/public';
-import type { LensOptions } from '../../../../types';
-import {
-  DEFAULT_LAYER_ID,
-  getAdhocDataView,
-  getBreakdownColumn,
-  getDefaultReferences,
-  getHistogramColumn,
-  getXYVisualizationState,
-} from '../utils';
-import type { ILensVisualization } from '../types';
-
-const BREAKDOWN_COLUMN_NAME = 'hosts_aggs_breakdown';
-const HISTOGRAM_COLUMN_NAME = 'x_date_histogram';
-
-export class DiskIOWrite implements ILensVisualization {
-  constructor(
-    private dataView: DataView,
-    private options: LensOptions,
-    private formula: FormulaPublicApi
-  ) {}
-
-  getTitle(): string {
-    return 'Disk Write IOPS';
-  }
-
-  getVisualizationType(): string {
-    return 'lnsXY';
-  }
-
-  getLayers = (): Record<string, Omit<FormBasedLayer, 'indexPatternId'>> => {
-    const baseLayer: PersistedIndexPatternLayer = {
-      columnOrder: [BREAKDOWN_COLUMN_NAME, HISTOGRAM_COLUMN_NAME],
-      columns: {
-        ...getBreakdownColumn(BREAKDOWN_COLUMN_NAME, 'host.name', this.options.breakdownSize),
-        ...getHistogramColumn(HISTOGRAM_COLUMN_NAME, this.dataView.timeFieldName ?? '@timestamp'),
-      },
-    };
-
-    const dataLayer = this.formula.insertOrReplaceFormulaColumn(
-      'y_diskio_write',
-      {
-        formula:
-          "counter_rate(max(system.diskio.write.bytes), kql='system.diskio.write.bytes>= 0')",
-        format: {
-          id: 'bytes',
-          params: {
-            decimals: 1,
-          },
-        },
-      },
-      baseLayer,
-      this.dataView
-    );
-
-    if (!dataLayer) {
-      throw new Error('Error generating the data layer for the chart');
-    }
-
-    return { [DEFAULT_LAYER_ID]: dataLayer };
-  };
-
-  getVisualizationState = (): XYState => {
-    return getXYVisualizationState({
-      layers: [
-        {
-          layerId: DEFAULT_LAYER_ID,
-          seriesType: 'line',
-          accessors: ['y_diskio_write'],
-          yConfig: [],
-          layerType: 'data',
-          xAccessor: HISTOGRAM_COLUMN_NAME,
-          splitAccessor: BREAKDOWN_COLUMN_NAME,
-        },
-      ],
-    });
-  };
-
-  getReferences = () => getDefaultReferences(this.dataView, DEFAULT_LAYER_ID);
-  getAdhocDataView = () => getAdhocDataView(this.dataView);
-}
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/hosts/index.ts b/x-pack/plugins/infra/public/common/visualizations/lens/hosts/index.ts
deleted file mode 100644
index 1332b4ed2aadc..0000000000000
--- a/x-pack/plugins/infra/public/common/visualizations/lens/hosts/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * 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 { CPU } from './cpu';
-export { Load } from './load';
-export { Memory } from './memory';
-export { MemoryAvailable } from './memory_available';
-export { RX } from './rx';
-export { TX } from './tx';
-export { DiskIORead } from './diskio_read';
-export { DiskIOWrite } from './diskio_write';
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/hosts/load.ts b/x-pack/plugins/infra/public/common/visualizations/lens/hosts/load.ts
deleted file mode 100644
index 59b6167c5dc1d..0000000000000
--- a/x-pack/plugins/infra/public/common/visualizations/lens/hosts/load.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * 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 {
-  PersistedIndexPatternLayer,
-  FormulaPublicApi,
-  XYState,
-  FormBasedLayer,
-} from '@kbn/lens-plugin/public';
-import type { DataView } from '@kbn/data-views-plugin/public';
-import type { ReferenceBasedIndexPatternColumn } from '@kbn/lens-plugin/public/datasources/form_based/operations/definitions/column_types';
-import type { SavedObjectReference } from '@kbn/core-saved-objects-common';
-import {
-  DEFAULT_AD_HOC_DATA_VIEW_ID,
-  DEFAULT_LAYER_ID,
-  getAdhocDataView,
-  getBreakdownColumn,
-  getDefaultReferences,
-  getHistogramColumn,
-  getXYVisualizationState,
-} from '../utils';
-import type { LensOptions } from '../../../../types';
-import type { ILensVisualization } from '../types';
-
-const BREAKDOWN_COLUMN_NAME = 'hosts_aggs_breakdown';
-const HISTOGRAM_COLUMN_NAME = 'x_date_histogram';
-const REFERENCE_LAYER = 'referenceLayer';
-
-export class Load implements ILensVisualization {
-  constructor(
-    private dataView: DataView,
-    private options: LensOptions,
-    private formula: FormulaPublicApi
-  ) {}
-
-  getTitle(): string {
-    return 'Normalized Load';
-  }
-
-  getVisualizationType(): string {
-    return 'lnsXY';
-  }
-
-  getLayers = (): Record<string, Omit<FormBasedLayer, 'indexPatternId'>> => {
-    const baseLayer: PersistedIndexPatternLayer = {
-      columnOrder: [BREAKDOWN_COLUMN_NAME, HISTOGRAM_COLUMN_NAME],
-      columns: {
-        ...getBreakdownColumn(BREAKDOWN_COLUMN_NAME, 'host.name', this.options.breakdownSize),
-        ...getHistogramColumn(HISTOGRAM_COLUMN_NAME, this.dataView.timeFieldName ?? '@timestamp'),
-      },
-    };
-
-    const dataLayer = this.formula.insertOrReplaceFormulaColumn(
-      'y_cpu_cores_usage',
-      {
-        formula: 'average(system.load.1) / max(system.load.cores)',
-        format: {
-          id: 'percent',
-          params: {
-            decimals: 0,
-          },
-        },
-      },
-      baseLayer,
-      this.dataView
-    );
-
-    if (!dataLayer) {
-      throw new Error('Error generating the data layer for the chart');
-    }
-
-    return {
-      [DEFAULT_LAYER_ID]: dataLayer,
-      referenceLayer: {
-        linkToLayers: [],
-        columnOrder: ['referenceColumn'],
-        columns: {
-          referenceColumn: {
-            label: 'Reference',
-            dataType: 'number',
-            operationType: 'static_value',
-            isStaticValue: true,
-            isBucketed: false,
-            scale: 'ratio',
-            params: {
-              value: 1,
-              format: {
-                id: 'percent',
-                params: {
-                  decimals: 0,
-                },
-              },
-            },
-            references: [],
-            customLabel: true,
-          } as ReferenceBasedIndexPatternColumn,
-        },
-        sampling: 1,
-        incompleteColumns: {},
-      },
-    };
-  };
-  getVisualizationState = (): XYState => {
-    return getXYVisualizationState({
-      layers: [
-        {
-          layerId: DEFAULT_LAYER_ID,
-          seriesType: 'line',
-          accessors: ['y_cpu_cores_usage'],
-          yConfig: [],
-          layerType: 'data',
-          xAccessor: HISTOGRAM_COLUMN_NAME,
-          splitAccessor: BREAKDOWN_COLUMN_NAME,
-        },
-        {
-          layerId: REFERENCE_LAYER,
-          layerType: 'referenceLine',
-          accessors: ['referenceColumn'],
-          yConfig: [
-            {
-              forAccessor: 'referenceColumn',
-              axisMode: 'left',
-              color: '#6092c0',
-            },
-          ],
-        },
-      ],
-    });
-  };
-
-  getReferences = (): SavedObjectReference[] => [
-    ...getDefaultReferences(this.dataView, DEFAULT_LAYER_ID),
-    {
-      type: 'index-pattern',
-      id: this.dataView.id ?? DEFAULT_AD_HOC_DATA_VIEW_ID,
-      name: `indexpattern-datasource-layer-${REFERENCE_LAYER}`,
-    },
-  ];
-  getAdhocDataView = () => getAdhocDataView(this.dataView);
-}
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/hosts/memory.ts b/x-pack/plugins/infra/public/common/visualizations/lens/hosts/memory.ts
deleted file mode 100644
index 01bcd45b6e283..0000000000000
--- a/x-pack/plugins/infra/public/common/visualizations/lens/hosts/memory.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * 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 {
-  FormBasedLayer,
-  FormulaPublicApi,
-  PersistedIndexPatternLayer,
-  XYState,
-} from '@kbn/lens-plugin/public';
-import type { DataView } from '@kbn/data-views-plugin/public';
-import {
-  DEFAULT_LAYER_ID,
-  getAdhocDataView,
-  getBreakdownColumn,
-  getDefaultReferences,
-  getHistogramColumn,
-  getXYVisualizationState,
-} from '../utils';
-import type { LensOptions } from '../../../../types';
-import type { ILensVisualization } from '../types';
-
-const BREAKDOWN_COLUMN_NAME = 'hosts_aggs_breakdown';
-const HISTOGRAM_COLUMN_NAME = 'x_date_histogram';
-
-export class Memory implements ILensVisualization {
-  constructor(
-    private dataView: DataView,
-    private options: LensOptions,
-    private formula: FormulaPublicApi
-  ) {}
-
-  getTitle(): string {
-    return 'Disk Writes IOPS';
-  }
-
-  getVisualizationType(): string {
-    return 'lnsXY';
-  }
-
-  getLayers = (): Record<string, Omit<FormBasedLayer, 'indexPatternId'>> => {
-    const baseLayer: PersistedIndexPatternLayer = {
-      columnOrder: [BREAKDOWN_COLUMN_NAME, HISTOGRAM_COLUMN_NAME],
-      columns: {
-        ...getBreakdownColumn(BREAKDOWN_COLUMN_NAME, 'host.name', this.options.breakdownSize),
-        ...getHistogramColumn(HISTOGRAM_COLUMN_NAME, this.dataView.timeFieldName ?? '@timestamp'),
-      },
-    };
-
-    const dataLayer = this.formula.insertOrReplaceFormulaColumn(
-      'y_memory_usage',
-      {
-        formula: 'average(system.memory.actual.used.bytes) / max(system.memory.total)',
-        format: {
-          id: 'percent',
-          params: {
-            decimals: 0,
-          },
-        },
-      },
-      baseLayer,
-      this.dataView
-    );
-
-    if (!dataLayer) {
-      throw new Error('Error generating the data layer for the chart');
-    }
-
-    return { [DEFAULT_LAYER_ID]: dataLayer };
-  };
-  getVisualizationState = (): XYState => {
-    return getXYVisualizationState({
-      layers: [
-        {
-          layerId: DEFAULT_LAYER_ID,
-          seriesType: 'line',
-          accessors: ['y_memory_usage'],
-          yConfig: [],
-          layerType: 'data',
-          xAccessor: HISTOGRAM_COLUMN_NAME,
-          splitAccessor: BREAKDOWN_COLUMN_NAME,
-        },
-      ],
-      yLeftExtent: {
-        mode: 'custom',
-        lowerBound: 0,
-        upperBound: 1,
-      },
-    });
-  };
-
-  getReferences = () => getDefaultReferences(this.dataView, DEFAULT_LAYER_ID);
-  getAdhocDataView = () => getAdhocDataView(this.dataView);
-}
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/hosts/memory_available.ts b/x-pack/plugins/infra/public/common/visualizations/lens/hosts/memory_available.ts
deleted file mode 100644
index 69818f407180e..0000000000000
--- a/x-pack/plugins/infra/public/common/visualizations/lens/hosts/memory_available.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * 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 {
-  FormBasedLayer,
-  FormulaPublicApi,
-  PersistedIndexPatternLayer,
-  XYState,
-} from '@kbn/lens-plugin/public';
-import type { DataView } from '@kbn/data-views-plugin/public';
-import {
-  DEFAULT_LAYER_ID,
-  getAdhocDataView,
-  getBreakdownColumn,
-  getDefaultReferences,
-  getHistogramColumn,
-  getXYVisualizationState,
-} from '../utils';
-import type { LensOptions } from '../../../../types';
-import type { ILensVisualization } from '../types';
-
-const BREAKDOWN_COLUMN_NAME = 'hosts_aggs_breakdown';
-const HISTOGRAM_COLUMN_NAME = 'x_date_histogram';
-
-export class MemoryAvailable implements ILensVisualization {
-  constructor(
-    private dataView: DataView,
-    private options: LensOptions,
-    private formula: FormulaPublicApi
-  ) {}
-
-  getTitle(): string {
-    return 'Memory Available';
-  }
-
-  getVisualizationType(): string {
-    return 'lnsXY';
-  }
-
-  getLayers = (): Record<string, Omit<FormBasedLayer, 'indexPatternId'>> => {
-    const baseLayer: PersistedIndexPatternLayer = {
-      columnOrder: [BREAKDOWN_COLUMN_NAME, HISTOGRAM_COLUMN_NAME],
-      columns: {
-        ...getBreakdownColumn(BREAKDOWN_COLUMN_NAME, 'host.name', this.options.breakdownSize),
-        ...getHistogramColumn(HISTOGRAM_COLUMN_NAME, this.dataView.timeFieldName ?? '@timestamp'),
-      },
-    };
-
-    const dataLayer = this.formula.insertOrReplaceFormulaColumn(
-      'y_memory_available',
-      {
-        formula: 'max(system.memory.total) - average(system.memory.actual.used.bytes)',
-        format: {
-          id: 'bytes',
-          params: {
-            decimals: 1,
-          },
-        },
-      },
-      baseLayer,
-      this.dataView
-    );
-
-    if (!dataLayer) {
-      throw new Error('Error generating the data layer for the chart');
-    }
-
-    return { [DEFAULT_LAYER_ID]: dataLayer };
-  };
-  getVisualizationState = (): XYState => {
-    return getXYVisualizationState({
-      layers: [
-        {
-          layerId: DEFAULT_LAYER_ID,
-          seriesType: 'line',
-          accessors: ['y_memory_available'],
-          yConfig: [],
-          layerType: 'data',
-          xAccessor: HISTOGRAM_COLUMN_NAME,
-          splitAccessor: BREAKDOWN_COLUMN_NAME,
-        },
-      ],
-    });
-  };
-  getReferences = () => getDefaultReferences(this.dataView, DEFAULT_LAYER_ID);
-  getAdhocDataView = () => getAdhocDataView(this.dataView);
-}
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/hosts/rx.ts b/x-pack/plugins/infra/public/common/visualizations/lens/hosts/rx.ts
deleted file mode 100644
index ff5e19b40dc85..0000000000000
--- a/x-pack/plugins/infra/public/common/visualizations/lens/hosts/rx.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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 {
-  FormBasedLayer,
-  FormulaPublicApi,
-  PersistedIndexPatternLayer,
-  XYState,
-} from '@kbn/lens-plugin/public';
-import type { DataView } from '@kbn/data-views-plugin/public';
-import {
-  DEFAULT_LAYER_ID,
-  getAdhocDataView,
-  getBreakdownColumn,
-  getDefaultReferences,
-  getHistogramColumn,
-  getXYVisualizationState,
-} from '../utils';
-import type { LensOptions } from '../../../../types';
-import type { ILensVisualization } from '../types';
-
-const BREAKDOWN_COLUMN_NAME = 'hosts_aggs_breakdown';
-const HISTOGRAM_COLUMN_NAME = 'x_date_histogram';
-
-export class RX implements ILensVisualization {
-  constructor(
-    private dataView: DataView,
-    private options: LensOptions,
-    private formula: FormulaPublicApi
-  ) {}
-
-  getTitle(): string {
-    return 'Network Inbound (RX)';
-  }
-
-  getVisualizationType(): string {
-    return 'lnsXY';
-  }
-
-  getLayers = (): Record<string, Omit<FormBasedLayer, 'indexPatternId'>> => {
-    const baseLayer: PersistedIndexPatternLayer = {
-      columnOrder: [BREAKDOWN_COLUMN_NAME, HISTOGRAM_COLUMN_NAME],
-      columns: {
-        ...getBreakdownColumn(BREAKDOWN_COLUMN_NAME, 'host.name', this.options.breakdownSize),
-        ...getHistogramColumn(HISTOGRAM_COLUMN_NAME, this.dataView.timeFieldName ?? '@timestamp'),
-      },
-    };
-
-    const dataLayer = this.formula.insertOrReplaceFormulaColumn(
-      'y_network_in_bytes',
-      {
-        formula:
-          "average(host.network.ingress.bytes) * 8 / (max(metricset.period, kql='host.network.ingress.bytes: *') / 1000)",
-        format: {
-          id: 'bits',
-          params: {
-            decimals: 1,
-          },
-        },
-      },
-      baseLayer,
-      this.dataView
-    );
-
-    if (!dataLayer) {
-      throw new Error('Error generating the data layer for the chart');
-    }
-
-    return { [DEFAULT_LAYER_ID]: dataLayer };
-  };
-  getVisualizationState = (): XYState => {
-    return getXYVisualizationState({
-      layers: [
-        {
-          layerId: DEFAULT_LAYER_ID,
-          seriesType: 'line',
-          accessors: ['y_network_in_bytes'],
-          yConfig: [],
-          layerType: 'data',
-          xAccessor: HISTOGRAM_COLUMN_NAME,
-          splitAccessor: BREAKDOWN_COLUMN_NAME,
-        },
-      ],
-    });
-  };
-  getReferences = () => getDefaultReferences(this.dataView, DEFAULT_LAYER_ID);
-  getAdhocDataView = () => getAdhocDataView(this.dataView);
-}
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/hosts/tx.ts b/x-pack/plugins/infra/public/common/visualizations/lens/hosts/tx.ts
deleted file mode 100644
index 8923060763d79..0000000000000
--- a/x-pack/plugins/infra/public/common/visualizations/lens/hosts/tx.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * 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 {
-  FormBasedLayer,
-  FormulaPublicApi,
-  PersistedIndexPatternLayer,
-  XYState,
-} from '@kbn/lens-plugin/public';
-import type { DataView } from '@kbn/data-views-plugin/public';
-import {
-  DEFAULT_LAYER_ID,
-  getAdhocDataView,
-  getBreakdownColumn,
-  getDefaultReferences,
-  getHistogramColumn,
-  getXYVisualizationState,
-} from '../utils';
-import type { LensOptions } from '../../../../types';
-import type { ILensVisualization } from '../types';
-
-const BREAKDOWN_COLUMN_NAME = 'hosts_aggs_breakdown';
-const HISTOGRAM_COLUMN_NAME = 'x_date_histogram';
-
-export class TX implements ILensVisualization {
-  constructor(
-    private dataView: DataView,
-    private options: LensOptions,
-    private formula: FormulaPublicApi
-  ) {}
-
-  getTitle(): string {
-    return 'Network Outbound (TX)';
-  }
-
-  getVisualizationType(): string {
-    return 'lnsXY';
-  }
-
-  getLayers = (): Record<string, Omit<FormBasedLayer, 'indexPatternId'>> => {
-    const baseLayer: PersistedIndexPatternLayer = {
-      columnOrder: [BREAKDOWN_COLUMN_NAME, HISTOGRAM_COLUMN_NAME],
-      columns: {
-        ...getBreakdownColumn(BREAKDOWN_COLUMN_NAME, 'host.name', this.options.breakdownSize),
-        ...getHistogramColumn(HISTOGRAM_COLUMN_NAME, this.dataView.timeFieldName ?? '@timestamp'),
-      },
-    };
-
-    const dataLayer = this.formula.insertOrReplaceFormulaColumn(
-      'y_network_out_bytes',
-      {
-        formula:
-          "average(host.network.egress.bytes) * 8 / (max(metricset.period, kql='host.network.egress.bytes: *') / 1000)",
-        format: {
-          id: 'bits',
-          params: {
-            decimals: 1,
-          },
-        },
-      },
-      baseLayer,
-      this.dataView
-    );
-
-    if (!dataLayer) {
-      throw new Error('Error generating the data layer for the chart');
-    }
-
-    return { [DEFAULT_LAYER_ID]: dataLayer };
-  };
-  getVisualizationState = (): XYState => {
-    return getXYVisualizationState({
-      layers: [
-        {
-          layerId: DEFAULT_LAYER_ID,
-          seriesType: 'line',
-          accessors: ['y_network_out_bytes'],
-          yConfig: [],
-          layerType: 'data',
-          xAccessor: HISTOGRAM_COLUMN_NAME,
-          splitAccessor: BREAKDOWN_COLUMN_NAME,
-        },
-      ],
-    });
-  };
-  getReferences = () => getDefaultReferences(this.dataView, DEFAULT_LAYER_ID);
-  getAdhocDataView = () => getAdhocDataView(this.dataView);
-}
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/types.ts b/x-pack/plugins/infra/public/common/visualizations/lens/types.ts
deleted file mode 100644
index a4e2779fad52c..0000000000000
--- a/x-pack/plugins/infra/public/common/visualizations/lens/types.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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 { SavedObjectReference } from '@kbn/core-saved-objects-common';
-import type { DataViewSpec } from '@kbn/data-views-plugin/common';
-import type { FormBasedLayer, XYState } from '@kbn/lens-plugin/public';
-
-export interface ILensVisualization {
-  getTitle(): string;
-  getVisualizationType(): string;
-  getLayers(): Record<string, Omit<FormBasedLayer, 'indexPatternId'>>;
-  getVisualizationState(): XYState;
-  getReferences(): SavedObjectReference[];
-  getAdhocDataView(): Record<string, DataViewSpec>;
-}
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/utils.ts b/x-pack/plugins/infra/public/common/visualizations/lens/utils.ts
index 8a4f1936c77d3..88b78e5a8096d 100644
--- a/x-pack/plugins/infra/public/common/visualizations/lens/utils.ts
+++ b/x-pack/plugins/infra/public/common/visualizations/lens/utils.ts
@@ -8,33 +8,45 @@ import {
   DateHistogramIndexPatternColumn,
   PersistedIndexPatternLayer,
   TermsIndexPatternColumn,
-  XYState,
 } from '@kbn/lens-plugin/public';
 import type { DataView, DataViewSpec } from '@kbn/data-views-plugin/public';
 import type { SavedObjectReference } from '@kbn/core-saved-objects-common';
 
 export const DEFAULT_LAYER_ID = 'layer1';
 export const DEFAULT_AD_HOC_DATA_VIEW_ID = 'infra_lens_ad_hoc_default';
+const DEFAULT_BREAKDOWN_SIZE = 10;
 
-export const getHistogramColumn = (columnName: string, sourceField: string) => {
+export const getHistogramColumn = ({
+  columnName,
+  overrides,
+}: {
+  columnName: string;
+  overrides?: Partial<Pick<DateHistogramIndexPatternColumn, 'sourceField' | 'params'>>;
+}) => {
   return {
     [columnName]: {
       dataType: 'date',
       isBucketed: true,
       label: '@timestamp',
       operationType: 'date_histogram',
-      params: { interval: 'auto' },
       scale: 'interval',
-      sourceField,
+      sourceField: '@timestamp',
+      ...overrides,
+      params: { interval: 'auto', ...overrides?.params },
     } as DateHistogramIndexPatternColumn,
   };
 };
 
-export const getBreakdownColumn = (
-  columnName: string,
-  sourceField: string,
-  breakdownSize: number
-): PersistedIndexPatternLayer['columns'] => {
+export const getBreakdownColumn = ({
+  columnName,
+  overrides,
+}: {
+  columnName: string;
+  overrides?: Partial<Pick<TermsIndexPatternColumn, 'sourceField'>> & {
+    breakdownSize?: number;
+  };
+}): PersistedIndexPatternLayer['columns'] => {
+  const { breakdownSize = DEFAULT_BREAKDOWN_SIZE, sourceField } = overrides ?? {};
   return {
     [columnName]: {
       label: `Top ${breakdownSize} values of ${sourceField}`,
@@ -64,47 +76,6 @@ export const getBreakdownColumn = (
   };
 };
 
-export const getXYVisualizationState = (
-  custom: Omit<Partial<XYState>, 'layers'> & { layers: XYState['layers'] }
-): XYState => ({
-  legend: {
-    isVisible: false,
-    position: 'right',
-    showSingleSeries: false,
-  },
-  valueLabels: 'show',
-  fittingFunction: 'Zero',
-  curveType: 'LINEAR',
-  yLeftScale: 'linear',
-  axisTitlesVisibilitySettings: {
-    x: false,
-    yLeft: false,
-    yRight: true,
-  },
-  tickLabelsVisibilitySettings: {
-    x: true,
-    yLeft: true,
-    yRight: true,
-  },
-  labelsOrientation: {
-    x: 0,
-    yLeft: 0,
-    yRight: 0,
-  },
-  gridlinesVisibilitySettings: {
-    x: true,
-    yLeft: true,
-    yRight: true,
-  },
-  preferredSeriesType: 'line',
-  valuesInLegend: false,
-  emphasizeFitting: true,
-  yTitle: '',
-  xTitle: '',
-  hideEndzones: true,
-  ...custom,
-});
-
 export const getDefaultReferences = (
   dataView: DataView,
   dataLayerId: string
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/visualization_types/index.ts b/x-pack/plugins/infra/public/common/visualizations/lens/visualization_types/index.ts
new file mode 100644
index 0000000000000..4abfeb3a60c45
--- /dev/null
+++ b/x-pack/plugins/infra/public/common/visualizations/lens/visualization_types/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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { LineChart } from './line_chart';
+export { MetricChart } from './metric_chart';
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/visualization_types/line_chart.ts b/x-pack/plugins/infra/public/common/visualizations/lens/visualization_types/line_chart.ts
new file mode 100644
index 0000000000000..68035fc821e80
--- /dev/null
+++ b/x-pack/plugins/infra/public/common/visualizations/lens/visualization_types/line_chart.ts
@@ -0,0 +1,154 @@
+/*
+ * 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 {
+  FormBasedPersistedState,
+  FormulaPublicApi,
+  PersistedIndexPatternLayer,
+  XYState,
+} from '@kbn/lens-plugin/public';
+import type { SavedObjectReference } from '@kbn/core-saved-objects-common';
+import type { DataView, DataViewSpec } from '@kbn/data-views-plugin/public';
+import { Filter } from '@kbn/es-query';
+import {
+  DEFAULT_LAYER_ID,
+  getAdhocDataView,
+  getBreakdownColumn,
+  getDefaultReferences,
+  getHistogramColumn,
+} from '../utils';
+import type { LensChartConfig, VisualizationAttributes, LineChartOptions } from '../../types';
+
+const BREAKDOWN_COLUMN_NAME = 'hosts_aggs_breakdown';
+const HISTOGRAM_COLUMN_NAME = 'x_date_histogram';
+const ACCESSOR = 'formula_accessor';
+
+export class LineChart implements VisualizationAttributes<XYState> {
+  constructor(
+    private chartConfig: LensChartConfig,
+    private dataView: DataView,
+    private formulaAPI: FormulaPublicApi,
+    private options?: LineChartOptions
+  ) {}
+
+  getVisualizationType(): string {
+    return 'lnsXY';
+  }
+
+  getLayers(): FormBasedPersistedState['layers'] {
+    const baseLayer: PersistedIndexPatternLayer = {
+      columnOrder: [BREAKDOWN_COLUMN_NAME, HISTOGRAM_COLUMN_NAME],
+      columns: {
+        ...getBreakdownColumn({
+          columnName: BREAKDOWN_COLUMN_NAME,
+          overrides: {
+            sourceField: 'host.name',
+            breakdownSize: this.options?.breakdownSize,
+          },
+        }),
+        ...getHistogramColumn({
+          columnName: HISTOGRAM_COLUMN_NAME,
+          overrides: {
+            sourceField: this.dataView.timeFieldName,
+          },
+        }),
+      },
+    };
+
+    const dataLayer = this.formulaAPI.insertOrReplaceFormulaColumn(
+      ACCESSOR,
+      this.chartConfig.formula,
+      baseLayer,
+      this.dataView
+    );
+
+    if (!dataLayer) {
+      throw new Error('Error generating the data layer for the chart');
+    }
+
+    return { [DEFAULT_LAYER_ID]: dataLayer, ...this.chartConfig.lineChartConfig?.extraLayers };
+  }
+
+  getVisualizationState(): XYState {
+    const extraVisualizationState = this.chartConfig.lineChartConfig?.extraVisualizationState;
+
+    return getXYVisualizationState({
+      ...extraVisualizationState,
+      layers: [
+        {
+          layerId: DEFAULT_LAYER_ID,
+          seriesType: 'line',
+          accessors: [ACCESSOR],
+          yConfig: [],
+          layerType: 'data',
+          xAccessor: HISTOGRAM_COLUMN_NAME,
+          splitAccessor: BREAKDOWN_COLUMN_NAME,
+        },
+        ...(extraVisualizationState?.layers ? extraVisualizationState?.layers : []),
+      ],
+    });
+  }
+
+  getReferences(): SavedObjectReference[] {
+    const extraReference = this.chartConfig.lineChartConfig?.extraReference;
+    return [
+      ...getDefaultReferences(this.dataView, DEFAULT_LAYER_ID),
+      ...(extraReference ? getDefaultReferences(this.dataView, extraReference) : []),
+    ];
+  }
+
+  getAdhocDataView(): Record<string, DataViewSpec> {
+    return getAdhocDataView(this.dataView);
+  }
+
+  getTitle(): string {
+    return this.options?.title ?? this.chartConfig.title ?? '';
+  }
+
+  getFilters(): Filter[] {
+    return this.chartConfig.getFilters({ id: this.dataView.id ?? DEFAULT_LAYER_ID });
+  }
+}
+
+export const getXYVisualizationState = (
+  custom: Omit<Partial<XYState>, 'layers'> & { layers: XYState['layers'] }
+): XYState => ({
+  legend: {
+    isVisible: false,
+    position: 'right',
+    showSingleSeries: false,
+  },
+  valueLabels: 'show',
+  fittingFunction: 'Zero',
+  curveType: 'LINEAR',
+  yLeftScale: 'linear',
+  axisTitlesVisibilitySettings: {
+    x: false,
+    yLeft: false,
+    yRight: true,
+  },
+  tickLabelsVisibilitySettings: {
+    x: true,
+    yLeft: true,
+    yRight: true,
+  },
+  labelsOrientation: {
+    x: 0,
+    yLeft: 0,
+    yRight: 0,
+  },
+  gridlinesVisibilitySettings: {
+    x: true,
+    yLeft: true,
+    yRight: true,
+  },
+  preferredSeriesType: 'line',
+  valuesInLegend: false,
+  emphasizeFitting: true,
+  hideEndzones: true,
+  ...custom,
+});
diff --git a/x-pack/plugins/infra/public/common/visualizations/lens/visualization_types/metric_chart.ts b/x-pack/plugins/infra/public/common/visualizations/lens/visualization_types/metric_chart.ts
new file mode 100644
index 0000000000000..823d882e02f8a
--- /dev/null
+++ b/x-pack/plugins/infra/public/common/visualizations/lens/visualization_types/metric_chart.ts
@@ -0,0 +1,139 @@
+/*
+ * 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 {
+  FormBasedPersistedState,
+  FormulaPublicApi,
+  MetricVisualizationState,
+  PersistedIndexPatternLayer,
+} from '@kbn/lens-plugin/public';
+import type { SavedObjectReference } from '@kbn/core-saved-objects-common';
+import type { DataView, DataViewSpec } from '@kbn/data-views-plugin/public';
+import type { Filter } from '@kbn/es-query';
+import {
+  DEFAULT_LAYER_ID,
+  getAdhocDataView,
+  getDefaultReferences,
+  getHistogramColumn,
+} from '../utils';
+
+import type { VisualizationAttributes, LensChartConfig, MetricChartOptions } from '../../types';
+
+const HISTOGRAM_COLUMN_NAME = 'x_date_histogram';
+const TRENDLINE_LAYER_ID = 'trendline_layer';
+const TRENDLINE_ACCESSOR = 'metric_trendline_formula_accessor';
+const ACCESSOR = 'metric_formula_accessor';
+
+export class MetricChart implements VisualizationAttributes<MetricVisualizationState> {
+  constructor(
+    private chartConfig: LensChartConfig,
+    private dataView: DataView,
+    private formulaAPI: FormulaPublicApi,
+    private options?: MetricChartOptions
+  ) {}
+
+  getVisualizationType(): string {
+    return 'lnsMetric';
+  }
+
+  getTrendLineLayer(baseLayer: PersistedIndexPatternLayer): FormBasedPersistedState['layers'] {
+    const trendLineLayer = this.formulaAPI.insertOrReplaceFormulaColumn(
+      TRENDLINE_ACCESSOR,
+      this.chartConfig.formula,
+      baseLayer,
+      this.dataView
+    );
+
+    if (!trendLineLayer) {
+      throw new Error('Error generating the data layer for the chart');
+    }
+
+    return {
+      [TRENDLINE_LAYER_ID]: {
+        linkToLayers: [DEFAULT_LAYER_ID],
+        ...trendLineLayer,
+      },
+    };
+  }
+
+  getLayers(): FormBasedPersistedState['layers'] {
+    const { showTrendLine = true } = this.options ?? {};
+    const baseLayer: PersistedIndexPatternLayer = {
+      columnOrder: [HISTOGRAM_COLUMN_NAME],
+      columns: getHistogramColumn({
+        columnName: HISTOGRAM_COLUMN_NAME,
+        overrides: {
+          sourceField: this.dataView.timeFieldName,
+          params: {
+            interval: 'auto',
+            includeEmptyRows: true,
+          },
+        },
+      }),
+      sampling: 1,
+    };
+
+    const baseLayerDetails = this.formulaAPI.insertOrReplaceFormulaColumn(
+      ACCESSOR,
+      {
+        ...this.chartConfig.formula,
+        label: this.options?.title ?? this.chartConfig.title,
+      },
+      { columnOrder: [], columns: {} },
+      this.dataView
+    );
+
+    if (!baseLayerDetails) {
+      throw new Error('Error generating the data layer for the chart');
+    }
+
+    return {
+      [DEFAULT_LAYER_ID]: baseLayerDetails,
+      ...(showTrendLine ? this.getTrendLineLayer(baseLayer) : {}),
+    };
+  }
+
+  getVisualizationState(): MetricVisualizationState {
+    const { subtitle, backgroundColor, showTrendLine = true } = this.options ?? {};
+    return {
+      layerId: DEFAULT_LAYER_ID,
+      layerType: 'data',
+      metricAccessor: ACCESSOR,
+      color: backgroundColor,
+      subtitle,
+      showBar: false,
+      ...(showTrendLine
+        ? {
+            trendlineLayerId: TRENDLINE_LAYER_ID,
+            trendlineLayerType: 'metricTrendline',
+            trendlineMetricAccessor: TRENDLINE_ACCESSOR,
+            trendlineTimeAccessor: HISTOGRAM_COLUMN_NAME,
+          }
+        : {}),
+    };
+  }
+
+  getReferences(): SavedObjectReference[] {
+    const { showTrendLine = true } = this.options ?? {};
+    return [
+      ...getDefaultReferences(this.dataView, DEFAULT_LAYER_ID),
+      ...(showTrendLine ? getDefaultReferences(this.dataView, TRENDLINE_LAYER_ID) : []),
+    ];
+  }
+
+  getAdhocDataView(): Record<string, DataViewSpec> {
+    return getAdhocDataView(this.dataView);
+  }
+
+  getTitle(): string {
+    return this.options?.showTitle ? this.options?.title ?? this.chartConfig.title : '';
+  }
+
+  getFilters(): Filter[] {
+    return this.chartConfig.getFilters({ id: this.dataView.id ?? DEFAULT_LAYER_ID });
+  }
+}
diff --git a/x-pack/plugins/infra/public/common/visualizations/types.ts b/x-pack/plugins/infra/public/common/visualizations/types.ts
new file mode 100644
index 0000000000000..76f644525bd14
--- /dev/null
+++ b/x-pack/plugins/infra/public/common/visualizations/types.ts
@@ -0,0 +1,63 @@
+/*
+ * 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 { SavedObjectReference } from '@kbn/core-saved-objects-common';
+import type { DataViewSpec } from '@kbn/data-views-plugin/common';
+import { DataViewBase, Filter } from '@kbn/es-query';
+import {
+  FormBasedPersistedState,
+  FormulaPublicApi,
+  MetricVisualizationState,
+  TypedLensByValueInput,
+  XYState,
+} from '@kbn/lens-plugin/public';
+import { hostLensFormulas, visualizationTypes } from './constants';
+
+export type LensAttributes = TypedLensByValueInput['attributes'];
+
+export interface LensOptions {
+  title: string;
+}
+export interface LineChartOptions extends LensOptions {
+  breakdownSize?: number;
+}
+export interface MetricChartOptions extends LensOptions {
+  subtitle?: string;
+  showTitle?: boolean;
+  showTrendLine?: boolean;
+  backgroundColor?: string;
+}
+
+export interface LensLineChartConfig {
+  extraVisualizationState?: Partial<Omit<XYState, 'layers'> & { layers: XYState['layers'] }>;
+  extraLayers?: FormBasedPersistedState['layers'];
+  extraReference?: string;
+}
+export interface LensChartConfig {
+  title: string;
+  formula: Formula;
+  lineChartConfig?: LensLineChartConfig;
+  getFilters: ({ id }: Pick<DataViewBase, 'id'>) => Filter[];
+}
+
+export type TVisualization = XYState | MetricVisualizationState;
+export interface VisualizationAttributes<T extends TVisualization> {
+  getTitle(): string;
+  getVisualizationType(): string;
+  getLayers(): FormBasedPersistedState['layers'];
+  getVisualizationState(): T;
+  getReferences(): SavedObjectReference[];
+  getFilters(): Filter[];
+  getAdhocDataView(): Record<string, DataViewSpec>;
+}
+
+export type Formula = Parameters<FormulaPublicApi['insertOrReplaceFormulaColumn']>[1];
+
+export type VisualizationTypes = keyof typeof visualizationTypes;
+export type HostsLensFormulas = keyof typeof hostLensFormulas;
+export type HostsLensMetricChartFormulas = Exclude<HostsLensFormulas, 'diskIORead' | 'diskIOWrite'>;
+export type HostsLensLineChartFormulas = Exclude<HostsLensFormulas, 'hostCount'>;
diff --git a/x-pack/plugins/infra/public/hooks/use_intersection_once.ts b/x-pack/plugins/infra/public/hooks/use_intersection_once.ts
new file mode 100644
index 0000000000000..8894e9fec3176
--- /dev/null
+++ b/x-pack/plugins/infra/public/hooks/use_intersection_once.ts
@@ -0,0 +1,25 @@
+/*
+ * 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 { RefObject, useEffect, useState } from 'react';
+import useIntersection from 'react-use/lib/useIntersection';
+
+export const useIntersectedOnce = (
+  ref: RefObject<HTMLElement>,
+  options: IntersectionObserverInit
+) => {
+  const [intersectedOnce, setIntersectedOnce] = useState(false);
+  const intersection = useIntersection(ref, options);
+
+  useEffect(() => {
+    if (!intersectedOnce && (intersection?.intersectionRatio ?? 0) > 0) {
+      setIntersectedOnce(true);
+    }
+  }, [intersectedOnce, intersection?.intersectionRatio]);
+
+  return { intersectedOnce, intersection };
+};
diff --git a/x-pack/plugins/infra/public/hooks/use_lens_attributes.test.ts b/x-pack/plugins/infra/public/hooks/use_lens_attributes.test.ts
index d4eb0e810cc1e..b58b25ec35b28 100644
--- a/x-pack/plugins/infra/public/hooks/use_lens_attributes.test.ts
+++ b/x-pack/plugins/infra/public/hooks/use_lens_attributes.test.ts
@@ -48,7 +48,11 @@ describe('useHostTable hook', () => {
   it('should return the basic lens attributes', async () => {
     const { result, waitForNextUpdate } = renderHook(() =>
       useLensAttributes({
+        visualizationType: 'lineChart',
         type: 'load',
+        options: {
+          title: 'Injected Normalized Load',
+        },
         dataView: mockDataView,
       })
     );
@@ -57,12 +61,12 @@ describe('useHostTable hook', () => {
     const { state, title } = result.current.attributes ?? {};
     const { datasourceStates, filters } = state ?? {};
 
-    expect(title).toBe('Normalized Load');
+    expect(title).toBe('Injected Normalized Load');
     expect(datasourceStates).toEqual({
       formBased: {
         layers: {
           layer1: {
-            columnOrder: ['hosts_aggs_breakdown', 'x_date_histogram', 'y_cpu_cores_usage'],
+            columnOrder: ['hosts_aggs_breakdown', 'x_date_histogram', 'formula_accessor'],
             columns: {
               hosts_aggs_breakdown: {
                 dataType: 'string',
@@ -100,7 +104,7 @@ describe('useHostTable hook', () => {
                 scale: 'interval',
                 sourceField: '@timestamp',
               },
-              y_cpu_cores_usage: {
+              formula_accessor: {
                 customLabel: false,
                 dataType: 'number',
                 filter: undefined,
@@ -154,19 +158,36 @@ describe('useHostTable hook', () => {
         },
       },
     });
-    expect(filters).toEqual([]);
+    expect(filters).toEqual([
+      {
+        meta: {
+          index: 'mock-id',
+        },
+        query: {
+          exists: {
+            field: 'host.name',
+          },
+        },
+      },
+    ]);
   });
 
-  it('should return attributes with injected values', async () => {
+  it('should return extra actions', async () => {
     const { result, waitForNextUpdate } = renderHook(() =>
       useLensAttributes({
+        visualizationType: 'lineChart',
         type: 'load',
         dataView: mockDataView,
       })
     );
     await waitForNextUpdate();
 
-    const injectedData = {
+    const extraActions = result.current.getExtraActions({
+      timeRange: {
+        from: 'now-15m',
+        to: 'now',
+        mode: 'relative',
+      },
       query: {
         language: 'kuery',
         query: '{term: { host.name: "a"}}',
@@ -186,17 +207,8 @@ describe('useHostTable hook', () => {
           query: { range: { 'system.load.cores': { gte: 0 } } },
         },
       ],
-      title: 'Injected CPU Cores',
-    };
-
-    const injectedAttributes = result.current.injectData(injectedData);
-
-    const { state, title } = injectedAttributes ?? {};
-    const { filters, query } = state ?? {};
+    });
 
-    expect(title).toEqual(injectedData.title);
-    expect(query).toEqual(injectedData.query);
-    expect(filters).toHaveLength(1);
-    expect(filters).toContain(injectedData.filters[0]);
+    expect(extraActions.openInLens).not.toBeNull();
   });
 });
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 c3b005f9ad8ad..c9ce48c909f9a 100644
--- a/x-pack/plugins/infra/public/hooks/use_lens_attributes.ts
+++ b/x-pack/plugins/infra/public/hooks/use_lens_attributes.ts
@@ -12,25 +12,45 @@ import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
 import { i18n } from '@kbn/i18n';
 import useAsync from 'react-use/lib/useAsync';
-import { InfraClientSetupDeps, LensAttributes, LensOptions } from '../types';
+import { InfraClientSetupDeps } from '../types';
 import {
   buildLensAttributes,
-  HostLensAttributesTypes,
-  hostMetricsLensAttributes,
+  HostsLensFormulas,
+  HostsLensMetricChartFormulas,
+  HostsLensLineChartFormulas,
+  LineChartOptions,
+  MetricChartOptions,
+  LensAttributes,
+  hostLensFormulas,
+  visualizationTypes,
 } from '../common/visualizations';
 
-interface UseLensAttributesParams {
-  type: HostLensAttributesTypes;
+type Options = LineChartOptions | MetricChartOptions;
+interface UseLensAttributesBaseParams<T extends HostsLensFormulas, O extends Options> {
   dataView: DataView | undefined;
-  options?: LensOptions;
+  type: T;
+  options?: O;
 }
 
+interface UseLensAttributesLineChartParams
+  extends UseLensAttributesBaseParams<HostsLensLineChartFormulas, LineChartOptions> {
+  visualizationType: 'lineChart';
+}
+
+interface UseLensAttributesMetricChartParams
+  extends UseLensAttributesBaseParams<HostsLensMetricChartFormulas, MetricChartOptions> {
+  visualizationType: 'metricChart';
+}
+
+type UseLensAttributesParams =
+  | UseLensAttributesLineChartParams
+  | UseLensAttributesMetricChartParams;
+
 export const useLensAttributes = ({
   type,
   dataView,
-  options = {
-    breakdownSize: 10,
-  },
+  options,
+  visualizationType,
 }: UseLensAttributesParams) => {
   const {
     services: { lens },
@@ -39,31 +59,31 @@ export const useLensAttributes = ({
   const { value, error } = useAsync(lens.stateHelperApi, [lens]);
   const { formula: formulaAPI } = value ?? {};
 
-  const attributes: LensAttributes | null = useMemo(() => {
+  const attributes = useMemo(() => {
     if (!dataView || !formulaAPI) {
       return null;
     }
 
-    const VisualizationClass = hostMetricsLensAttributes[type];
+    const lensChartConfig = hostLensFormulas[type];
+    const VisualizationType = visualizationTypes[visualizationType];
+
     const visualizationAttributes = buildLensAttributes(
-      new VisualizationClass(dataView, options, formulaAPI)
+      new VisualizationType(lensChartConfig, dataView, formulaAPI, options)
     );
 
     return visualizationAttributes;
-  }, [dataView, formulaAPI, options, type]);
+  }, [dataView, formulaAPI, options, type, visualizationType]);
 
-  const injectData = (data: {
+  const injectFilters = (data: {
+    timeRange: TimeRange;
     filters: Filter[];
     query: Query;
-    title?: string;
   }): LensAttributes | null => {
     if (!attributes) {
       return null;
     }
-
     return {
       ...attributes,
-      ...(!!data.title ? { title: data.title } : {}),
       state: {
         ...attributes.state,
         query: data.query,
@@ -72,7 +92,15 @@ export const useLensAttributes = ({
     };
   };
 
-  const getExtraActions = (currentAttributes: LensAttributes | null, timeRange: TimeRange) => {
+  const getExtraActions = ({
+    timeRange,
+    filters,
+    query,
+  }: {
+    timeRange: TimeRange;
+    filters: Filter[];
+    query: Query;
+  }) => {
     return {
       openInLens: {
         id: 'openInLens',
@@ -93,12 +121,13 @@ export const useLensAttributes = ({
           return true;
         },
         async execute(_context: ActionExecutionContext): Promise<void> {
-          if (currentAttributes) {
+          const injectedAttributes = injectFilters({ timeRange, filters, query });
+          if (injectedAttributes) {
             navigateToPrefilledEditor(
               {
                 id: '',
                 timeRange,
-                attributes: currentAttributes,
+                attributes: injectedAttributes,
               },
               {
                 openInNewTab: true,
@@ -111,5 +140,5 @@ export const useLensAttributes = ({
     };
   };
 
-  return { attributes, injectData, getExtraActions, error };
+  return { attributes, getExtraActions, error };
 };
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
new file mode 100644
index 0000000000000..9985db0751fd4
--- /dev/null
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/components/chart/lens_wrapper.tsx
@@ -0,0 +1,93 @@
+/*
+ * 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, { useEffect, useState } from 'react';
+
+import { Action } from '@kbn/ui-actions-plugin/public';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
+import { BrushTriggerEvent } from '@kbn/charts-plugin/public';
+import { EuiFlexGroup } from '@elastic/eui';
+import { EuiFlexItem } from '@elastic/eui';
+import { EuiLoadingChart } from '@elastic/eui';
+import { Filter, Query, TimeRange } from '@kbn/es-query';
+import { useKibanaContextForPlugin } from '../../../../../hooks/use_kibana';
+import { useIntersectedOnce } from '../../../../../hooks/use_intersection_once';
+import { LensAttributes } from '../../../../../common/visualizations';
+
+export interface Props {
+  id: string;
+  attributes: LensAttributes | null;
+  dateRange: TimeRange;
+  query: Query;
+  filters: Filter[];
+  extraActions: Action[];
+  lastReloadRequestTime?: number;
+  style?: React.CSSProperties;
+  onBrushEnd?: (data: BrushTriggerEvent['data']) => void;
+}
+
+export const LensWrapper = ({
+  attributes,
+  dateRange,
+  filters,
+  id,
+  query,
+  extraActions,
+  style,
+  onBrushEnd,
+  lastReloadRequestTime,
+}: Props) => {
+  const intersectionRef = React.useRef(null);
+
+  const [currentLastReloadRequestTime, setCurrentLastReloadRequestTime] = useState<
+    number | undefined
+  >(lastReloadRequestTime);
+  const {
+    services: { lens },
+  } = useKibanaContextForPlugin();
+  const { intersectedOnce, intersection } = useIntersectedOnce(intersectionRef, {
+    threshold: 1,
+  });
+
+  const EmbeddableComponent = lens.EmbeddableComponent;
+
+  useEffect(() => {
+    if ((intersection?.intersectionRatio ?? 0) === 1) {
+      setCurrentLastReloadRequestTime(lastReloadRequestTime);
+    }
+  }, [intersection?.intersectionRatio, lastReloadRequestTime]);
+
+  const isReady = attributes && intersectedOnce;
+
+  return (
+    <div ref={intersectionRef}>
+      {!isReady ? (
+        <EuiFlexGroup style={style} justifyContent="center" alignItems="center">
+          <EuiFlexItem grow={false}>
+            <EuiLoadingChart size="l" mono />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      ) : (
+        <EmbeddableComponent
+          id={id}
+          style={style}
+          attributes={attributes}
+          viewMode={ViewMode.VIEW}
+          timeRange={dateRange}
+          query={query}
+          filters={filters}
+          extraActions={extraActions}
+          lastReloadRequestTime={currentLastReloadRequestTime}
+          executionContext={{
+            type: 'infrastructure_observability_hosts_view',
+            name: id,
+          }}
+          onBrushEnd={onBrushEnd}
+        />
+      )}
+    </div>
+  );
+};
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/components/kpi_charts/kpi_chart.tsx b/x-pack/plugins/infra/public/pages/metrics/hosts/components/chart/metric_chart_wrapper.tsx
similarity index 65%
rename from x-pack/plugins/infra/public/pages/metrics/hosts/components/kpi_charts/kpi_chart.tsx
rename to x-pack/plugins/infra/public/pages/metrics/hosts/components/chart/metric_chart_wrapper.tsx
index dc2a4d7d72c86..9df937983ae1e 100644
--- a/x-pack/plugins/infra/public/pages/metrics/hosts/components/kpi_charts/kpi_chart.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/components/chart/metric_chart_wrapper.tsx
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import React, { useMemo } from 'react';
+import React, { useEffect, useMemo, useRef } from 'react';
 import {
   Chart,
   Metric,
@@ -12,13 +12,15 @@ import {
   type MetricWNumber,
   type MetricWTrend,
 } from '@elastic/charts';
-
 import { EuiPanel } from '@elastic/eui';
 import styled from 'styled-components';
 import { EuiLoadingChart } from '@elastic/eui';
 import { EuiFlexGroup } from '@elastic/eui';
 import { EuiFlexItem } from '@elastic/eui';
 import { EuiToolTip } from '@elastic/eui';
+import { EuiProgress } from '@elastic/eui';
+import { css } from '@emotion/react';
+import { useEuiTheme } from '@elastic/eui';
 import type { SnapshotNode, SnapshotNodeMetric } from '../../../../../../common/http_api';
 import { createInventoryMetricFormatter } from '../../../inventory_view/lib/create_inventory_metric_formatter';
 import type { SnapshotMetricType } from '../../../../../../common/inventory_models/types';
@@ -47,7 +49,7 @@ interface Props extends ChartBaseProps {
 
 const MIN_HEIGHT = 150;
 
-export const KPIChart = ({
+export const MetricChartWrapper = ({
   color,
   extra,
   id,
@@ -63,12 +65,23 @@ export const KPIChart = ({
   type,
   ...props
 }: Props) => {
+  const { euiTheme } = useEuiTheme();
+  const loadedOnce = useRef(false);
   const metrics = useMemo(() => (nodes ?? [])[0]?.metrics ?? [], [nodes]);
   const metricsTimeseries = useMemo(
     () => (metrics ?? []).find((m) => m.name === type)?.timeseries,
     [metrics, type]
   );
 
+  useEffect(() => {
+    if (!loadedOnce.current && !loading) {
+      loadedOnce.current = true;
+    }
+    return () => {
+      loadedOnce.current = false;
+    };
+  }, [loading]);
+
   const metricsValue = useMemo(() => {
     if (overrideValue) {
       return overrideValue;
@@ -96,24 +109,39 @@ export const KPIChart = ({
 
   return (
     <EuiPanel hasShadow={false} paddingSize="none" {...props}>
-      {loading ? (
-        <EuiFlexGroup style={{ minHeight: MIN_HEIGHT }} justifyContent="center" alignItems="center">
-          <EuiFlexItem grow={false}>
-            <EuiLoadingChart />
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      ) : (
-        <EuiToolTip
-          className="eui-fullWidth"
-          delay="long"
-          content={toolTip}
-          anchorClassName="eui-fullWidth"
-        >
-          <KPIChartStyled size={{ height: MIN_HEIGHT }}>
-            <Metric id={id} data={[[metricsData]]} />
-          </KPIChartStyled>
-        </EuiToolTip>
-      )}
+      <div
+        css={css`
+          position: relative;
+          border-radius: ${euiTheme.size.s};
+          overflow: hidden;
+        `}
+      >
+        {loading && (
+          <EuiProgress size="xs" color="accent" position="absolute" style={{ zIndex: 1 }} />
+        )}
+        {loading && !loadedOnce.current ? (
+          <EuiFlexGroup
+            style={{ minHeight: MIN_HEIGHT }}
+            justifyContent="center"
+            alignItems="center"
+          >
+            <EuiFlexItem grow={false}>
+              <EuiLoadingChart size="l" mono />
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        ) : (
+          <EuiToolTip
+            className="eui-fullWidth"
+            delay="regular"
+            content={toolTip}
+            anchorClassName="eui-fullWidth"
+          >
+            <KPIChartStyled size={{ height: MIN_HEIGHT }}>
+              <Metric id={id} data={[[metricsData]]} />
+            </KPIChartStyled>
+          </EuiToolTip>
+        )}
+      </div>
     </EuiPanel>
   );
 };
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/components/hosts_container.tsx b/x-pack/plugins/infra/public/pages/metrics/hosts/components/hosts_container.tsx
index 9bae6b9ae1df0..e8e8a8a8e7c4f 100644
--- a/x-pack/plugins/infra/public/pages/metrics/hosts/components/hosts_container.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/components/hosts_container.tsx
@@ -13,9 +13,9 @@ import { useMetricsDataViewContext } from '../hooks/use_data_view';
 import { UnifiedSearchBar } from './unified_search_bar';
 import { HostsTable } from './hosts_table';
 import { HostsViewProvider } from '../hooks/use_hosts_view';
-import { KPICharts } from './kpi_charts/kpi_charts';
 import { Tabs } from './tabs/tabs';
 import { AlertsQueryProvider } from '../hooks/use_alerts_query';
+import { KPIGrid } from './kpis/kpi_grid';
 
 export const HostContainer = () => {
   const { dataView, loading, hasError } = useMetricsDataViewContext();
@@ -40,7 +40,7 @@ export const HostContainer = () => {
       <HostsViewProvider>
         <EuiFlexGroup direction="column">
           <EuiFlexItem grow={false}>
-            <KPICharts />
+            <KPIGrid />
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
             <HostsTable />
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/components/hosts_table.tsx b/x-pack/plugins/infra/public/pages/metrics/hosts/components/hosts_table.tsx
index 798147bc1da0a..ca6f904ceea84 100644
--- a/x-pack/plugins/infra/public/pages/metrics/hosts/components/hosts_table.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/components/hosts_table.tsx
@@ -49,7 +49,7 @@ export const HostsTable = () => {
   if (loading) {
     return (
       <InfraLoadingPanel
-        height="185px"
+        height="400px"
         width="auto"
         text={i18n.translate('xpack.infra.waffle.loadingDataText', {
           defaultMessage: 'Loading data',
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/components/kpi_charts/kpi_charts.tsx b/x-pack/plugins/infra/public/pages/metrics/hosts/components/kpi_charts/kpi_charts.tsx
deleted file mode 100644
index af2cbb18fdcbb..0000000000000
--- a/x-pack/plugins/infra/public/pages/metrics/hosts/components/kpi_charts/kpi_charts.tsx
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * 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 { EuiFlexGroup } from '@elastic/eui';
-import { EuiFlexItem } from '@elastic/eui';
-
-import { i18n } from '@kbn/i18n';
-import { Tile } from './tile';
-import { HostsTile } from './hosts_tile';
-
-export const KPICharts = () => {
-  return (
-    <EuiFlexGroup
-      direction="row"
-      gutterSize="s"
-      style={{ flexGrow: 0 }}
-      data-test-subj="hostsView-metricsTrend"
-    >
-      <EuiFlexItem>
-        <HostsTile
-          type="hostsCount"
-          metricType="value"
-          color="#6DCCB1"
-          title={i18n.translate('xpack.infra.hostsViewPage.metricTrend.hostCount.title', {
-            defaultMessage: 'Hosts',
-          })}
-          trendA11yTitle={i18n.translate(
-            'xpack.infra.hostsViewPage.metricTrend.hostCount.a11y.title',
-            {
-              defaultMessage: 'CPU usage over time.',
-            }
-          )}
-          toolTip={i18n.translate('xpack.infra.hostsViewPage.metricTrend.hostCount.tooltip', {
-            defaultMessage: 'The number of hosts returned by your current search criteria.',
-          })}
-          data-test-subj="hostsView-metricsTrend-hosts"
-        />
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <Tile
-          type="cpu"
-          metricType="avg"
-          color="#F1D86F"
-          title={i18n.translate('xpack.infra.hostsViewPage.metricTrend.cpu.title', {
-            defaultMessage: 'CPU usage',
-          })}
-          subtitle={i18n.translate('xpack.infra.hostsViewPage.metricTrend.cpu.subtitle', {
-            defaultMessage: 'Average',
-          })}
-          trendA11yTitle={i18n.translate('xpack.infra.hostsViewPage.metricTrend.cpu.a11y.title', {
-            defaultMessage: 'CPU usage over time.',
-          })}
-          trendA11yDescription={i18n.translate(
-            'xpack.infra.hostsViewPage.metricTrend.cpu.a11y.description',
-            {
-              defaultMessage: 'A line chart showing the trend of the primary metric over time.',
-            }
-          )}
-          toolTip={i18n.translate('xpack.infra.hostsViewPage.metricTrend.cpu.tooltip', {
-            defaultMessage:
-              'Average of percentage of CPU time spent in states other than Idle and IOWait, normalized by the number of CPU cores. Includes both time spent on user space and kernel space. 100% means all CPUs of the host are busy.',
-          })}
-          data-test-subj="hostsView-metricsTrend-cpu"
-        />
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <Tile
-          type="memory"
-          metricType="avg"
-          color="#A987D1"
-          title={i18n.translate('xpack.infra.hostsViewPage.metricTrend.memory.title', {
-            defaultMessage: 'Memory usage',
-          })}
-          subtitle={i18n.translate('xpack.infra.hostsViewPage.metricTrend.memory.subtitle', {
-            defaultMessage: 'Average',
-          })}
-          trendA11yTitle={i18n.translate('xpack.infra.hostsViewPage.metricTrend.memory.a11yTitle', {
-            defaultMessage: 'Memory usage over time.',
-          })}
-          trendA11yDescription={i18n.translate(
-            'xpack.infra.hostsViewPage.metricTrend.memory.a11yDescription',
-            {
-              defaultMessage: 'A line chart showing the trend of the primary metric over time.',
-            }
-          )}
-          toolTip={i18n.translate('xpack.infra.hostsViewPage.metricTrend.memory.tooltip', {
-            defaultMessage:
-              "Average of percentage of main memory usage excluding page cache. This includes resident memory for all processes plus memory used by the kernel structures and code apart the page cache. A high level indicates a situation of memory saturation for a host. 100% means the main memory is entirely filled with memory that can't be reclaimed, except by swapping out.",
-          })}
-          data-test-subj="hostsView-metricsTrend-memory"
-        />
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <Tile
-          type="rx"
-          metricType="avg"
-          color="#79AAD9"
-          title={i18n.translate('xpack.infra.hostsViewPage.metricTrend.rx.title', {
-            defaultMessage: 'Network inbound (RX)',
-          })}
-          subtitle={i18n.translate('xpack.infra.hostsViewPage.metricTrend.rx.subtitle', {
-            defaultMessage: 'Average',
-          })}
-          trendA11yTitle={i18n.translate('xpack.infra.hostsViewPage.metricTrend.rx.a11y.title', {
-            defaultMessage: 'Network inbound (RX) over time.',
-          })}
-          trendA11yDescription={i18n.translate(
-            'xpack.infra.hostsViewPage.metricTrend.rx.a11y.description',
-            {
-              defaultMessage: 'A line chart showing the trend of the primary metric over time.',
-            }
-          )}
-          toolTip={i18n.translate('xpack.infra.hostsViewPage.metricTrend.rx.tooltip', {
-            defaultMessage:
-              'Number of bytes which have been received per second on the public interfaces of the hosts.',
-          })}
-          data-test-subj="hostsView-metricsTrend-rx"
-        />
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <Tile
-          type="tx"
-          metricType="avg"
-          color="#F5A35C"
-          title={i18n.translate('xpack.infra.hostsViewPage.metricTrend.tx.title', {
-            defaultMessage: 'Network outbound (TX)',
-          })}
-          subtitle={i18n.translate('xpack.infra.hostsViewPage.metricTrend.tx.subtitle', {
-            defaultMessage: 'Average',
-          })}
-          trendA11yTitle={i18n.translate('xpack.infra.hostsViewPage.metricTrend.tx.a11.title', {
-            defaultMessage: 'Network outbound (TX) usage over time.',
-          })}
-          trendA11yDescription={i18n.translate(
-            'xpack.infra.hostsViewPage.metricTrend.tx.a11y.description',
-            {
-              defaultMessage: 'A line chart showing the trend of the primary metric over time.',
-            }
-          )}
-          toolTip={i18n.translate('xpack.infra.hostsViewPage.metricTrend.tx.tooltip', {
-            defaultMessage:
-              'Number of bytes which have been sent per second on the public interfaces of the hosts',
-          })}
-          data-test-subj="hostsView-metricsTrend-tx"
-        />
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  );
-};
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/components/kpi_charts/tile.tsx b/x-pack/plugins/infra/public/pages/metrics/hosts/components/kpi_charts/tile.tsx
deleted file mode 100644
index 3f396ebcd7bf8..0000000000000
--- a/x-pack/plugins/infra/public/pages/metrics/hosts/components/kpi_charts/tile.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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 type { SnapshotMetricType } from '../../../../../../common/inventory_models/types';
-
-import { useSnapshot } from '../../../inventory_view/hooks/use_snaphot';
-import { useHostsViewContext } from '../../hooks/use_hosts_view';
-import { type ChartBaseProps, KPIChart } from './kpi_chart';
-
-interface Props extends Omit<ChartBaseProps, 'type'> {
-  type: SnapshotMetricType;
-}
-export const Tile = ({ type, ...props }: Props) => {
-  const { baseRequest } = useHostsViewContext();
-
-  const { nodes, loading } = useSnapshot(
-    {
-      ...baseRequest,
-      metrics: [{ type }],
-      groupBy: null,
-      includeTimeseries: true,
-      dropPartialBuckets: false,
-    },
-    { abortable: true }
-  );
-
-  return <KPIChart id={`$metric-${type}`} type={type} nodes={nodes} loading={loading} {...props} />;
-};
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/components/kpi_charts/hosts_tile.tsx b/x-pack/plugins/infra/public/pages/metrics/hosts/components/kpis/hosts_tile.tsx
similarity index 81%
rename from x-pack/plugins/infra/public/pages/metrics/hosts/components/kpi_charts/hosts_tile.tsx
rename to x-pack/plugins/infra/public/pages/metrics/hosts/components/kpis/hosts_tile.tsx
index b6973327101f0..396c0bd72ad71 100644
--- a/x-pack/plugins/infra/public/pages/metrics/hosts/components/kpi_charts/hosts_tile.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/components/kpis/hosts_tile.tsx
@@ -7,14 +7,14 @@
 import React from 'react';
 
 import { useHostsViewContext } from '../../hooks/use_hosts_view';
-import { type ChartBaseProps, KPIChart } from './kpi_chart';
+import { type ChartBaseProps, MetricChartWrapper } from '../chart/metric_chart_wrapper';
 
 export const HostsTile = ({ type, ...props }: ChartBaseProps) => {
   const { hostNodes, loading } = useHostsViewContext();
 
   return (
-    <KPIChart
-      id={`$metric-${type}`}
+    <MetricChartWrapper
+      id={`metric-${type}`}
       type={type}
       nodes={[]}
       loading={loading}
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/components/kpis/kpi_grid.tsx b/x-pack/plugins/infra/public/pages/metrics/hosts/components/kpis/kpi_grid.tsx
new file mode 100644
index 0000000000000..968e7462b38f4
--- /dev/null
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/components/kpis/kpi_grid.tsx
@@ -0,0 +1,115 @@
+/*
+ * 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 { EuiFlexGroup } from '@elastic/eui';
+import { EuiFlexItem } from '@elastic/eui';
+
+import { i18n } from '@kbn/i18n';
+
+import { KPIChartProps, Tile } from './tile';
+import { HostsTile } from './hosts_tile';
+import { ChartBaseProps } from '../chart/metric_chart_wrapper';
+
+const KPI_CHARTS: KPIChartProps[] = [
+  {
+    type: 'cpu',
+    trendLine: true,
+    backgroundColor: '#F1D86F',
+    title: i18n.translate('xpack.infra.hostsViewPage.metricTrend.cpu.title', {
+      defaultMessage: 'CPU usage',
+    }),
+    subtitle: i18n.translate('xpack.infra.hostsViewPage.metricTrend.cpu.subtitle', {
+      defaultMessage: 'Average',
+    }),
+    toolTip: i18n.translate('xpack.infra.hostsViewPage.metricTrend.cpu.tooltip', {
+      defaultMessage:
+        'Average of percentage of CPU time spent in states other than Idle and IOWait, normalized by the number of CPU cores. Includes both time spent on user space and kernel space. 100% means all CPUs of the host are busy.',
+    }),
+  },
+  {
+    type: 'memory',
+    trendLine: true,
+    backgroundColor: '#A987D1',
+    title: i18n.translate('xpack.infra.hostsViewPage.metricTrend.memory.title', {
+      defaultMessage: 'Memory usage',
+    }),
+    subtitle: i18n.translate('xpack.infra.hostsViewPage.metricTrend.memory.subtitle', {
+      defaultMessage: 'Average',
+    }),
+    toolTip: i18n.translate('xpack.infra.hostsViewPage.metricTrend.memory.tooltip', {
+      defaultMessage:
+        "Average of percentage of main memory usage excluding page cache. This includes resident memory for all processes plus memory used by the kernel structures and code apart the page cache. A high level indicates a situation of memory saturation for a host. 100% means the main memory is entirely filled with memory that can't be reclaimed, except by swapping out.",
+    }),
+  },
+  {
+    type: 'rx',
+    trendLine: true,
+    backgroundColor: '#79AAD9',
+    title: i18n.translate('xpack.infra.hostsViewPage.metricTrend.rx.title', {
+      defaultMessage: 'Network inbound (RX)',
+    }),
+    subtitle: i18n.translate('xpack.infra.hostsViewPage.metricTrend.rx.subtitle', {
+      defaultMessage: 'Average',
+    }),
+    toolTip: i18n.translate('xpack.infra.hostsViewPage.metricTrend.rx.tooltip', {
+      defaultMessage:
+        'Number of bytes which have been received per second on the public interfaces of the hosts.',
+    }),
+  },
+  {
+    type: 'tx',
+    trendLine: true,
+    backgroundColor: '#F5A35C',
+    title: i18n.translate('xpack.infra.hostsViewPage.metricTrend.tx.title', {
+      defaultMessage: 'Network outbound (TX)',
+    }),
+    subtitle: i18n.translate('xpack.infra.hostsViewPage.metricTrend.tx.subtitle', {
+      defaultMessage: 'Average',
+    }),
+    toolTip: i18n.translate('xpack.infra.hostsViewPage.metricTrend.tx.tooltip', {
+      defaultMessage:
+        'Number of bytes which have been received per second on the public interfaces of the hosts.',
+    }),
+  },
+];
+
+const HOSTS_CHART: ChartBaseProps = {
+  type: 'hostsCount',
+  color: '#6DCCB1',
+  metricType: 'value',
+  title: i18n.translate('xpack.infra.hostsViewPage.metricTrend.hostCount.title', {
+    defaultMessage: 'Hosts',
+  }),
+  trendA11yTitle: i18n.translate('xpack.infra.hostsViewPage.metricTrend.hostCount.a11y.title', {
+    defaultMessage: 'Hosts count.',
+  }),
+  toolTip: i18n.translate('xpack.infra.hostsViewPage.metricTrend.hostCount.tooltip', {
+    defaultMessage: 'The number of hosts returned by your current search criteria.',
+  }),
+  ['data-test-subj']: 'hostsView-metricsTrend-hosts',
+};
+
+export const KPIGrid = () => {
+  return (
+    <EuiFlexGroup
+      direction="row"
+      gutterSize="s"
+      style={{ flexGrow: 0 }}
+      data-test-subj="hostsView-metricsTrend"
+    >
+      <EuiFlexItem>
+        <HostsTile {...HOSTS_CHART} />
+      </EuiFlexItem>
+      {KPI_CHARTS.map(({ ...chartProp }) => (
+        <EuiFlexItem key={chartProp.type}>
+          <Tile {...chartProp} />
+        </EuiFlexItem>
+      ))}
+    </EuiFlexGroup>
+  );
+};
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
new file mode 100644
index 0000000000000..480e6c415dc45
--- /dev/null
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/components/kpis/tile.tsx
@@ -0,0 +1,137 @@
+/*
+ * 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 { Action } from '@kbn/ui-actions-plugin/public';
+import { BrushTriggerEvent } from '@kbn/charts-plugin/public';
+import { EuiIcon, EuiPanel } from '@elastic/eui';
+import { EuiFlexGroup } from '@elastic/eui';
+import { EuiFlexItem } from '@elastic/eui';
+import { EuiText } from '@elastic/eui';
+import { EuiI18n } from '@elastic/eui';
+import styled from 'styled-components';
+import { EuiToolTip } from '@elastic/eui';
+import { useLensAttributes } from '../../../../../hooks/use_lens_attributes';
+import { useMetricsDataViewContext } from '../../hooks/use_data_view';
+import { useUnifiedSearchContext } from '../../hooks/use_unified_search';
+import { HostsLensMetricChartFormulas } from '../../../../../common/visualizations';
+import { useHostsViewContext } from '../../hooks/use_hosts_view';
+import { LensWrapper } from '../chart/lens_wrapper';
+
+export interface KPIChartProps {
+  title: string;
+  subtitle?: string;
+  trendLine?: boolean;
+  backgroundColor: string;
+  type: HostsLensMetricChartFormulas;
+  toolTip: string;
+}
+
+const MIN_HEIGHT = 150;
+
+export const Tile = ({
+  title,
+  subtitle,
+  type,
+  backgroundColor,
+  toolTip,
+  trendLine = false,
+}: KPIChartProps) => {
+  const { searchCriteria, onSubmit } = useUnifiedSearchContext();
+  const { dataView } = useMetricsDataViewContext();
+  const { baseRequest } = useHostsViewContext();
+
+  const { attributes, getExtraActions, error } = useLensAttributes({
+    type,
+    dataView,
+    options: {
+      title,
+      subtitle,
+      backgroundColor,
+      showTrendLine: trendLine,
+      showTitle: false,
+    },
+    visualizationType: 'metricChart',
+  });
+
+  const filters = [...searchCriteria.filters, ...searchCriteria.panelFilters];
+  const extraActionOptions = getExtraActions({
+    timeRange: searchCriteria.dateRange,
+    filters,
+    query: searchCriteria.query,
+  });
+
+  const extraActions: Action[] = [extraActionOptions.openInLens];
+
+  const handleBrushEnd = ({ range }: BrushTriggerEvent['data']) => {
+    const [min, max] = range;
+    onSubmit({
+      dateRange: {
+        from: new Date(min).toISOString(),
+        to: new Date(max).toISOString(),
+        mode: 'absolute',
+      },
+    });
+  };
+
+  return (
+    <EuiPanelStyled
+      hasShadow={false}
+      paddingSize={error ? 'm' : 'none'}
+      style={{ minHeight: MIN_HEIGHT }}
+      data-test-subj={`hostsView-metricsTrend-${type}`}
+    >
+      {error ? (
+        <EuiFlexGroup
+          style={{ height: MIN_HEIGHT, alignContent: 'center' }}
+          gutterSize="xs"
+          justifyContent="center"
+          alignItems="center"
+          direction="column"
+        >
+          <EuiFlexItem grow={false}>
+            <EuiIcon type="warning" />
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiText size="s" textAlign="center">
+              <EuiI18n
+                token="'xpack.infra.hostsViewPage.errorOnLoadingLensDependencies'"
+                default="There was an error trying to load Lens Plugin."
+              />
+            </EuiText>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      ) : (
+        <EuiToolTip
+          className="eui-fullWidth"
+          delay="regular"
+          content={toolTip}
+          anchorClassName="eui-fullWidth"
+        >
+          <LensWrapper
+            id={`hostViewKPIChart-${type}`}
+            attributes={attributes}
+            style={{ height: MIN_HEIGHT }}
+            extraActions={extraActions}
+            lastReloadRequestTime={baseRequest.requestTs}
+            dateRange={searchCriteria.dateRange}
+            filters={filters}
+            query={searchCriteria.query}
+            onBrushEnd={handleBrushEnd}
+          />
+        </EuiToolTip>
+      )}
+    </EuiPanelStyled>
+  );
+};
+
+const EuiPanelStyled = styled(EuiPanel)`
+  .echMetric {
+    border-radius: ${(p) => p.theme.eui.euiBorderRadius};
+    pointer-events: none;
+  }
+`;
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 9563dbaa6169e..252bea5389e3a 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
@@ -5,26 +5,25 @@
  * 2.0.
  */
 import React from 'react';
-import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { Action } from '@kbn/ui-actions-plugin/public';
-import { ViewMode } from '@kbn/embeddable-plugin/public';
 import { BrushTriggerEvent } from '@kbn/charts-plugin/public';
 import { EuiIcon, EuiPanel } from '@elastic/eui';
 import { EuiFlexGroup } from '@elastic/eui';
 import { EuiFlexItem } from '@elastic/eui';
 import { EuiText } from '@elastic/eui';
 import { EuiI18n } from '@elastic/eui';
-import { InfraClientSetupDeps } from '../../../../../../types';
 import { useLensAttributes } from '../../../../../../hooks/use_lens_attributes';
 import { useMetricsDataViewContext } from '../../../hooks/use_data_view';
 import { useUnifiedSearchContext } from '../../../hooks/use_unified_search';
-import { HostLensAttributesTypes } from '../../../../../../common/visualizations';
+import { HostsLensLineChartFormulas } from '../../../../../../common/visualizations';
 import { useHostsViewContext } from '../../../hooks/use_hosts_view';
+import { LensWrapper } from '../../chart/lens_wrapper';
 
 export interface MetricChartProps {
   title: string;
-  type: HostLensAttributesTypes;
+  type: HostsLensLineChartFormulas;
   breakdownSize: number;
+  render?: boolean;
 }
 
 const MIN_HEIGHT = 300;
@@ -33,28 +32,25 @@ export const MetricChart = ({ title, type, breakdownSize }: MetricChartProps) =>
   const { searchCriteria, onSubmit } = useUnifiedSearchContext();
   const { dataView } = useMetricsDataViewContext();
   const { baseRequest } = useHostsViewContext();
-  const {
-    services: { lens },
-  } = useKibana<InfraClientSetupDeps>();
 
-  const EmbeddableComponent = lens.EmbeddableComponent;
-
-  const { injectData, getExtraActions, error } = useLensAttributes({
+  const { attributes, getExtraActions, error } = useLensAttributes({
     type,
     dataView,
     options: {
+      title,
       breakdownSize,
     },
+    visualizationType: 'lineChart',
   });
 
-  const injectedLensAttributes = injectData({
-    filters: [...searchCriteria.filters, ...searchCriteria.panelFilters],
+  const filters = [...searchCriteria.filters, ...searchCriteria.panelFilters];
+  const extraActionOptions = getExtraActions({
+    timeRange: searchCriteria.dateRange,
+    filters,
     query: searchCriteria.query,
-    title,
   });
 
-  const extraActionOptions = getExtraActions(injectedLensAttributes, searchCriteria.dateRange);
-  const extraAction: Action[] = [extraActionOptions.openInLens];
+  const extraActions: Action[] = [extraActionOptions.openInLens];
 
   const handleBrushEnd = ({ range }: BrushTriggerEvent['data']) => {
     const [min, max] = range;
@@ -97,24 +93,17 @@ export const MetricChart = ({ title, type, breakdownSize }: MetricChartProps) =>
           </EuiFlexItem>
         </EuiFlexGroup>
       ) : (
-        injectedLensAttributes && (
-          <EmbeddableComponent
-            id={`hostsViewsmetricsChart-${type}`}
-            style={{ height: MIN_HEIGHT }}
-            attributes={injectedLensAttributes}
-            viewMode={ViewMode.VIEW}
-            timeRange={searchCriteria.dateRange}
-            query={searchCriteria.query}
-            filters={searchCriteria.filters}
-            extraActions={extraAction}
-            lastReloadRequestTime={baseRequest.requestTs}
-            executionContext={{
-              type: 'infrastructure_observability_hosts_view',
-              name: `Hosts View ${type} Chart`,
-            }}
-            onBrushEnd={handleBrushEnd}
-          />
-        )
+        <LensWrapper
+          id={`hostsViewsmetricsChart-${type}`}
+          attributes={attributes}
+          style={{ height: MIN_HEIGHT }}
+          extraActions={extraActions}
+          lastReloadRequestTime={baseRequest.requestTs}
+          dateRange={searchCriteria.dateRange}
+          filters={filters}
+          query={searchCriteria.query}
+          onBrushEnd={handleBrushEnd}
+        />
       )}
     </EuiPanel>
   );
diff --git a/x-pack/plugins/infra/public/types.ts b/x-pack/plugins/infra/public/types.ts
index 0b961e0b8ed36..ac8c8316a7083 100644
--- a/x-pack/plugins/infra/public/types.ts
+++ b/x-pack/plugins/infra/public/types.ts
@@ -34,7 +34,7 @@ import type {
 // import type { OsqueryPluginStart } from '../../osquery/public';
 import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
 import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
-import { type TypedLensByValueInput, LensPublicStart } from '@kbn/lens-plugin/public';
+import { LensPublicStart } from '@kbn/lens-plugin/public';
 import type { ChartsPluginStart } from '@kbn/charts-plugin/public';
 import { CasesUiStart } from '@kbn/cases-plugin/public';
 import type { UnwrapPromise } from '../common/utility_types';
@@ -112,12 +112,6 @@ export interface InfraHttpError extends IHttpFetchError {
   };
 }
 
-export type LensAttributes = TypedLensByValueInput['attributes'];
-
-export interface LensOptions {
-  breakdownSize: number;
-}
-
 export interface ExecutionTimeRange {
   gte: number;
   lte: number;
diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
index b8e6993bf9d6a..05a0176af89d8 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -17427,26 +17427,18 @@
     "xpack.infra.hostsViewPage.landing.introTitle": "Présentation : Analyse de l'hôte",
     "xpack.infra.hostsViewPage.landing.learnMore": "En savoir plus",
     "xpack.infra.hostsViewPage.landing.tryTheFeatureMessage": "Il s'agit d'une version préliminaire de la fonctionnalité, et nous souhaiterions vivement connaître votre avis tandis que nous continuons\n                à la développer et à l'améliorer. Pour accéder à cette fonctionnalité, il suffit de l'activer ci-dessous. Ne passez pas à côté\n                de cette nouvelle et puissante fonctionnalité ajoutée à notre plateforme... Essayez-la aujourd'hui même !",
-    "xpack.infra.hostsViewPage.metricTrend.cpu.a11y.description": "Graphique linéaire affichant la tendance de l'indicateur principal sur la durée.",
-    "xpack.infra.hostsViewPage.metricTrend.cpu.a11y.title": "Utilisation CPU sur la durée.",
     "xpack.infra.hostsViewPage.metricTrend.cpu.subtitle": "Moyenne",
     "xpack.infra.hostsViewPage.metricTrend.cpu.title": "Utilisation CPU",
     "xpack.infra.hostsViewPage.metricTrend.cpu.tooltip": "Moyenne de pourcentage de temps CPU utilisé dans les états autres que Inactif et IOWait, normalisée par le nombre de cœurs de processeur. Inclut le temps passé à la fois sur l'espace utilisateur et sur l'espace du noyau. 100 % signifie que tous les processeurs de l'hôte sont occupés.",
     "xpack.infra.hostsViewPage.metricTrend.hostCount.a11y.title": "Utilisation CPU sur la durée.",
     "xpack.infra.hostsViewPage.metricTrend.hostCount.title": "Hôtes",
     "xpack.infra.hostsViewPage.metricTrend.hostCount.tooltip": "Nombre d'hôtes renvoyé par vos critères de recherche actuels.",
-    "xpack.infra.hostsViewPage.metricTrend.memory.a11yDescription": "Graphique linéaire affichant la tendance de l'indicateur principal sur la durée.",
-    "xpack.infra.hostsViewPage.metricTrend.memory.a11yTitle": "Utilisation de la mémoire sur la durée.",
     "xpack.infra.hostsViewPage.metricTrend.memory.subtitle": "Moyenne",
     "xpack.infra.hostsViewPage.metricTrend.memory.title": "Utilisation mémoire",
     "xpack.infra.hostsViewPage.metricTrend.memory.tooltip": "Moyenne de pourcentage d'utilisation de la mémoire principale, en excluant le cache de pages. Cela inclut la mémoire résidente pour tous les processus, plus la mémoire utilisée par les structures et le code du noyau, à l'exception du cache de pages. Un niveau élevé indique une situation de saturation de la mémoire pour un hôte. 100 % signifie que la mémoire principale est entièrement remplie par de la mémoire ne pouvant pas être récupérée, sauf en l'échangeant.",
-    "xpack.infra.hostsViewPage.metricTrend.rx.a11y.description": "Graphique linéaire affichant la tendance de l'indicateur principal sur la durée.",
-    "xpack.infra.hostsViewPage.metricTrend.rx.a11y.title": "Réseau entrant (RX) sur la durée.",
     "xpack.infra.hostsViewPage.metricTrend.rx.subtitle": "Moyenne",
     "xpack.infra.hostsViewPage.metricTrend.rx.title": "Réseau entrant (RX)",
     "xpack.infra.hostsViewPage.metricTrend.rx.tooltip": "Nombre d'octets qui ont été reçus par seconde sur les interfaces publiques des hôtes.",
-    "xpack.infra.hostsViewPage.metricTrend.tx.a11.title": "Utilisation de réseau sortant (TX) sur la durée.",
-    "xpack.infra.hostsViewPage.metricTrend.tx.a11y.description": "Graphique linéaire affichant la tendance de l'indicateur principal sur la durée.",
     "xpack.infra.hostsViewPage.metricTrend.tx.subtitle": "Moyenne",
     "xpack.infra.hostsViewPage.metricTrend.tx.title": "Réseau sortant (TX)",
     "xpack.infra.hostsViewPage.metricTrend.tx.tooltip": "Nombre d'octets qui ont été envoyés par seconde sur les interfaces publiques des hôtes",
@@ -38121,4 +38113,4 @@
     "xpack.painlessLab.title": "Painless Lab",
     "xpack.painlessLab.walkthroughButtonLabel": "Présentation"
   }
-}
+}
\ No newline at end of file
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 7d3317df1bf37..6eaa5a4584e7d 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -17426,26 +17426,18 @@
     "xpack.infra.hostsViewPage.landing.introTitle": "導入：ホスト分析",
     "xpack.infra.hostsViewPage.landing.learnMore": "詳細",
     "xpack.infra.hostsViewPage.landing.tryTheFeatureMessage": "この機能は初期バージョンであり、今後継続する中で、開発、改善するうえで皆様からのフィードバックをお願いします\n                。機能にアクセスするには、以下を有効にします。プラットフォームに\n                追加されたこの強力な新機能をお見逃しなく。今すぐお試しください！",
-    "xpack.infra.hostsViewPage.metricTrend.cpu.a11y.description": "主要なメトリックの経時的な傾向を示す折れ線グラフ。",
-    "xpack.infra.hostsViewPage.metricTrend.cpu.a11y.title": "経時的なCPU使用状況。",
     "xpack.infra.hostsViewPage.metricTrend.cpu.subtitle": "平均",
     "xpack.infra.hostsViewPage.metricTrend.cpu.title": "CPU 使用状況",
     "xpack.infra.hostsViewPage.metricTrend.cpu.tooltip": "アイドルおよびIOWait以外の状態で費やされたCPU時間の割合の平均値を、CPUコア数で正規化したもの。ユーザースペースとカーネルスペースの両方で費やされた時間が含まれます。100％はホストのすべてのCPUがビジー状態であることを示します。",
     "xpack.infra.hostsViewPage.metricTrend.hostCount.a11y.title": "経時的なCPU使用状況。",
     "xpack.infra.hostsViewPage.metricTrend.hostCount.title": "ホスト",
     "xpack.infra.hostsViewPage.metricTrend.hostCount.tooltip": "現在の検索条件から返されたホストの数です。",
-    "xpack.infra.hostsViewPage.metricTrend.memory.a11yDescription": "主要なメトリックの経時的な傾向を示す折れ線グラフ。",
-    "xpack.infra.hostsViewPage.metricTrend.memory.a11yTitle": "経時的なメモリ使用状況。",
     "xpack.infra.hostsViewPage.metricTrend.memory.subtitle": "平均",
     "xpack.infra.hostsViewPage.metricTrend.memory.title": "メモリー使用状況",
     "xpack.infra.hostsViewPage.metricTrend.memory.tooltip": "ページキャッシュを除いたメインメモリの割合の平均値。これには、すべてのプロセスの常駐メモリと、ページキャッシュを離れてカーネル構造とコードによって使用されるメモリが含まれます。高レベルは、ホストのメモリが飽和状態にあることを示します。100%とは、メインメモリがすべてスワップアウト以外の、再利用不可能なメモリで満たされていることを意味します。",
-    "xpack.infra.hostsViewPage.metricTrend.rx.a11y.description": "主要なメトリックの経時的な傾向を示す折れ線グラフ。",
-    "xpack.infra.hostsViewPage.metricTrend.rx.a11y.title": "経時的なネットワーク受信（RX）。",
     "xpack.infra.hostsViewPage.metricTrend.rx.subtitle": "平均",
     "xpack.infra.hostsViewPage.metricTrend.rx.title": "ネットワーク受信（RX）",
     "xpack.infra.hostsViewPage.metricTrend.rx.tooltip": "ホストのパブリックインターフェースで1秒間に受信したバイト数。",
-    "xpack.infra.hostsViewPage.metricTrend.tx.a11.title": "経時的なネットワーク送信（TX）。",
-    "xpack.infra.hostsViewPage.metricTrend.tx.a11y.description": "主要なメトリックの経時的な傾向を示す折れ線グラフ。",
     "xpack.infra.hostsViewPage.metricTrend.tx.subtitle": "平均",
     "xpack.infra.hostsViewPage.metricTrend.tx.title": "ネットワーク送信（TX）",
     "xpack.infra.hostsViewPage.metricTrend.tx.tooltip": "ホストのパブリックインターフェースで1秒間に送信したバイト数",
@@ -38089,4 +38081,4 @@
     "xpack.painlessLab.title": "Painless Lab",
     "xpack.painlessLab.walkthroughButtonLabel": "実地検証"
   }
-}
+}
\ No newline at end of file
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index dce328063bf26..fb3cdb9c46c01 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -17427,26 +17427,18 @@
     "xpack.infra.hostsViewPage.landing.introTitle": "即将引入：主机分析",
     "xpack.infra.hostsViewPage.landing.learnMore": "了解详情",
     "xpack.infra.hostsViewPage.landing.tryTheFeatureMessage": "这是早期版本的功能，我们需要您的反馈，\n                以便继续开发和改进该功能。要访问该功能，直接在下面启用即可。请抓紧时间，\n                了解新添加到我们平台中的这项强大功能 - 立即试用！",
-    "xpack.infra.hostsViewPage.metricTrend.cpu.a11y.description": "显示一段时间的主要指标趋势的折线图。",
-    "xpack.infra.hostsViewPage.metricTrend.cpu.a11y.title": "一段时间的 CPU 使用率。",
     "xpack.infra.hostsViewPage.metricTrend.cpu.subtitle": "平均值",
     "xpack.infra.hostsViewPage.metricTrend.cpu.title": "CPU 使用",
     "xpack.infra.hostsViewPage.metricTrend.cpu.tooltip": "CPU 在空闲和 IOWait 状态以外所花费时间的平均百分比，按 CPU 核心数进行标准化。包括在用户空间和内核空间上花费的时间。100% 表示主机的所有 CPU 都处于忙碌状态。",
     "xpack.infra.hostsViewPage.metricTrend.hostCount.a11y.title": "一段时间的 CPU 使用率。",
     "xpack.infra.hostsViewPage.metricTrend.hostCount.title": "主机",
     "xpack.infra.hostsViewPage.metricTrend.hostCount.tooltip": "当前搜索条件返回的主机数。",
-    "xpack.infra.hostsViewPage.metricTrend.memory.a11yDescription": "显示一段时间的主要指标趋势的折线图。",
-    "xpack.infra.hostsViewPage.metricTrend.memory.a11yTitle": "一段时间的内存使用率。",
     "xpack.infra.hostsViewPage.metricTrend.memory.subtitle": "平均值",
     "xpack.infra.hostsViewPage.metricTrend.memory.title": "内存使用",
     "xpack.infra.hostsViewPage.metricTrend.memory.tooltip": "主内存使用率（不包括页面缓存）的平均百分比。这包括所有进程的常驻内存，加上由内核结构和代码使用的内存，但不包括页面缓存。高比率表明主机出现内存饱和情况。100% 表示主内存被完全占用，除了进行换出外无法回收内存。",
-    "xpack.infra.hostsViewPage.metricTrend.rx.a11y.description": "显示一段时间的主要指标趋势的折线图。",
-    "xpack.infra.hostsViewPage.metricTrend.rx.a11y.title": "一段时间的网络入站数据 (RX)。",
     "xpack.infra.hostsViewPage.metricTrend.rx.subtitle": "平均值",
     "xpack.infra.hostsViewPage.metricTrend.rx.title": "网络入站数据 (RX)",
     "xpack.infra.hostsViewPage.metricTrend.rx.tooltip": "主机的公共接口上每秒接收的字节数。",
-    "xpack.infra.hostsViewPage.metricTrend.tx.a11.title": "一段时间的网络出站数据 (TX) 使用量。",
-    "xpack.infra.hostsViewPage.metricTrend.tx.a11y.description": "显示一段时间的主要指标趋势的折线图。",
     "xpack.infra.hostsViewPage.metricTrend.tx.subtitle": "平均值",
     "xpack.infra.hostsViewPage.metricTrend.tx.title": "网络出站数据 (TX)",
     "xpack.infra.hostsViewPage.metricTrend.tx.tooltip": "主机的公共接口上每秒发送的字节数",
@@ -38116,4 +38108,4 @@
     "xpack.painlessLab.title": "Painless 实验室",
     "xpack.painlessLab.walkthroughButtonLabel": "指导"
   }
-}
+}
\ No newline at end of file
diff --git a/x-pack/test/functional/apps/infra/hosts_view.ts b/x-pack/test/functional/apps/infra/hosts_view.ts
index b22bb934109dc..3e229fcdc1142 100644
--- a/x-pack/test/functional/apps/infra/hosts_view.ts
+++ b/x-pack/test/functional/apps/infra/hosts_view.ts
@@ -367,9 +367,9 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         [
           { metric: 'hosts', value: '6' },
           { metric: 'cpu', value: '0.8%' },
-          { metric: 'memory', value: '16.8%' },
-          { metric: 'tx', value: '0 bit/s' },
-          { metric: 'rx', value: '0 bit/s' },
+          { metric: 'memory', value: '16.81%' },
+          { metric: 'tx', value: 'N/A' },
+          { metric: 'rx', value: 'N/A' },
         ].forEach(({ metric, value }) => {
           it(`${metric} tile should show ${value}`, async () => {
             const tileValue = await pageObjects.infraHostsView.getMetricsTrendTileValue(metric);
@@ -497,9 +497,9 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
             [
               { metric: 'hosts', value: '3' },
               { metric: 'cpu', value: '0.8%' },
-              { metric: 'memory', value: '16.2%' },
-              { metric: 'tx', value: '0 bit/s' },
-              { metric: 'rx', value: '0 bit/s' },
+              { metric: 'memory', value: '16.25%' },
+              { metric: 'tx', value: 'N/A' },
+              { metric: 'rx', value: 'N/A' },
             ].map(async ({ metric, value }) => {
               const tileValue = await pageObjects.infraHostsView.getMetricsTrendTileValue(metric);
               expect(tileValue).to.eql(value);

From fc3496902a722f768481657f1f61f3806f3d9baa Mon Sep 17 00:00:00 2001
From: Ying Mao <ying.mao@elastic.co>
Date: Wed, 19 Apr 2023 10:08:05 -0400
Subject: [PATCH 071/100] [Response Ops][Alerting] Aliasing context and state
 variables for detection rules in alert summary mode (#154864)

Toward enabling per-action-alerts for detection rules
https://github.com/elastic/kibana/pull/154977

## Summary

This PR provides the necessary changes for detection rules to fully
onboard onto alerting framework alert summaries.
* Aliases detection rule context and state variables for summary action
variables. This provides backwards compatibility with the
`context.alerts`, `context.results_link` and `state.signals_count`
action variables that are currently used by detection rules.
* Calculates time bounds for summary alerts that can be passed back to
the view in app URL generator. This allows rule types to generate view
in app URLs limited to the timeframe that will match the summary alerts
time range
* For throttled summary alerts, the time range is generated as `now -
throttle duration`
* For per execution summary alerts, we use the `previousStartedAt` time
from the task state if available and the schedule duration if not
available. This is because some rules write out alerts with `@timestamp:
task.startedAt` so just using `now - schedule duration` may not capture
those alerts due to task manager schedule delays.

---------

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../task_runner/execution_handler.test.ts     | 71 +++++++++++++++++++
 .../server/task_runner/execution_handler.ts   | 15 +++-
 .../task_runner/rule_action_helper.test.ts    | 60 ++++++++++++++++
 .../server/task_runner/rule_action_helper.ts  | 30 ++++++++
 .../server/task_runner/task_runner.ts         |  1 +
 .../transform_action_params.test.ts           | 31 +++++++-
 .../task_runner/transform_action_params.ts    | 14 ++++
 .../alerting/server/task_runner/types.ts      |  1 +
 x-pack/plugins/alerting/server/types.ts       |  3 +
 9 files changed, 221 insertions(+), 5 deletions(-)

diff --git a/x-pack/plugins/alerting/server/task_runner/execution_handler.test.ts b/x-pack/plugins/alerting/server/task_runner/execution_handler.test.ts
index de3e05dae82ce..a83211aa9d040 100644
--- a/x-pack/plugins/alerting/server/task_runner/execution_handler.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/execution_handler.test.ts
@@ -21,6 +21,7 @@ import {
   RuleTypeParams,
   RuleTypeState,
   SanitizedRule,
+  GetViewInAppRelativeUrlFnOpts,
 } from '../types';
 import { RuleRunMetricsStore } from '../lib/rule_run_metrics_store';
 import { alertingEventLoggerMock } from '../lib/alerting_event_logger/alerting_event_logger.mock';
@@ -80,6 +81,7 @@ const rule = {
     contextVal: 'My other {{context.value}} goes here',
     stateVal: 'My other {{state.value}} goes here',
   },
+  schedule: { interval: '1m' },
   notifyWhen: 'onActiveAlert',
   actions: [
     {
@@ -116,6 +118,7 @@ const defaultExecutionParams = {
   ruleLabel: 'rule-label',
   request: {} as KibanaRequest,
   alertingEventLogger,
+  previousStartedAt: null,
   taskInstance: {
     params: { spaceId: 'test1', alertId: '1' },
   } as unknown as ConcreteTaskInstance,
@@ -1447,6 +1450,25 @@ describe('Execution Handler', () => {
       ],
     } as unknown as SanitizedRule<RuleTypeParams>;
 
+    const summaryRuleWithUrl = {
+      ...rule,
+      actions: [
+        {
+          id: '1',
+          group: null,
+          actionTypeId: 'test',
+          frequency: {
+            summary: true,
+            notifyWhen: 'onActiveAlert',
+            throttle: null,
+          },
+          params: {
+            val: 'rule url: {{rule.url}}',
+          },
+        },
+      ],
+    } as unknown as SanitizedRule<RuleTypeParams>;
+
     it('populates the rule.url in the action params when the base url and rule id are specified', async () => {
       const execParams = {
         ...defaultExecutionParams,
@@ -1474,6 +1496,55 @@ describe('Execution Handler', () => {
       `);
     });
 
+    it('populates the rule.url with start and stop time when available', async () => {
+      clock.reset();
+      clock.tick(90000);
+      getSummarizedAlertsMock.mockResolvedValue({
+        new: {
+          count: 2,
+          data: [
+            mockAAD,
+            {
+              ...mockAAD,
+              '@timestamp': '2022-12-07T15:45:41.4672Z',
+              alert: { instance: { id: 'all' } },
+            },
+          ],
+        },
+        ongoing: { count: 0, data: [] },
+        recovered: { count: 0, data: [] },
+      });
+      const execParams = {
+        ...defaultExecutionParams,
+        ruleType: {
+          ...ruleType,
+          getViewInAppRelativeUrl: (opts: GetViewInAppRelativeUrlFnOpts<RuleTypeParams>) =>
+            `/app/test/rule/${opts.rule.id}?start=${opts.start ?? 0}&end=${opts.end ?? 0}`,
+        },
+        rule: summaryRuleWithUrl,
+        taskRunnerContext: {
+          ...defaultExecutionParams.taskRunnerContext,
+          kibanaBaseUrl: 'http://localhost:12345',
+        },
+      };
+
+      const executionHandler = new ExecutionHandler(generateExecutionParams(execParams));
+      await executionHandler.run(generateAlert({ id: 1 }));
+
+      expect(injectActionParamsMock.mock.calls[0]).toMatchInlineSnapshot(`
+        Array [
+          Object {
+            "actionParams": Object {
+              "val": "rule url: http://localhost:12345/s/test1/app/test/rule/1?start=30000&end=90000",
+            },
+            "actionTypeId": "test",
+            "ruleId": "1",
+            "spaceId": "test1",
+          },
+        ]
+      `);
+    });
+
     it('populates the rule.url without the space specifier when the spaceId is the string "default"', async () => {
       const execParams = {
         ...defaultExecutionParams,
diff --git a/x-pack/plugins/alerting/server/task_runner/execution_handler.ts b/x-pack/plugins/alerting/server/task_runner/execution_handler.ts
index 18c06c0b36f56..083225de1f371 100644
--- a/x-pack/plugins/alerting/server/task_runner/execution_handler.ts
+++ b/x-pack/plugins/alerting/server/task_runner/execution_handler.ts
@@ -40,6 +40,7 @@ import {
 import {
   generateActionHash,
   getSummaryActionsFromTaskState,
+  getSummaryActionTimeBounds,
   isActionOnInterval,
   isSummaryAction,
   isSummaryActionOnInterval,
@@ -91,6 +92,7 @@ export class ExecutionHandler<
   private actionsClient: PublicMethodsOf<ActionsClient>;
   private ruleTypeActionGroups?: Map<ActionGroupIds | RecoveryActionGroupId, string>;
   private mutedAlertIdsSet: Set<string> = new Set();
+  private previousStartedAt: Date | null;
 
   constructor({
     rule,
@@ -104,6 +106,7 @@ export class ExecutionHandler<
     ruleConsumer,
     executionId,
     ruleLabel,
+    previousStartedAt,
     actionsClient,
   }: ExecutionHandlerOptions<
     Params,
@@ -130,6 +133,7 @@ export class ExecutionHandler<
     this.ruleTypeActionGroups = new Map(
       ruleType.actionGroups.map((actionGroup) => [actionGroup.id, actionGroup.name])
     );
+    this.previousStartedAt = previousStartedAt;
     this.mutedAlertIdsSet = new Set(rule.mutedInstanceIds);
   }
 
@@ -205,6 +209,11 @@ export class ExecutionHandler<
         ruleRunMetricsStore.incrementNumberOfTriggeredActionsByConnectorType(actionTypeId);
 
         if (isSummaryAction(action) && summarizedAlerts) {
+          const { start, end } = getSummaryActionTimeBounds(
+            action,
+            this.rule.schedule,
+            this.previousStartedAt
+          );
           const actionToRun = {
             ...action,
             params: injectActionParams({
@@ -221,7 +230,7 @@ export class ExecutionHandler<
                 actionsPlugin,
                 actionTypeId,
                 kibanaBaseUrl: this.taskRunnerContext.kibanaBaseUrl,
-                ruleUrl: this.buildRuleUrl(spaceId),
+                ruleUrl: this.buildRuleUrl(spaceId, start, end),
               }),
             }),
           };
@@ -419,13 +428,13 @@ export class ExecutionHandler<
     return alert.getScheduledActionOptions()?.actionGroup || this.ruleType.recoveryActionGroup.id;
   }
 
-  private buildRuleUrl(spaceId: string): string | undefined {
+  private buildRuleUrl(spaceId: string, start?: number, end?: number): string | undefined {
     if (!this.taskRunnerContext.kibanaBaseUrl) {
       return;
     }
 
     const relativePath = this.ruleType.getViewInAppRelativeUrl
-      ? this.ruleType.getViewInAppRelativeUrl({ rule: this.rule })
+      ? this.ruleType.getViewInAppRelativeUrl({ rule: this.rule, start, end })
       : `${triggersActionsRoute}${getRuleDetailsRoute(this.rule.id)}`;
 
     try {
diff --git a/x-pack/plugins/alerting/server/task_runner/rule_action_helper.test.ts b/x-pack/plugins/alerting/server/task_runner/rule_action_helper.test.ts
index 244110472cec2..872672801b52c 100644
--- a/x-pack/plugins/alerting/server/task_runner/rule_action_helper.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/rule_action_helper.test.ts
@@ -14,8 +14,12 @@ import {
   isSummaryAction,
   isSummaryActionOnInterval,
   isSummaryActionThrottled,
+  getSummaryActionTimeBounds,
 } from './rule_action_helper';
 
+const now = '2021-05-13T12:33:37.000Z';
+Date.now = jest.fn().mockReturnValue(new Date(now));
+
 const mockOldAction: RuleAction = {
   id: '1',
   group: 'default',
@@ -309,4 +313,60 @@ describe('rule_action_helper', () => {
       ).toBe(false);
     });
   });
+
+  describe('getSummaryActionTimeBounds', () => {
+    test('returns undefined start and end action is not summary action', () => {
+      expect(getSummaryActionTimeBounds(mockAction, { interval: '1m' }, null)).toEqual({
+        start: undefined,
+        end: undefined,
+      });
+    });
+
+    test('returns start and end for summary action with throttle', () => {
+      const { start, end } = getSummaryActionTimeBounds(
+        mockSummaryAction,
+        { interval: '1m' },
+        null
+      );
+      expect(end).toEqual(1620909217000);
+      expect(end).toEqual(new Date(now).valueOf());
+      expect(start).toEqual(1620822817000);
+      // start is end - throttle interval (1d)
+      expect(start).toEqual(new Date('2021-05-12T12:33:37.000Z').valueOf());
+    });
+
+    test('returns start and end for summary action without throttle with previousStartedAt', () => {
+      const { start, end } = getSummaryActionTimeBounds(
+        {
+          ...mockSummaryAction,
+          frequency: { summary: true, notifyWhen: 'onActiveAlert', throttle: null },
+        },
+        { interval: '1m' },
+        new Date('2021-05-13T12:31:57.000Z')
+      );
+
+      expect(end).toEqual(1620909217000);
+      expect(end).toEqual(new Date(now).valueOf());
+      expect(start).toEqual(1620909117000);
+      // start is previous started at time
+      expect(start).toEqual(new Date('2021-05-13T12:31:57.000Z').valueOf());
+    });
+
+    test('returns start and end for summary action without throttle without previousStartedAt', () => {
+      const { start, end } = getSummaryActionTimeBounds(
+        {
+          ...mockSummaryAction,
+          frequency: { summary: true, notifyWhen: 'onActiveAlert', throttle: null },
+        },
+        { interval: '1m' },
+        null
+      );
+
+      expect(end).toEqual(1620909217000);
+      expect(end).toEqual(new Date(now).valueOf());
+      expect(start).toEqual(1620909157000);
+      // start is end - schedule interval (1m)
+      expect(start).toEqual(new Date('2021-05-13T12:32:37.000Z').valueOf());
+    });
+  });
 });
diff --git a/x-pack/plugins/alerting/server/task_runner/rule_action_helper.ts b/x-pack/plugins/alerting/server/task_runner/rule_action_helper.ts
index 2918d346511ca..5150170a52bcd 100644
--- a/x-pack/plugins/alerting/server/task_runner/rule_action_helper.ts
+++ b/x-pack/plugins/alerting/server/task_runner/rule_action_helper.ts
@@ -7,6 +7,7 @@
 
 import { Logger } from '@kbn/logging';
 import {
+  IntervalSchedule,
   parseDuration,
   RuleAction,
   RuleNotifyWhenTypeValues,
@@ -99,3 +100,32 @@ export const getSummaryActionsFromTaskState = ({
     }
   }, {});
 };
+
+export const getSummaryActionTimeBounds = (
+  action: RuleAction,
+  ruleSchedule: IntervalSchedule,
+  previousStartedAt: Date | null
+): { start?: number; end?: number } => {
+  if (!isSummaryAction(action)) {
+    return { start: undefined, end: undefined };
+  }
+  let startDate: Date;
+  const now = Date.now();
+
+  if (isActionOnInterval(action)) {
+    // If action is throttled, set time bounds using throttle interval
+    const throttleMills = parseDuration(action.frequency!.throttle!);
+    startDate = new Date(now - throttleMills);
+  } else {
+    // If action is not throttled, set time bounds to previousStartedAt - now
+    // If previousStartedAt is null, use the rule schedule interval
+    if (previousStartedAt) {
+      startDate = previousStartedAt;
+    } else {
+      const scheduleMillis = parseDuration(ruleSchedule.interval);
+      startDate = new Date(now - scheduleMillis);
+    }
+  }
+
+  return { start: startDate.valueOf(), end: now.valueOf() };
+};
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner.ts b/x-pack/plugins/alerting/server/task_runner/task_runner.ts
index 45d22a8fbf2ac..466a785de4003 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner.ts
@@ -458,6 +458,7 @@ export class TaskRunner<
       ruleConsumer: this.ruleConsumer!,
       executionId: this.executionId,
       ruleLabel,
+      previousStartedAt: previousStartedAt ? new Date(previousStartedAt) : null,
       alertingEventLogger: this.alertingEventLogger,
       actionsClient: await this.context.actionsPlugin.getActionsClientWithRequest(fakeRequest),
     });
diff --git a/x-pack/plugins/alerting/server/task_runner/transform_action_params.test.ts b/x-pack/plugins/alerting/server/task_runner/transform_action_params.test.ts
index a240105f7cab2..cd581afafa266 100644
--- a/x-pack/plugins/alerting/server/task_runner/transform_action_params.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/transform_action_params.test.ts
@@ -626,13 +626,13 @@ describe('transformSummaryActionParams', () => {
       new: { count: 1, data: [mockAAD] },
       ongoing: { count: 0, data: [] },
       recovered: { count: 0, data: [] },
-      all: { count: 0, data: [] },
+      all: { count: 1, data: [mockAAD] },
     },
     rule: {
       id: '1',
       name: 'test-rule',
       tags: ['test-tag'],
-      params: {},
+      params: { foo: 'bar', fooBar: true },
     } as SanitizedRule,
     ruleTypeId: 'rule-type-id',
     actionId: 'action-id',
@@ -657,6 +657,33 @@ describe('transformSummaryActionParams', () => {
     `);
   });
 
+  test('renders aliased context values', () => {
+    const actionParams = {
+      message:
+        'Value "{{context.alerts}}", "{{context.results_link}}" and "{{context.rule}}" exist',
+    };
+
+    const result = transformSummaryActionParams({ ...params, actionParams });
+    expect(result).toMatchInlineSnapshot(`
+        Object {
+          "message": "Value \\"{\\"@timestamp\\":\\"2022-12-07T15:38:43.472Z\\",\\"event\\":{\\"kind\\":\\"signal\\",\\"action\\":\\"active\\"},\\"kibana\\":{\\"version\\":\\"8.7.0\\",\\"space_ids\\":[\\"default\\"],\\"alert\\":{\\"instance\\":{\\"id\\":\\"*\\"},\\"uuid\\":\\"2d3e8fe5-3e8b-4361-916e-9eaab0bf2084\\",\\"status\\":\\"active\\",\\"workflow_status\\":\\"open\\",\\"reason\\":\\"system.cpu is 90% in the last 1 min for all hosts. Alert when > 50%.\\",\\"time_range\\":{\\"gte\\":\\"2022-01-01T12:00:00.000Z\\"},\\"start\\":\\"2022-12-07T15:23:13.488Z\\",\\"duration\\":{\\"us\\":100000},\\"flapping\\":false,\\"rule\\":{\\"category\\":\\"Metric threshold\\",\\"consumer\\":\\"alerts\\",\\"execution\\":{\\"uuid\\":\\"c35db7cc-5bf7-46ea-b43f-b251613a5b72\\"},\\"name\\":\\"test-rule\\",\\"producer\\":\\"infrastructure\\",\\"rule_type_id\\":\\"metrics.alert.threshold\\",\\"uuid\\":\\"0de91960-7643-11ed-b719-bb9db8582cb6\\",\\"tags\\":[]}}}}\\", \\"http://ruleurl\\" and \\"{\\"foo\\":\\"bar\\",\\"foo_bar\\":true,\\"name\\":\\"test-rule\\",\\"id\\":\\"1\\"}\\" exist",
+        }
+    `);
+  });
+
+  test('renders aliased state values', () => {
+    const actionParams = {
+      message: 'Value "{{state.signals_count}}" exists',
+    };
+
+    const result = transformSummaryActionParams({ ...params, actionParams });
+    expect(result).toMatchInlineSnapshot(`
+        Object {
+          "message": "Value \\"1\\" exists",
+        }
+    `);
+  });
+
   test('renders alerts values', () => {
     const actionParams = {
       message:
diff --git a/x-pack/plugins/alerting/server/task_runner/transform_action_params.ts b/x-pack/plugins/alerting/server/task_runner/transform_action_params.ts
index 9f037d39b75d1..b4a3727863169 100644
--- a/x-pack/plugins/alerting/server/task_runner/transform_action_params.ts
+++ b/x-pack/plugins/alerting/server/task_runner/transform_action_params.ts
@@ -6,6 +6,7 @@
  */
 
 import { PluginStartContract as ActionsPluginStartContract } from '@kbn/actions-plugin/server';
+import { mapKeys, snakeCase } from 'lodash/fp';
 import {
   RuleActionParams,
   AlertInstanceState,
@@ -143,6 +144,19 @@ export function transformSummaryActionParams({
   const variables = {
     kibanaBaseUrl,
     date: new Date().toISOString(),
+    // For backwards compatibility with security solutions rules
+    context: {
+      alerts: alerts.all.data ?? [],
+      results_link: ruleUrl,
+      rule: mapKeys(snakeCase, {
+        ...rule.params,
+        name: rule.name,
+        id: rule.id,
+      }),
+    },
+    state: {
+      signals_count: alerts.all.count ?? 0,
+    },
     rule: {
       params: rule.params,
       id: rule.id,
diff --git a/x-pack/plugins/alerting/server/task_runner/types.ts b/x-pack/plugins/alerting/server/task_runner/types.ts
index f2d04812115a8..4a1343add9249 100644
--- a/x-pack/plugins/alerting/server/task_runner/types.ts
+++ b/x-pack/plugins/alerting/server/task_runner/types.ts
@@ -85,6 +85,7 @@ export interface ExecutionHandlerOptions<
   ruleConsumer: string;
   executionId: string;
   ruleLabel: string;
+  previousStartedAt: Date | null;
   actionsClient: PublicMethodsOf<ActionsClient>;
 }
 
diff --git a/x-pack/plugins/alerting/server/types.ts b/x-pack/plugins/alerting/server/types.ts
index 1a23f623a54d4..c578a05c468a7 100644
--- a/x-pack/plugins/alerting/server/types.ts
+++ b/x-pack/plugins/alerting/server/types.ts
@@ -168,6 +168,9 @@ export interface CombinedSummarizedAlerts extends SummarizedAlerts {
 export type GetSummarizedAlertsFn = (opts: GetSummarizedAlertsFnOpts) => Promise<SummarizedAlerts>;
 export interface GetViewInAppRelativeUrlFnOpts<Params extends RuleTypeParams> {
   rule: Omit<SanitizedRule<Params>, 'viewInAppRelativeUrl'>;
+  // Optional time bounds
+  start?: number;
+  end?: number;
 }
 export type GetViewInAppRelativeUrlFn<Params extends RuleTypeParams> = (
   opts: GetViewInAppRelativeUrlFnOpts<Params>

From 8d96fc82cfac0da292058ada8e067d78dee6585b Mon Sep 17 00:00:00 2001
From: Jonathan Buttner <56361221+jonathan-buttner@users.noreply.github.com>
Date: Wed, 19 Apr 2023 10:10:22 -0400
Subject: [PATCH 072/100] [Cases] Delete file attachments when files do not
 exist (#155088)

This PR modifies the bulk delete files API to support deleting the case
attachments even when the file does not exist. We could run into this
scenario if a user deleted the file outside of cases first and then
attempts to delete the case attachment.
---
 package.json                                  |   2 +
 .../client/attachments/bulk_delete.test.ts    |  99 +++++++++++++++
 .../server/client/attachments/bulk_delete.ts  | 119 +++++++++++++-----
 .../cases/server/client/files/index.test.ts   |   9 ++
 .../cases/server/client/files/index.ts        |   9 +-
 .../internal/bulk_delete_file_attachments.ts  |  51 ++++++--
 yarn.lock                                     |  15 ++-
 7 files changed, 264 insertions(+), 40 deletions(-)
 create mode 100644 x-pack/plugins/cases/server/client/attachments/bulk_delete.test.ts

diff --git a/package.json b/package.json
index d36fc1284122b..f898970efe8e7 100644
--- a/package.json
+++ b/package.json
@@ -850,6 +850,7 @@
     "p-limit": "^3.0.1",
     "p-map": "^4.0.0",
     "p-retry": "^4.2.0",
+    "p-settle": "4.1.1",
     "papaparse": "^5.2.0",
     "pbf": "3.2.1",
     "pdfjs-dist": "^2.13.216",
@@ -1426,6 +1427,7 @@
     "nyc": "^15.1.0",
     "oboe": "^2.1.4",
     "openapi-types": "^10.0.0",
+    "p-reflect": "2.1.0",
     "pbf": "3.2.1",
     "peggy": "^1.2.0",
     "picomatch": "^2.3.1",
diff --git a/x-pack/plugins/cases/server/client/attachments/bulk_delete.test.ts b/x-pack/plugins/cases/server/client/attachments/bulk_delete.test.ts
new file mode 100644
index 0000000000000..49a12c904eb63
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/attachments/bulk_delete.test.ts
@@ -0,0 +1,99 @@
+/*
+ * 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 { loggerMock } from '@kbn/logging-mocks';
+import pReflect from 'p-reflect';
+import type { File } from '@kbn/files-plugin/common';
+import { FileNotFoundError } from '@kbn/files-plugin/server/file_service/errors';
+import { retrieveFilesIgnoringNotFound } from './bulk_delete';
+
+describe('bulk_delete', () => {
+  describe('retrieveFilesIgnoringNotFound', () => {
+    const mockLogger = loggerMock.create();
+
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it('returns an empty array when the results is an empty array', () => {
+      expect(retrieveFilesIgnoringNotFound([], [], mockLogger)).toEqual([]);
+    });
+
+    it('returns a fulfilled file', async () => {
+      expect(retrieveFilesIgnoringNotFound([await createFakeFile()], ['abc'], mockLogger)).toEqual([
+        {},
+      ]);
+    });
+
+    it('logs a warning when encountering a file not found error', async () => {
+      const fileNotFound = await pReflect(Promise.reject(new FileNotFoundError('not found')));
+
+      expect(retrieveFilesIgnoringNotFound([fileNotFound], ['abc'], mockLogger)).toEqual([]);
+      expect(mockLogger.warn).toBeCalledTimes(1);
+      expect(mockLogger.warn.mock.calls[0]).toMatchInlineSnapshot(`
+        Array [
+          "Failed to find file id: abc: Error: not found",
+        ]
+      `);
+    });
+
+    it('logs a warning without the fileId when the results length is different from the file ids', async () => {
+      const fileNotFound = await pReflect(Promise.reject(new FileNotFoundError('not found')));
+
+      expect(retrieveFilesIgnoringNotFound([fileNotFound], ['abc', '123'], mockLogger)).toEqual([]);
+      expect(mockLogger.warn).toBeCalledTimes(1);
+      expect(mockLogger.warn.mock.calls[0]).toMatchInlineSnapshot(`
+        Array [
+          "Failed to find file: Error: not found",
+        ]
+      `);
+    });
+
+    it('throws when encountering an error that is not a file not found', async () => {
+      const otherError = new Error('other error');
+      const otherErrorResult = await pReflect(Promise.reject(new Error('other error')));
+
+      expect.assertions(2);
+
+      expect(() =>
+        retrieveFilesIgnoringNotFound([otherErrorResult], ['abc'], mockLogger)
+      ).toThrowError(otherError);
+      expect(mockLogger.warn).not.toBeCalled();
+    });
+
+    it('throws when encountering an error that is not a file not found after a valid file', async () => {
+      const otherError = new Error('other error');
+      const otherErrorResult = await pReflect(Promise.reject(otherError));
+      const fileResult = await createFakeFile();
+
+      expect.assertions(2);
+
+      expect(() =>
+        retrieveFilesIgnoringNotFound([fileResult, otherErrorResult], ['1', '2'], mockLogger)
+      ).toThrowError(otherError);
+      expect(mockLogger.warn).not.toBeCalled();
+    });
+
+    it('throws a new error when encountering an error that is a string', async () => {
+      // this produces an error because .reject() must be passed an error but I want to test a string just in case
+      // eslint-disable-next-line prefer-promise-reject-errors
+      const otherErrorResult = await pReflect(Promise.reject('string error'));
+      const fileResult = await createFakeFile();
+
+      expect.assertions(2);
+
+      expect(() =>
+        retrieveFilesIgnoringNotFound([fileResult, otherErrorResult], ['1', '2'], mockLogger)
+      ).toThrowErrorMatchingInlineSnapshot(`"Failed to retrieve file id: 2: string error"`);
+      expect(mockLogger.warn).not.toBeCalled();
+    });
+  });
+});
+
+const createFakeFile = () => {
+  return pReflect(Promise.resolve({} as File));
+};
diff --git a/x-pack/plugins/cases/server/client/attachments/bulk_delete.ts b/x-pack/plugins/cases/server/client/attachments/bulk_delete.ts
index 75cdf6f42e05f..9f9aaaf59c736 100644
--- a/x-pack/plugins/cases/server/client/attachments/bulk_delete.ts
+++ b/x-pack/plugins/cases/server/client/attachments/bulk_delete.ts
@@ -10,8 +10,10 @@ import { pipe } from 'fp-ts/lib/pipeable';
 import { fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
 
-import pMap from 'p-map';
+import type { PromiseResult, PromiseRejectedResult } from 'p-settle';
+import pSettle from 'p-settle';
 import { partition } from 'lodash';
+import type { Logger } from '@kbn/core/server';
 import type { File, FileJSON } from '@kbn/files-plugin/common';
 import type { FileServiceStart } from '@kbn/files-plugin/server';
 import { FileNotFoundError } from '@kbn/files-plugin/server/file_service/errors';
@@ -46,7 +48,12 @@ export const bulkDeleteFileAttachments = async (
 
     await casesClient.cases.resolve({ id: caseId, includeComments: false });
 
-    const fileEntities = await getFileEntities(caseId, request.ids, fileService);
+    const fileEntities = await getFileEntities({
+      caseId,
+      fileIds: request.ids,
+      fileService,
+      logger,
+    });
 
     // It's possible for this to return an empty array if there was an error creating file attachments in which case the
     // file would be present but the case attachment would not
@@ -67,7 +74,10 @@ export const bulkDeleteFileAttachments = async (
     });
 
     await Promise.all([
-      deleteFiles(request.ids, fileService),
+      deleteFiles(
+        fileEntities.map((entity) => entity.id),
+        fileService
+      ),
       attachmentService.bulkDelete({
         attachmentIds: fileAttachments.map((so) => so.id),
         refresh: false,
@@ -84,43 +94,53 @@ export const bulkDeleteFileAttachments = async (
       user,
     });
   } catch (error) {
-    let errorToTrack = error;
-
-    // if it's an error from the file service let's put it in a boom so we don't loose the status code of a 404
-    if (error instanceof FileNotFoundError) {
-      errorToTrack = Boom.notFound(error.message);
-    }
-
     throw createCaseError({
       message: `Failed to delete file attachments for case: ${caseId}: ${error}`,
-      error: errorToTrack,
+      error,
       logger,
     });
   }
 };
 
-const getFileEntities = async (
-  caseId: BulkDeleteFileArgs['caseId'],
-  fileIds: BulkDeleteFileArgs['fileIds'],
-  fileService: FileServiceStart
-) => {
-  const files = await getFiles(caseId, fileIds, fileService);
+const getFileEntities = async ({
+  caseId,
+  fileIds,
+  fileService,
+  logger,
+}: {
+  caseId: BulkDeleteFileArgs['caseId'];
+  fileIds: BulkDeleteFileArgs['fileIds'];
+  fileService: FileServiceStart;
+  logger: Logger;
+}) => {
+  const files = await getFiles({ caseId, fileIds, fileService, logger });
 
   const fileEntities = createFileEntities(files);
 
   return fileEntities;
 };
 
-const getFiles = async (
-  caseId: BulkDeleteFileArgs['caseId'],
-  fileIds: BulkDeleteFileArgs['fileIds'],
-  fileService: FileServiceStart
-): Promise<FileJSON[]> => {
+const getFiles = async ({
+  caseId,
+  fileIds,
+  fileService,
+  logger,
+}: {
+  caseId: BulkDeleteFileArgs['caseId'];
+  fileIds: BulkDeleteFileArgs['fileIds'];
+  fileService: FileServiceStart;
+  logger: Logger;
+}): Promise<FileJSON[]> => {
   // it's possible that we're trying to delete a file when an attachment wasn't created (for example if the create
   // attachment request failed)
-  const files = await pMap(fileIds, async (fileId: string) => fileService.getById({ id: fileId }), {
-    concurrency: MAX_CONCURRENT_SEARCHES,
-  });
+  const fileSettleResults = await pSettle(
+    fileIds.map(async (fileId) => fileService.getById({ id: fileId })),
+    {
+      concurrency: MAX_CONCURRENT_SEARCHES,
+    }
+  );
+
+  const files = retrieveFilesIgnoringNotFound(fileSettleResults, fileIds, logger);
 
   const [validFiles, invalidFiles] = partition(files, (file) => {
     return (
@@ -137,9 +157,52 @@ const getFiles = async (
     throw Boom.badRequest(`Failed to delete files because filed ids were invalid: ${invalidIds}`);
   }
 
-  if (validFiles.length <= 0) {
-    throw Boom.badRequest('Failed to find files to delete');
+  return validFiles.map((fileInfo) => fileInfo.data);
+};
+
+export const retrieveFilesIgnoringNotFound = (
+  results: Array<PromiseResult<File<unknown>>>,
+  fileIds: BulkDeleteFileArgs['fileIds'],
+  logger: Logger
+) => {
+  const files: File[] = [];
+
+  results.forEach((result, index) => {
+    if (result.isFulfilled) {
+      files.push(result.value);
+    } else if (result.reason instanceof FileNotFoundError) {
+      const warningMessage = getFileNotFoundErrorMessage({
+        resultsLength: results.length,
+        fileIds,
+        index,
+        result,
+      });
+
+      logger.warn(warningMessage);
+    } else if (result.reason instanceof Error) {
+      throw result.reason;
+    } else {
+      throw new Error(`Failed to retrieve file id: ${fileIds[index]}: ${result.reason}`);
+    }
+  });
+
+  return files;
+};
+
+const getFileNotFoundErrorMessage = ({
+  resultsLength,
+  fileIds,
+  index,
+  result,
+}: {
+  resultsLength: number;
+  fileIds: BulkDeleteFileArgs['fileIds'];
+  index: number;
+  result: PromiseRejectedResult;
+}) => {
+  if (resultsLength === fileIds.length) {
+    return `Failed to find file id: ${fileIds[index]}: ${result.reason}`;
   }
 
-  return validFiles.map((fileInfo) => fileInfo.data);
+  return `Failed to find file: ${result.reason}`;
 };
diff --git a/x-pack/plugins/cases/server/client/files/index.test.ts b/x-pack/plugins/cases/server/client/files/index.test.ts
index e1727f5885d4a..853f7debabad9 100644
--- a/x-pack/plugins/cases/server/client/files/index.test.ts
+++ b/x-pack/plugins/cases/server/client/files/index.test.ts
@@ -51,6 +51,15 @@ describe('server files', () => {
   });
 
   describe('deleteFiles', () => {
+    it('does not call delete when the file ids is empty', async () => {
+      const fileServiceMock = createFileServiceMock();
+
+      expect.assertions(1);
+      await deleteFiles([], fileServiceMock);
+
+      expect(fileServiceMock.delete).not.toBeCalled();
+    });
+
     it('calls delete twice with the ids passed in', async () => {
       const fileServiceMock = createFileServiceMock();
 
diff --git a/x-pack/plugins/cases/server/client/files/index.ts b/x-pack/plugins/cases/server/client/files/index.ts
index 31e0bcf8fb2dd..2a400b8037d6d 100644
--- a/x-pack/plugins/cases/server/client/files/index.ts
+++ b/x-pack/plugins/cases/server/client/files/index.ts
@@ -33,7 +33,12 @@ export const createFileEntities = (files: FileEntityInfo[]): OwnerEntity[] => {
   return fileEntities;
 };
 
-export const deleteFiles = async (fileIds: string[], fileService: FileServiceStart) =>
-  pMap(fileIds, async (fileId: string) => fileService.delete({ id: fileId }), {
+export const deleteFiles = async (fileIds: string[], fileService: FileServiceStart) => {
+  if (fileIds.length <= 0) {
+    return;
+  }
+
+  return pMap(fileIds, async (fileId: string) => fileService.delete({ id: fileId }), {
     concurrency: MAX_CONCURRENT_SEARCHES,
   });
+};
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/internal/bulk_delete_file_attachments.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/internal/bulk_delete_file_attachments.ts
index 2a65a0a2fbdc3..bd2a4b8f85456 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/internal/bulk_delete_file_attachments.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/internal/bulk_delete_file_attachments.ts
@@ -121,15 +121,6 @@ export default ({ getService }: FtrProviderContext): void => {
         });
       });
 
-      it('fails to delete a file when the file does not exist', async () => {
-        await bulkDeleteFileAttachments({
-          supertest,
-          caseId: postedCase.id,
-          fileIds: ['abc'],
-          expectedHttpCode: 404,
-        });
-      });
-
       it('returns a 400 when the fileIds is an empty array', async () => {
         await bulkDeleteFileAttachments({
           supertest,
@@ -254,6 +245,17 @@ export default ({ getService }: FtrProviderContext): void => {
         await deleteAllCaseItems(es);
       });
 
+      it('returns a 204 when the file does not exist', async () => {
+        const postedCase = await createCase(supertest, getPostCaseRequest());
+
+        await bulkDeleteFileAttachments({
+          supertest,
+          caseId: postedCase.id,
+          fileIds: ['abc'],
+          expectedHttpCode: 204,
+        });
+      });
+
       it('deletes a file when the owner is not formatted as an array of strings', async () => {
         const postedCase = await createCase(supertest, getPostCaseRequest());
 
@@ -412,6 +414,37 @@ export default ({ getService }: FtrProviderContext): void => {
         await deleteAllCaseItems(es);
       });
 
+      it('deletes the attachment even when the file does not exist', async () => {
+        const postedCase = await createCase(
+          supertest,
+          getPostCaseRequest({ owner: 'securitySolution' })
+        );
+
+        const caseWithAttachments = await bulkCreateAttachments({
+          supertest,
+          caseId: postedCase.id,
+          params: [
+            getFilesAttachmentReq({
+              externalReferenceId: 'abc',
+              owner: 'securitySolution',
+            }),
+          ],
+        });
+
+        await bulkDeleteFileAttachments({
+          supertest,
+          caseId: postedCase.id,
+          fileIds: ['abc'],
+        });
+
+        await getComment({
+          supertest,
+          caseId: postedCase.id,
+          commentId: caseWithAttachments.comments![0].id,
+          expectedHttpCode: 404,
+        });
+      });
+
       it('deletes a single file', async () => {
         const postedCase = await createCase(
           supertest,
diff --git a/yarn.lock b/yarn.lock
index bd8668fa91fc1..772067b69cdca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -22312,7 +22312,7 @@ p-limit@^1.1.0:
   dependencies:
     p-try "^1.0.0"
 
-p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.3.0:
+p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.2, p-limit@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
@@ -22373,6 +22373,11 @@ p-map@^4.0.0:
   dependencies:
     aggregate-error "^3.0.0"
 
+p-reflect@2.1.0, p-reflect@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/p-reflect/-/p-reflect-2.1.0.tgz#5d67c7b3c577c4e780b9451fc9129675bd99fe67"
+  integrity sha512-paHV8NUz8zDHu5lhr/ngGWQiW067DK/+IbJ+RfZ4k+s8y4EKyYCz8pGYWjxCg35eHztpJAt+NUgvN4L+GCbPlg==
+
 p-retry@^4.2.0, p-retry@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.5.0.tgz#6685336b3672f9ee8174d3769a660cb5e488521d"
@@ -22381,6 +22386,14 @@ p-retry@^4.2.0, p-retry@^4.5.0:
     "@types/retry" "^0.12.0"
     retry "^0.12.0"
 
+p-settle@4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/p-settle/-/p-settle-4.1.1.tgz#37fbceb2b02c9efc28658fc8d36949922266035f"
+  integrity sha512-6THGh13mt3gypcNMm0ADqVNCcYa3BK6DWsuJWFCuEKP1rpY+OKGp7gaZwVmLspmic01+fsg/fN57MfvDzZ/PuQ==
+  dependencies:
+    p-limit "^2.2.2"
+    p-reflect "^2.1.0"
+
 p-timeout@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"

From f2d880cba240104d8049bdb54e8f2ad1d7c9bbf6 Mon Sep 17 00:00:00 2001
From: Jonathan Buttner <56361221+jonathan-buttner@users.noreply.github.com>
Date: Wed, 19 Apr 2023 10:10:37 -0400
Subject: [PATCH 073/100] [Cases] Adding new config options to docker script
 (#155194)

This PR adds the follow cases config options from this PR to the docker
script.

https://github.com/elastic/kibana/pull/154013

```
    xpack.cases.files.allowedMimeTypes
    xpack.cases.files.maxSize
```
---
 .../docker_generator/resources/base/bin/kibana-docker           | 2 ++
 1 file changed, 2 insertions(+)

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 6801686f90f57..b08d26b8c657d 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
@@ -253,6 +253,8 @@ kibana_vars=(
     xpack.banners.placement
     xpack.banners.textColor
     xpack.banners.textContent
+    xpack.cases.files.allowedMimeTypes
+    xpack.cases.files.maxSize
     xpack.code.disk.thresholdEnabled
     xpack.code.disk.watermarkLow
     xpack.code.indexRepoFrequencyMs

From bc10169e16541887a5d1e70c2b1812b08bf2ba44 Mon Sep 17 00:00:00 2001
From: Rickyanto Ang <rickyangwyn@gmail.com>
Date: Wed, 19 Apr 2023 07:25:35 -0700
Subject: [PATCH 074/100] [Cloud Security] Message update for index-timeout
 status (#155223)

## Summary

This PR is for rephrasing the message the user see when status =
index-timeout



![waiting](https://user-images.githubusercontent.com/8703149/232987730-ddf3c3c1-9611-4cbf-8bef-b912d519ee5e.png)
---
 .../public/components/no_findings_states.tsx                | 6 +++---
 .../public/components/no_vulnerabilities_states.tsx         | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/x-pack/plugins/cloud_security_posture/public/components/no_findings_states.tsx b/x-pack/plugins/cloud_security_posture/public/components/no_findings_states.tsx
index 3c6a286ba0e33..897de7df552b9 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/no_findings_states.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/no_findings_states.tsx
@@ -117,7 +117,7 @@ const IndexTimeout = () => (
       <h2>
         <FormattedMessage
           id="xpack.csp.noFindingsStates.indexTimeout.indexTimeoutTitle"
-          defaultMessage="Findings Delayed"
+          defaultMessage="Waiting for Findings data"
         />
       </h2>
     }
@@ -125,13 +125,13 @@ const IndexTimeout = () => (
       <p>
         <FormattedMessage
           id="xpack.csp.noFindingsStates.indexTimeout.indexTimeoutDescription"
-          defaultMessage="Collecting findings is taking longer than expected, please review our {docs} or reach out to support"
+          defaultMessage="Data should appear in less than 10 minutes after elastic-agent is successfully deployed. {docs}"
           values={{
             docs: (
               <EuiLink href="https://ela.st/findings" target="_blank">
                 <FormattedMessage
                   id="xpack.csp.noFindingsStates.indexTimeout.indexTimeoutDocLink"
-                  defaultMessage="docs"
+                  defaultMessage="Learn more"
                 />
               </EuiLink>
             ),
diff --git a/x-pack/plugins/cloud_security_posture/public/components/no_vulnerabilities_states.tsx b/x-pack/plugins/cloud_security_posture/public/components/no_vulnerabilities_states.tsx
index 61c9fc8c407dd..48f790bf4c332 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/no_vulnerabilities_states.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/no_vulnerabilities_states.tsx
@@ -129,13 +129,13 @@ const IndexTimeout = () => (
       <p>
         <FormattedMessage
           id="xpack.csp.noVulnerabilitiesStates.indexTimeout.indexTimeoutDescription"
-          defaultMessage="Collecting findings is taking longer than expected, please review our {docs} or reach out to support"
+          defaultMessage="Data should appear in less than 10 minutes after elastic-agent is successfully deployed. {docs}"
           values={{
             docs: (
               <EuiLink href="https://ela.st/findings" target="_blank">
                 <FormattedMessage
                   id="xpack.csp.noVulnerabilitiesStates.indexTimeout.indexTimeoutDocLink"
-                  defaultMessage="docs"
+                  defaultMessage="Learn more"
                 />
               </EuiLink>
             ),

From fa7bde1296f8dd7bf48bfcbc476d74017ba71d61 Mon Sep 17 00:00:00 2001
From: Michael Olorunnisola <michael.olorunnisola@elastic.co>
Date: Wed, 19 Apr 2023 10:30:25 -0400
Subject: [PATCH 075/100] [Security Solution][Investigations] - add highlighted
 fields (#155247)

## Summary

Adding highlighted fields as requested here:
https://github.com/elastic/security-team/issues/6348
Decision was made to have the fields be global highlighted fields.
---
 .../event_details/get_alert_summary_rows.tsx        | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/get_alert_summary_rows.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/get_alert_summary_rows.tsx
index 793cba6810645..f591fad6a6629 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/get_alert_summary_rows.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/get_alert_summary_rows.tsx
@@ -47,6 +47,19 @@ const alwaysDisplayedFields: EventSummaryField[] = [
   { id: 'agent.id', overrideField: AGENT_STATUS_FIELD_NAME, label: i18n.AGENT_STATUS },
   { id: 'user.name' },
   { id: 'rule.name' },
+  { id: 'cloud.provider' },
+  { id: 'cloud.region' },
+  { id: 'cloud.provider' },
+  { id: 'cloud.region' },
+  { id: 'orchestrator.cluster.id' },
+  { id: 'orchestrator.cluster.name' },
+  { id: 'container.image.name' },
+  { id: 'container.image.tag' },
+  { id: 'orchestrator.namespace' },
+  { id: 'orchestrator.resource.parent.type' },
+  { id: 'orchestrator.resource.type' },
+  { id: 'process.executable' },
+  { id: 'file.path' },
   { id: ALERT_RULE_TYPE, label: i18n.RULE_TYPE },
 ];
 

From ddf9ab6c13815bff3464fefeab8244f0064b2498 Mon Sep 17 00:00:00 2001
From: "Joey F. Poon" <joey.poon@elastic.co>
Date: Wed, 19 Apr 2023 07:34:21 -0700
Subject: [PATCH 076/100] [Fleet] fix message signing service encryption bug
 (#154934)

## Summary

fixes: adding an encryption key after generating a key pair would cause
the private key to become unable to decrypt.


### 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


### For maintainers

- [x] 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)
---
 .../security/message_signing_service.test.ts  |   3 +-
 .../security/message_signing_service.ts       | 115 +++++++++---------
 2 files changed, 62 insertions(+), 56 deletions(-)

diff --git a/x-pack/plugins/fleet/server/services/security/message_signing_service.test.ts b/x-pack/plugins/fleet/server/services/security/message_signing_service.test.ts
index e3ad1d82bdee7..fd0b3c8f2ca2b 100644
--- a/x-pack/plugins/fleet/server/services/security/message_signing_service.test.ts
+++ b/x-pack/plugins/fleet/server/services/security/message_signing_service.test.ts
@@ -153,7 +153,8 @@ describe('MessageSigningService', () => {
         MESSAGE_SIGNING_KEYS_SAVED_OBJECT_TYPE,
         keyPairObj.id,
         {
-          passphrase: expect.any(String),
+          ...keyPairObj.attributes,
+          passphrase: keyPairObj.attributes.passphrase_plain,
           passphrase_plain: '',
         }
       );
diff --git a/x-pack/plugins/fleet/server/services/security/message_signing_service.ts b/x-pack/plugins/fleet/server/services/security/message_signing_service.ts
index 443f35ec06ed2..ab63b746286e3 100644
--- a/x-pack/plugins/fleet/server/services/security/message_signing_service.ts
+++ b/x-pack/plugins/fleet/server/services/security/message_signing_service.ts
@@ -8,7 +8,10 @@
 import { generateKeyPairSync, createSign, randomBytes } from 'crypto';
 
 import type { KibanaRequest } from '@kbn/core-http-server';
-import type { SavedObjectsClientContract } from '@kbn/core-saved-objects-api-server';
+import type {
+  SavedObjectsClientContract,
+  SavedObjectsFindResult,
+} from '@kbn/core-saved-objects-api-server';
 import type { EncryptedSavedObjectsClient } from '@kbn/encrypted-saved-objects-plugin/server';
 import { SECURITY_EXTENSION_ID } from '@kbn/core-saved-objects-server';
 
@@ -45,35 +48,12 @@ export class MessageSigningService implements MessageSigningServiceInterface {
     publicKey: string;
     passphrase: string;
   }> {
-    let passphrase = providedPassphrase || this.generatePassphrase();
-
-    const currentKeyPair = await this.getCurrentKeyPair();
-    if (
-      currentKeyPair.privateKey &&
-      currentKeyPair.publicKey &&
-      (currentKeyPair.passphrase || currentKeyPair.passphrasePlain)
-    ) {
-      passphrase = currentKeyPair.passphrase || currentKeyPair.passphrasePlain;
-
-      // newly configured encryption key, encrypt the passphrase
-      if (currentKeyPair.passphrasePlain && this.isEncryptionAvailable) {
-        await this.soClient.update<MessageSigningKeys>(
-          MESSAGE_SIGNING_KEYS_SAVED_OBJECT_TYPE,
-          currentKeyPair.id,
-          {
-            passphrase,
-            passphrase_plain: '',
-          }
-        );
-      }
-
-      return {
-        privateKey: currentKeyPair.privateKey,
-        publicKey: currentKeyPair.publicKey,
-        passphrase,
-      };
+    const existingKeyPair = await this.checkForExistingKeyPair();
+    if (existingKeyPair) {
+      return existingKeyPair;
     }
 
+    const passphrase = providedPassphrase || this.generatePassphrase();
     const keyPair = generateKeyPairSync('ec', {
       namedCurve: 'prime256v1',
       privateKeyEncoding: {
@@ -176,13 +156,9 @@ export class MessageSigningService implements MessageSigningServiceInterface {
     return this._soClient;
   }
 
-  private async getCurrentKeyPair(): Promise<{
-    id: string;
-    privateKey: string;
-    publicKey: string;
-    passphrase: string;
-    passphrasePlain: string;
-  }> {
+  private async getCurrentKeyPairObj(): Promise<
+    SavedObjectsFindResult<MessageSigningKeys> | undefined
+  > {
     const finder =
       await this.esoClient.createPointInTimeFinderDecryptedAsInternalUser<MessageSigningKeys>({
         type: MESSAGE_SIGNING_KEYS_SAVED_OBJECT_TYPE,
@@ -190,30 +166,59 @@ export class MessageSigningService implements MessageSigningServiceInterface {
         sortField: 'created_at',
         sortOrder: 'desc',
       });
-    let keyPair = {
-      id: '',
-      privateKey: '',
-      publicKey: '',
-      passphrase: '',
-      passphrasePlain: '',
-    };
+    let soDoc: SavedObjectsFindResult<MessageSigningKeys> | undefined;
     for await (const result of finder.find()) {
-      const savedObject = result.saved_objects[0];
-      const attributes = savedObject?.attributes;
-      if (!attributes?.private_key) {
-        break;
-      }
-      keyPair = {
-        id: savedObject.id,
-        privateKey: attributes.private_key,
-        publicKey: attributes.public_key,
-        passphrase: attributes.passphrase,
-        passphrasePlain: attributes.passphrase_plain,
-      };
+      soDoc = result.saved_objects[0];
       break;
     }
+    finder.close();
+
+    return soDoc;
+  }
+
+  private async checkForExistingKeyPair(): Promise<
+    | {
+        privateKey: string;
+        publicKey: string;
+        passphrase: string;
+      }
+    | undefined
+  > {
+    const currentKeyPair = await this.getCurrentKeyPairObj();
+    if (!currentKeyPair) {
+      return;
+    }
 
-    return keyPair;
+    const { attributes } = currentKeyPair;
+    if (!attributes) {
+      return;
+    }
+
+    const {
+      private_key: privateKey,
+      public_key: publicKey,
+      passphrase: passphraseEncrypted,
+      passphrase_plain: passphrasePlain,
+    } = attributes;
+    const passphrase = passphraseEncrypted || passphrasePlain;
+    if (!privateKey || !publicKey || !passphrase) {
+      return;
+    }
+
+    // newly configured encryption key, encrypt the passphrase
+    if (passphrasePlain && this.isEncryptionAvailable) {
+      await this.soClient.update<MessageSigningKeys>(
+        MESSAGE_SIGNING_KEYS_SAVED_OBJECT_TYPE,
+        currentKeyPair?.id,
+        { ...attributes, passphrase, passphrase_plain: '' }
+      );
+    }
+
+    return {
+      privateKey,
+      publicKey,
+      passphrase,
+    };
   }
 
   private generatePassphrase(): string {

From 271d9aa68cf93ae9a3d398e909a0c4fb06a409b5 Mon Sep 17 00:00:00 2001
From: Dzmitry Lemechko <dzmitry.lemechko@elastic.co>
Date: Wed, 19 Apr 2023 16:39:35 +0200
Subject: [PATCH 077/100] [kbn-failed-test-reporter-cli] truncate report
 message to fix github api call failure (#155141)

## Summary

We recently had a
[failure](https://buildkite.com/elastic/kibana-on-merge/builds/29020#018792bc-498a-46d1-9343-fb791823d92e)
while calling Github API to open new issue:

```
2023-04-18 07:56:26 CEST	ERROR Error: [post https://api.github.com/repos/elastic/kibana/issues] 422 Unprocessable Entity Error: {"message":"Validation Failed","errors":[{"resource":"Issue","code":"custom","field":"body","message":"body is too long"},{"resource":"Issue","code":"custom","field":"body","message":"body is too long (maximum is 65536 characters)"}],"documentation_url":"https://docs.github.com/rest/reference/issues#create-an-issue"}
2023-04-18 07:56:26 CEST	          at GithubApi.request (github_api.ts:177:17)
2023-04-18 07:56:26 CEST	          at processTicksAndRejections (node:internal/process/task_queues:96:5)
2023-04-18 07:56:26 CEST	          at GithubApi.createIssue (github_api.ts:106:18)
2023-04-18 07:56:26 CEST	          at createFailureIssue (report_failure.ts:39:10)
2023-04-18 07:56:26 CEST	          at description (failed_tests_reporter_cli.ts:153:28)
2023-04-18 07:56:26 CEST	          at run.ts:70:7
2023-04-18 07:56:26 CEST	          at withProcRunner (with_proc_runner.ts:29:5)
2023-04-18 07:56:26 CEST	          at run (run.ts:69:5)
```

It seems like some test might have a very long failure message that
reaches Github body length limit and causes a failure.

Since mocha truncates failure message to 8192 chars, I thought it might
be a good option for Github issues as well (Having too long message is
not very useful anyway)
---
 .../failed_tests_reporter/report_failure.ts        | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/kbn-failed-test-reporter-cli/failed_tests_reporter/report_failure.ts b/packages/kbn-failed-test-reporter-cli/failed_tests_reporter/report_failure.ts
index e2750f15b8720..ed282b44325e3 100644
--- a/packages/kbn-failed-test-reporter-cli/failed_tests_reporter/report_failure.ts
+++ b/packages/kbn-failed-test-reporter-cli/failed_tests_reporter/report_failure.ts
@@ -19,12 +19,24 @@ export async function createFailureIssue(
 ) {
   const title = `Failing test: ${failure.classname} - ${failure.name}`;
 
+  // Github API body length maximum is 65536 characters
+  // Let's keep consistency with Mocha output that is truncated to 8192 characters
+  const failureMaxCharacters = 8192;
+
+  const failureBody =
+    failure.failure.length <= failureMaxCharacters
+      ? failure.failure
+      : [
+          failure.failure.substring(0, failureMaxCharacters),
+          `[report_failure] output truncated to ${failureMaxCharacters} characters`,
+        ].join('\n');
+
   const body = updateIssueMetadata(
     [
       'A test failed on a tracked branch',
       '',
       '```',
-      failure.failure,
+      failureBody,
       '```',
       '',
       `First failure: [CI Build - ${branch}](${buildUrl})`,

From 6d8d1708fef7751f5cd7be6ff2da7cf69cb4b742 Mon Sep 17 00:00:00 2001
From: Jatin Kathuria <jatin.kathuria@elastic.co>
Date: Wed, 19 Apr 2023 16:58:48 +0200
Subject: [PATCH 078/100] [Control Group] Add override options of
 openAddDataControlFlyout (#153007)

## Summary

This PR adds the option to provide, custom props when calling
`openAddDataControlFlyout`. For example, users of the API may want
different placeholder than default for any new options list that is
added.

Currently, in security solution, we need a custom placeholder for newly
added controls. Hence, this PR. Please let me know if this is not the
best way to do this.



https://user-images.githubusercontent.com/7485038/232775198-a111d711-ffba-4d26-8c70-c2af08008e05.mov
---
 .../controls_example/public/edit_example.tsx  | 33 +++++++++++++++++--
 src/plugins/controls/common/index.ts          |  2 +-
 src/plugins/controls/common/types.ts          |  5 +++
 .../control_group/editor/control_editor.tsx   |  6 +++-
 .../editor/open_add_data_control_flyout.tsx   | 10 +++++-
 .../controls/public/control_group/index.ts    |  1 +
 .../controls/public/control_group/types.ts    |  2 ++
 src/plugins/controls/public/index.ts          |  1 +
 8 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/examples/controls_example/public/edit_example.tsx b/examples/controls_example/public/edit_example.tsx
index cf5430cad48f1..21689eb13ab09 100644
--- a/examples/controls_example/public/edit_example.tsx
+++ b/examples/controls_example/public/edit_example.tsx
@@ -21,18 +21,23 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 import { ViewMode } from '@kbn/embeddable-plugin/public';
+import { OPTIONS_LIST_CONTROL, RANGE_SLIDER_CONTROL } from '@kbn/controls-plugin/common';
 import {
   LazyControlGroupRenderer,
   ControlGroupContainer,
   ControlGroupInput,
+  ACTION_EDIT_CONTROL,
+  ACTION_DELETE_CONTROL,
 } from '@kbn/controls-plugin/public';
 import { withSuspense } from '@kbn/presentation-util-plugin/public';
-import { ACTION_EDIT_CONTROL, ACTION_DELETE_CONTROL } from '@kbn/controls-plugin/public';
+import { ControlInputTransform } from '@kbn/controls-plugin/common/types';
 
 const ControlGroupRenderer = withSuspense(LazyControlGroupRenderer);
 
 const INPUT_KEY = 'kbnControls:saveExample:input';
 
+const WITH_CUSTOM_PLACEHOLDER = 'Custom Placeholder';
+
 export const EditExample = () => {
   const [isSaving, setIsSaving] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
@@ -85,6 +90,7 @@ export const EditExample = () => {
         setToggleIconIdToSelectedMapIcon({
           [ACTION_EDIT_CONTROL]: disabledActions.includes(ACTION_EDIT_CONTROL),
           [ACTION_DELETE_CONTROL]: disabledActions.includes(ACTION_DELETE_CONTROL),
+          [WITH_CUSTOM_PLACEHOLDER]: false,
         });
       } catch (e) {
         // ignore parse errors
@@ -94,6 +100,24 @@ export const EditExample = () => {
     return input;
   }
 
+  const controlInputTransform: ControlInputTransform = (newState, type) => {
+    if (type === OPTIONS_LIST_CONTROL && toggleIconIdToSelectedMapIcon[WITH_CUSTOM_PLACEHOLDER]) {
+      return {
+        ...newState,
+        placeholder: 'Custom Placeholder',
+      };
+    }
+
+    if (type === RANGE_SLIDER_CONTROL) {
+      return {
+        ...newState,
+        value: ['0', '4'],
+      };
+    }
+
+    return newState;
+  };
+
   return (
     <>
       <EuiTitle>
@@ -111,7 +135,7 @@ export const EditExample = () => {
               iconType="plusInCircle"
               isDisabled={controlGroup === undefined}
               onClick={() => {
-                controlGroup!.openAddDataControlFlyout();
+                controlGroup!.openAddDataControlFlyout(controlInputTransform);
               }}
             >
               Add control
@@ -132,6 +156,11 @@ export const EditExample = () => {
                   label: 'Disable delete action',
                   value: ACTION_DELETE_CONTROL,
                 },
+                {
+                  id: WITH_CUSTOM_PLACEHOLDER,
+                  label: WITH_CUSTOM_PLACEHOLDER,
+                  value: WITH_CUSTOM_PLACEHOLDER,
+                },
               ]}
               idToSelectedMap={toggleIconIdToSelectedMapIcon}
               type="multi"
diff --git a/src/plugins/controls/common/index.ts b/src/plugins/controls/common/index.ts
index 346cb53ce4244..de492adb399f3 100644
--- a/src/plugins/controls/common/index.ts
+++ b/src/plugins/controls/common/index.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-export type { ControlWidth } from './types';
+export type { ControlWidth, ControlInputTransform } from './types';
 
 // Control Group exports
 export {
diff --git a/src/plugins/controls/common/types.ts b/src/plugins/controls/common/types.ts
index 5f37ef2c72871..7eb0d69f98a4f 100644
--- a/src/plugins/controls/common/types.ts
+++ b/src/plugins/controls/common/types.ts
@@ -32,3 +32,8 @@ export type DataControlInput = ControlInput & {
   fieldName: string;
   dataViewId: string;
 };
+
+export type ControlInputTransform = (
+  newState: Partial<ControlInput>,
+  controlType: string
+) => Partial<ControlInput>;
diff --git a/src/plugins/controls/public/control_group/editor/control_editor.tsx b/src/plugins/controls/public/control_group/editor/control_editor.tsx
index 5cc94acaebcf1..90285c7cca005 100644
--- a/src/plugins/controls/public/control_group/editor/control_editor.tsx
+++ b/src/plugins/controls/public/control_group/editor/control_editor.tsx
@@ -97,6 +97,7 @@ export const ControlEditor = ({
 
   const { useEmbeddableSelector: select } = useControlGroupContainerContext();
   const editorConfig = select((state) => state.componentState.editorConfig);
+  const customFilterPredicate = select((state) => state.componentState.fieldFilterPredicate);
 
   const [defaultTitle, setDefaultTitle] = useState<string>();
   const [currentTitle, setCurrentTitle] = useState(title ?? '');
@@ -195,7 +196,10 @@ export const ControlEditor = ({
           )}
           <EuiFormRow label={ControlGroupStrings.manageControl.getFieldTitle()}>
             <FieldPicker
-              filterPredicate={(field: DataViewField) => Boolean(fieldRegistry?.[field.name])}
+              filterPredicate={(field: DataViewField) => {
+                const customPredicate = customFilterPredicate ? customFilterPredicate(field) : true;
+                return Boolean(fieldRegistry?.[field.name]) && customPredicate;
+              }}
               selectedFieldName={selectedField}
               dataView={selectedDataView}
               onSelectField={(field) => {
diff --git a/src/plugins/controls/public/control_group/editor/open_add_data_control_flyout.tsx b/src/plugins/controls/public/control_group/editor/open_add_data_control_flyout.tsx
index 0b44c09fbaabf..e9e89d3828729 100644
--- a/src/plugins/controls/public/control_group/editor/open_add_data_control_flyout.tsx
+++ b/src/plugins/controls/public/control_group/editor/open_add_data_control_flyout.tsx
@@ -8,6 +8,7 @@
 
 import React from 'react';
 import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+import { ControlInputTransform } from '../../../common/types';
 import type {
   AddDataControlProps,
   AddOptionsListControlProps,
@@ -24,7 +25,10 @@ import {
   DEFAULT_CONTROL_WIDTH,
 } from '../../../common/control_group/control_group_constants';
 
-export function openAddDataControlFlyout(this: ControlGroupContainer) {
+export function openAddDataControlFlyout(
+  this: ControlGroupContainer,
+  controlInputTransform?: ControlInputTransform
+) {
   const {
     overlays: { openFlyout, openConfirm },
     controls: { getControlFactory },
@@ -76,6 +80,10 @@ export function openAddDataControlFlyout(this: ControlGroupContainer) {
                 controlInput = factory.presaveTransformFunction(controlInput);
               }
 
+              if (controlInputTransform) {
+                controlInput = controlInputTransform({ ...controlInput }, type);
+              }
+
               if (type === OPTIONS_LIST_CONTROL) {
                 this.addOptionsListControl(controlInput as AddOptionsListControlProps);
                 return;
diff --git a/src/plugins/controls/public/control_group/index.ts b/src/plugins/controls/public/control_group/index.ts
index 745e41ec474b1..d56fc619885c2 100644
--- a/src/plugins/controls/public/control_group/index.ts
+++ b/src/plugins/controls/public/control_group/index.ts
@@ -19,6 +19,7 @@ export { ACTION_EDIT_CONTROL, ACTION_DELETE_CONTROL } from './actions';
 export {
   type AddDataControlProps,
   type AddOptionsListControlProps,
+  type AddRangeSliderControlProps,
   controlGroupInputBuilder,
 } from './control_group_input_builder';
 
diff --git a/src/plugins/controls/public/control_group/types.ts b/src/plugins/controls/public/control_group/types.ts
index 98455b5aab527..5fea9dcfb9628 100644
--- a/src/plugins/controls/public/control_group/types.ts
+++ b/src/plugins/controls/public/control_group/types.ts
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import { DataViewField } from '@kbn/data-views-plugin/common';
 import { ContainerOutput } from '@kbn/embeddable-plugin/public';
 import { ReduxEmbeddableState } from '@kbn/presentation-util-plugin/public';
 import { ControlGroupInput } from '../../common/control_group/types';
@@ -34,6 +35,7 @@ export interface ControlGroupSettings {
     hideWidthSettings?: boolean;
     hideAdditionalSettings?: boolean;
   };
+  fieldFilterPredicate?: (field: DataViewField) => boolean;
 }
 
 export {
diff --git a/src/plugins/controls/public/index.ts b/src/plugins/controls/public/index.ts
index 1e9df544bd1c9..62378f5abbf26 100644
--- a/src/plugins/controls/public/index.ts
+++ b/src/plugins/controls/public/index.ts
@@ -35,6 +35,7 @@ export {
 export {
   type AddDataControlProps,
   type AddOptionsListControlProps,
+  type AddRangeSliderControlProps,
   type ControlGroupContainer,
   ControlGroupContainerFactory,
   type ControlGroupInput,

From b40b89e711c5397237e44e456e0365e9d55b8f8b Mon Sep 17 00:00:00 2001
From: Marco Antonio Ghiani <marcoantonio.ghiani01@gmail.com>
Date: Wed, 19 Apr 2023 17:30:45 +0200
Subject: [PATCH 079/100] [Logs UI] Redirect Logs UI to Discover when in
 serverless mode (#154145)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## 📓 Summary

Closes #153890

The implementation creates a new LogsApp service where we should keep
any logic concerned with what `target_app` parameter is configured and
the actions related to a specific configuration. I thought it could be a
good approach to avoid drilling down the global config till we need it
and keep it cleaner by injecting only the service with predefined
actions.

In this first case, we create a redirect to discover using its locator,
and the exposed method can be used anywhere across the app for
triggering the redirect.

## 🧪 Testing

### Normal behaviour

When Kibana is used as always, we want to keep the current behaviour and
the user will stay on the Logs UI pages.
- Launch the Kibana dev environment with `yarn start`
- Navigate to Logs UI
- Verify the navigation works normally and that no redirect to Discover
occurs

### Serverless behaviour

When Kibana is used in serverless mode, we want to redirect any user
landing to Logs UI to the Discover page, configuring the same data view
or creating an ad-hoc one starting from the index pattern
- Launch the Kibana dev environment with `yarn serverless-oblt`
- Navigate to Logs UI
- Verify to be redirected to Discover and a temporary data view is
created from the current index pattern

---------

Co-authored-by: Marco Antonio Ghiani <marcoantonio.ghiani@elastic.co>
Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
---
 config/serverless.oblt.yml                    |   1 +
 config/serverless.yml                         |   2 +-
 .../test_suites/core_plugins/rendering.ts     |   1 +
 x-pack/plugins/infra/common/constants.ts      |   1 +
 .../common/log_views/resolved_log_view.ts     |   1 +
 .../infra/common/plugin_config_types.ts       |   4 +
 x-pack/plugins/infra/kibana.jsonc             |   1 +
 .../infra/public/apps/discover_app.tsx        | 105 ++++++++++++++++
 x-pack/plugins/infra/public/plugin.ts         | 112 +++++++++++-------
 x-pack/plugins/infra/public/types.ts          |   2 +
 ...nventory_metric_threshold_executor.test.ts |   3 +
 .../metric_threshold_executor.test.ts         |   6 +-
 .../infra/server/lib/sources/sources.test.ts  |   7 +-
 x-pack/plugins/infra/server/plugin.ts         |   5 +
 x-pack/plugins/infra/tsconfig.json            |   1 +
 15 files changed, 202 insertions(+), 50 deletions(-)
 create mode 100644 x-pack/plugins/infra/public/apps/discover_app.tsx

diff --git a/config/serverless.oblt.yml b/config/serverless.oblt.yml
index e69de29bb2d1d..ba76648238348 100644
--- a/config/serverless.oblt.yml
+++ b/config/serverless.oblt.yml
@@ -0,0 +1 @@
+xpack.infra.logs.app_target: discover
diff --git a/config/serverless.yml b/config/serverless.yml
index 80e4ab584f9f6..d38863072d8a0 100644
--- a/config/serverless.yml
+++ b/config/serverless.yml
@@ -1,2 +1,2 @@
 xpack.fleet.enableExperimental: ['fleetServerStandalone']
-xpack.fleet.internal.ILMPoliciesDisabled: true
+xpack.fleet.internal.disableILMPolicies: true
diff --git a/test/plugin_functional/test_suites/core_plugins/rendering.ts b/test/plugin_functional/test_suites/core_plugins/rendering.ts
index 6106f430dbafd..ad66d01098665 100644
--- a/test/plugin_functional/test_suites/core_plugins/rendering.ts
+++ b/test/plugin_functional/test_suites/core_plugins/rendering.ts
@@ -201,6 +201,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
         'xpack.graph.savePolicy (alternatives)',
         'xpack.ilm.ui.enabled (boolean)',
         'xpack.index_management.ui.enabled (boolean)',
+        'xpack.infra.logs.app_target (alternatives)',
         'xpack.infra.sources.default.fields.message (array)',
         'xpack.license_management.ui.enabled (boolean)',
         'xpack.maps.preserveDrawingBuffer (boolean)',
diff --git a/x-pack/plugins/infra/common/constants.ts b/x-pack/plugins/infra/common/constants.ts
index 9fcb488e02fda..d428ebd3e4909 100644
--- a/x-pack/plugins/infra/common/constants.ts
+++ b/x-pack/plugins/infra/common/constants.ts
@@ -16,6 +16,7 @@ export const LOGS_FEATURE_ID = 'logs';
 export type InfraFeatureId = typeof METRICS_FEATURE_ID | typeof LOGS_FEATURE_ID;
 
 export const TIMESTAMP_FIELD = '@timestamp';
+export const MESSAGE_FIELD = 'message';
 export const TIEBREAKER_FIELD = '_doc';
 export const HOST_FIELD = 'host.name';
 export const CONTAINER_FIELD = 'container.id';
diff --git a/x-pack/plugins/infra/common/log_views/resolved_log_view.ts b/x-pack/plugins/infra/common/log_views/resolved_log_view.ts
index 2fc2fd7aa2374..391c6be18fb9d 100644
--- a/x-pack/plugins/infra/common/log_views/resolved_log_view.ts
+++ b/x-pack/plugins/infra/common/log_views/resolved_log_view.ts
@@ -55,6 +55,7 @@ const resolveLegacyReference = async (
     .create(
       {
         id: `log-view-${logViewId}`,
+        name: logViewAttributes.name,
         title: indices,
         timeFieldName: TIMESTAMP_FIELD,
         allowNoIndex: true,
diff --git a/x-pack/plugins/infra/common/plugin_config_types.ts b/x-pack/plugins/infra/common/plugin_config_types.ts
index 59ed36c9b3279..2c3a3bd2efeb7 100644
--- a/x-pack/plugins/infra/common/plugin_config_types.ts
+++ b/x-pack/plugins/infra/common/plugin_config_types.ts
@@ -17,6 +17,9 @@ export interface InfraConfig {
   inventory: {
     compositeSize: number;
   };
+  logs: {
+    app_target: 'logs-ui' | 'discover';
+  };
   sources?: {
     default?: {
       fields?: {
@@ -28,6 +31,7 @@ export interface InfraConfig {
 
 export const publicConfigKeys = {
   sources: true,
+  logs: true,
 } as const;
 
 export type InfraPublicConfigKey = keyof {
diff --git a/x-pack/plugins/infra/kibana.jsonc b/x-pack/plugins/infra/kibana.jsonc
index 1243275a4a416..abf1d2f8766f2 100644
--- a/x-pack/plugins/infra/kibana.jsonc
+++ b/x-pack/plugins/infra/kibana.jsonc
@@ -14,6 +14,7 @@
       "charts",
       "data",
       "dataViews",
+      "discover",
       "embeddable",
       "features",
       "lens",
diff --git a/x-pack/plugins/infra/public/apps/discover_app.tsx b/x-pack/plugins/infra/public/apps/discover_app.tsx
new file mode 100644
index 0000000000000..807b64845cdc7
--- /dev/null
+++ b/x-pack/plugins/infra/public/apps/discover_app.tsx
@@ -0,0 +1,105 @@
+/*
+ * 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 { interpret } from 'xstate';
+import type { DiscoverStart } from '@kbn/discover-plugin/public';
+import { createKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
+import type { InfraClientStartDeps, InfraClientStartExports } from '../types';
+import type { LogViewColumnConfiguration, ResolvedLogView } from '../../common/log_views';
+import {
+  createLogViewStateMachine,
+  DEFAULT_LOG_VIEW,
+  initializeFromUrl,
+} from '../observability_logs/log_view_state';
+import { MESSAGE_FIELD, TIMESTAMP_FIELD } from '../../common/constants';
+
+export const renderApp = (
+  core: CoreStart,
+  plugins: InfraClientStartDeps,
+  pluginStart: InfraClientStartExports,
+  params: AppMountParameters
+) => {
+  const { discover } = plugins;
+  const { logViews } = pluginStart;
+
+  const machine = createLogViewStateMachine({
+    initialContext: { logViewReference: DEFAULT_LOG_VIEW },
+    logViews: logViews.client,
+    initializeFromUrl: createInitializeFromUrl(core, params),
+  });
+
+  const service = interpret(machine)
+    .onTransition((state) => {
+      if (
+        state.matches('checkingStatus') ||
+        state.matches('resolvedPersistedLogView') ||
+        state.matches('resolvedInlineLogView')
+      ) {
+        return redirectToDiscover(discover, state.context.resolvedLogView);
+      } else if (
+        state.matches('loadingFailed') ||
+        state.matches('resolutionFailed') ||
+        state.matches('checkingStatusFailed')
+      ) {
+        return redirectToDiscover(discover);
+      }
+    })
+    .start();
+
+  return () => {
+    // Stop machine interpreter after navigation
+    service.stop();
+  };
+};
+
+const redirectToDiscover = (discover: DiscoverStart, resolvedLogView?: ResolvedLogView) => {
+  const navigationOptions = { replace: true };
+
+  if (!resolvedLogView) {
+    return discover.locator?.navigate({}, navigationOptions);
+  }
+
+  const columns = parseColumns(resolvedLogView.columns);
+  const dataViewSpec = resolvedLogView.dataViewReference.toSpec();
+
+  return discover.locator?.navigate(
+    {
+      columns,
+      dataViewId: dataViewSpec.id,
+      dataViewSpec,
+    },
+    navigationOptions
+  );
+};
+
+/**
+ * Helpers
+ */
+
+const parseColumns = (columns: ResolvedLogView['columns']) => {
+  return columns.map(getColumnValue).filter(Boolean) as string[];
+};
+
+const getColumnValue = (column: LogViewColumnConfiguration) => {
+  if ('messageColumn' in column) return MESSAGE_FIELD;
+  if ('timestampColumn' in column) return TIMESTAMP_FIELD;
+  if ('fieldColumn' in column) return column.fieldColumn.field;
+
+  return null;
+};
+
+const createInitializeFromUrl = (core: CoreStart, params: AppMountParameters) => {
+  const toastsService = core.notifications.toasts;
+
+  const urlStateStorage = createKbnUrlStateStorage({
+    history: params.history,
+    useHash: false,
+    useHashQuery: false,
+  });
+
+  return initializeFromUrl({ toastsService, urlStateStorage });
+};
diff --git a/x-pack/plugins/infra/public/plugin.ts b/x-pack/plugins/infra/public/plugin.ts
index cae0cbd62bae4..8931a6fd32cb7 100644
--- a/x-pack/plugins/infra/public/plugin.ts
+++ b/x-pack/plugins/infra/public/plugin.ts
@@ -7,6 +7,7 @@
 
 import {
   AppMountParameters,
+  AppNavLinkStatus,
   AppUpdater,
   CoreStart,
   DEFAULT_APP_CATEGORIES,
@@ -136,54 +137,73 @@ export class Plugin implements InfraClientPluginClass {
       new LogStreamEmbeddableFactoryDefinition(core.getStartServices)
     );
 
-    core.application.register({
-      id: 'logs',
-      title: i18n.translate('xpack.infra.logs.pluginTitle', {
-        defaultMessage: 'Logs',
-      }),
-      euiIconType: 'logoObservability',
-      order: 8100,
-      appRoute: '/app/logs',
-      // !! Need to be kept in sync with the routes in x-pack/plugins/infra/public/pages/logs/page_content.tsx
-      deepLinks: [
-        {
-          id: 'stream',
-          title: i18n.translate('xpack.infra.logs.index.streamTabTitle', {
-            defaultMessage: 'Stream',
-          }),
-          path: '/stream',
-        },
-        {
-          id: 'anomalies',
-          title: i18n.translate('xpack.infra.logs.index.anomaliesTabTitle', {
-            defaultMessage: 'Anomalies',
-          }),
-          path: '/anomalies',
-        },
-        {
-          id: 'log-categories',
-          title: i18n.translate('xpack.infra.logs.index.logCategoriesBetaBadgeTitle', {
-            defaultMessage: 'Categories',
-          }),
-          path: '/log-categories',
-        },
-        {
-          id: 'settings',
-          title: i18n.translate('xpack.infra.logs.index.settingsTabTitle', {
-            defaultMessage: 'Settings',
-          }),
-          path: '/settings',
+    if (this.config.logs.app_target === 'discover') {
+      core.application.register({
+        id: 'logs-to-discover',
+        title: '',
+        navLinkStatus: AppNavLinkStatus.hidden,
+        appRoute: '/app/logs',
+        mount: async (params: AppMountParameters) => {
+          // mount callback should not use setup dependencies, get start dependencies instead
+          const [coreStart, plugins, pluginStart] = await core.getStartServices();
+
+          const { renderApp } = await import('./apps/discover_app');
+
+          return renderApp(coreStart, plugins, pluginStart, params);
         },
-      ],
-      category: DEFAULT_APP_CATEGORIES.observability,
-      mount: async (params: AppMountParameters) => {
-        // mount callback should not use setup dependencies, get start dependencies instead
-        const [coreStart, pluginsStart, pluginStart] = await core.getStartServices();
-        const { renderApp } = await import('./apps/logs_app');
+      });
+    }
 
-        return renderApp(coreStart, pluginsStart, pluginStart, params);
-      },
-    });
+    if (this.config.logs.app_target === 'logs-ui') {
+      core.application.register({
+        id: 'logs',
+        title: i18n.translate('xpack.infra.logs.pluginTitle', {
+          defaultMessage: 'Logs',
+        }),
+        euiIconType: 'logoObservability',
+        order: 8100,
+        appRoute: '/app/logs',
+        // !! Need to be kept in sync with the routes in x-pack/plugins/infra/public/pages/logs/page_content.tsx
+        deepLinks: [
+          {
+            id: 'stream',
+            title: i18n.translate('xpack.infra.logs.index.streamTabTitle', {
+              defaultMessage: 'Stream',
+            }),
+            path: '/stream',
+          },
+          {
+            id: 'anomalies',
+            title: i18n.translate('xpack.infra.logs.index.anomaliesTabTitle', {
+              defaultMessage: 'Anomalies',
+            }),
+            path: '/anomalies',
+          },
+          {
+            id: 'log-categories',
+            title: i18n.translate('xpack.infra.logs.index.logCategoriesBetaBadgeTitle', {
+              defaultMessage: 'Categories',
+            }),
+            path: '/log-categories',
+          },
+          {
+            id: 'settings',
+            title: i18n.translate('xpack.infra.logs.index.settingsTabTitle', {
+              defaultMessage: 'Settings',
+            }),
+            path: '/settings',
+          },
+        ],
+        category: DEFAULT_APP_CATEGORIES.observability,
+        mount: async (params: AppMountParameters) => {
+          // mount callback should not use setup dependencies, get start dependencies instead
+          const [coreStart, plugins, pluginStart] = await core.getStartServices();
+
+          const { renderApp } = await import('./apps/logs_app');
+          return renderApp(coreStart, plugins, pluginStart, params);
+        },
+      });
+    }
 
     // !! Need to be kept in sync with the routes in x-pack/plugins/infra/public/pages/metrics/index.tsx
     const infraDeepLinks = [
diff --git a/x-pack/plugins/infra/public/types.ts b/x-pack/plugins/infra/public/types.ts
index ac8c8316a7083..9d5cc8abbfbe1 100644
--- a/x-pack/plugins/infra/public/types.ts
+++ b/x-pack/plugins/infra/public/types.ts
@@ -37,6 +37,7 @@ import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { LensPublicStart } from '@kbn/lens-plugin/public';
 import type { ChartsPluginStart } from '@kbn/charts-plugin/public';
 import { CasesUiStart } from '@kbn/cases-plugin/public';
+import { DiscoverStart } from '@kbn/discover-plugin/public';
 import type { UnwrapPromise } from '../common/utility_types';
 import type {
   SourceProviderProps,
@@ -79,6 +80,7 @@ export interface InfraClientStartDeps {
   charts: ChartsPluginStart;
   data: DataPublicPluginStart;
   dataViews: DataViewsPublicPluginStart;
+  discover: DiscoverStart;
   embeddable?: EmbeddableStart;
   lens: LensPublicStart;
   ml: MlPluginStart;
diff --git a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.test.ts b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.test.ts
index de3ef3cf68d0c..0860da5c7a184 100644
--- a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.test.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.test.ts
@@ -99,6 +99,9 @@ const createMockStaticConfiguration = (sources: any) => ({
   inventory: {
     compositeSize: 2000,
   },
+  logs: {
+    app_target: 'logs-ui',
+  },
   sources,
 });
 
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts
index a24a02b2df5e8..9298b7583ef3d 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts
@@ -34,6 +34,7 @@ import {
 import { Evaluation } from './lib/evaluate_rule';
 import type { LogMeta, Logger } from '@kbn/logging';
 import { DEFAULT_FLAPPING_SETTINGS } from '@kbn/alerting-plugin/common';
+import { InfraConfig } from '../../../../common/plugin_config_types';
 
 jest.mock('./lib/evaluate_rule', () => ({ evaluateRule: jest.fn() }));
 
@@ -1818,7 +1819,7 @@ describe('The metric threshold alert type', () => {
   });
 });
 
-const createMockStaticConfiguration = (sources: any) => ({
+const createMockStaticConfiguration = (sources: any): InfraConfig => ({
   alerting: {
     inventory_threshold: {
       group_by_page_size: 100,
@@ -1830,6 +1831,9 @@ const createMockStaticConfiguration = (sources: any) => ({
   inventory: {
     compositeSize: 2000,
   },
+  logs: {
+    app_target: 'logs-ui',
+  },
   sources,
 });
 
diff --git a/x-pack/plugins/infra/server/lib/sources/sources.test.ts b/x-pack/plugins/infra/server/lib/sources/sources.test.ts
index 22e6d4912a402..a8d78d1ba09f1 100644
--- a/x-pack/plugins/infra/server/lib/sources/sources.test.ts
+++ b/x-pack/plugins/infra/server/lib/sources/sources.test.ts
@@ -6,6 +6,7 @@
  */
 
 import { SavedObject } from '@kbn/core/server';
+import { InfraConfig } from '../../types';
 import { infraSourceConfigurationSavedObjectName } from './saved_object_type';
 import { InfraSources } from './sources';
 
@@ -108,7 +109,7 @@ describe('the InfraSources lib', () => {
   });
 });
 
-const createMockStaticConfiguration = (sources: any) => ({
+const createMockStaticConfiguration = (sources: any): InfraConfig => ({
   alerting: {
     inventory_threshold: {
       group_by_page_size: 10000,
@@ -117,10 +118,12 @@ const createMockStaticConfiguration = (sources: any) => ({
       group_by_page_size: 10000,
     },
   },
-  enabled: true,
   inventory: {
     compositeSize: 2000,
   },
+  logs: {
+    app_target: 'logs-ui',
+  },
   sources,
 });
 
diff --git a/x-pack/plugins/infra/server/plugin.ts b/x-pack/plugins/infra/server/plugin.ts
index 0fb0aad42d0cc..7e7507c1d2e45 100644
--- a/x-pack/plugins/infra/server/plugin.ts
+++ b/x-pack/plugins/infra/server/plugin.ts
@@ -58,6 +58,11 @@ import { UsageCollector } from './usage/usage_collector';
 
 export const config: PluginConfigDescriptor<InfraConfig> = {
   schema: schema.object({
+    logs: schema.object({
+      app_target: schema.oneOf([schema.literal('logs-ui'), schema.literal('discover')], {
+        defaultValue: 'logs-ui',
+      }),
+    }),
     alerting: schema.object({
       inventory_threshold: schema.object({
         group_by_page_size: schema.number({ defaultValue: 5_000 }),
diff --git a/x-pack/plugins/infra/tsconfig.json b/x-pack/plugins/infra/tsconfig.json
index 6d7327a7d9731..dd0632788e847 100644
--- a/x-pack/plugins/infra/tsconfig.json
+++ b/x-pack/plugins/infra/tsconfig.json
@@ -59,6 +59,7 @@
     "@kbn/shared-ux-prompt-not-found",
     "@kbn/shared-ux-router",
     "@kbn/shared-ux-link-redirect-app",
+    "@kbn/discover-plugin",
     "@kbn/observability-alert-details",
     "@kbn/observability-shared-plugin",
     "@kbn/ui-theme"

From e35a1d46d95bacda63656de43dc63a429904f4a2 Mon Sep 17 00:00:00 2001
From: Paul Tavares <56442535+paul-tavares@users.noreply.github.com>
Date: Wed, 19 Apr 2023 11:40:37 -0400
Subject: [PATCH 080/100] [Security Solution][Endpoint] Show consistent
 Endpoint Agent Status across security solution (#154961)

## Summary

- PR refactors the display of the Endpoint Host Agent status across the
multiple places in Security solution so that it uses 1 common component.
The Status of an Endpoint Host also displays the isolation state of the
endpoint along with any other Actions that might be pending against it.

- The refactor also address a prior issue where new added response
actions were not accounted for when the component displays (on hover in
a popover) the itemized count of pending response actions against the
host. The new implementation will display the summary of all pending
actions going forward as they are added without having to remember to
update the Component.

- The Endpoint host agent pending actions display was also adjusted to
ensure that isolation state is primary shown when there are multiple
pending actions, so that its always visible to the user the state of
isolation (see GIF below)

As a result of the refactor, several redundant components were deleted.

Pages that display Endpoint Host Agent status, and thus impacted by
these changes, are:

- Endpoint List
- Endpoint Details flyout
- Responder
- Alert Details
- Host Details
---
 .../endpoint_metadata_generator.ts            |  29 +-
 .../service/response_actions/constants.ts     |  12 +
 .../common/endpoint/types/actions.ts          |   5 +-
 .../common/endpoint/types/index.ts            |  10 +-
 .../security_solution/hosts/common/index.ts   |   4 +-
 .../agent_pending_action_status_badge.tsx     | 100 -----
 .../components/endpoint/agent_status.tsx      |  26 --
 .../endpoint_agent_status.test.tsx            | 366 ++++++++++++++++++
 .../endpoint_agent_status.tsx                 | 343 ++++++++++++++++
 .../endpoint/endpoint_agent_status}/index.ts  |   4 +-
 .../endpoint_host_isolation_status.test.tsx   | 138 -------
 .../endpoint_host_isolation_status.tsx        | 167 --------
 .../endpoint/host_isolation/index.ts          |   1 -
 .../summary/host_panel/host_panel.test.tsx    |  24 +-
 ...dpoint_agent_and_isolation_status.test.tsx |  47 ---
 .../endpoint_agent_and_isolation_status.tsx   |  61 ---
 .../status_action.tsx                         |  11 +-
 .../components/header_endpoint_info.tsx       |  26 +-
 .../management/pages/endpoint_hosts/mocks.ts  |   2 +-
 .../pages/endpoint_hosts/store/reducer.ts     |   1 +
 .../pages/endpoint_hosts/store/selectors.ts   |  61 +--
 .../management/pages/endpoint_hosts/types.ts  |   3 +
 .../components/endpoint_agent_status.test.tsx |  90 -----
 .../view/components/endpoint_agent_status.tsx |  49 ---
 .../view/details/endpoint_details_content.tsx |  32 +-
 .../pages/endpoint_hosts/view/index.tsx       |  20 +-
 .../endpoint_overview/index.test.tsx          |  12 +-
 .../host_overview/endpoint_overview/index.tsx |  22 +-
 .../body/renderers/agent_statuses.tsx         |  60 ---
 .../body/renderers/formatted_field.tsx        |  13 +-
 .../timeline/body/renderers/translations.ts   |  13 -
 .../factory/hosts/details/helpers.ts          |   1 +
 .../translations/translations/fr-FR.json      |  12 -
 .../translations/translations/ja-JP.json      |  12 -
 .../translations/translations/zh-CN.json      |  12 -
 35 files changed, 886 insertions(+), 903 deletions(-)
 delete mode 100644 x-pack/plugins/security_solution/public/common/components/endpoint/agent_pending_action_status_badge.tsx
 delete mode 100644 x-pack/plugins/security_solution/public/common/components/endpoint/agent_status.tsx
 create mode 100644 x-pack/plugins/security_solution/public/common/components/endpoint/endpoint_agent_status/endpoint_agent_status.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/common/components/endpoint/endpoint_agent_status/endpoint_agent_status.tsx
 rename x-pack/plugins/security_solution/public/{management/components/endpoint_agent_and_isolation_status => common/components/endpoint/endpoint_agent_status}/index.ts (57%)
 delete mode 100644 x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_status.test.tsx
 delete mode 100644 x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_status.tsx
 delete mode 100644 x-pack/plugins/security_solution/public/management/components/endpoint_agent_and_isolation_status/endpoint_agent_and_isolation_status.test.tsx
 delete mode 100644 x-pack/plugins/security_solution/public/management/components/endpoint_agent_and_isolation_status/endpoint_agent_and_isolation_status.tsx
 delete mode 100644 x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/endpoint_agent_status.test.tsx
 delete mode 100644 x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/endpoint_agent_status.tsx
 delete mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/agent_statuses.tsx

diff --git a/x-pack/plugins/security_solution/common/endpoint/data_generators/endpoint_metadata_generator.ts b/x-pack/plugins/security_solution/common/endpoint/data_generators/endpoint_metadata_generator.ts
index e040fa4811677..e5a44c46f5afc 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_generators/endpoint_metadata_generator.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_generators/endpoint_metadata_generator.ts
@@ -12,8 +12,8 @@ import { merge, set } from 'lodash';
 import { gte } from 'semver';
 import type { EndpointCapabilities } from '../service/response_actions/constants';
 import { BaseDataGenerator } from './base_data_generator';
-import type { HostMetadataInterface, OSFields } from '../types';
-import { EndpointStatus, HostPolicyResponseActionStatus } from '../types';
+import type { HostMetadataInterface, OSFields, HostInfoInterface } from '../types';
+import { EndpointStatus, HostPolicyResponseActionStatus, HostStatus } from '../types';
 
 export interface GetCustomEndpointMetadataGeneratorOptions {
   /** Version for agent/endpoint. Defaults to the stack version */
@@ -184,6 +184,31 @@ export class EndpointMetadataGenerator extends BaseDataGenerator {
     return merge(hostMetadataDoc, overrides);
   }
 
+  /** Generates the complete `HostInfo` as returned by a call to the Endpoint host details api */
+  generateHostInfo(overrides: DeepPartial<HostInfoInterface> = {}): HostInfoInterface {
+    const hostInfo: HostInfoInterface = {
+      metadata: this.generate(),
+      host_status: HostStatus.HEALTHY,
+      policy_info: {
+        endpoint: {
+          id: 'policy-123',
+          revision: 4,
+        },
+        agent: {
+          applied: {
+            id: 'policy-123',
+            revision: 4,
+          },
+          configured: {
+            id: 'policy-123',
+            revision: 4,
+          },
+        },
+      },
+    };
+    return merge(hostInfo, overrides);
+  }
+
   protected randomOsFields(): OSFields {
     return this.randomChoice([
       EndpointMetadataGenerator.windowsOSFields,
diff --git a/x-pack/plugins/security_solution/common/endpoint/service/response_actions/constants.ts b/x-pack/plugins/security_solution/common/endpoint/service/response_actions/constants.ts
index b304dcd819d8b..ea7ee057dc273 100644
--- a/x-pack/plugins/security_solution/common/endpoint/service/response_actions/constants.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/service/response_actions/constants.ts
@@ -76,6 +76,18 @@ export const commandToRBACMap: Record<ConsoleResponseActionCommands, ResponseCon
     execute: 'writeExecuteOperations',
   });
 
+export const RESPONSE_ACTION_API_COMMANDS_TO_CONSOLE_COMMAND_MAP = Object.freeze<
+  Record<ResponseActionsApiCommandNames, ConsoleResponseActionCommands>
+>({
+  isolate: 'isolate',
+  unisolate: 'release',
+  execute: 'execute',
+  'get-file': 'get-file',
+  'running-processes': 'processes',
+  'kill-process': 'kill-process',
+  'suspend-process': 'suspend-process',
+});
+
 // 4 hrs in seconds
 // 4 * 60 * 60
 export const DEFAULT_EXECUTE_ACTION_TIMEOUT = 14400;
diff --git a/x-pack/plugins/security_solution/common/endpoint/types/actions.ts b/x-pack/plugins/security_solution/common/endpoint/types/actions.ts
index 58c07459de441..d9082f8aa1d8c 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types/actions.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types/actions.ts
@@ -307,8 +307,9 @@ export interface ResponseActionApiResponse<TOutput extends object = object> {
 
 export interface EndpointPendingActions {
   agent_id: string;
-  pending_actions: {
-    /** Number of actions pending for each type. The `key` could be one of the `RESPONSE_ACTION_COMMANDS` values. */
+  /** Number of actions pending for each type */
+  pending_actions: Partial<Record<ResponseActionsApiCommandNames, number>> & {
+    // Defined any other key just in case we get back some other actions
     [key: string]: number;
   };
 }
diff --git a/x-pack/plugins/security_solution/common/endpoint/types/index.ts b/x-pack/plugins/security_solution/common/endpoint/types/index.ts
index 75899b5422039..4ab2e1e3d2ed0 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types/index.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types/index.ts
@@ -473,8 +473,10 @@ export type PolicyInfo = Immutable<{
   id: string;
 }>;
 
-export type HostInfo = Immutable<{
-  metadata: HostMetadata;
+// Host Information as returned by the Host Details API.
+// NOTE:  `HostInfo` type is the original and defined as Immutable.
+export interface HostInfoInterface {
+  metadata: HostMetadataInterface;
   host_status: HostStatus;
   policy_info?: {
     agent: {
@@ -492,7 +494,9 @@ export type HostInfo = Immutable<{
      */
     endpoint: PolicyInfo;
   };
-}>;
+}
+
+export type HostInfo = Immutable<HostInfoInterface>;
 
 // Host metadata document streamed up to ES by the Endpoint running on host machines.
 // NOTE:  `HostMetadata` type is the original and defined as Immutable. If needing to
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/common/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/common/index.ts
index 7f708ab3f6111..2e433b8cfd45f 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/common/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/common/index.ts
@@ -7,7 +7,7 @@
 
 import type { CloudEcs, HostEcs, OsEcs } from '@kbn/securitysolution-ecs';
 import type { Hit, Hits, Maybe, SearchHit, StringOrNumber, TotalValue } from '../../../common';
-import type { EndpointPendingActions, HostStatus } from '../../../../endpoint/types';
+import type { EndpointPendingActions, HostInfo, HostStatus } from '../../../../endpoint/types';
 import type { CommonFields } from '../..';
 
 export enum HostPolicyResponseActionStatus {
@@ -33,6 +33,8 @@ export interface EndpointFields {
   elasticAgentStatus?: Maybe<HostStatus>;
   fleetAgentId?: Maybe<string>;
   id?: Maybe<string>;
+  /** The complete Endpoint Host Details information (which also includes some of the fields above */
+  hostInfo?: HostInfo;
 }
 
 interface AgentFields {
diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/agent_pending_action_status_badge.tsx b/x-pack/plugins/security_solution/public/common/components/endpoint/agent_pending_action_status_badge.tsx
deleted file mode 100644
index ee318996b97fe..0000000000000
--- a/x-pack/plugins/security_solution/public/common/components/endpoint/agent_pending_action_status_badge.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * 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, { memo } from 'react';
-import { EuiBadge, EuiFlexGroup, EuiFlexItem, EuiTextColor, EuiToolTip } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n-react';
-import type { EndpointHostIsolationStatusProps } from './host_isolation';
-
-export const AgentPendingActionStatusBadge = memo<
-  { 'data-test-subj'?: string } & Pick<EndpointHostIsolationStatusProps, 'pendingActions'>
->(({ 'data-test-subj': dataTestSubj, pendingActions }) => {
-  return (
-    <EuiBadge color="hollow" data-test-subj={dataTestSubj}>
-      <EuiToolTip
-        display="block"
-        anchorClassName="eui-textTruncate"
-        content={
-          <div style={{ width: 150 }} data-test-subj={`${dataTestSubj}-tooltipContent`}>
-            <div>
-              <FormattedMessage
-                id="xpack.securitySolution.endpoint.hostIsolationStatus.tooltipPendingActions"
-                defaultMessage="Pending actions:"
-              />
-            </div>
-            {!!pendingActions.pendingIsolate && (
-              <EuiFlexGroup gutterSize="none" justifyContent="spaceBetween">
-                <EuiFlexItem>
-                  <FormattedMessage
-                    id="xpack.securitySolution.endpoint.hostIsolationStatus.tooltipPendingIsolate"
-                    defaultMessage="Isolate"
-                  />
-                </EuiFlexItem>
-                <EuiFlexItem grow={false}>{pendingActions.pendingIsolate}</EuiFlexItem>
-              </EuiFlexGroup>
-            )}
-            {!!pendingActions.pendingUnIsolate && (
-              <EuiFlexGroup gutterSize="none">
-                <EuiFlexItem>
-                  <FormattedMessage
-                    id="xpack.securitySolution.endpoint.hostIsolationStatus.tooltipPendingUnIsolate"
-                    defaultMessage="Release"
-                  />
-                </EuiFlexItem>
-                <EuiFlexItem grow={false}>{pendingActions.pendingUnIsolate}</EuiFlexItem>
-              </EuiFlexGroup>
-            )}
-            {!!pendingActions.pendingKillProcess && (
-              <EuiFlexGroup gutterSize="none">
-                <EuiFlexItem>
-                  <FormattedMessage
-                    id="xpack.securitySolution.endpoint.hostIsolationStatus.tooltipPendingKillProcess"
-                    defaultMessage="Kill process"
-                  />
-                </EuiFlexItem>
-                <EuiFlexItem grow={false}>{pendingActions.pendingKillProcess}</EuiFlexItem>
-              </EuiFlexGroup>
-            )}
-            {!!pendingActions.pendingSuspendProcess && (
-              <EuiFlexGroup gutterSize="none">
-                <EuiFlexItem>
-                  <FormattedMessage
-                    id="xpack.securitySolution.endpoint.hostIsolationStatus.tooltipPendingSuspendProcess"
-                    defaultMessage="Suspend process"
-                  />
-                </EuiFlexItem>
-                <EuiFlexItem grow={false}>{pendingActions.pendingSuspendProcess}</EuiFlexItem>
-              </EuiFlexGroup>
-            )}
-            {!!pendingActions.pendingRunningProcesses && (
-              <EuiFlexGroup gutterSize="none">
-                <EuiFlexItem>
-                  <FormattedMessage
-                    id="xpack.securitySolution.endpoint.hostIsolationStatus.tooltipPendingRunningProcesses"
-                    defaultMessage="Processes"
-                  />
-                </EuiFlexItem>
-                <EuiFlexItem grow={false}>{pendingActions.pendingRunningProcesses}</EuiFlexItem>
-              </EuiFlexGroup>
-            )}
-          </div>
-        }
-      >
-        <EuiTextColor color="subdued" data-test-subj={`${dataTestSubj}-pending`}>
-          <FormattedMessage
-            id="xpack.securitySolution.endpoint.hostIsolationStatus.multiplePendingActions"
-            defaultMessage="{count} {count, plural, one {action} other {actions}} pending"
-            values={{
-              count: Object.values(pendingActions).reduce((prev, curr) => prev + curr, 0),
-            }}
-          />
-        </EuiTextColor>
-      </EuiToolTip>
-    </EuiBadge>
-  );
-});
-
-AgentPendingActionStatusBadge.displayName = 'AgentPendingActionStatusBadge';
diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/agent_status.tsx b/x-pack/plugins/security_solution/public/common/components/endpoint/agent_status.tsx
deleted file mode 100644
index 150189e273cb3..0000000000000
--- a/x-pack/plugins/security_solution/public/common/components/endpoint/agent_status.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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 { EuiBadge } from '@elastic/eui';
-import type { HostStatus } from '../../../../common/endpoint/types';
-import { HOST_STATUS_TO_BADGE_COLOR } from '../../../management/pages/endpoint_hosts/view/host_constants';
-import { getAgentStatusText } from './agent_status_text';
-
-export const AgentStatus = React.memo(({ hostStatus }: { hostStatus: HostStatus }) => {
-  return (
-    <EuiBadge
-      color={hostStatus != null ? HOST_STATUS_TO_BADGE_COLOR[hostStatus] : 'warning'}
-      data-test-subj="rowHostStatus"
-      className="eui-textTruncate"
-    >
-      {getAgentStatusText(hostStatus)}
-    </EuiBadge>
-  );
-});
-
-AgentStatus.displayName = 'AgentStatus';
diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/endpoint_agent_status/endpoint_agent_status.test.tsx b/x-pack/plugins/security_solution/public/common/components/endpoint/endpoint_agent_status/endpoint_agent_status.test.tsx
new file mode 100644
index 0000000000000..bf6f85712b6c7
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/endpoint/endpoint_agent_status/endpoint_agent_status.test.tsx
@@ -0,0 +1,366 @@
+/*
+ * 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 { AppContextTestRender } from '../../../mock/endpoint';
+import { createAppRootMockRenderer } from '../../../mock/endpoint';
+import type {
+  EndpointAgentStatusByIdProps,
+  EndpointAgentStatusProps,
+} from './endpoint_agent_status';
+import { EndpointAgentStatus, EndpointAgentStatusById } from './endpoint_agent_status';
+import type {
+  EndpointPendingActions,
+  HostInfoInterface,
+} from '../../../../../common/endpoint/types';
+import { HostStatus } from '../../../../../common/endpoint/types';
+import React from 'react';
+import { EndpointActionGenerator } from '../../../../../common/endpoint/data_generators/endpoint_action_generator';
+import { EndpointDocGenerator } from '../../../../../common/endpoint/generate_data';
+import { composeHttpHandlerMocks } from '../../../mock/endpoint/http_handler_mock_factory';
+import type { EndpointMetadataHttpMocksInterface } from '../../../../management/pages/endpoint_hosts/mocks';
+import { endpointMetadataHttpMocks } from '../../../../management/pages/endpoint_hosts/mocks';
+import type { ResponseActionsHttpMocksInterface } from '../../../../management/mocks/response_actions_http_mocks';
+import { responseActionsHttpMocks } from '../../../../management/mocks/response_actions_http_mocks';
+import { waitFor, within, fireEvent } from '@testing-library/react';
+import { getEmptyValue } from '../../empty_value';
+import { clone, set } from 'lodash';
+
+type AgentStatusApiMocksInterface = EndpointMetadataHttpMocksInterface &
+  ResponseActionsHttpMocksInterface;
+
+// API mocks composed from the endpoint metadata API mock and the response actions API mocks
+const agentStatusApiMocks = composeHttpHandlerMocks<AgentStatusApiMocksInterface>([
+  endpointMetadataHttpMocks,
+  responseActionsHttpMocks,
+]);
+
+describe('When showing Endpoint Agent Status', () => {
+  const ENDPOINT_ISOLATION_OBJ_PATH = 'metadata.Endpoint.state.isolation';
+
+  let appTestContext: AppContextTestRender;
+  let render: () => ReturnType<AppContextTestRender['render']>;
+  let renderResult: ReturnType<AppContextTestRender['render']>;
+  let endpointDetails: HostInfoInterface;
+  let actionsSummary: EndpointPendingActions;
+  let apiMocks: ReturnType<typeof agentStatusApiMocks>;
+
+  const triggerTooltip = () => {
+    fireEvent.mouseOver(renderResult.getByTestId('test-actionStatuses-tooltipTrigger'));
+  };
+
+  beforeEach(() => {
+    appTestContext = createAppRootMockRenderer();
+    apiMocks = agentStatusApiMocks(appTestContext.coreStart.http);
+
+    const actionGenerator = new EndpointActionGenerator('seed');
+
+    actionsSummary = actionGenerator.generateAgentPendingActionsSummary();
+    actionsSummary.pending_actions = {};
+    apiMocks.responseProvider.agentPendingActionsSummary.mockImplementation(() => {
+      return {
+        data: [actionsSummary],
+      };
+    });
+
+    const metadataGenerator = new EndpointDocGenerator('seed');
+
+    endpointDetails = {
+      metadata: metadataGenerator.generateHostMetadata(),
+      host_status: HostStatus.HEALTHY,
+    } as HostInfoInterface;
+    apiMocks.responseProvider.metadataDetails.mockImplementation(() => endpointDetails);
+  });
+
+  describe('and using `EndpointAgentStatus` component', () => {
+    let renderProps: EndpointAgentStatusProps;
+
+    beforeEach(() => {
+      renderProps = {
+        'data-test-subj': 'test',
+        endpointHostInfo: endpointDetails,
+      };
+
+      render = () => {
+        renderResult = appTestContext.render(<EndpointAgentStatus {...renderProps} />);
+        return renderResult;
+      };
+    });
+
+    it('should display status', () => {
+      const { getByTestId } = render();
+
+      expect(getByTestId('test').textContent).toEqual('Healthy');
+    });
+
+    it('should display status and isolated', () => {
+      set(endpointDetails, ENDPOINT_ISOLATION_OBJ_PATH, true);
+      const { getByTestId } = render();
+
+      expect(getByTestId('test').textContent).toEqual('HealthyIsolated');
+    });
+
+    it('should display status and isolated and display other pending actions in tooltip', async () => {
+      set(endpointDetails, ENDPOINT_ISOLATION_OBJ_PATH, true);
+      actionsSummary.pending_actions = {
+        'get-file': 2,
+        execute: 6,
+      };
+      const { getByTestId } = render();
+
+      await waitFor(() => {
+        expect(apiMocks.responseProvider.agentPendingActionsSummary).toHaveBeenCalled();
+      });
+
+      expect(getByTestId('test').textContent).toEqual('HealthyIsolated');
+
+      triggerTooltip();
+
+      await waitFor(() => {
+        expect(
+          within(renderResult.baseElement).getByTestId('test-actionStatuses-tooltipContent')
+            .textContent
+        ).toEqual('Pending actions:execute6get-file2');
+      });
+    });
+
+    it('should display status and action count', async () => {
+      actionsSummary.pending_actions = {
+        'get-file': 2,
+        execute: 6,
+      };
+      const { getByTestId } = render();
+
+      await waitFor(() => {
+        expect(apiMocks.responseProvider.agentPendingActionsSummary).toHaveBeenCalled();
+      });
+
+      expect(getByTestId('test').textContent).toEqual('Healthy8 actions pending');
+    });
+
+    it('should display status and isolating', async () => {
+      actionsSummary.pending_actions = {
+        isolate: 1,
+      };
+      const { getByTestId } = render();
+
+      await waitFor(() => {
+        expect(apiMocks.responseProvider.agentPendingActionsSummary).toHaveBeenCalled();
+      });
+
+      expect(getByTestId('test').textContent).toEqual('HealthyIsolating');
+    });
+
+    it('should display status and isolating and have tooltip with other pending actions', async () => {
+      actionsSummary.pending_actions = {
+        isolate: 1,
+        'kill-process': 1,
+      };
+      const { getByTestId } = render();
+
+      await waitFor(() => {
+        expect(apiMocks.responseProvider.agentPendingActionsSummary).toHaveBeenCalled();
+      });
+
+      expect(getByTestId('test').textContent).toEqual('HealthyIsolating');
+
+      triggerTooltip();
+
+      await waitFor(() => {
+        expect(
+          within(renderResult.baseElement).getByTestId('test-actionStatuses-tooltipContent')
+            .textContent
+        ).toEqual('Pending actions:isolate1kill-process1');
+      });
+    });
+
+    it('should display status and releasing', async () => {
+      actionsSummary.pending_actions = {
+        unisolate: 1,
+      };
+      set(endpointDetails, ENDPOINT_ISOLATION_OBJ_PATH, true);
+      const { getByTestId } = render();
+
+      await waitFor(() => {
+        expect(apiMocks.responseProvider.agentPendingActionsSummary).toHaveBeenCalled();
+      });
+
+      expect(getByTestId('test').textContent).toEqual('HealthyReleasing');
+    });
+
+    it('should display status and releasing and show other pending actions in tooltip', async () => {
+      actionsSummary.pending_actions = {
+        unisolate: 1,
+        'kill-process': 1,
+      };
+      set(endpointDetails, ENDPOINT_ISOLATION_OBJ_PATH, true);
+      const { getByTestId } = render();
+
+      await waitFor(() => {
+        expect(apiMocks.responseProvider.agentPendingActionsSummary).toHaveBeenCalled();
+      });
+
+      expect(getByTestId('test').textContent).toEqual('HealthyReleasing');
+
+      triggerTooltip();
+
+      await waitFor(() => {
+        expect(
+          within(renderResult.baseElement).getByTestId('test-actionStatuses-tooltipContent')
+            .textContent
+        ).toEqual('Pending actions:kill-process1release1');
+      });
+    });
+
+    it('should show individual action count in tooltip (including unknown actions) sorted asc', async () => {
+      actionsSummary.pending_actions = {
+        isolate: 1,
+        'get-file': 2,
+        execute: 6,
+        'kill-process': 1,
+        foo: 2,
+      };
+      const { getByTestId } = render();
+
+      await waitFor(() => {
+        expect(apiMocks.responseProvider.agentPendingActionsSummary).toHaveBeenCalled();
+      });
+
+      expect(getByTestId('test').textContent).toEqual('HealthyIsolating');
+
+      triggerTooltip();
+
+      await waitFor(() => {
+        expect(
+          within(renderResult.baseElement).getByTestId('test-actionStatuses-tooltipContent')
+            .textContent
+        ).toEqual('Pending actions:execute6foo2get-file2isolate1kill-process1');
+      });
+    });
+
+    it('should still display status and isolation state if action summary api fails', async () => {
+      set(endpointDetails, ENDPOINT_ISOLATION_OBJ_PATH, true);
+      apiMocks.responseProvider.agentPendingActionsSummary.mockImplementation(() => {
+        throw new Error('test error');
+      });
+
+      const { getByTestId } = render();
+
+      await waitFor(() => {
+        expect(apiMocks.responseProvider.agentPendingActionsSummary).toHaveBeenCalled();
+      });
+
+      expect(getByTestId('test').textContent).toEqual('HealthyIsolated');
+    });
+
+    describe('and `autoRefresh` prop is set to true', () => {
+      beforeEach(() => {
+        renderProps.autoRefresh = true;
+        jest.useFakeTimers();
+      });
+
+      afterEach(() => {
+        jest.useRealTimers();
+      });
+
+      it('should keep actions up to date when autoRefresh is true', async () => {
+        apiMocks.responseProvider.agentPendingActionsSummary.mockReturnValueOnce({
+          data: [actionsSummary],
+        });
+
+        const { getByTestId } = render();
+
+        await waitFor(() => {
+          expect(apiMocks.responseProvider.agentPendingActionsSummary).toHaveBeenCalled();
+        });
+
+        expect(getByTestId('test').textContent).toEqual('Healthy');
+
+        apiMocks.responseProvider.agentPendingActionsSummary.mockReturnValueOnce({
+          data: [
+            {
+              ...actionsSummary,
+              pending_actions: {
+                'kill-process': 2,
+                'running-processes': 2,
+              },
+            },
+          ],
+        });
+
+        jest.runOnlyPendingTimers();
+
+        await waitFor(() => {
+          expect(getByTestId('test').textContent).toEqual('Healthy4 actions pending');
+        });
+      });
+    });
+  });
+
+  describe('And when using EndpointAgentStatusById', () => {
+    let renderProps: EndpointAgentStatusByIdProps;
+
+    beforeEach(() => {
+      jest.useFakeTimers();
+
+      renderProps = {
+        'data-test-subj': 'test',
+        endpointAgentId: '123',
+      };
+
+      render = () => {
+        renderResult = appTestContext.render(<EndpointAgentStatusById {...renderProps} />);
+        return renderResult;
+      };
+    });
+
+    afterEach(() => {
+      jest.useRealTimers();
+    });
+
+    it('should display status and isolated', async () => {
+      set(endpointDetails, ENDPOINT_ISOLATION_OBJ_PATH, true);
+      const { getByTestId } = render();
+
+      await waitFor(() => {
+        expect(getByTestId('test').textContent).toEqual('HealthyIsolated');
+      });
+    });
+
+    it('should display empty value if API call to host metadata fails', async () => {
+      apiMocks.responseProvider.metadataDetails.mockImplementation(() => {
+        throw new Error('test error');
+      });
+      const { getByTestId } = render();
+
+      await waitFor(() => {
+        expect(apiMocks.responseProvider.metadataDetails).toHaveBeenCalled();
+      });
+
+      expect(getByTestId('test').textContent).toEqual(getEmptyValue());
+    });
+
+    it('should keep agent status up to date when autoRefresh is true', async () => {
+      renderProps.autoFresh = true;
+      apiMocks.responseProvider.metadataDetails.mockReturnValueOnce(endpointDetails);
+
+      const { getByTestId } = render();
+
+      await waitFor(() => {
+        expect(getByTestId('test').textContent).toEqual('Healthy');
+      });
+
+      apiMocks.responseProvider.metadataDetails.mockReturnValueOnce(
+        set(clone(endpointDetails), 'metadata.Endpoint.state.isolation', true)
+      );
+      jest.runOnlyPendingTimers();
+
+      await waitFor(() => {
+        expect(getByTestId('test').textContent).toEqual('HealthyIsolated');
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/endpoint_agent_status/endpoint_agent_status.tsx b/x-pack/plugins/security_solution/public/common/components/endpoint/endpoint_agent_status/endpoint_agent_status.tsx
new file mode 100644
index 0000000000000..e74cdcf41fd57
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/endpoint/endpoint_agent_status/endpoint_agent_status.tsx
@@ -0,0 +1,343 @@
+/*
+ * 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, { memo, useMemo } from 'react';
+import {
+  EuiBadge,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiText,
+  EuiTextColor,
+  EuiToolTip,
+} from '@elastic/eui';
+import styled from 'styled-components';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { i18n } from '@kbn/i18n';
+import { DEFAULT_POLL_INTERVAL } from '../../../../management/common/constants';
+import { HOST_STATUS_TO_BADGE_COLOR } from '../../../../management/pages/endpoint_hosts/view/host_constants';
+import { getEmptyValue } from '../../empty_value';
+import type { ResponseActionsApiCommandNames } from '../../../../../common/endpoint/service/response_actions/constants';
+import { RESPONSE_ACTION_API_COMMANDS_TO_CONSOLE_COMMAND_MAP } from '../../../../../common/endpoint/service/response_actions/constants';
+import { useIsExperimentalFeatureEnabled } from '../../../hooks/use_experimental_features';
+import { useGetEndpointPendingActionsSummary } from '../../../../management/hooks/response_actions/use_get_endpoint_pending_actions_summary';
+import { useTestIdGenerator } from '../../../../management/hooks/use_test_id_generator';
+import type { HostInfo, EndpointPendingActions } from '../../../../../common/endpoint/types';
+import { useGetEndpointDetails } from '../../../../management/hooks';
+import { getAgentStatusText } from '../agent_status_text';
+
+const TOOLTIP_CONTENT_STYLES: React.CSSProperties = Object.freeze({ width: 150 });
+const ISOLATING_LABEL = i18n.translate(
+  'xpack.securitySolution.endpoint.agentAndActionsStatus.isIsolating',
+  { defaultMessage: 'Isolating' }
+);
+const RELEASING_LABEL = i18n.translate(
+  'xpack.securitySolution.endpoint.agentAndActionsStatus.isUnIsolating',
+  { defaultMessage: 'Releasing' }
+);
+const ISOLATED_LABEL = i18n.translate(
+  'xpack.securitySolution.endpoint.agentAndActionsStatus.isolated',
+  { defaultMessage: 'Isolated' }
+);
+
+const EuiFlexGroupStyled = styled(EuiFlexGroup)`
+  .isolation-status {
+    margin-left: ${({ theme }) => theme.eui.euiSizeS};
+  }
+`;
+
+export interface EndpointAgentStatusProps {
+  endpointHostInfo: HostInfo;
+  /**
+   * If set to `true` (Default), then the endpoint isolation state and response actions count
+   * will be kept up to date by querying the API periodically.
+   * Only used if `pendingActions` is not defined.
+   */
+  autoRefresh?: boolean;
+  /**
+   * The pending actions for the host (as return by the pending actions summary api).
+   * If undefined, then this component will call the API to retrieve that list of pending actions.
+   * NOTE: if this prop is defined, it will invalidate `autoRefresh` prop.
+   */
+  pendingActions?: EndpointPendingActions['pending_actions'];
+  'data-test-subj'?: string;
+}
+
+/**
+ * Displays the status of an Endpoint agent along with its Isolation state or the number of pending
+ * response actions against it.
+ *
+ * TIP: if you only have the Endpoint's `agent.id`, then consider using `EndpointAgentStatusById`,
+ * which will call the needed APIs to get the information necessary to display the status.
+ */
+export const EndpointAgentStatus = memo<EndpointAgentStatusProps>(
+  ({ endpointHostInfo, autoRefresh = true, pendingActions, 'data-test-subj': dataTestSubj }) => {
+    const getTestId = useTestIdGenerator(dataTestSubj);
+    const { data: endpointPendingActions } = useGetEndpointPendingActionsSummary(
+      [endpointHostInfo.metadata.agent.id],
+      {
+        refetchInterval: autoRefresh ? DEFAULT_POLL_INTERVAL : false,
+        enabled: !pendingActions,
+      }
+    );
+
+    const [hasPendingActions, hostPendingActions] = useMemo<
+      [boolean, EndpointPendingActions['pending_actions']]
+    >(() => {
+      if (!endpointPendingActions && !pendingActions) {
+        return [false, {}];
+      }
+
+      const pending = pendingActions
+        ? pendingActions
+        : endpointPendingActions?.data[0].pending_actions ?? {};
+
+      return [Object.keys(pending).length > 0, pending];
+    }, [endpointPendingActions, pendingActions]);
+
+    const status = endpointHostInfo.host_status;
+    const isIsolated = Boolean(endpointHostInfo.metadata.Endpoint.state?.isolation);
+
+    return (
+      <EuiFlexGroupStyled
+        gutterSize="none"
+        responsive={false}
+        className="eui-textTruncate"
+        data-test-subj={dataTestSubj}
+      >
+        <EuiFlexItem grow={false}>
+          <EuiBadge
+            color={status != null ? HOST_STATUS_TO_BADGE_COLOR[status] : 'warning'}
+            data-test-subj={getTestId('agentStatus')}
+            className="eui-textTruncate"
+          >
+            {getAgentStatusText(status)}
+          </EuiBadge>
+        </EuiFlexItem>
+        {(isIsolated || hasPendingActions) && (
+          <EuiFlexItem grow={false} className="eui-textTruncate isolation-status">
+            <EndpointHostResponseActionsStatus
+              data-test-subj={getTestId('actionStatuses')}
+              isIsolated={isIsolated}
+              pendingActions={hostPendingActions}
+            />
+          </EuiFlexItem>
+        )}
+      </EuiFlexGroupStyled>
+    );
+  }
+);
+EndpointAgentStatus.displayName = 'EndpointAgentStatus';
+
+export interface EndpointAgentStatusByIdProps {
+  endpointAgentId: string;
+  /**
+   * If set to `true` (Default), then the endpoint status and isolation/action counts will
+   * be kept up to date by querying the API periodically
+   */
+  autoFresh?: boolean;
+  'data-test-subj'?: string;
+}
+
+/**
+ * Given an Endpoint Agent Id, it will make the necessary API calls and then display the agent
+ * status using the `<EndpointAgentStatus />` component.
+ *
+ * NOTE: if the `HostInfo` is already available, consider using `<EndpointAgentStatus/>` component
+ * instead in order to avoid duplicate API calls.
+ */
+export const EndpointAgentStatusById = memo<EndpointAgentStatusByIdProps>(
+  ({ endpointAgentId, autoFresh, 'data-test-subj': dataTestSubj }) => {
+    const { data } = useGetEndpointDetails(endpointAgentId, {
+      refetchInterval: autoFresh ? DEFAULT_POLL_INTERVAL : false,
+    });
+
+    const emptyValue = (
+      <EuiText size="xs" data-test-subj={dataTestSubj}>
+        <p>{getEmptyValue()}</p>
+      </EuiText>
+    );
+
+    if (!data) {
+      return emptyValue;
+    }
+
+    return (
+      <EndpointAgentStatus
+        endpointHostInfo={data}
+        data-test-subj={dataTestSubj}
+        autoRefresh={autoFresh}
+      />
+    );
+  }
+);
+EndpointAgentStatusById.displayName = 'EndpointAgentStatusById';
+
+interface EndpointHostResponseActionsStatusProps {
+  /** The host's individual pending action list as return by the pending action summary api */
+  pendingActions: EndpointPendingActions['pending_actions'];
+  /** Is host currently isolated */
+  isIsolated: boolean;
+  'data-test-subj'?: string;
+}
+
+const EndpointHostResponseActionsStatus = memo<EndpointHostResponseActionsStatusProps>(
+  ({ pendingActions, isIsolated, 'data-test-subj': dataTestSubj }) => {
+    const getTestId = useTestIdGenerator(dataTestSubj);
+    const isPendingStatusDisabled = useIsExperimentalFeatureEnabled(
+      'disableIsolationUIPendingStatuses'
+    );
+
+    interface PendingActionsState {
+      actionList: Array<{ label: string; count: number }>;
+      totalPending: number;
+      wasReleasing: boolean;
+      wasIsolating: boolean;
+      hasMultipleActionTypesPending: boolean;
+      hasPendingIsolate: boolean;
+      hasPendingUnIsolate: boolean;
+    }
+
+    const {
+      totalPending,
+      actionList,
+      wasReleasing,
+      wasIsolating,
+      hasMultipleActionTypesPending,
+      hasPendingIsolate,
+      hasPendingUnIsolate,
+    } = useMemo<PendingActionsState>(() => {
+      const list: Array<{ label: string; count: number }> = [];
+      let actionTotal = 0;
+      let actionTypesCount = 0;
+
+      Object.entries(pendingActions)
+        .sort()
+        .forEach(([actionName, actionCount]) => {
+          actionTotal += actionCount;
+          actionTypesCount += 1;
+
+          list.push({
+            count: actionCount,
+            label:
+              RESPONSE_ACTION_API_COMMANDS_TO_CONSOLE_COMMAND_MAP[
+                actionName as ResponseActionsApiCommandNames
+              ] ?? actionName,
+          });
+        });
+
+      const pendingIsolate = pendingActions.isolate ?? 0;
+      const pendingUnIsolate = pendingActions.unisolate ?? 0;
+
+      return {
+        actionList: list,
+        totalPending: actionTotal,
+        wasReleasing: pendingIsolate === 0 && pendingUnIsolate > 0,
+        wasIsolating: pendingIsolate > 0 && pendingUnIsolate === 0,
+        hasMultipleActionTypesPending: actionTypesCount > 1,
+        hasPendingIsolate: pendingIsolate > 0,
+        hasPendingUnIsolate: pendingUnIsolate > 0,
+      };
+    }, [pendingActions]);
+
+    const badgeDisplayValue = useMemo(() => {
+      return hasPendingIsolate ? (
+        ISOLATING_LABEL
+      ) : hasPendingUnIsolate ? (
+        RELEASING_LABEL
+      ) : isIsolated ? (
+        ISOLATED_LABEL
+      ) : (
+        <FormattedMessage
+          id="xpack.securitySolution.endpoint.agentAndActionsStatus.multiplePendingActions"
+          defaultMessage="{count} {count, plural, one {action} other {actions}} pending"
+          values={{
+            count: totalPending,
+          }}
+        />
+      );
+    }, [hasPendingIsolate, hasPendingUnIsolate, isIsolated, totalPending]);
+
+    const isolatedBadge = useMemo(() => {
+      return (
+        <EuiBadge color="hollow" data-test-subj={dataTestSubj}>
+          {ISOLATED_LABEL}
+        </EuiBadge>
+      );
+    }, [dataTestSubj]);
+
+    if (isPendingStatusDisabled) {
+      // If nothing is pending and host is not currently isolated, then render nothing
+      if (!isIsolated) {
+        return null;
+      }
+
+      return isolatedBadge;
+    }
+
+    // If nothing is pending
+    if (totalPending === 0) {
+      // and host is either releasing and or currently released, then render nothing
+      if ((!wasIsolating && wasReleasing) || !isIsolated) {
+        return null;
+      }
+      // else host was isolating or is isolated, then show isolation badge
+      else if ((!isIsolated && wasIsolating && !wasReleasing) || isIsolated) {
+        return isolatedBadge;
+      }
+    }
+
+    // If there are different types of action pending
+    //    --OR--
+    // the only type of actions pending is NOT isolate/release,
+    // then show a summary with tooltip
+    if (hasMultipleActionTypesPending || (!hasPendingIsolate && !hasPendingUnIsolate)) {
+      return (
+        <EuiBadge color="hollow" data-test-subj={dataTestSubj} iconType="plus" iconSide="right">
+          <EuiToolTip
+            display="block"
+            anchorClassName="eui-textTruncate"
+            anchorProps={{ 'data-test-subj': getTestId('tooltipTrigger') }}
+            content={
+              <div style={TOOLTIP_CONTENT_STYLES} data-test-subj={`${dataTestSubj}-tooltipContent`}>
+                <div>
+                  <FormattedMessage
+                    id="xpack.securitySolution.endpoint.agentAndActionsStatus.tooltipPendingActions"
+                    defaultMessage="Pending actions:"
+                  />
+                </div>
+                {actionList.map(({ count, label }) => {
+                  return (
+                    <EuiFlexGroup gutterSize="none" key={label}>
+                      <EuiFlexItem>{label}</EuiFlexItem>
+                      <EuiFlexItem grow={false}>{count}</EuiFlexItem>
+                    </EuiFlexGroup>
+                  );
+                })}
+              </div>
+            }
+          >
+            <EuiTextColor color="subdued" data-test-subj={`${dataTestSubj}-pending`}>
+              {badgeDisplayValue}
+            </EuiTextColor>
+          </EuiToolTip>
+        </EuiBadge>
+      );
+    }
+
+    // show pending isolation badge if a single type of isolation action has pending numbers.
+    // We don't care about the count here because if there were more than 1 of the same type
+    // (ex. 3 isolate... 0 release), then the action status displayed is still the same - "isolating".
+    return (
+      <EuiBadge color="hollow" data-test-subj={dataTestSubj}>
+        <EuiTextColor color="subdued" data-test-subj={getTestId('pending')}>
+          {badgeDisplayValue}
+        </EuiTextColor>
+      </EuiBadge>
+    );
+  }
+);
+EndpointHostResponseActionsStatus.displayName = 'EndpointHostResponseActionsStatus';
diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_agent_and_isolation_status/index.ts b/x-pack/plugins/security_solution/public/common/components/endpoint/endpoint_agent_status/index.ts
similarity index 57%
rename from x-pack/plugins/security_solution/public/management/components/endpoint_agent_and_isolation_status/index.ts
rename to x-pack/plugins/security_solution/public/common/components/endpoint/endpoint_agent_status/index.ts
index 8379f425733cb..1d94de32e333c 100644
--- a/x-pack/plugins/security_solution/public/management/components/endpoint_agent_and_isolation_status/index.ts
+++ b/x-pack/plugins/security_solution/public/common/components/endpoint/endpoint_agent_status/index.ts
@@ -5,5 +5,5 @@
  * 2.0.
  */
 
-export { EndpointAgentAndIsolationStatus } from './endpoint_agent_and_isolation_status';
-export type { EndpointAgentAndIsolationStatusProps } from './endpoint_agent_and_isolation_status';
+export * from './endpoint_agent_status';
+export type { EndpointAgentStatusProps } from './endpoint_agent_status';
diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_status.test.tsx b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_status.test.tsx
deleted file mode 100644
index 7f4cee7fa8973..0000000000000
--- a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_status.test.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * 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 type { EndpointHostIsolationStatusProps } from './endpoint_host_isolation_status';
-import { EndpointHostIsolationStatus } from './endpoint_host_isolation_status';
-import type { AppContextTestRender } from '../../../mock/endpoint';
-import { createAppRootMockRenderer } from '../../../mock/endpoint';
-
-describe('when using the EndpointHostIsolationStatus component', () => {
-  let render: (
-    renderProps?: Partial<EndpointHostIsolationStatusProps>
-  ) => ReturnType<AppContextTestRender['render']>;
-  let appContext: AppContextTestRender;
-
-  beforeEach(() => {
-    appContext = createAppRootMockRenderer();
-
-    render = (renderProps = {}) =>
-      appContext.render(
-        <EndpointHostIsolationStatus
-          {...{
-            'data-test-subj': 'test',
-            isIsolated: false,
-            pendingActions: {},
-            ...renderProps,
-          }}
-        />
-      );
-  });
-
-  it('should render `null` if not isolated and nothing is pending', () => {
-    const renderResult = render();
-    expect(renderResult.container.textContent).toBe('');
-  });
-
-  it('should show `Isolated` when no pending actions and isolated', () => {
-    const { getByTestId } = render({ isIsolated: true });
-    expect(getByTestId('test').textContent).toBe('Isolated');
-  });
-
-  it.each([
-    [
-      'Isolating',
-      {
-        pendingActions: {
-          pendingIsolate: 1,
-        },
-      },
-    ],
-    [
-      'Releasing',
-      {
-        pendingActions: {
-          pendingUnIsolate: 1,
-        },
-      },
-    ],
-    [
-      // Because they are both of the same type and there are no other types,
-      // the status should be `isolating`
-      'Isolating',
-      {
-        pendingActions: {
-          pendingIsolate: 2,
-        },
-      },
-    ],
-    [
-      // Because they are both of the same type and there are no other types,
-      // the status should be `Releasing`
-      'Releasing',
-      {
-        pendingActions: {
-          pendingUnIsolate: 2,
-        },
-      },
-    ],
-    [
-      '10 actions pending',
-      {
-        isIsolated: true,
-        pendingActions: {
-          pendingIsolate: 2,
-          pendingUnIsolate: 2,
-          pendingKillProcess: 2,
-          pendingSuspendProcess: 2,
-          pendingRunningProcesses: 2,
-        },
-      },
-    ],
-    [
-      '1 action pending',
-      {
-        isIsolated: true,
-        pendingActions: {
-          pendingKillProcess: 1,
-        },
-      },
-    ],
-  ])('should show %s}', (expectedLabel, componentProps) => {
-    const { getByTestId } = render(componentProps);
-    expect(getByTestId('test').textContent).toBe(expectedLabel);
-    // Validate that the text color is set to `subdued`
-    expect(getByTestId('test-pending').classList.toString().includes('subdued')).toBe(true);
-  });
-
-  describe('and the disableIsolationUIPendingStatuses experimental feature flag is true', () => {
-    beforeEach(() => {
-      appContext.setExperimentalFlag({ disableIsolationUIPendingStatuses: true });
-    });
-
-    it('should render `null` if not isolated', () => {
-      const renderResult = render({
-        pendingActions: {
-          pendingIsolate: 10,
-          pendingUnIsolate: 20,
-        },
-      });
-      expect(renderResult.container.textContent).toBe('');
-    });
-
-    it('should show `Isolated` when no pending actions and isolated', () => {
-      const { getByTestId } = render({
-        isIsolated: true,
-        pendingActions: {
-          pendingIsolate: 10,
-          pendingUnIsolate: 20,
-        },
-      });
-      expect(getByTestId('test').textContent).toBe('Isolated');
-    });
-  });
-});
diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_status.tsx b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_status.tsx
deleted file mode 100644
index 650999029c545..0000000000000
--- a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_status.tsx
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * 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, { memo, useMemo, useRef, useEffect } from 'react';
-import { EuiBadge, EuiTextColor } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n-react';
-import { useTestIdGenerator } from '../../../../management/hooks/use_test_id_generator';
-import { useIsExperimentalFeatureEnabled } from '../../../hooks/use_experimental_features';
-import { AgentPendingActionStatusBadge } from '../agent_pending_action_status_badge';
-
-export interface EndpointHostIsolationStatusProps {
-  isIsolated: boolean;
-  pendingActions: {
-    /** the count of pending isolate actions */
-    pendingIsolate?: number;
-    /** the count of pending unisolate actions */
-    pendingUnIsolate?: number;
-    pendingKillProcess?: number;
-    pendingSuspendProcess?: number;
-    pendingRunningProcesses?: number;
-  };
-  'data-test-subj'?: string;
-}
-
-/**
- * Component will display a host isolation status based on whether it is currently isolated or there are
- * isolate/unisolate actions pending. If none of these are applicable, no UI component will be rendered
- * (`null` is returned)
- */
-export const EndpointHostIsolationStatus = memo<EndpointHostIsolationStatusProps>(
-  ({ isIsolated, pendingActions, 'data-test-subj': dataTestSubj }) => {
-    const getTestId = useTestIdGenerator(dataTestSubj);
-    const isPendingStatusDisabled = useIsExperimentalFeatureEnabled(
-      'disableIsolationUIPendingStatuses'
-    );
-
-    const {
-      pendingIsolate = 0,
-      pendingUnIsolate = 0,
-      pendingKillProcess = 0,
-      pendingSuspendProcess = 0,
-      pendingRunningProcesses = 0,
-    } = pendingActions;
-
-    const wasReleasing = useRef<boolean>(false);
-    const wasIsolating = useRef<boolean>(false);
-
-    const totalPending = useMemo(
-      () =>
-        pendingIsolate +
-        pendingUnIsolate +
-        pendingKillProcess +
-        pendingSuspendProcess +
-        pendingRunningProcesses,
-      [
-        pendingIsolate,
-        pendingKillProcess,
-        pendingRunningProcesses,
-        pendingSuspendProcess,
-        pendingUnIsolate,
-      ]
-    );
-
-    const hasMultipleActionTypesPending = useMemo<boolean>(() => {
-      return (
-        Object.values(pendingActions).reduce((countOfTypes, pendingActionCount) => {
-          if (pendingActionCount > 0) {
-            return countOfTypes + 1;
-          }
-          return countOfTypes;
-        }, 0) > 1
-      );
-    }, [pendingActions]);
-
-    useEffect(() => {
-      wasReleasing.current = pendingIsolate === 0 && pendingUnIsolate > 0;
-      wasIsolating.current = pendingIsolate > 0 && pendingUnIsolate === 0;
-    }, [pendingIsolate, pendingUnIsolate]);
-
-    return useMemo(() => {
-      if (isPendingStatusDisabled) {
-        // If nothing is pending and host is not currently isolated, then render nothing
-        if (!isIsolated) {
-          return null;
-        }
-
-        return (
-          <EuiBadge color="hollow" data-test-subj={dataTestSubj}>
-            <FormattedMessage
-              id="xpack.securitySolution.endpoint.hostIsolationStatus.isolated"
-              defaultMessage="Isolated"
-            />
-          </EuiBadge>
-        );
-      }
-
-      // If nothing is pending
-      if (totalPending === 0) {
-        // and host is either releasing and or currently released, then render nothing
-        if ((!wasIsolating.current && wasReleasing.current) || !isIsolated) {
-          return null;
-        }
-        // else host was isolating or is isolated, then show isolation badge
-        else if ((!isIsolated && wasIsolating.current && !wasReleasing.current) || isIsolated) {
-          return (
-            <EuiBadge color="hollow" data-test-subj={dataTestSubj}>
-              <FormattedMessage
-                id="xpack.securitySolution.endpoint.hostIsolationStatus.isolated"
-                defaultMessage="Isolated"
-              />
-            </EuiBadge>
-          );
-        }
-      }
-
-      // If there are different types of action pending
-      //    --OR--
-      // the only type of actions pending is NOT isolate/release,
-      // then show a summary with tooltip
-      if (hasMultipleActionTypesPending || (!pendingIsolate && !pendingUnIsolate)) {
-        return (
-          <AgentPendingActionStatusBadge
-            data-test-subj={dataTestSubj}
-            pendingActions={pendingActions}
-          />
-        );
-      }
-
-      // show pending isolation badge if a single type of isolation action has pending numbers.
-      // We don't care about the count here because if there were more than 1 of the same type
-      // (ex. 3 isolate... 0 release), then the action status displayed is still the same - "isolating".
-      return (
-        <EuiBadge color="hollow" data-test-subj={dataTestSubj}>
-          <EuiTextColor color="subdued" data-test-subj={getTestId('pending')}>
-            {pendingIsolate ? (
-              <FormattedMessage
-                id="xpack.securitySolution.endpoint.hostIsolationStatus.isIsolating"
-                defaultMessage="Isolating"
-              />
-            ) : (
-              <FormattedMessage
-                id="xpack.securitySolution.endpoint.hostIsolationStatus.isUnIsolating"
-                defaultMessage="Releasing"
-              />
-            )}
-          </EuiTextColor>
-        </EuiBadge>
-      );
-    }, [
-      isPendingStatusDisabled,
-      totalPending,
-      hasMultipleActionTypesPending,
-      pendingIsolate,
-      pendingUnIsolate,
-      dataTestSubj,
-      getTestId,
-      isIsolated,
-      pendingActions,
-    ]);
-  }
-);
-
-EndpointHostIsolationStatus.displayName = 'EndpointHostIsolationStatus';
diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/index.ts b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/index.ts
index 24b94cd6212b7..41763a6e88d37 100644
--- a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/index.ts
+++ b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/index.ts
@@ -8,5 +8,4 @@
 export * from './isolate_success';
 export * from './isolate_form';
 export * from './unisolate_form';
-export * from './endpoint_host_isolation_status';
 export * from './action_completion_return_button';
diff --git a/x-pack/plugins/security_solution/public/detections/pages/alert_details/tabs/summary/host_panel/host_panel.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/alert_details/tabs/summary/host_panel/host_panel.test.tsx
index edca07bd3426f..210c700c2eb37 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/alert_details/tabs/summary/host_panel/host_panel.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/alert_details/tabs/summary/host_panel/host_panel.test.tsx
@@ -20,6 +20,28 @@ import { getTimelineEventData } from '../../../utils/get_timeline_event_data';
 import { RiskSeverity } from '../../../../../../../common/search_strategy';
 import { useRiskScore } from '../../../../../../explore/containers/risk_score';
 
+jest.mock('../../../../../../management/hooks', () => {
+  const Generator = jest.requireActual(
+    '../../../../../../../common/endpoint/data_generators/endpoint_metadata_generator'
+  );
+
+  return {
+    useGetEndpointDetails: jest.fn(() => {
+      return {
+        data: new Generator.EndpointMetadataGenerator('seed').generateHostInfo({
+          metadata: {
+            Endpoint: {
+              state: {
+                isolation: true,
+              },
+            },
+          },
+        }),
+      };
+    }),
+  };
+});
+
 jest.mock('../../../../../../explore/containers/risk_score');
 const mockUseRiskScore = useRiskScore as jest.Mock;
 
@@ -76,7 +98,7 @@ describe('AlertDetailsPage - SummaryTab - HostPanel', () => {
   describe('Agent status', () => {
     it('should show healthy', () => {
       const { getByTestId } = render(<HostPanelWithDefaultProps />);
-      expect(getByTestId('host-panel-agent-status')).toHaveTextContent('Healthy');
+      expect(getByTestId('endpointHostAgentStatus').textContent).toEqual('HealthyIsolated');
     });
   });
 
diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_agent_and_isolation_status/endpoint_agent_and_isolation_status.test.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_agent_and_isolation_status/endpoint_agent_and_isolation_status.test.tsx
deleted file mode 100644
index 742f5515e7ade..0000000000000
--- a/x-pack/plugins/security_solution/public/management/components/endpoint_agent_and_isolation_status/endpoint_agent_and_isolation_status.test.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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 { AppContextTestRender } from '../../../common/mock/endpoint';
-import { createAppRootMockRenderer } from '../../../common/mock/endpoint';
-import type { EndpointAgentAndIsolationStatusProps } from './endpoint_agent_and_isolation_status';
-import { EndpointAgentAndIsolationStatus } from './endpoint_agent_and_isolation_status';
-import { HostStatus } from '../../../../common/endpoint/types';
-import React from 'react';
-
-describe('When using the EndpointAgentAndIsolationStatus component', () => {
-  let render: () => ReturnType<AppContextTestRender['render']>;
-  let renderResult: ReturnType<AppContextTestRender['render']>;
-  let renderProps: EndpointAgentAndIsolationStatusProps;
-
-  beforeEach(() => {
-    const appTestContext = createAppRootMockRenderer();
-
-    renderProps = {
-      status: HostStatus.HEALTHY,
-      'data-test-subj': 'test',
-      pendingActions: {},
-    };
-
-    render = () => {
-      renderResult = appTestContext.render(<EndpointAgentAndIsolationStatus {...renderProps} />);
-      return renderResult;
-    };
-  });
-
-  it('should display host status only when `isIsolated` is undefined', () => {
-    render();
-
-    expect(renderResult.queryByTestId('test-isolationStatus')).toBeNull();
-  });
-
-  it('should display pending status and pending counts', () => {
-    renderProps.isIsolated = true;
-    render();
-
-    expect(renderResult.getByTestId('test-isolationStatus')).toBeTruthy();
-  });
-});
diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_agent_and_isolation_status/endpoint_agent_and_isolation_status.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_agent_and_isolation_status/endpoint_agent_and_isolation_status.tsx
deleted file mode 100644
index 3e80d57d2d70b..0000000000000
--- a/x-pack/plugins/security_solution/public/management/components/endpoint_agent_and_isolation_status/endpoint_agent_and_isolation_status.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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, { memo } from 'react';
-import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import styled from 'styled-components';
-import { useTestIdGenerator } from '../../hooks/use_test_id_generator';
-import type { HostStatus } from '../../../../common/endpoint/types';
-import { AgentStatus } from '../../../common/components/endpoint/agent_status';
-import type { EndpointHostIsolationStatusProps } from '../../../common/components/endpoint/host_isolation';
-import { EndpointHostIsolationStatus } from '../../../common/components/endpoint/host_isolation';
-
-const EuiFlexGroupStyled = styled(EuiFlexGroup)`
-  .isolation-status {
-    margin-left: ${({ theme }) => theme.eui.euiSizeS};
-  }
-`;
-
-export interface EndpointAgentAndIsolationStatusProps
-  extends Pick<EndpointHostIsolationStatusProps, 'pendingActions'> {
-  status: HostStatus;
-  /**
-   * If defined with a boolean, then the isolation status will be shown along with the agent status.
-   * The `pendingIsolate` and `pendingUnIsolate` props will only be used when this prop is set to a
-   * `boolean`
-   */
-  isIsolated?: boolean;
-  'data-test-subj'?: string;
-}
-
-export const EndpointAgentAndIsolationStatus = memo<EndpointAgentAndIsolationStatusProps>(
-  ({ status, isIsolated, pendingActions, 'data-test-subj': dataTestSubj }) => {
-    const getTestId = useTestIdGenerator(dataTestSubj);
-    return (
-      <EuiFlexGroupStyled
-        gutterSize="none"
-        responsive={false}
-        className="eui-textTruncate"
-        data-test-subj={dataTestSubj}
-      >
-        <EuiFlexItem grow={false}>
-          <AgentStatus hostStatus={status} />
-        </EuiFlexItem>
-        {isIsolated !== undefined && (
-          <EuiFlexItem grow={false} className="eui-textTruncate isolation-status">
-            <EndpointHostIsolationStatus
-              data-test-subj={getTestId('isolationStatus')}
-              isIsolated={isIsolated}
-              pendingActions={pendingActions}
-            />
-          </EuiFlexItem>
-        )}
-      </EuiFlexGroupStyled>
-    );
-  }
-);
-EndpointAgentAndIsolationStatus.displayName = 'EndpointAgentAndIsolationStatus';
diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/command_render_components/status_action.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/command_render_components/status_action.tsx
index 94b7aa9dd5160..e901e9b1a116d 100644
--- a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/command_render_components/status_action.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/command_render_components/status_action.tsx
@@ -12,7 +12,6 @@ import { i18n } from '@kbn/i18n';
 import type { IHttpFetchError } from '@kbn/core-http-browser';
 import type { HostInfo, PendingActionsResponse } from '../../../../../common/endpoint/types';
 import type { EndpointCommandDefinitionMeta } from '../types';
-import type { EndpointHostIsolationStatusProps } from '../../../../common/components/endpoint/host_isolation';
 import { useGetEndpointPendingActionsSummary } from '../../../hooks/response_actions/use_get_endpoint_pending_actions_summary';
 import { FormattedDate } from '../../../../common/components/formatted_date';
 import { useGetEndpointDetails } from '../../../hooks';
@@ -53,12 +52,10 @@ export const EndpointStatusActionResult = memo<
     queryKey: [queryKey, endpointId],
   });
 
-  const pendingIsolationActions = useMemo<
-    Pick<
-      Required<EndpointHostIsolationStatusProps['pendingActions']>,
-      'pendingIsolate' | 'pendingUnIsolate'
-    >
-  >(() => {
+  const pendingIsolationActions = useMemo<{
+    pendingIsolate: number;
+    pendingUnIsolate: number;
+  }>(() => {
     if (endpointPendingActions?.data.length) {
       const pendingActions = endpointPendingActions.data[0].pending_actions;
 
diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/components/header_endpoint_info.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/components/header_endpoint_info.tsx
index 2ffcf76b8ba01..b56746e7890a6 100644
--- a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/components/header_endpoint_info.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/components/header_endpoint_info.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { memo, useMemo } from 'react';
+import React, { memo } from 'react';
 import {
   EuiFlexGroup,
   EuiFlexItem,
@@ -17,8 +17,7 @@ import {
 import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { FormattedMessage, FormattedRelative } from '@kbn/i18n-react';
 import { useGetEndpointDetails } from '../../../hooks/endpoint/use_get_endpoint_details';
-import type { EndpointHostIsolationStatusProps } from '../../../../common/components/endpoint/host_isolation';
-import { EndpointAgentAndIsolationStatus } from '../../endpoint_agent_and_isolation_status';
+import { EndpointAgentStatus } from '../../../../common/components/endpoint/endpoint_agent_status';
 import { useGetEndpointPendingActionsSummary } from '../../../hooks/response_actions/use_get_endpoint_pending_actions_summary';
 import type { Platform } from './platforms';
 import { PlatformIcon } from './platforms';
@@ -42,21 +41,6 @@ export const HeaderEndpointInfo = memo<HeaderEndpointInfoProps>(({ endpointId })
     refetchInterval: 10000,
   });
 
-  const pendingActionRequests = useMemo<
-    Pick<Required<EndpointHostIsolationStatusProps>, 'pendingActions'>
-  >(() => {
-    const pendingActions = endpointPendingActions?.data?.[0].pending_actions;
-    return {
-      pendingActions: {
-        pendingIsolate: pendingActions?.isolate ?? 0,
-        pendingUnIsolate: pendingActions?.unisolate ?? 0,
-        pendingKillProcess: pendingActions?.['kill-process'] ?? 0,
-        pendingSuspendProcess: pendingActions?.['suspend-process'] ?? 0,
-        pendingRunningProcesses: pendingActions?.['running-processes'] ?? 0,
-      },
-    };
-  }, [endpointPendingActions?.data]);
-
   if (isFetching && endpointPendingActions === undefined) {
     return <EuiSkeletonText lines={2} />;
   }
@@ -90,10 +74,8 @@ export const HeaderEndpointInfo = memo<HeaderEndpointInfoProps>(({ endpointId })
                 </EuiToolTip>
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
-                <EndpointAgentAndIsolationStatus
-                  status={endpointDetails.host_status}
-                  isIsolated={endpointDetails.metadata.Endpoint.state?.isolation}
-                  {...pendingActionRequests}
+                <EndpointAgentStatus
+                  endpointHostInfo={endpointDetails}
                   data-test-subj="responderHeaderEndpointAgentIsolationStatus"
                 />
               </EuiFlexItem>
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/mocks.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/mocks.ts
index 39bd07d071974..7030f13bdd0f9 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/mocks.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/mocks.ts
@@ -45,7 +45,7 @@ import {
   fleetGetPackagePoliciesListHttpMock,
 } from '../../mocks';
 
-type EndpointMetadataHttpMocksInterface = ResponseProvidersInterface<{
+export type EndpointMetadataHttpMocksInterface = ResponseProvidersInterface<{
   metadataList: () => MetadataListResponse;
   metadataDetails: () => HostInfo;
 }>;
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts
index 29f0d81b96a97..8ad781c60dd20 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts
@@ -113,6 +113,7 @@ export const endpointListReducer: StateReducer = (state = initialEndpointPageSta
       ...state,
       endpointDetails: {
         ...state.endpointDetails,
+        hostInfo: action.payload,
         hostDetails: {
           ...state.endpointDetails.hostDetails,
           details: action.payload.metadata,
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts
index 6431bde743483..1b4c716c37462 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts
@@ -11,7 +11,7 @@ import { createSelector } from 'reselect';
 import { matchPath } from 'react-router-dom';
 import { decode } from '@kbn/rison';
 import type { Query } from '@kbn/es-query';
-import type { Immutable, HostMetadata } from '../../../../../common/endpoint/types';
+import type { Immutable, EndpointPendingActions } from '../../../../../common/endpoint/types';
 import { HostStatus } from '../../../../../common/endpoint/types';
 import type { EndpointState, EndpointIndexUIQueryParams } from '../types';
 import { extractListPaginationParams } from '../../../common/routing';
@@ -29,7 +29,6 @@ import {
 
 import type { ServerApiError } from '../../../../common/types';
 import { isEndpointHostIsolated } from '../../../../common/utils/validators';
-import type { EndpointHostIsolationStatusProps } from '../../../../common/components/endpoint/host_isolation';
 import { EndpointDetailsTabsTypes } from '../view/details/components/endpoint_details_tabs';
 
 export const listData = (state: Immutable<EndpointState>) => state.hosts;
@@ -47,6 +46,9 @@ export const listError = (state: Immutable<EndpointState>) => state.error;
 export const detailsData = (state: Immutable<EndpointState>) =>
   state.endpointDetails.hostDetails.details;
 
+export const fullDetailsHostInfo = (state: Immutable<EndpointState>) =>
+  state.endpointDetails.hostInfo;
+
 export const detailsLoading = (state: Immutable<EndpointState>): boolean =>
   state.endpointDetails.hostDetails.detailsLoading;
 
@@ -266,53 +268,32 @@ export const getEndpointPendingActionsState = (
   return state.endpointPendingActions;
 };
 
+export const getMetadataTransformStats = (state: Immutable<EndpointState>) =>
+  state.metadataTransformStats;
+
+export const metadataTransformStats = (state: Immutable<EndpointState>) =>
+  isLoadedResourceState(state.metadataTransformStats) ? state.metadataTransformStats.data : [];
+
+export const isMetadataTransformStatsLoading = (state: Immutable<EndpointState>) =>
+  isLoadingResourceState(state.metadataTransformStats);
+
 /**
- * Returns a function (callback) that can be used to retrieve the props for the `EndpointHostIsolationStatus`
- * component for a given Endpoint
+ * Returns a function (callback) that can be used to retrieve the list of pending actions against
+ * an endpoint currently displayed in the endpoint list
  */
-export const getEndpointHostIsolationStatusPropsCallback: (
+export const getEndpointPendingActionsCallback: (
   state: Immutable<EndpointState>
-) => (endpoint: HostMetadata) => EndpointHostIsolationStatusProps = createSelector(
+) => (endpointId: string) => EndpointPendingActions['pending_actions'] = createSelector(
   getEndpointPendingActionsState,
   (pendingActionsState) => {
-    return (endpoint: HostMetadata) => {
-      let pendingIsolate = 0;
-      let pendingUnIsolate = 0;
-      let pendingKillProcess = 0;
-      let pendingSuspendProcess = 0;
-      let pendingRunningProcesses = 0;
+    return (endpointId: string) => {
+      let response: EndpointPendingActions['pending_actions'] = {};
 
       if (isLoadedResourceState(pendingActionsState)) {
-        const endpointPendingActions = pendingActionsState.data.get(endpoint.elastic.agent.id);
-
-        if (endpointPendingActions) {
-          pendingIsolate = endpointPendingActions?.isolate ?? 0;
-          pendingUnIsolate = endpointPendingActions?.unisolate ?? 0;
-          pendingKillProcess = endpointPendingActions?.['kill-process'] ?? 0;
-          pendingSuspendProcess = endpointPendingActions?.['suspend-process'] ?? 0;
-          pendingRunningProcesses = endpointPendingActions?.['running-processes'] ?? 0;
-        }
+        response = pendingActionsState.data.get(endpointId) ?? {};
       }
 
-      return {
-        isIsolated: isEndpointHostIsolated(endpoint),
-        pendingActions: {
-          pendingIsolate,
-          pendingUnIsolate,
-          pendingKillProcess,
-          pendingSuspendProcess,
-          pendingRunningProcesses,
-        },
-      };
+      return response;
     };
   }
 );
-
-export const getMetadataTransformStats = (state: Immutable<EndpointState>) =>
-  state.metadataTransformStats;
-
-export const metadataTransformStats = (state: Immutable<EndpointState>) =>
-  isLoadedResourceState(state.metadataTransformStats) ? state.metadataTransformStats.data : [];
-
-export const isMetadataTransformStatsLoading = (state: Immutable<EndpointState>) =>
-  isLoadingResourceState(state.metadataTransformStats);
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts
index 8d7e6b0c4d10b..cdd5020226697 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts
@@ -36,6 +36,9 @@ export interface EndpointState {
   /** api error from retrieving host list */
   error?: ServerApiError;
   endpointDetails: {
+    // Adding `hostInfo` to store full API response in order to support the
+    // refactoring effort with AgentStatus component
+    hostInfo?: HostInfo;
     hostDetails: {
       /** details data for a specific host */
       details?: Immutable<HostMetadata>;
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/endpoint_agent_status.test.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/endpoint_agent_status.test.tsx
deleted file mode 100644
index c4270e8736e83..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/endpoint_agent_status.test.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * 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 type { AppContextTestRender } from '../../../../../common/mock/endpoint';
-import { createAppRootMockRenderer } from '../../../../../common/mock/endpoint';
-import { endpointPageHttpMock } from '../../mocks';
-import { act } from '@testing-library/react';
-import type { EndpointAgentStatusProps } from './endpoint_agent_status';
-import { EndpointAgentStatus } from './endpoint_agent_status';
-import type { HostMetadata } from '../../../../../../common/endpoint/types';
-import { HostStatus } from '../../../../../../common/endpoint/types';
-import { isLoadedResourceState } from '../../../../state';
-import { KibanaServices } from '../../../../../common/lib/kibana';
-
-jest.mock('../../../../../common/lib/kibana');
-
-describe('When using the EndpointAgentStatus component', () => {
-  let render: (
-    props: EndpointAgentStatusProps
-  ) => Promise<ReturnType<AppContextTestRender['render']>>;
-  let waitForAction: AppContextTestRender['middlewareSpy']['waitForAction'];
-  let renderResult: ReturnType<AppContextTestRender['render']>;
-  let httpMocks: ReturnType<typeof endpointPageHttpMock>;
-  let endpointMeta: HostMetadata;
-
-  beforeEach(() => {
-    const mockedContext = createAppRootMockRenderer();
-
-    (KibanaServices.get as jest.Mock).mockReturnValue(mockedContext.startServices);
-    httpMocks = endpointPageHttpMock(mockedContext.coreStart.http);
-    waitForAction = mockedContext.middlewareSpy.waitForAction;
-    endpointMeta = httpMocks.responseProvider.metadataList().data[0].metadata;
-    render = async (props: EndpointAgentStatusProps) => {
-      renderResult = mockedContext.render(<EndpointAgentStatus {...props} />);
-      return renderResult;
-    };
-
-    act(() => {
-      mockedContext.history.push('/administration/endpoints');
-    });
-  });
-
-  it.each([
-    ['Healthy', 'healthy'],
-    ['Unhealthy', 'unhealthy'],
-    ['Updating', 'updating'],
-    ['Offline', 'offline'],
-    ['Inactive', 'inactive'],
-    ['Unhealthy', 'someUnknownValueHere'],
-  ])('should show agent status of %s', async (expectedLabel, hostStatus) => {
-    await render({ hostStatus: hostStatus as HostStatus, endpointMetadata: endpointMeta });
-    expect(renderResult.getByTestId('rowHostStatus').textContent).toEqual(expectedLabel);
-  });
-
-  // FIXME: un-skip test once Islation pending statuses are supported
-  describe.skip('and host is isolated or pending isolation', () => {
-    beforeEach(async () => {
-      // Ensure pending action api sets pending action for the test endpoint metadata
-      const pendingActionsResponseProvider =
-        httpMocks.responseProvider.pendingActions.getMockImplementation();
-      httpMocks.responseProvider.pendingActions.mockImplementation((...args) => {
-        const response = pendingActionsResponseProvider!(...args);
-        response.data.some((pendingAction) => {
-          if (pendingAction.agent_id === endpointMeta.elastic.agent.id) {
-            pendingAction.pending_actions.isolate = 1;
-            return true;
-          }
-          return false;
-        });
-        return response;
-      });
-
-      const loadingPendingActions = waitForAction('endpointPendingActionsStateChanged', {
-        validate: (action) => isLoadedResourceState(action.payload),
-      });
-
-      await render({ hostStatus: HostStatus.HEALTHY, endpointMetadata: endpointMeta });
-      await loadingPendingActions;
-    });
-
-    it('should show host pending action', () => {
-      expect(renderResult.getByTestId('rowIsolationStatus').textContent).toEqual('Isolating');
-    });
-  });
-});
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/endpoint_agent_status.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/endpoint_agent_status.tsx
deleted file mode 100644
index 494545b237052..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/endpoint_agent_status.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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, { memo } from 'react';
-import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import styled from 'styled-components';
-import type { HostInfo, HostMetadata } from '../../../../../../common/endpoint/types';
-import { EndpointHostIsolationStatus } from '../../../../../common/components/endpoint/host_isolation';
-import { useEndpointSelector } from '../hooks';
-import { getEndpointHostIsolationStatusPropsCallback } from '../../store/selectors';
-import { AgentStatus } from '../../../../../common/components/endpoint/agent_status';
-
-const EuiFlexGroupStyled = styled(EuiFlexGroup)`
-  .isolation-status {
-    margin-left: ${({ theme }) => theme.eui.euiSizeS};
-  }
-`;
-
-export interface EndpointAgentStatusProps {
-  hostStatus: HostInfo['host_status'];
-  endpointMetadata: HostMetadata;
-}
-export const EndpointAgentStatus = memo<EndpointAgentStatusProps>(
-  ({ endpointMetadata, hostStatus }) => {
-    const getEndpointIsolationStatusProps = useEndpointSelector(
-      getEndpointHostIsolationStatusPropsCallback
-    );
-
-    return (
-      <EuiFlexGroupStyled gutterSize="none" responsive={false} className="eui-textTruncate">
-        <EuiFlexItem grow={false}>
-          <AgentStatus hostStatus={hostStatus} />
-        </EuiFlexItem>
-        <EuiFlexItem grow={false} className="eui-textTruncate isolation-status">
-          <EndpointHostIsolationStatus
-            data-test-subj="rowIsolationStatus"
-            {...getEndpointIsolationStatusProps(endpointMetadata)}
-          />
-        </EuiFlexItem>
-      </EuiFlexGroupStyled>
-    );
-  }
-);
-
-EndpointAgentStatus.displayName = 'EndpointAgentStatus';
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details_content.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details_content.tsx
index d142e1385e80d..b33f98078b9fb 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details_content.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details_content.tsx
@@ -17,17 +17,23 @@ import {
 } from '@elastic/eui';
 import React, { memo, useMemo } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { EndpointAgentStatus } from '../../../../../common/components/endpoint/endpoint_agent_status';
 import { isPolicyOutOfDate } from '../../utils';
 import type { HostInfo, HostMetadata, HostStatus } from '../../../../../../common/endpoint/types';
 import { useEndpointSelector } from '../hooks';
-import { nonExistingPolicies, policyResponseStatus, uiQueryParams } from '../../store/selectors';
+import {
+  fullDetailsHostInfo,
+  getEndpointPendingActionsCallback,
+  nonExistingPolicies,
+  policyResponseStatus,
+  uiQueryParams,
+} from '../../store/selectors';
 import { POLICY_STATUS_TO_BADGE_COLOR } from '../host_constants';
 import { FormattedDate } from '../../../../../common/components/formatted_date';
 import { useNavigateByRouterEventHandler } from '../../../../../common/hooks/endpoint/use_navigate_by_router_event_handler';
 import { getEndpointDetailsPath } from '../../../../common/routing';
 import { EndpointPolicyLink } from '../../../../components/endpoint_policy_link';
 import { OutOfDate } from '../components/out_of_date';
-import { EndpointAgentStatus } from '../components/endpoint_agent_status';
 
 const EndpointDetailsContentStyled = styled.div`
   dl dt {
@@ -63,8 +69,9 @@ export const EndpointDetailsContent = memo(
     const policyStatus = useEndpointSelector(
       policyResponseStatus
     ) as keyof typeof POLICY_STATUS_TO_BADGE_COLOR;
-
+    const getHostPendingActions = useEndpointSelector(getEndpointPendingActionsCallback);
     const missingPolicies = useEndpointSelector(nonExistingPolicies);
+    const hostInfo = useEndpointSelector(fullDetailsHostInfo);
 
     const policyResponseRoutePath = useMemo(() => {
       // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -101,7 +108,14 @@ export const EndpointDetailsContent = memo(
               />
             </ColumnTitle>
           ),
-          description: <EndpointAgentStatus hostStatus={hostStatus} endpointMetadata={details} />,
+          description: hostInfo ? (
+            <EndpointAgentStatus
+              pendingActions={getHostPendingActions(hostInfo.metadata.agent.id)}
+              endpointHostInfo={hostInfo}
+            />
+          ) : (
+            <></>
+          ),
         },
         {
           title: (
@@ -214,7 +228,15 @@ export const EndpointDetailsContent = memo(
           ),
         },
       ];
-    }, [details, hostStatus, policyStatus, policyStatusClickHandler, policyInfo, missingPolicies]);
+    }, [
+      details,
+      getHostPendingActions,
+      hostInfo,
+      missingPolicies,
+      policyInfo,
+      policyStatus,
+      policyStatusClickHandler,
+    ]);
 
     return (
       <EndpointDetailsContentStyled>
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
index 095f6ce65c9b3..95f63266d4778 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx
@@ -29,6 +29,7 @@ import type {
   CreatePackagePolicyRouteState,
   AgentPolicyDetailsDeployAgentAction,
 } from '@kbn/fleet-plugin/public';
+import { EndpointAgentStatus } from '../../../../common/components/endpoint/endpoint_agent_status';
 import { EndpointDetailsFlyout } from './details';
 import * as selectors from '../store/selectors';
 import { useEndpointSelector } from './hooks';
@@ -60,7 +61,6 @@ import { AdminSearchBar } from './components/search_bar';
 import { AdministrationListPage } from '../../../components/administration_list_page';
 import { LinkToApp } from '../../../../common/components/endpoint/link_to_app';
 import { TableRowActions } from './components/table_row_actions';
-import { EndpointAgentStatus } from './components/endpoint_agent_status';
 import { CallOut } from '../../../../common/components/callouts';
 import { metadataTransformPrefix } from '../../../../../common/endpoint/constants';
 import { WARNING_TRANSFORM_STATES, APP_UI_ID } from '../../../../../common/constants';
@@ -69,6 +69,7 @@ import { BackToExternalAppButton } from '../../../components/back_to_external_ap
 import { ManagementEmptyStateWrapper } from '../../../components/management_empty_state_wrapper';
 import { useUserPrivileges } from '../../../../common/components/user_privileges';
 import { useKibana } from '../../../../common/lib/kibana';
+import { getEndpointPendingActionsCallback } from '../store/selectors';
 const MAX_PAGINATED_ITEM = 9999;
 const TRANSFORM_URL = '/data/transform';
 
@@ -127,6 +128,7 @@ export const EndpointList = () => {
     patternsError,
     metadataTransformStats,
   } = useEndpointSelector(selector);
+  const getHostPendingActions = useEndpointSelector(getEndpointPendingActionsCallback);
   const {
     canReadEndpointList,
     canAccessFleet,
@@ -370,7 +372,11 @@ export const EndpointList = () => {
         }),
         render: (hostStatus: HostInfo['host_status'], endpointInfo) => {
           return (
-            <EndpointAgentStatus hostStatus={hostStatus} endpointMetadata={endpointInfo.metadata} />
+            <EndpointAgentStatus
+              endpointHostInfo={endpointInfo}
+              pendingActions={getHostPendingActions(endpointInfo.metadata.agent.id)}
+              data-test-subj="rowHostStatus"
+            />
           );
         },
       },
@@ -536,7 +542,15 @@ export const EndpointList = () => {
         ],
       },
     ];
-  }, [queryParams, search, getAppUrl, canReadPolicyManagement, backToEndpointList, PAD_LEFT]);
+  }, [
+    queryParams,
+    search,
+    getAppUrl,
+    getHostPendingActions,
+    canReadPolicyManagement,
+    backToEndpointList,
+    PAD_LEFT,
+  ]);
 
   const renderTableOrEmptyState = useMemo(() => {
     if (endpointsExist) {
diff --git a/x-pack/plugins/security_solution/public/overview/components/host_overview/endpoint_overview/index.test.tsx b/x-pack/plugins/security_solution/public/overview/components/host_overview/endpoint_overview/index.test.tsx
index d7591ed353fa9..cc24f8b0dbeba 100644
--- a/x-pack/plugins/security_solution/public/overview/components/host_overview/endpoint_overview/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/host_overview/endpoint_overview/index.test.tsx
@@ -16,6 +16,7 @@ import { EndpointOverview } from '.';
 import type { EndpointFields } from '../../../../../common/search_strategy/security_solution/hosts';
 import { HostPolicyResponseActionStatus } from '../../../../../common/search_strategy/security_solution/hosts';
 import { HostStatus } from '../../../../../common/endpoint/types';
+import { EndpointMetadataGenerator } from '../../../../../common/endpoint/data_generators/endpoint_metadata_generator';
 
 jest.mock('../../../../common/lib/kibana');
 
@@ -44,6 +45,15 @@ describe('EndpointOverview Component', () => {
       isolation: false,
       elasticAgentStatus: HostStatus.HEALTHY,
       pendingActions: {},
+      hostInfo: new EndpointMetadataGenerator('seed').generateHostInfo({
+        metadata: {
+          Endpoint: {
+            state: {
+              isolation: true,
+            },
+          },
+        },
+      }),
     };
   });
 
@@ -52,7 +62,7 @@ describe('EndpointOverview Component', () => {
     expect(findData.at(0).text()).toEqual(endpointData.endpointPolicy);
     expect(findData.at(1).text()).toEqual(endpointData.policyStatus);
     expect(findData.at(2).text()).toContain(endpointData.sensorVersion); // contain because drag adds a space
-    expect(findData.at(3).text()).toEqual('Healthy');
+    expect(findData.at(3).text()).toEqual('HealthyIsolated');
   });
 
   test('it renders with null data', () => {
diff --git a/x-pack/plugins/security_solution/public/overview/components/host_overview/endpoint_overview/index.tsx b/x-pack/plugins/security_solution/public/overview/components/host_overview/endpoint_overview/index.tsx
index 43be986d78500..f62fa5627ebdf 100644
--- a/x-pack/plugins/security_solution/public/overview/components/host_overview/endpoint_overview/index.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/host_overview/endpoint_overview/index.tsx
@@ -9,6 +9,7 @@ import { EuiHealth } from '@elastic/eui';
 import { getOr } from 'lodash/fp';
 import React, { useCallback, useMemo } from 'react';
 
+import { EndpointAgentStatus } from '../../../../common/components/endpoint/endpoint_agent_status';
 import { OverviewDescriptionList } from '../../../../common/components/overview_description_list';
 import type { DescriptionList } from '../../../../../common/utility_types';
 import { getEmptyTagValue } from '../../../../common/components/empty_value';
@@ -16,8 +17,6 @@ import { DefaultFieldRenderer } from '../../../../timelines/components/field_ren
 import * as i18n from './translations';
 import type { EndpointFields } from '../../../../../common/search_strategy/security_solution/hosts';
 import { HostPolicyResponseActionStatus } from '../../../../../common/search_strategy/security_solution/hosts';
-import { AgentStatus } from '../../../../common/components/endpoint/agent_status';
-import { EndpointHostIsolationStatus } from '../../../../common/components/endpoint/host_isolation';
 
 interface Props {
   contextID?: string;
@@ -77,20 +76,11 @@ export const EndpointOverview = React.memo<Props>(({ contextID, data }) => {
         {
           title: i18n.FLEET_AGENT_STATUS,
           description:
-            data != null && data.elasticAgentStatus ? (
-              <>
-                <AgentStatus hostStatus={data.elasticAgentStatus} />
-                <EndpointHostIsolationStatus
-                  isIsolated={Boolean(data.isolation)}
-                  pendingActions={{
-                    pendingIsolate: data.pendingActions?.isolate ?? 0,
-                    pendingUnIsolate: data.pendingActions?.unisolate ?? 0,
-                    pendingKillProcess: data.pendingActions?.['kill-process'] ?? 0,
-                    pendingSuspendProcess: data.pendingActions?.['suspend-process'] ?? 0,
-                    pendingRunningProcesses: data.pendingActions?.['running-processes'] ?? 0,
-                  }}
-                />
-              </>
+            data != null && data.hostInfo ? (
+              <EndpointAgentStatus
+                endpointHostInfo={data.hostInfo}
+                data-test-subj="endpointHostAgentStatus"
+              />
             ) : (
               getEmptyTagValue()
             ),
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/agent_statuses.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/agent_statuses.tsx
deleted file mode 100644
index 5ef421d057a4a..0000000000000
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/agent_statuses.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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 { EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
-import { EndpointHostIsolationStatus } from '../../../../../common/components/endpoint/host_isolation';
-import { useHostIsolationStatus } from '../../../../../detections/containers/detection_engine/alerts/use_host_isolation_status';
-import { AgentStatus } from '../../../../../common/components/endpoint/agent_status';
-import { EMPTY_STATUS } from './translations';
-
-export const AgentStatuses = React.memo(
-  ({
-    fieldName,
-    contextId,
-    eventId,
-    fieldType,
-    isAggregatable,
-    isDraggable,
-    value,
-  }: {
-    fieldName: string;
-    fieldType: string;
-    contextId: string;
-    eventId: string;
-    isAggregatable: boolean;
-    isDraggable: boolean;
-    value: string;
-  }) => {
-    const { isIsolated, agentStatus, pendingIsolation, pendingUnisolation } =
-      useHostIsolationStatus({ agentId: value });
-    return (
-      <EuiFlexGroup gutterSize="none">
-        {agentStatus !== undefined ? (
-          <EuiFlexItem grow={false}>
-            <AgentStatus hostStatus={agentStatus} />
-          </EuiFlexItem>
-        ) : (
-          <EuiText>
-            <p>{EMPTY_STATUS}</p>
-          </EuiText>
-        )}
-        <EuiFlexItem grow={false}>
-          <EndpointHostIsolationStatus
-            isIsolated={isIsolated}
-            pendingActions={{
-              pendingIsolate: pendingIsolation,
-              pendingUnIsolate: pendingUnisolation,
-            }}
-          />
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    );
-  }
-);
-
-AgentStatuses.displayName = 'AgentStatuses';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx
index 1fe2a6b658791..bf216c55f721f 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx
@@ -12,6 +12,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
 import { isNumber, isEmpty } from 'lodash/fp';
 import React from 'react';
 
+import { EndpointAgentStatusById } from '../../../../../common/components/endpoint/endpoint_agent_status';
 import { INDICATOR_REFERENCE } from '../../../../../../common/cti/constants';
 import { DefaultDraggable } from '../../../../../common/components/draggables';
 import { Bytes, BYTES_FORMAT } from './bytes';
@@ -40,7 +41,6 @@ import {
 import { RenderRuleName, renderEventModule, renderUrl } from './formatted_field_helpers';
 import { RuleStatus } from './rule_status';
 import { HostName } from './host_name';
-import { AgentStatuses } from './agent_statuses';
 import { UserName } from './user_name';
 
 // simple black-list to prevent dragging and dropping fields such as message name
@@ -240,14 +240,9 @@ const FormattedFieldValueComponent: React.FC<{
     );
   } else if (fieldName === AGENT_STATUS_FIELD_NAME) {
     return (
-      <AgentStatuses
-        contextId={contextId}
-        eventId={eventId}
-        fieldName={fieldName}
-        fieldType={fieldType}
-        isAggregatable={isAggregatable}
-        isDraggable={isDraggable}
-        value={typeof value === 'string' ? value : ''}
+      <EndpointAgentStatusById
+        endpointAgentId={String(value ?? '')}
+        data-test-subj="endpointHostAgentStatus"
       />
     );
   } else if (
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/translations.ts b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/translations.ts
index d303fe45bba53..e58a4ceefd46c 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/translations.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/translations.ts
@@ -40,16 +40,3 @@ export const LINK_ELASTIC_ENDPOINT_SECURITY = i18n.translate(
     defaultMessage: 'Open in Endpoint Security',
   }
 );
-
-export const EMPTY_STATUS = i18n.translate(
-  'xpack.securitySolution.hostIsolation.agentStatuses.empty',
-  {
-    defaultMessage: '-',
-  }
-);
-
-export const REASON_RENDERER_TITLE = (eventRendererName: string) =>
-  i18n.translate('xpack.securitySolution.event.reason.reasonRendererTitle', {
-    values: { eventRendererName },
-    defaultMessage: 'Event renderer: {eventRendererName} ',
-  });
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/helpers.ts
index aa07acd20c896..66f36a9052bb5 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/helpers.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/details/helpers.ts
@@ -201,6 +201,7 @@ export const getHostEndpoint = async (
       : {};
 
     return {
+      hostInfo: endpointData,
       endpointPolicy: endpointData.metadata.Endpoint.policy.applied.name,
       policyStatus: endpointData.metadata.Endpoint.policy.applied.status,
       sensorVersion: endpointData.metadata.agent.version,
diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
index 05a0176af89d8..72cfaa355835f 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -27987,7 +27987,6 @@
     "xpack.securitySolution.endpoint.hostIsolation.successfulIsolation.cases": "Cette action a été attachée {caseCount, plural, one {au cas suivant} other {aux cas suivants}} :",
     "xpack.securitySolution.endpoint.hostIsolation.unisolate.successfulMessage": "La libération de l'hôte {hostName} a été soumise avec succès",
     "xpack.securitySolution.endpoint.hostIsolation.unIsolateThisHost": "{hostName} est actuellement {isolated}. Voulez-vous vraiment {unisolate} cet hôte ?",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.multiplePendingActions": "{count} {count, plural, one {action} other {actions}} en attente",
     "xpack.securitySolution.endpoint.list.hostStatusValue": "{hostStatus, select, healthy {Sain} unhealthy {Défectueux} updating {En cours de mise à jour} offline {Hors ligne} inactive {Inactif} unenrolled {Désinscrit} other {Défectueux}}",
     "xpack.securitySolution.endpoint.list.policy.revisionNumber": "rév. {revNumber}",
     "xpack.securitySolution.endpoint.list.totalCount": "Affichage de {totalItemCount, plural, one {# point de terminaison} other {# points de terminaison}}",
@@ -28063,7 +28062,6 @@
     "xpack.securitySolution.entityAnalytics.riskDashboard.nameTitle": "Nom de {riskEntity}",
     "xpack.securitySolution.entityAnalytics.riskDashboard.riskClassificationTitle": "Classification de risque de {riskEntity}",
     "xpack.securitySolution.entityAnalytics.riskDashboard.riskToolTip": "La classification de risque de {riskEntity} est déterminée par le score de risque de {riskEntityLowercase}. Les {riskEntity} classées comme Critique ou Élevée sont indiquées comme étant à risque.",
-    "xpack.securitySolution.event.reason.reasonRendererTitle": "Outils de rendu d'événement : {eventRendererName} ",
     "xpack.securitySolution.eventDetails.nestedColumnCheckboxAriaLabel": "Le champ {field} est un objet, et il est composé de champs imbriqués qui peuvent être ajoutés en tant que colonne",
     "xpack.securitySolution.eventDetails.viewColumnCheckboxAriaLabel": "Afficher la colonne {field}",
     "xpack.securitySolution.eventFilter.flyoutForm.creationSuccessToastTitle": "\"{name}\" a été ajouté à la liste de filtres d'événements.",
@@ -30387,15 +30385,6 @@
     "xpack.securitySolution.endpoint.hostisolation.unisolate": "libération",
     "xpack.securitySolution.endpoint.hostIsolation.unisolateHost": "Libérer l'hôte",
     "xpack.securitySolution.endpoint.hostIsolationExceptions.fleetIntegration.title": "Exceptions d'isolation de l'hôte",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.isIsolating": "Isolation",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.isolated": "Isolé",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.isUnIsolating": "Libération",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.tooltipPendingActions": "Actions en attente :",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.tooltipPendingIsolate": "Isoler",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.tooltipPendingKillProcess": "Arrêter le processus",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.tooltipPendingRunningProcesses": "Processus",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.tooltipPendingSuspendProcess": "Suspendre le processus",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.tooltipPendingUnIsolate": "Libération",
     "xpack.securitySolution.endpoint.ingestManager.createPackagePolicy.environments": "protéger vos points de terminaison traditionnels ou vos environnements cloud dynamiques",
     "xpack.securitySolution.endpoint.ingestManager.createPackagePolicy.seeDocumentationLink": "documentation",
     "xpack.securitySolution.endpoint.list.actionmenu": "Ouvrir",
@@ -31211,7 +31200,6 @@
     "xpack.securitySolution.host.details.overview.platformTitle": "Plateforme",
     "xpack.securitySolution.host.details.overview.regionTitle": "Région",
     "xpack.securitySolution.host.details.versionLabel": "Version",
-    "xpack.securitySolution.hostIsolation.agentStatuses.empty": "-",
     "xpack.securitySolution.hostIsolationExceptions.cardActionDeleteLabel": "Supprimer l'exception",
     "xpack.securitySolution.hostIsolationExceptions.cardActionEditLabel": "Modifier l'exception",
     "xpack.securitySolution.hostIsolationExceptions.deleteModtalTitle": "Supprimer l'exception d'isolation de l'hôte",
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 6eaa5a4584e7d..5636aeac2d32d 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -27966,7 +27966,6 @@
     "xpack.securitySolution.endpoint.hostIsolation.successfulIsolation.cases": "このアクションは次の{caseCount, plural, other {ケース}}に関連付けられました：",
     "xpack.securitySolution.endpoint.hostIsolation.unisolate.successfulMessage": "ホスト{hostName}でのリリースは正常に送信されました",
     "xpack.securitySolution.endpoint.hostIsolation.unIsolateThisHost": "{hostName}は現在{isolated}されています。このホストを{unisolate}しますか？",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.multiplePendingActions": "{count}個の{count, plural, other {アクション}}が保留中",
     "xpack.securitySolution.endpoint.list.hostStatusValue": "{hostStatus, select, healthy {正常} unhealthy {異常} updating {更新中} offline {オフライン} inactive {非アクティブ} unenrolled {登録解除済み} other {異常}}",
     "xpack.securitySolution.endpoint.list.policy.revisionNumber": "rev. {revNumber}",
     "xpack.securitySolution.endpoint.list.totalCount": "{totalItemCount, plural, other {#個のエンドポイント}}を表示中",
@@ -28042,7 +28041,6 @@
     "xpack.securitySolution.entityAnalytics.riskDashboard.nameTitle": "{riskEntity}名",
     "xpack.securitySolution.entityAnalytics.riskDashboard.riskClassificationTitle": "{riskEntity}リスク分類",
     "xpack.securitySolution.entityAnalytics.riskDashboard.riskToolTip": "{riskEntity}リスク分類は、{riskEntityLowercase}リスクスコアによって決定されます。「重大」または「高」に分類された{riskEntity}は、リスクが高いことが表示されます。",
-    "xpack.securitySolution.event.reason.reasonRendererTitle": "イベントレンダラー：{eventRendererName} ",
     "xpack.securitySolution.eventDetails.nestedColumnCheckboxAriaLabel": "{field}フィールドはオブジェクトであり、列として追加できるネストされたフィールドに分解されます",
     "xpack.securitySolution.eventDetails.viewColumnCheckboxAriaLabel": "{field}列を表示",
     "xpack.securitySolution.eventFilter.flyoutForm.creationSuccessToastTitle": "\"{name}\"がイベントフィルターリストに追加されました。",
@@ -30366,15 +30364,6 @@
     "xpack.securitySolution.endpoint.hostisolation.unisolate": "リリース",
     "xpack.securitySolution.endpoint.hostIsolation.unisolateHost": "ホストのリリース",
     "xpack.securitySolution.endpoint.hostIsolationExceptions.fleetIntegration.title": "ホスト分離例外",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.isIsolating": "分離中",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.isolated": "分離済み",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.isUnIsolating": "リリース中",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.tooltipPendingActions": "保留中のアクション：",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.tooltipPendingIsolate": "分離",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.tooltipPendingKillProcess": "プロセスを終了",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.tooltipPendingRunningProcesses": "プロセス",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.tooltipPendingSuspendProcess": "プロセスを一時停止",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.tooltipPendingUnIsolate": "リリース",
     "xpack.securitySolution.endpoint.ingestManager.createPackagePolicy.environments": "従来のエンドポイントや動的クラウド環境を保護",
     "xpack.securitySolution.endpoint.ingestManager.createPackagePolicy.seeDocumentationLink": "ドキュメンテーション",
     "xpack.securitySolution.endpoint.list.actionmenu": "開く",
@@ -31190,7 +31179,6 @@
     "xpack.securitySolution.host.details.overview.platformTitle": "プラットフォーム",
     "xpack.securitySolution.host.details.overview.regionTitle": "地域",
     "xpack.securitySolution.host.details.versionLabel": "バージョン",
-    "xpack.securitySolution.hostIsolation.agentStatuses.empty": "-",
     "xpack.securitySolution.hostIsolationExceptions.cardActionDeleteLabel": "例外の削除",
     "xpack.securitySolution.hostIsolationExceptions.cardActionEditLabel": "例外の編集",
     "xpack.securitySolution.hostIsolationExceptions.deleteModtalTitle": "ホスト分離例外を削除",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index fb3cdb9c46c01..28b56ee5b92ff 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -27982,7 +27982,6 @@
     "xpack.securitySolution.endpoint.hostIsolation.successfulIsolation.cases": "此操作已附加到以下{caseCount, plural, other {案例}}：",
     "xpack.securitySolution.endpoint.hostIsolation.unisolate.successfulMessage": "已成功提交主机 {hostName} 的释放",
     "xpack.securitySolution.endpoint.hostIsolation.unIsolateThisHost": "{hostName} 当前 {isolated}。是否确定要{unisolate}此主机？",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.multiplePendingActions": "{count} 个{count, plural, other {操作}}未决",
     "xpack.securitySolution.endpoint.list.hostStatusValue": "{hostStatus, select, healthy {运行正常} unhealthy {运行不正常} updating {正在更新} offline {脱机} inactive {非活动} unenrolled {未注册} other {运行不正常}}",
     "xpack.securitySolution.endpoint.list.policy.revisionNumber": "rev. {revNumber}",
     "xpack.securitySolution.endpoint.list.totalCount": "正在显示 {totalItemCount, plural, other {# 个终端}}",
@@ -28058,7 +28057,6 @@
     "xpack.securitySolution.entityAnalytics.riskDashboard.nameTitle": "{riskEntity} 名称",
     "xpack.securitySolution.entityAnalytics.riskDashboard.riskClassificationTitle": "{riskEntity} 风险分类",
     "xpack.securitySolution.entityAnalytics.riskDashboard.riskToolTip": "{riskEntity} 风险分类由 {riskEntityLowercase} 风险分数决定。分类为紧急或高的{riskEntity}主机即表示存在风险。",
-    "xpack.securitySolution.event.reason.reasonRendererTitle": "事件呈现器：{eventRendererName}",
     "xpack.securitySolution.eventDetails.nestedColumnCheckboxAriaLabel": "{field} 字段是对象，并分解为可以添加为列的嵌套字段",
     "xpack.securitySolution.eventDetails.viewColumnCheckboxAriaLabel": "查看 {field} 列",
     "xpack.securitySolution.eventFilter.flyoutForm.creationSuccessToastTitle": "“{name}”已添加到事件筛选列表。",
@@ -30382,15 +30380,6 @@
     "xpack.securitySolution.endpoint.hostisolation.unisolate": "释放",
     "xpack.securitySolution.endpoint.hostIsolation.unisolateHost": "释放主机",
     "xpack.securitySolution.endpoint.hostIsolationExceptions.fleetIntegration.title": "主机隔离例外",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.isIsolating": "正在隔离",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.isolated": "已隔离",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.isUnIsolating": "正在释放",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.tooltipPendingActions": "未决操作：",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.tooltipPendingIsolate": "隔离",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.tooltipPendingKillProcess": "结束进程",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.tooltipPendingRunningProcesses": "进程",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.tooltipPendingSuspendProcess": "挂起进程",
-    "xpack.securitySolution.endpoint.hostIsolationStatus.tooltipPendingUnIsolate": "释放",
     "xpack.securitySolution.endpoint.ingestManager.createPackagePolicy.environments": "保护您的传统终端或动态云环境",
     "xpack.securitySolution.endpoint.ingestManager.createPackagePolicy.seeDocumentationLink": "文档",
     "xpack.securitySolution.endpoint.list.actionmenu": "打开",
@@ -31206,7 +31195,6 @@
     "xpack.securitySolution.host.details.overview.platformTitle": "平台",
     "xpack.securitySolution.host.details.overview.regionTitle": "地区",
     "xpack.securitySolution.host.details.versionLabel": "版本",
-    "xpack.securitySolution.hostIsolation.agentStatuses.empty": "-",
     "xpack.securitySolution.hostIsolationExceptions.cardActionDeleteLabel": "删除例外",
     "xpack.securitySolution.hostIsolationExceptions.cardActionEditLabel": "编辑例外",
     "xpack.securitySolution.hostIsolationExceptions.deleteModtalTitle": "删除主机隔离例外",

From 14f01672c7643c76ab7a4549cae9cc05aacde229 Mon Sep 17 00:00:00 2001
From: Jiawei Wu <74562234+JiaweiWu@users.noreply.github.com>
Date: Wed, 19 Apr 2023 08:48:23 -0700
Subject: [PATCH 081/100] [RAM] Maintenance Window Task Runner Integration +
 New AAD/Event Log Fields (#154761)

## Summary

Resolves: https://github.com/elastic/kibana/issues/153468
Maintenance window API PR: https://github.com/elastic/kibana/pull/153411

This PR does the following:
- Skip alert notifications for rules in maintenance
- Add `maintenance_window_ids` field to alert events in the event log
- Add `maintenance_window_ids` attribute to AAD

### 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>
---
 .../src/field_maps/alert_field_map.ts         |   6 +
 .../src/default_alerts_as_data.ts             |   5 +
 .../src/technical_field_names.ts              |   2 +
 .../field_maps/mapping_from_field_map.test.ts |   3 +
 .../legacy_alerts_client.test.ts              |   2 +
 .../alerts_client/legacy_alerts_client.ts     |   3 +
 .../alerting_event_logger.test.ts             |   2 +
 .../alerting_event_logger.ts                  |   2 +
 ...eate_alert_event_log_record_object.test.ts |   8 +
 .../create_alert_event_log_record_object.ts   |   3 +
 .../server/maintenance_window_client.mock.ts  |   2 +-
 x-pack/plugins/alerting/server/plugin.ts      |   5 +
 .../alerting/server/task_runner/fixtures.ts   |   9 +-
 .../server/task_runner/log_alerts.test.ts     |  83 +++++
 .../alerting/server/task_runner/log_alerts.ts |   5 +
 .../server/task_runner/task_runner.test.ts    | 104 ++++++
 .../server/task_runner/task_runner.ts         |  23 ++
 .../task_runner/task_runner_cancel.test.ts    |   7 +
 .../task_runner/task_runner_factory.test.ts   |   4 +
 .../server/task_runner/task_runner_factory.ts |   2 +
 x-pack/plugins/alerting/server/types.ts       |   1 +
 .../plugins/event_log/generated/mappings.json |   7 +
 x-pack/plugins/event_log/generated/schemas.ts |   1 +
 x-pack/plugins/event_log/scripts/mappings.js  |   5 +
 .../technical_rule_field_map.test.ts          |   5 +
 .../utils/create_lifecycle_executor.test.ts   | 327 ++++++++++++++++++
 .../server/utils/create_lifecycle_executor.ts |   5 +
 .../utils/rule_executor.test_helpers.ts       |   3 +
 .../tests/alerting/group1/event_log.ts        | 123 +++++++
 .../tests/trial/get_summarized_alerts.ts      | 137 ++++++++
 30 files changed, 892 insertions(+), 2 deletions(-)

diff --git a/packages/kbn-alerts-as-data-utils/src/field_maps/alert_field_map.ts b/packages/kbn-alerts-as-data-utils/src/field_maps/alert_field_map.ts
index 72fe68fa9cf59..91f51ea3acffc 100644
--- a/packages/kbn-alerts-as-data-utils/src/field_maps/alert_field_map.ts
+++ b/packages/kbn-alerts-as-data-utils/src/field_maps/alert_field_map.ts
@@ -13,6 +13,7 @@ import {
   ALERT_END,
   ALERT_FLAPPING,
   ALERT_FLAPPING_HISTORY,
+  ALERT_MAINTENANCE_WINDOW_IDS,
   ALERT_INSTANCE_ID,
   ALERT_LAST_DETECTED,
   ALERT_REASON,
@@ -67,6 +68,11 @@ export const alertFieldMap = {
     array: true,
     required: false,
   },
+  [ALERT_MAINTENANCE_WINDOW_IDS]: {
+    type: 'keyword',
+    array: true,
+    required: false,
+  },
   [ALERT_INSTANCE_ID]: {
     type: 'keyword',
     array: false,
diff --git a/packages/kbn-rule-data-utils/src/default_alerts_as_data.ts b/packages/kbn-rule-data-utils/src/default_alerts_as_data.ts
index e996acbd9fb6c..98ea2d76730c2 100644
--- a/packages/kbn-rule-data-utils/src/default_alerts_as_data.ts
+++ b/packages/kbn-rule-data-utils/src/default_alerts_as_data.ts
@@ -40,6 +40,9 @@ const ALERT_FLAPPING = `${ALERT_NAMESPACE}.flapping` as const;
 // kibana.alert.flapping_history - whether the alert is currently in a flapping state
 const ALERT_FLAPPING_HISTORY = `${ALERT_NAMESPACE}.flapping_history` as const;
 
+// kibana.alert.maintenance_window_ids - IDs of maintenance windows that are affecting this alert
+const ALERT_MAINTENANCE_WINDOW_IDS = `${ALERT_NAMESPACE}.maintenance_window_ids` as const;
+
 // kibana.alert.instance.id - alert ID, also known as alert instance ID
 const ALERT_INSTANCE_ID = `${ALERT_NAMESPACE}.instance.id` as const;
 
@@ -107,6 +110,7 @@ const fields = {
   ALERT_END,
   ALERT_FLAPPING,
   ALERT_FLAPPING_HISTORY,
+  ALERT_MAINTENANCE_WINDOW_IDS,
   ALERT_INSTANCE_ID,
   ALERT_LAST_DETECTED,
   ALERT_REASON,
@@ -143,6 +147,7 @@ export {
   ALERT_END,
   ALERT_FLAPPING,
   ALERT_FLAPPING_HISTORY,
+  ALERT_MAINTENANCE_WINDOW_IDS,
   ALERT_INSTANCE_ID,
   ALERT_LAST_DETECTED,
   ALERT_REASON,
diff --git a/packages/kbn-rule-data-utils/src/technical_field_names.ts b/packages/kbn-rule-data-utils/src/technical_field_names.ts
index cf45162b20853..a5a39d7ef33b1 100644
--- a/packages/kbn-rule-data-utils/src/technical_field_names.ts
+++ b/packages/kbn-rule-data-utils/src/technical_field_names.ts
@@ -16,6 +16,7 @@ import {
   ALERT_DURATION,
   ALERT_END,
   ALERT_FLAPPING,
+  ALERT_MAINTENANCE_WINDOW_IDS,
   ALERT_INSTANCE_ID,
   ALERT_REASON,
   ALERT_RULE_CATEGORY,
@@ -125,6 +126,7 @@ const fields = {
   ALERT_EVALUATION_THRESHOLD,
   ALERT_EVALUATION_VALUE,
   ALERT_FLAPPING,
+  ALERT_MAINTENANCE_WINDOW_IDS,
   ALERT_INSTANCE_ID,
   ALERT_RULE_CONSUMER,
   ALERT_RULE_PRODUCER,
diff --git a/x-pack/plugins/alerting/common/alert_schema/field_maps/mapping_from_field_map.test.ts b/x-pack/plugins/alerting/common/alert_schema/field_maps/mapping_from_field_map.test.ts
index 4456bd363a016..7a86a45dcd045 100644
--- a/x-pack/plugins/alerting/common/alert_schema/field_maps/mapping_from_field_map.test.ts
+++ b/x-pack/plugins/alerting/common/alert_schema/field_maps/mapping_from_field_map.test.ts
@@ -216,6 +216,9 @@ describe('mappingFromFieldMap', () => {
                 flapping_history: {
                   type: 'boolean',
                 },
+                maintenance_window_ids: {
+                  type: 'keyword',
+                },
                 instance: {
                   properties: {
                     id: {
diff --git a/x-pack/plugins/alerting/server/alerts_client/legacy_alerts_client.test.ts b/x-pack/plugins/alerting/server/alerts_client/legacy_alerts_client.test.ts
index 3fb1877756d15..59668072632b4 100644
--- a/x-pack/plugins/alerting/server/alerts_client/legacy_alerts_client.test.ts
+++ b/x-pack/plugins/alerting/server/alerts_client/legacy_alerts_client.test.ts
@@ -236,6 +236,7 @@ describe('Legacy Alerts Client', () => {
       shouldLogAndScheduleActionsForAlerts: true,
       flappingSettings: DEFAULT_FLAPPING_SETTINGS,
       notifyWhen: RuleNotifyWhen.CHANGE,
+      maintenanceWindowIds: ['window-id1', 'window-id2'],
     });
 
     expect(processAlerts).toHaveBeenCalledWith({
@@ -284,6 +285,7 @@ describe('Legacy Alerts Client', () => {
       ruleRunMetricsStore,
       canSetRecoveryContext: false,
       shouldPersistAlerts: true,
+      maintenanceWindowIds: ['window-id1', 'window-id2'],
     });
 
     expect(alertsClient.getProcessedAlerts('active')).toEqual({
diff --git a/x-pack/plugins/alerting/server/alerts_client/legacy_alerts_client.ts b/x-pack/plugins/alerting/server/alerts_client/legacy_alerts_client.ts
index 8fce6782cd2f1..b06ca4ffada79 100644
--- a/x-pack/plugins/alerting/server/alerts_client/legacy_alerts_client.ts
+++ b/x-pack/plugins/alerting/server/alerts_client/legacy_alerts_client.ts
@@ -117,6 +117,7 @@ export class LegacyAlertsClient<
     shouldLogAndScheduleActionsForAlerts,
     flappingSettings,
     notifyWhen,
+    maintenanceWindowIds,
   }: {
     eventLogger: AlertingEventLogger;
     ruleLabel: string;
@@ -124,6 +125,7 @@ export class LegacyAlertsClient<
     ruleRunMetricsStore: RuleRunMetricsStore;
     flappingSettings: RulesSettingsFlappingProperties;
     notifyWhen: RuleNotifyWhenType | null;
+    maintenanceWindowIds?: string[];
   }) {
     const {
       newAlerts: processedAlertsNew,
@@ -176,6 +178,7 @@ export class LegacyAlertsClient<
       ruleRunMetricsStore,
       canSetRecoveryContext: this.options.ruleType.doesSetRecoveryContext ?? false,
       shouldPersistAlerts: shouldLogAndScheduleActionsForAlerts,
+      maintenanceWindowIds,
     });
   }
 
diff --git a/x-pack/plugins/alerting/server/lib/alerting_event_logger/alerting_event_logger.test.ts b/x-pack/plugins/alerting/server/lib/alerting_event_logger/alerting_event_logger.test.ts
index 90c3645e151e5..0eba6610754f3 100644
--- a/x-pack/plugins/alerting/server/lib/alerting_event_logger/alerting_event_logger.test.ts
+++ b/x-pack/plugins/alerting/server/lib/alerting_event_logger/alerting_event_logger.test.ts
@@ -68,6 +68,7 @@ const alert = {
     duration: '2343252346',
   },
   flapping: false,
+  maintenanceWindowIds: ['window-id1', 'window-id2'],
 };
 
 const action = {
@@ -1068,6 +1069,7 @@ describe('createAlertRecord', () => {
     expect(record.kibana?.alert?.rule?.rule_type_id).toEqual(contextWithName.ruleType.id);
     expect(record.kibana?.alert?.rule?.consumer).toEqual(contextWithName.consumer);
     expect(record.kibana?.alert?.rule?.execution?.uuid).toEqual(contextWithName.executionId);
+    expect(record.kibana?.alert?.maintenance_window_ids).toEqual(alert.maintenanceWindowIds);
     expect(record.kibana?.alerting?.instance_id).toEqual(alert.id);
     expect(record.kibana?.alerting?.action_group_id).toEqual(alert.group);
     expect(record.kibana?.saved_objects).toEqual([
diff --git a/x-pack/plugins/alerting/server/lib/alerting_event_logger/alerting_event_logger.ts b/x-pack/plugins/alerting/server/lib/alerting_event_logger/alerting_event_logger.ts
index f84936e7ea6e4..37029b4c96703 100644
--- a/x-pack/plugins/alerting/server/lib/alerting_event_logger/alerting_event_logger.ts
+++ b/x-pack/plugins/alerting/server/lib/alerting_event_logger/alerting_event_logger.ts
@@ -50,6 +50,7 @@ interface AlertOpts {
   group?: string;
   state?: AlertInstanceState;
   flapping: boolean;
+  maintenanceWindowIds?: string[];
 }
 
 interface ActionOpts {
@@ -256,6 +257,7 @@ export function createAlertRecord(context: RuleContextOpts, alert: AlertOpts) {
     ],
     ruleName: context.ruleName,
     flapping: alert.flapping,
+    maintenanceWindowIds: alert.maintenanceWindowIds,
   });
 }
 
diff --git a/x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.test.ts b/x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.test.ts
index 185aa098a49d7..e7d77e55b9e4a 100644
--- a/x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.test.ts
+++ b/x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.test.ts
@@ -9,6 +9,8 @@ import { createAlertEventLogRecordObject } from './create_alert_event_log_record
 import { UntypedNormalizedRuleType } from '../rule_type_registry';
 import { RecoveredActionGroup } from '../types';
 
+const MAINTENANCE_WINDOW_IDS = ['test-1', 'test-2'];
+
 describe('createAlertEventLogRecordObject', () => {
   const ruleType: jest.Mocked<UntypedNormalizedRuleType> = {
     id: 'test',
@@ -44,6 +46,7 @@ describe('createAlertEventLogRecordObject', () => {
           },
         ],
         spaceId: 'default',
+        maintenanceWindowIds: MAINTENANCE_WINDOW_IDS,
       })
     ).toStrictEqual({
       '@timestamp': '1970-01-01T00:00:00.000Z',
@@ -61,6 +64,7 @@ describe('createAlertEventLogRecordObject', () => {
             },
             rule_type_id: 'test',
           },
+          maintenance_window_ids: MAINTENANCE_WINDOW_IDS,
         },
         saved_objects: [
           {
@@ -113,6 +117,7 @@ describe('createAlertEventLogRecordObject', () => {
           },
         ],
         spaceId: 'default',
+        maintenanceWindowIds: MAINTENANCE_WINDOW_IDS,
       })
     ).toStrictEqual({
       event: {
@@ -132,6 +137,7 @@ describe('createAlertEventLogRecordObject', () => {
             },
             rule_type_id: 'test',
           },
+          maintenance_window_ids: MAINTENANCE_WINDOW_IDS,
         },
         alerting: {
           action_group_id: 'group 1',
@@ -196,6 +202,7 @@ describe('createAlertEventLogRecordObject', () => {
           ongoing: 3,
           recovered: 1,
         },
+        maintenanceWindowIds: MAINTENANCE_WINDOW_IDS,
       })
     ).toStrictEqual({
       event: {
@@ -215,6 +222,7 @@ describe('createAlertEventLogRecordObject', () => {
             },
             rule_type_id: 'test',
           },
+          maintenance_window_ids: MAINTENANCE_WINDOW_IDS,
         },
         alerting: {
           action_group_id: 'group 1',
diff --git a/x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.ts b/x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.ts
index f987c297d0217..97284f0ce9f78 100644
--- a/x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.ts
+++ b/x-pack/plugins/alerting/server/lib/create_alert_event_log_record_object.ts
@@ -42,6 +42,7 @@ interface CreateAlertEventLogRecordParams {
     ongoing: number;
     recovered: number;
   };
+  maintenanceWindowIds?: string[];
 }
 
 export function createAlertEventLogRecordObject(params: CreateAlertEventLogRecordParams): Event {
@@ -60,6 +61,7 @@ export function createAlertEventLogRecordObject(params: CreateAlertEventLogRecor
     flapping,
     alertUuid,
     alertSummary,
+    maintenanceWindowIds,
   } = params;
   const alerting =
     params.instanceId || group || alertSummary
@@ -92,6 +94,7 @@ export function createAlertEventLogRecordObject(params: CreateAlertEventLogRecor
     kibana: {
       alert: {
         ...(flapping !== undefined ? { flapping } : {}),
+        ...(maintenanceWindowIds ? { maintenance_window_ids: maintenanceWindowIds } : {}),
         ...(alertUuid ? { uuid: alertUuid } : {}),
         rule: {
           rule_type_id: ruleType.id,
diff --git a/x-pack/plugins/alerting/server/maintenance_window_client.mock.ts b/x-pack/plugins/alerting/server/maintenance_window_client.mock.ts
index 9d0157d8e2139..cda36a816f41c 100644
--- a/x-pack/plugins/alerting/server/maintenance_window_client.mock.ts
+++ b/x-pack/plugins/alerting/server/maintenance_window_client.mock.ts
@@ -17,7 +17,7 @@ const createMaintenanceWindowClientMock = () => {
     find: jest.fn(),
     get: jest.fn(),
     archive: jest.fn(),
-    getActiveMaintenanceWindows: jest.fn(),
+    getActiveMaintenanceWindows: jest.fn().mockResolvedValue([]),
     finish: jest.fn(),
     delete: jest.fn(),
   };
diff --git a/x-pack/plugins/alerting/server/plugin.ts b/x-pack/plugins/alerting/server/plugin.ts
index 2902848b6dea5..e5e7aaa8f8610 100644
--- a/x-pack/plugins/alerting/server/plugin.ts
+++ b/x-pack/plugins/alerting/server/plugin.ts
@@ -502,6 +502,10 @@ export class AlertingPlugin {
       return rulesSettingsClientFactory!.create(request);
     };
 
+    const getMaintenanceWindowClientWithRequest = (request: KibanaRequest) => {
+      return maintenanceWindowClientFactory!.create(request);
+    };
+
     taskRunnerFactory.initialize({
       logger,
       data: plugins.data,
@@ -528,6 +532,7 @@ export class AlertingPlugin {
       actionsConfigMap: getActionsConfigMap(this.config.rules.run.actions),
       usageCounter: this.usageCounter,
       getRulesSettingsClientWithRequest,
+      getMaintenanceWindowClientWithRequest,
     });
 
     this.eventLogService!.registerSavedObjectProvider('alert', (request) => {
diff --git a/x-pack/plugins/alerting/server/task_runner/fixtures.ts b/x-pack/plugins/alerting/server/task_runner/fixtures.ts
index dacddea634fa4..64db706d824f7 100644
--- a/x-pack/plugins/alerting/server/task_runner/fixtures.ts
+++ b/x-pack/plugins/alerting/server/task_runner/fixtures.ts
@@ -233,7 +233,13 @@ export const mockTaskInstance = () => ({
   ownerId: null,
 });
 
-export const generateAlertOpts = ({ action, group, state, id }: GeneratorParams = {}) => {
+export const generateAlertOpts = ({
+  action,
+  group,
+  state,
+  id,
+  maintenanceWindowIds = [],
+}: GeneratorParams = {}) => {
   id = id ?? '1';
   let message: string = '';
   switch (action) {
@@ -255,6 +261,7 @@ export const generateAlertOpts = ({ action, group, state, id }: GeneratorParams
     state,
     ...(group ? { group } : {}),
     flapping: false,
+    maintenanceWindowIds,
   };
 };
 
diff --git a/x-pack/plugins/alerting/server/task_runner/log_alerts.test.ts b/x-pack/plugins/alerting/server/task_runner/log_alerts.test.ts
index ffeb5db16fed3..18379740e5feb 100644
--- a/x-pack/plugins/alerting/server/task_runner/log_alerts.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/log_alerts.test.ts
@@ -362,4 +362,87 @@ describe('logAlerts', () => {
       uuid: expect.any(String),
     });
   });
+
+  test('should correctly set maintenance window in ruleRunMetricsStore and call alertingEventLogger.logAlert', () => {
+    jest.clearAllMocks();
+    const MAINTENANCE_WINDOW_IDS = ['window-id-1', 'window-id-2'];
+
+    logAlerts({
+      logger,
+      alertingEventLogger,
+      newAlerts: {
+        '4': new Alert<{}, {}, DefaultActionGroupId>('4'),
+      },
+      activeAlerts: {
+        '1': new Alert<{}, {}, DefaultActionGroupId>('1'),
+        '4': new Alert<{}, {}, DefaultActionGroupId>('4'),
+      },
+      recoveredAlerts: {
+        '7': new Alert<{}, {}, DefaultActionGroupId>('7'),
+        '8': new Alert<{}, {}, DefaultActionGroupId>('8'),
+      },
+      ruleLogPrefix: `test-rule-type-id:123: 'test rule'`,
+      ruleRunMetricsStore,
+      canSetRecoveryContext: false,
+      shouldPersistAlerts: true,
+      maintenanceWindowIds: MAINTENANCE_WINDOW_IDS,
+    });
+
+    expect(ruleRunMetricsStore.getNumberOfNewAlerts()).toEqual(1);
+    expect(ruleRunMetricsStore.getNumberOfActiveAlerts()).toEqual(2);
+    expect(ruleRunMetricsStore.getNumberOfRecoveredAlerts()).toEqual(2);
+
+    expect(alertingEventLogger.logAlert).toHaveBeenCalledTimes(5);
+
+    expect(alertingEventLogger.logAlert).toHaveBeenNthCalledWith(1, {
+      action: 'recovered-instance',
+      id: '7',
+      message: "test-rule-type-id:123: 'test rule' alert '7' has recovered",
+      state: {},
+      flapping: false,
+      group: undefined,
+      uuid: expect.any(String),
+      maintenanceWindowIds: MAINTENANCE_WINDOW_IDS,
+    });
+    expect(alertingEventLogger.logAlert).toHaveBeenNthCalledWith(2, {
+      action: 'recovered-instance',
+      id: '8',
+      message: "test-rule-type-id:123: 'test rule' alert '8' has recovered",
+      state: {},
+      flapping: false,
+      group: undefined,
+      uuid: expect.any(String),
+      maintenanceWindowIds: MAINTENANCE_WINDOW_IDS,
+    });
+    expect(alertingEventLogger.logAlert).toHaveBeenNthCalledWith(3, {
+      action: 'new-instance',
+      id: '4',
+      message: "test-rule-type-id:123: 'test rule' created new alert: '4'",
+      state: {},
+      flapping: false,
+      group: undefined,
+      uuid: expect.any(String),
+      maintenanceWindowIds: MAINTENANCE_WINDOW_IDS,
+    });
+    expect(alertingEventLogger.logAlert).toHaveBeenNthCalledWith(4, {
+      action: 'active-instance',
+      id: '1',
+      message: "test-rule-type-id:123: 'test rule' active alert: '1' in actionGroup: 'undefined'",
+      state: {},
+      flapping: false,
+      group: undefined,
+      uuid: expect.any(String),
+      maintenanceWindowIds: MAINTENANCE_WINDOW_IDS,
+    });
+    expect(alertingEventLogger.logAlert).toHaveBeenNthCalledWith(5, {
+      action: 'active-instance',
+      id: '4',
+      message: "test-rule-type-id:123: 'test rule' active alert: '4' in actionGroup: 'undefined'",
+      state: {},
+      flapping: false,
+      group: undefined,
+      uuid: expect.any(String),
+      maintenanceWindowIds: MAINTENANCE_WINDOW_IDS,
+    });
+  });
 });
diff --git a/x-pack/plugins/alerting/server/task_runner/log_alerts.ts b/x-pack/plugins/alerting/server/task_runner/log_alerts.ts
index a939ad511da34..8c1427b12b123 100644
--- a/x-pack/plugins/alerting/server/task_runner/log_alerts.ts
+++ b/x-pack/plugins/alerting/server/task_runner/log_alerts.ts
@@ -28,6 +28,7 @@ export interface LogAlertsParams<
   ruleRunMetricsStore: RuleRunMetricsStore;
   canSetRecoveryContext: boolean;
   shouldPersistAlerts: boolean;
+  maintenanceWindowIds?: string[];
 }
 
 export function logAlerts<
@@ -45,6 +46,7 @@ export function logAlerts<
   ruleRunMetricsStore,
   canSetRecoveryContext,
   shouldPersistAlerts,
+  maintenanceWindowIds,
 }: LogAlertsParams<State, Context, ActionGroupIds, RecoveryActionGroupId>) {
   const newAlertIds = Object.keys(newAlerts);
   const activeAlertIds = Object.keys(activeAlerts);
@@ -104,6 +106,7 @@ export function logAlerts<
         message,
         state,
         flapping: recoveredAlerts[id].getFlapping(),
+        maintenanceWindowIds,
       });
     }
 
@@ -121,6 +124,7 @@ export function logAlerts<
         message,
         state,
         flapping: activeAlerts[id].getFlapping(),
+        maintenanceWindowIds,
       });
     }
 
@@ -138,6 +142,7 @@ export function logAlerts<
         message,
         state,
         flapping: activeAlerts[id].getFlapping(),
+        maintenanceWindowIds,
       });
     }
   }
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts b/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts
index d99bc21d5d3d4..ea37e5d8594d6 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts
@@ -16,6 +16,7 @@ import {
   RuleExecutionStatusWarningReasons,
   Rule,
   RuleAction,
+  MaintenanceWindow,
 } from '../types';
 import { ConcreteTaskInstance, isUnrecoverableError } from '@kbn/task-manager-plugin/server';
 import { TaskRunnerContext } from './task_runner_factory';
@@ -77,7 +78,9 @@ import { SharePluginStart } from '@kbn/share-plugin/server';
 import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 import { DataViewsServerPluginStart } from '@kbn/data-views-plugin/server';
 import { rulesSettingsClientMock } from '../rules_settings_client.mock';
+import { maintenanceWindowClientMock } from '../maintenance_window_client.mock';
 import { alertsServiceMock } from '../alerts_service/alerts_service.mock';
+import { getMockMaintenanceWindow } from '../maintenance_window_client/methods/test_helpers';
 
 jest.mock('uuid', () => ({
   v4: () => '5f6aa57d-3e22-484e-bae8-cbed868f4d28',
@@ -130,6 +133,7 @@ describe('Task Runner', () => {
     dataViewsServiceFactory: jest.fn().mockResolvedValue(dataViewPluginMocks.createStartContract()),
   } as DataViewsServerPluginStart;
   const alertsService = alertsServiceMock.create();
+  const maintenanceWindowClient = maintenanceWindowClientMock.create();
 
   type TaskRunnerFactoryInitializerParamsType = jest.Mocked<TaskRunnerContext> & {
     actionsPlugin: jest.Mocked<ActionsPluginStart>;
@@ -167,6 +171,7 @@ describe('Task Runner', () => {
       },
     },
     getRulesSettingsClientWithRequest: jest.fn().mockReturnValue(rulesSettingsClientMock.create()),
+    getMaintenanceWindowClientWithRequest: jest.fn().mockReturnValue(maintenanceWindowClient),
   };
 
   const ephemeralTestParams: Array<
@@ -203,6 +208,7 @@ describe('Task Runner', () => {
       });
     savedObjectsService.getScopedClient.mockReturnValue(services.savedObjectsClient);
     elasticsearchService.client.asScoped.mockReturnValue(services.scopedClusterClient);
+    maintenanceWindowClient.getActiveMaintenanceWindows.mockResolvedValue([]);
     taskRunnerFactoryInitializerParams.getRulesClientWithRequest.mockReturnValue(rulesClient);
     taskRunnerFactoryInitializerParams.actionsPlugin.getActionsClientWithRequest.mockResolvedValue(
       actionsClient
@@ -217,6 +223,9 @@ describe('Task Runner', () => {
     taskRunnerFactoryInitializerParams.getRulesSettingsClientWithRequest.mockReturnValue(
       rulesSettingsClientMock.create()
     );
+    taskRunnerFactoryInitializerParams.getMaintenanceWindowClientWithRequest.mockReturnValue(
+      maintenanceWindowClient
+    );
     mockedRuleTypeSavedObject.monitoring!.run.history = [];
     mockedRuleTypeSavedObject.monitoring!.run.calculated_metrics.success_ratio = 0;
 
@@ -602,6 +611,101 @@ describe('Task Runner', () => {
     }
   );
 
+  test('skips alert notification if there are active maintenance windows', async () => {
+    taskRunnerFactoryInitializerParams.actionsPlugin.isActionTypeEnabled.mockReturnValue(true);
+    taskRunnerFactoryInitializerParams.actionsPlugin.isActionExecutable.mockReturnValue(true);
+    ruleType.executor.mockImplementation(
+      async ({
+        services: executorServices,
+      }: RuleExecutorOptions<
+        RuleTypeParams,
+        RuleTypeState,
+        AlertInstanceState,
+        AlertInstanceContext,
+        string
+      >) => {
+        executorServices.alertFactory.create('1').scheduleActions('default');
+        return { state: {} };
+      }
+    );
+    const taskRunner = new TaskRunner(
+      ruleType,
+      mockedTaskInstance,
+      taskRunnerFactoryInitializerParams,
+      inMemoryMetrics
+    );
+    expect(AlertingEventLogger).toHaveBeenCalledTimes(1);
+    rulesClient.getAlertFromRaw.mockReturnValue(mockedRuleTypeSavedObject as Rule);
+    maintenanceWindowClient.getActiveMaintenanceWindows.mockResolvedValueOnce([
+      {
+        ...getMockMaintenanceWindow(),
+        id: 'test-id-1',
+      } as MaintenanceWindow,
+      {
+        ...getMockMaintenanceWindow(),
+        id: 'test-id-2',
+      } as MaintenanceWindow,
+    ]);
+
+    encryptedSavedObjectsClient.getDecryptedAsInternalUser.mockResolvedValue(SAVED_OBJECT);
+    await taskRunner.run();
+    expect(actionsClient.ephemeralEnqueuedExecution).toHaveBeenCalledTimes(0);
+
+    expect(logger.debug).toHaveBeenCalledTimes(7);
+    expect(logger.debug).nthCalledWith(1, 'executing rule test:1 at 1970-01-01T00:00:00.000Z');
+    expect(logger.debug).nthCalledWith(
+      2,
+      `rule test:1: '${RULE_NAME}' has 1 active alerts: [{\"instanceId\":\"1\",\"actionGroup\":\"default\"}]`
+    );
+    expect(logger.debug).nthCalledWith(
+      3,
+      `no scheduling of actions for rule test:1: '${RULE_NAME}': has active maintenance windows test-id-1,test-id-2.`
+    );
+    expect(logger.debug).nthCalledWith(
+      4,
+      'deprecated ruleRunStatus for test:1: {"lastExecutionDate":"1970-01-01T00:00:00.000Z","status":"active"}'
+    );
+    expect(logger.debug).nthCalledWith(
+      5,
+      'ruleRunStatus for test:1: {"outcome":"succeeded","outcomeOrder":0,"outcomeMsg":null,"warning":null,"alertsCount":{"active":1,"new":1,"recovered":0,"ignored":0}}'
+    );
+    expect(logger.debug).nthCalledWith(
+      6,
+      'ruleRunMetrics for test:1: {"numSearches":3,"totalSearchDurationMs":23423,"esSearchDurationMs":33,"numberOfTriggeredActions":0,"numberOfGeneratedActions":0,"numberOfActiveAlerts":1,"numberOfRecoveredAlerts":0,"numberOfNewAlerts":1,"hasReachedAlertLimit":false,"triggeredActionsStatus":"complete"}'
+    );
+    expect(logger.debug).nthCalledWith(
+      7,
+      'Updating rule task for test rule with id 1 - {"lastExecutionDate":"1970-01-01T00:00:00.000Z","status":"active"} - {"outcome":"succeeded","outcomeOrder":0,"outcomeMsg":null,"warning":null,"alertsCount":{"active":1,"new":1,"recovered":0,"ignored":0}}'
+    );
+
+    testAlertingEventLogCalls({
+      activeAlerts: 1,
+      newAlerts: 1,
+      status: 'active',
+      logAlert: 2,
+    });
+    expect(alertingEventLogger.logAlert).toHaveBeenNthCalledWith(
+      1,
+      generateAlertOpts({
+        action: EVENT_LOG_ACTIONS.newInstance,
+        group: 'default',
+        state: { start: DATE_1970, duration: '0' },
+        maintenanceWindowIds: ['test-id-1', 'test-id-2'],
+      })
+    );
+    expect(alertingEventLogger.logAlert).toHaveBeenNthCalledWith(
+      2,
+      generateAlertOpts({
+        action: EVENT_LOG_ACTIONS.activeInstance,
+        group: 'default',
+        state: { start: DATE_1970, duration: '0' },
+        maintenanceWindowIds: ['test-id-1', 'test-id-2'],
+      })
+    );
+
+    expect(mockUsageCounter.incrementCounter).not.toHaveBeenCalled();
+  });
+
   test.each(ephemeralTestParams)(
     'skips firing actions for active alert if alert is muted %s',
     async (nameExtension, customTaskRunnerFactoryInitializerParams, enqueueFunction) => {
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner.ts b/x-pack/plugins/alerting/server/task_runner/task_runner.ts
index 466a785de4003..febe4a2eeacb7 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner.ts
@@ -47,6 +47,7 @@ import {
   parseDuration,
   RawAlertInstance,
   RuleLastRunOutcomeOrderMap,
+  MaintenanceWindow,
 } from '../../common';
 import { NormalizedRuleType, UntypedNormalizedRuleType } from '../rule_type_registry';
 import { getEsErrorMessage } from '../lib/errors';
@@ -315,6 +316,22 @@ export class TaskRunner<
     });
     const rulesSettingsClient = this.context.getRulesSettingsClientWithRequest(fakeRequest);
     const flappingSettings = await rulesSettingsClient.flapping().get();
+    const maintenanceWindowClient = this.context.getMaintenanceWindowClientWithRequest(fakeRequest);
+
+    let activeMaintenanceWindows: MaintenanceWindow[] = [];
+    try {
+      activeMaintenanceWindows = await maintenanceWindowClient.getActiveMaintenanceWindows({
+        interval: rule.schedule.interval,
+      });
+    } catch (err) {
+      this.logger.error(
+        `error getting active maintenance window for ${ruleTypeId}:${ruleId} ${err.message}`
+      );
+    }
+
+    const maintenanceWindowIds = activeMaintenanceWindows.map(
+      (maintenanceWindow) => maintenanceWindow.id
+    );
 
     const { updatedRuleTypeState } = await this.timer.runWithTimer(
       TaskRunnerTimerSpan.RuleTypeRun,
@@ -397,6 +414,7 @@ export class TaskRunner<
               },
               logger: this.logger,
               flappingSettings,
+              ...(maintenanceWindowIds.length ? { maintenanceWindowIds } : {}),
             })
           );
 
@@ -444,6 +462,7 @@ export class TaskRunner<
         shouldLogAndScheduleActionsForAlerts: this.shouldLogAndScheduleActionsForAlerts(),
         flappingSettings,
         notifyWhen,
+        maintenanceWindowIds,
       });
     });
 
@@ -470,6 +489,10 @@ export class TaskRunner<
 
       if (isRuleSnoozed(rule)) {
         this.logger.debug(`no scheduling of actions for rule ${ruleLabel}: rule is snoozed.`);
+      } else if (maintenanceWindowIds.length) {
+        this.logger.debug(
+          `no scheduling of actions for rule ${ruleLabel}: has active maintenance windows ${maintenanceWindowIds}.`
+        );
       } else if (!this.shouldLogAndScheduleActionsForAlerts()) {
         this.logger.debug(
           `no scheduling of actions for rule ${ruleLabel}: rule execution has been cancelled.`
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner_cancel.test.ts b/x-pack/plugins/alerting/server/task_runner/task_runner_cancel.test.ts
index c02ebe647e697..b43149fc05bcf 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner_cancel.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner_cancel.test.ts
@@ -54,6 +54,7 @@ import { SharePluginStart } from '@kbn/share-plugin/server';
 import { DataViewsServerPluginStart } from '@kbn/data-views-plugin/server';
 import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 import { rulesSettingsClientMock } from '../rules_settings_client.mock';
+import { maintenanceWindowClientMock } from '../maintenance_window_client.mock';
 import { alertsServiceMock } from '../alerts_service/alerts_service.mock';
 
 jest.mock('uuid', () => ({
@@ -143,6 +144,9 @@ describe('Task Runner Cancel', () => {
       },
     },
     getRulesSettingsClientWithRequest: jest.fn().mockReturnValue(rulesSettingsClientMock.create()),
+    getMaintenanceWindowClientWithRequest: jest
+      .fn()
+      .mockReturnValue(maintenanceWindowClientMock.create()),
   };
 
   beforeEach(() => {
@@ -173,6 +177,9 @@ describe('Task Runner Cancel', () => {
     taskRunnerFactoryInitializerParams.getRulesSettingsClientWithRequest.mockReturnValue(
       rulesSettingsClientMock.create()
     );
+    taskRunnerFactoryInitializerParams.getMaintenanceWindowClientWithRequest.mockReturnValue(
+      maintenanceWindowClientMock.create()
+    );
     rulesClient.getAlertFromRaw.mockReturnValue(mockedRuleTypeSavedObject as Rule);
 
     encryptedSavedObjectsClient.getDecryptedAsInternalUser.mockResolvedValue({
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner_factory.test.ts b/x-pack/plugins/alerting/server/task_runner/task_runner_factory.test.ts
index 61ec6f18a1138..e9c9f244118ab 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner_factory.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner_factory.test.ts
@@ -30,6 +30,7 @@ import { SharePluginStart } from '@kbn/share-plugin/server';
 import { DataViewsServerPluginStart } from '@kbn/data-views-plugin/server';
 import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 import { rulesSettingsClientMock } from '../rules_settings_client.mock';
+import { maintenanceWindowClientMock } from '../maintenance_window_client.mock';
 import { alertsServiceMock } from '../alerts_service/alerts_service.mock';
 
 const inMemoryMetrics = inMemoryMetricsMock.create();
@@ -120,6 +121,9 @@ describe('Task Runner Factory', () => {
       },
     },
     getRulesSettingsClientWithRequest: jest.fn().mockReturnValue(rulesSettingsClientMock.create()),
+    getMaintenanceWindowClientWithRequest: jest
+      .fn()
+      .mockReturnValue(maintenanceWindowClientMock.create()),
   };
 
   beforeEach(() => {
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner_factory.ts b/x-pack/plugins/alerting/server/task_runner/task_runner_factory.ts
index ced3da1ef346d..0299f07ab8de4 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner_factory.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner_factory.ts
@@ -32,6 +32,7 @@ import {
   AlertInstanceContext,
   RulesClientApi,
   RulesSettingsClientApi,
+  MaintenanceWindowClientApi,
 } from '../types';
 import { TaskRunner } from './task_runner';
 import { NormalizedRuleType } from '../rule_type_registry';
@@ -65,6 +66,7 @@ export interface TaskRunnerContext {
   cancelAlertsOnRuleTimeout: boolean;
   usageCounter?: UsageCounter;
   getRulesSettingsClientWithRequest(request: KibanaRequest): RulesSettingsClientApi;
+  getMaintenanceWindowClientWithRequest(request: KibanaRequest): MaintenanceWindowClientApi;
 }
 
 export class TaskRunnerFactory {
diff --git a/x-pack/plugins/alerting/server/types.ts b/x-pack/plugins/alerting/server/types.ts
index c578a05c468a7..ee9bf42e5716b 100644
--- a/x-pack/plugins/alerting/server/types.ts
+++ b/x-pack/plugins/alerting/server/types.ts
@@ -118,6 +118,7 @@ export interface RuleExecutorOptions<
   state: State;
   namespace?: string;
   flappingSettings: RulesSettingsFlappingProperties;
+  maintenanceWindowIds?: string[];
 }
 
 export interface RuleParamsAndRefs<Params extends RuleTypeParams> {
diff --git a/x-pack/plugins/event_log/generated/mappings.json b/x-pack/plugins/event_log/generated/mappings.json
index c9758df202a3d..f50a1c0ef3321 100644
--- a/x-pack/plugins/event_log/generated/mappings.json
+++ b/x-pack/plugins/event_log/generated/mappings.json
@@ -304,6 +304,13 @@
                         "flapping": {
                             "type": "boolean"
                         },
+                        "maintenance_window_ids": {
+                            "type": "keyword",
+                            "ignore_above": 1024,
+                            "meta": {
+                                "isArray": "true"
+                            }
+                        },
                         "uuid": {
                             "type": "keyword",
                             "ignore_above": 1024
diff --git a/x-pack/plugins/event_log/generated/schemas.ts b/x-pack/plugins/event_log/generated/schemas.ts
index 7471390a7bc88..6706db9635397 100644
--- a/x-pack/plugins/event_log/generated/schemas.ts
+++ b/x-pack/plugins/event_log/generated/schemas.ts
@@ -140,6 +140,7 @@ export const EventSchema = schema.maybe(
         alert: schema.maybe(
           schema.object({
             flapping: ecsBoolean(),
+            maintenance_window_ids: ecsStringMulti(),
             uuid: ecsString(),
             rule: schema.maybe(
               schema.object({
diff --git a/x-pack/plugins/event_log/scripts/mappings.js b/x-pack/plugins/event_log/scripts/mappings.js
index 2e236d7b4eff8..7081c321cc659 100644
--- a/x-pack/plugins/event_log/scripts/mappings.js
+++ b/x-pack/plugins/event_log/scripts/mappings.js
@@ -86,6 +86,10 @@ exports.EcsCustomPropertyMappings = {
           flapping: {
             type: 'boolean',
           },
+          maintenance_window_ids: {
+            type: 'keyword',
+            ignore_above: 1024,
+          },
           uuid: {
             type: 'keyword',
             ignore_above: 1024,
@@ -274,4 +278,5 @@ exports.EcsEventLogMultiValuedProperties = [
   'event.type',
   'rule.author',
   'kibana.space_ids',
+  'kibana.alert.maintenance_window_ids',
 ];
diff --git a/x-pack/plugins/rule_registry/common/assets/field_maps/technical_rule_field_map.test.ts b/x-pack/plugins/rule_registry/common/assets/field_maps/technical_rule_field_map.test.ts
index 581c77670a153..b98c94b163445 100644
--- a/x-pack/plugins/rule_registry/common/assets/field_maps/technical_rule_field_map.test.ts
+++ b/x-pack/plugins/rule_registry/common/assets/field_maps/technical_rule_field_map.test.ts
@@ -72,6 +72,11 @@ it('matches snapshot', () => {
         "required": false,
         "type": "date",
       },
+      "kibana.alert.maintenance_window_ids": Object {
+        "array": true,
+        "required": false,
+        "type": "keyword",
+      },
       "kibana.alert.reason": Object {
         "array": false,
         "required": false,
diff --git a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.test.ts b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.test.ts
index 375deb87aa7fd..daaac95f952f1 100644
--- a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.test.ts
+++ b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.test.ts
@@ -9,6 +9,7 @@ import { loggerMock } from '@kbn/logging-mocks';
 import { pick } from 'lodash';
 import {
   ALERT_INSTANCE_ID,
+  ALERT_MAINTENANCE_WINDOW_IDS,
   ALERT_RULE_CATEGORY,
   ALERT_RULE_CONSUMER,
   ALERT_RULE_NAME,
@@ -921,6 +922,332 @@ describe('createLifecycleExecutor', () => {
     });
   });
 
+  describe('set maintenance window ids on the document', () => {
+    const maintenanceWindowIds = ['test-id-1', 'test-id-2'];
+
+    it('updates documents with maintenance window ids for newly firing alerts', async () => {
+      const logger = loggerMock.create();
+      const ruleDataClientMock = createRuleDataClientMock();
+      const executor = createLifecycleExecutor(
+        logger,
+        ruleDataClientMock
+      )<{}, TestRuleState, never, never, never>(async ({ services, state }) => {
+        services.alertWithLifecycle({
+          id: 'TEST_ALERT_0',
+          fields: { [TAGS]: ['source-tag1', 'source-tag2'] },
+        });
+        services.alertWithLifecycle({
+          id: 'TEST_ALERT_1',
+          fields: { [TAGS]: ['source-tag3', 'source-tag4'] },
+        });
+
+        return { state };
+      });
+
+      await executor(
+        createDefaultAlertExecutorOptions({
+          params: {},
+          state: { wrapped: initialRuleState, trackedAlerts: {}, trackedAlertsRecovered: {} },
+          logger,
+          maintenanceWindowIds,
+        })
+      );
+
+      expect((await ruleDataClientMock.getWriter()).bulk).toHaveBeenCalledWith(
+        expect.objectContaining({
+          body: [
+            // alert documents
+            { index: { _id: expect.any(String) } },
+            expect.objectContaining({
+              [ALERT_INSTANCE_ID]: 'TEST_ALERT_0',
+              [ALERT_STATUS]: ALERT_STATUS_ACTIVE,
+              [EVENT_ACTION]: 'open',
+              [EVENT_KIND]: 'signal',
+              [TAGS]: ['source-tag1', 'source-tag2', 'rule-tag1', 'rule-tag2'],
+              [ALERT_MAINTENANCE_WINDOW_IDS]: maintenanceWindowIds,
+            }),
+            { index: { _id: expect.any(String) } },
+            expect.objectContaining({
+              [ALERT_INSTANCE_ID]: 'TEST_ALERT_1',
+              [ALERT_STATUS]: ALERT_STATUS_ACTIVE,
+              [EVENT_ACTION]: 'open',
+              [EVENT_KIND]: 'signal',
+              [TAGS]: ['source-tag3', 'source-tag4', 'rule-tag1', 'rule-tag2'],
+              [ALERT_MAINTENANCE_WINDOW_IDS]: maintenanceWindowIds,
+            }),
+          ],
+        })
+      );
+      expect((await ruleDataClientMock.getWriter()).bulk).not.toHaveBeenCalledWith(
+        expect.objectContaining({
+          body: expect.arrayContaining([
+            // evaluation documents
+            { index: {} },
+            expect.objectContaining({
+              [EVENT_KIND]: 'event',
+            }),
+          ]),
+        })
+      );
+    });
+
+    it('updates documents with maintenance window ids for repeatedly firing alerts', async () => {
+      const logger = loggerMock.create();
+      const ruleDataClientMock = createRuleDataClientMock();
+      ruleDataClientMock.getReader().search.mockResolvedValue({
+        hits: {
+          hits: [
+            {
+              _source: {
+                '@timestamp': '',
+                [ALERT_INSTANCE_ID]: 'TEST_ALERT_0',
+                [ALERT_UUID]: 'ALERT_0_UUID',
+                [ALERT_RULE_CATEGORY]: 'RULE_TYPE_NAME',
+                [ALERT_RULE_CONSUMER]: 'CONSUMER',
+                [ALERT_RULE_NAME]: 'NAME',
+                [ALERT_RULE_PRODUCER]: 'PRODUCER',
+                [ALERT_RULE_TYPE_ID]: 'RULE_TYPE_ID',
+                [ALERT_RULE_UUID]: 'RULE_UUID',
+                [ALERT_STATUS]: ALERT_STATUS_ACTIVE,
+                [ALERT_WORKFLOW_STATUS]: 'closed',
+                [SPACE_IDS]: ['fake-space-id'],
+                labels: { LABEL_0_KEY: 'LABEL_0_VALUE' }, // this must show up in the written doc
+              },
+            },
+            {
+              _source: {
+                '@timestamp': '',
+                [ALERT_INSTANCE_ID]: 'TEST_ALERT_1',
+                [ALERT_UUID]: 'ALERT_1_UUID',
+                [ALERT_RULE_CATEGORY]: 'RULE_TYPE_NAME',
+                [ALERT_RULE_CONSUMER]: 'CONSUMER',
+                [ALERT_RULE_NAME]: 'NAME',
+                [ALERT_RULE_PRODUCER]: 'PRODUCER',
+                [ALERT_RULE_TYPE_ID]: 'RULE_TYPE_ID',
+                [ALERT_RULE_UUID]: 'RULE_UUID',
+                [ALERT_STATUS]: ALERT_STATUS_ACTIVE,
+                [ALERT_WORKFLOW_STATUS]: 'open',
+                [SPACE_IDS]: ['fake-space-id'],
+                labels: { LABEL_0_KEY: 'LABEL_0_VALUE' }, // this must not show up in the written doc
+              },
+            },
+          ],
+        },
+      } as any);
+
+      const executor = createLifecycleExecutor(
+        logger,
+        ruleDataClientMock
+      )<{}, TestRuleState, never, never, never>(async ({ services, state }) => {
+        services.alertWithLifecycle({
+          id: 'TEST_ALERT_0',
+          fields: {},
+        });
+        services.alertWithLifecycle({
+          id: 'TEST_ALERT_1',
+          fields: {},
+        });
+
+        return { state };
+      });
+
+      await executor(
+        createDefaultAlertExecutorOptions({
+          alertId: 'TEST_ALERT_0',
+          params: {},
+          state: {
+            wrapped: initialRuleState,
+            trackedAlerts: {
+              TEST_ALERT_0: {
+                alertId: 'TEST_ALERT_0',
+                alertUuid: 'TEST_ALERT_0_UUID',
+                started: '2020-01-01T12:00:00.000Z',
+                flappingHistory: [],
+                flapping: false,
+                pendingRecoveredCount: 0,
+              },
+              TEST_ALERT_1: {
+                alertId: 'TEST_ALERT_1',
+                alertUuid: 'TEST_ALERT_1_UUID',
+                started: '2020-01-02T12:00:00.000Z',
+                flappingHistory: [],
+                flapping: false,
+                pendingRecoveredCount: 0,
+              },
+            },
+            trackedAlertsRecovered: {},
+          },
+          logger,
+          maintenanceWindowIds,
+        })
+      );
+
+      expect((await ruleDataClientMock.getWriter()).bulk).toHaveBeenCalledWith(
+        expect.objectContaining({
+          body: [
+            // alert document
+            { index: { _id: 'TEST_ALERT_0_UUID' } },
+            expect.objectContaining({
+              [ALERT_INSTANCE_ID]: 'TEST_ALERT_0',
+              [ALERT_WORKFLOW_STATUS]: 'closed',
+              [ALERT_STATUS]: ALERT_STATUS_ACTIVE,
+              labels: { LABEL_0_KEY: 'LABEL_0_VALUE' },
+              [EVENT_ACTION]: 'active',
+              [EVENT_KIND]: 'signal',
+              [ALERT_MAINTENANCE_WINDOW_IDS]: maintenanceWindowIds,
+            }),
+            { index: { _id: 'TEST_ALERT_1_UUID' } },
+            expect.objectContaining({
+              [ALERT_INSTANCE_ID]: 'TEST_ALERT_1',
+              [ALERT_WORKFLOW_STATUS]: 'open',
+              [ALERT_STATUS]: ALERT_STATUS_ACTIVE,
+              [EVENT_ACTION]: 'active',
+              [EVENT_KIND]: 'signal',
+              [ALERT_MAINTENANCE_WINDOW_IDS]: maintenanceWindowIds,
+            }),
+          ],
+        })
+      );
+      expect((await ruleDataClientMock.getWriter()).bulk).not.toHaveBeenCalledWith(
+        expect.objectContaining({
+          body: expect.arrayContaining([
+            // evaluation documents
+            { index: {} },
+            expect.objectContaining({
+              [EVENT_KIND]: 'event',
+            }),
+          ]),
+        })
+      );
+    });
+
+    it('updates document with maintenance window ids for recovered alerts', async () => {
+      const logger = loggerMock.create();
+      const ruleDataClientMock = createRuleDataClientMock();
+      ruleDataClientMock.getReader().search.mockResolvedValue({
+        hits: {
+          hits: [
+            {
+              _source: {
+                '@timestamp': '',
+                [ALERT_INSTANCE_ID]: 'TEST_ALERT_0',
+                [ALERT_UUID]: 'ALERT_0_UUID',
+                [ALERT_RULE_CATEGORY]: 'RULE_TYPE_NAME',
+                [ALERT_RULE_CONSUMER]: 'CONSUMER',
+                [ALERT_RULE_NAME]: 'NAME',
+                [ALERT_RULE_PRODUCER]: 'PRODUCER',
+                [ALERT_RULE_TYPE_ID]: 'RULE_TYPE_ID',
+                [ALERT_RULE_UUID]: 'RULE_UUID',
+                [ALERT_STATUS]: ALERT_STATUS_ACTIVE,
+                [SPACE_IDS]: ['fake-space-id'],
+                labels: { LABEL_0_KEY: 'LABEL_0_VALUE' }, // this must show up in the written doc
+                [TAGS]: ['source-tag1', 'source-tag2'],
+              },
+            },
+            {
+              _source: {
+                '@timestamp': '',
+                [ALERT_INSTANCE_ID]: 'TEST_ALERT_1',
+                [ALERT_UUID]: 'ALERT_1_UUID',
+                [ALERT_RULE_CATEGORY]: 'RULE_TYPE_NAME',
+                [ALERT_RULE_CONSUMER]: 'CONSUMER',
+                [ALERT_RULE_NAME]: 'NAME',
+                [ALERT_RULE_PRODUCER]: 'PRODUCER',
+                [ALERT_RULE_TYPE_ID]: 'RULE_TYPE_ID',
+                [ALERT_RULE_UUID]: 'RULE_UUID',
+                [ALERT_STATUS]: ALERT_STATUS_ACTIVE,
+                [SPACE_IDS]: ['fake-space-id'],
+                labels: { LABEL_0_KEY: 'LABEL_0_VALUE' }, // this must not show up in the written doc
+                [TAGS]: ['source-tag3', 'source-tag4'],
+              },
+            },
+          ],
+        },
+      } as any);
+      const executor = createLifecycleExecutor(
+        logger,
+        ruleDataClientMock
+      )<{}, TestRuleState, never, never, never>(async ({ services, state }) => {
+        // TEST_ALERT_0 has recovered
+        services.alertWithLifecycle({
+          id: 'TEST_ALERT_1',
+          fields: {},
+        });
+
+        return { state };
+      });
+
+      await executor(
+        createDefaultAlertExecutorOptions({
+          alertId: 'TEST_ALERT_0',
+          params: {},
+          state: {
+            wrapped: initialRuleState,
+            trackedAlerts: {
+              TEST_ALERT_0: {
+                alertId: 'TEST_ALERT_0',
+                alertUuid: 'TEST_ALERT_0_UUID',
+                started: '2020-01-01T12:00:00.000Z',
+                flappingHistory: [],
+                flapping: false,
+                pendingRecoveredCount: 0,
+              },
+              TEST_ALERT_1: {
+                alertId: 'TEST_ALERT_1',
+                alertUuid: 'TEST_ALERT_1_UUID',
+                started: '2020-01-02T12:00:00.000Z',
+                flappingHistory: [],
+                flapping: false,
+                pendingRecoveredCount: 0,
+              },
+            },
+            trackedAlertsRecovered: {},
+          },
+          logger,
+          maintenanceWindowIds,
+        })
+      );
+
+      expect((await ruleDataClientMock.getWriter()).bulk).toHaveBeenCalledWith(
+        expect.objectContaining({
+          body: expect.arrayContaining([
+            // alert document
+            { index: { _id: 'TEST_ALERT_0_UUID' } },
+            expect.objectContaining({
+              [ALERT_INSTANCE_ID]: 'TEST_ALERT_0',
+              [ALERT_STATUS]: ALERT_STATUS_RECOVERED,
+              labels: { LABEL_0_KEY: 'LABEL_0_VALUE' },
+              [TAGS]: ['source-tag1', 'source-tag2', 'rule-tag1', 'rule-tag2'],
+              [EVENT_ACTION]: 'close',
+              [EVENT_KIND]: 'signal',
+              [ALERT_MAINTENANCE_WINDOW_IDS]: maintenanceWindowIds,
+            }),
+            { index: { _id: 'TEST_ALERT_1_UUID' } },
+            expect.objectContaining({
+              [ALERT_INSTANCE_ID]: 'TEST_ALERT_1',
+              [ALERT_STATUS]: ALERT_STATUS_ACTIVE,
+              [EVENT_ACTION]: 'active',
+              [EVENT_KIND]: 'signal',
+              [TAGS]: ['source-tag3', 'source-tag4', 'rule-tag1', 'rule-tag2'],
+              [ALERT_MAINTENANCE_WINDOW_IDS]: maintenanceWindowIds,
+            }),
+          ]),
+        })
+      );
+      expect((await ruleDataClientMock.getWriter()).bulk).not.toHaveBeenCalledWith(
+        expect.objectContaining({
+          body: expect.arrayContaining([
+            // evaluation documents
+            { index: {} },
+            expect.objectContaining({
+              [EVENT_KIND]: 'event',
+            }),
+          ]),
+        })
+      );
+    });
+  });
+
   describe('set flapping on the document', () => {
     const flapping = new Array(16).fill(false).concat([true, true, true, true]);
     const notFlapping = new Array(20).fill(false);
diff --git a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.ts b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.ts
index 1b9c03745cda0..a213f25cc0fcd 100644
--- a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.ts
+++ b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.ts
@@ -43,6 +43,7 @@ import {
   TIMESTAMP,
   VERSION,
   ALERT_FLAPPING,
+  ALERT_MAINTENANCE_WINDOW_IDS,
 } from '../../common/technical_rule_data_field_names';
 import { CommonAlertFieldNameLatest, CommonAlertIdFieldNameLatest } from '../../common/schemas';
 import { IRuleDataClient } from '../rule_data_client';
@@ -131,6 +132,7 @@ export const createLifecycleExecutor =
       services: { alertFactory, shouldWriteAlerts },
       state: previousState,
       flappingSettings,
+      maintenanceWindowIds,
       rule,
     } = options;
 
@@ -299,6 +301,9 @@ export const createLifecycleExecutor =
           [VERSION]: ruleDataClient.kibanaVersion,
           [ALERT_FLAPPING]: flapping,
           ...(isRecovered ? { [ALERT_END]: commonRuleFields[TIMESTAMP] } : {}),
+          ...(maintenanceWindowIds?.length
+            ? { [ALERT_MAINTENANCE_WINDOW_IDS]: maintenanceWindowIds }
+            : {}),
         };
 
         return {
diff --git a/x-pack/plugins/rule_registry/server/utils/rule_executor.test_helpers.ts b/x-pack/plugins/rule_registry/server/utils/rule_executor.test_helpers.ts
index 58b370847de5f..588e2efa3eeb8 100644
--- a/x-pack/plugins/rule_registry/server/utils/rule_executor.test_helpers.ts
+++ b/x-pack/plugins/rule_registry/server/utils/rule_executor.test_helpers.ts
@@ -39,6 +39,7 @@ export const createDefaultAlertExecutorOptions = <
   startedAt = new Date(),
   updatedAt = new Date(),
   shouldWriteAlerts = true,
+  maintenanceWindowIds,
 }: {
   alertId?: string;
   ruleName?: string;
@@ -49,6 +50,7 @@ export const createDefaultAlertExecutorOptions = <
   startedAt?: Date;
   updatedAt?: Date;
   shouldWriteAlerts?: boolean;
+  maintenanceWindowIds?: string[];
 }): RuleExecutorOptions<Params, State, InstanceState, InstanceContext, ActionGroupIds> => ({
   startedAt,
   rule: {
@@ -92,4 +94,5 @@ export const createDefaultAlertExecutorOptions = <
   executionId: 'b33f65d7-6e8b-4aae-8d20-c93613deb33f',
   logger,
   flappingSettings: DEFAULT_FLAPPING_SETTINGS,
+  ...(maintenanceWindowIds ? { maintenanceWindowIds } : {}),
 });
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/event_log.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/event_log.ts
index 7d832ccb450b4..fac54e789bd30 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/event_log.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/event_log.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import moment from 'moment';
 import expect from '@kbn/expect';
 import { IValidatedEvent, nanosToMillis } from '@kbn/event-log-plugin/server';
 import { RuleNotifyWhen } from '@kbn/alerting-plugin/common';
@@ -1180,6 +1181,128 @@ export default function eventLogTests({ getService }: FtrProviderContext) {
             }
           }
         });
+
+        it('should generate expected events affected by active maintenance windows', async () => {
+          // Create 2 active maintenance windows
+          const { body: window1 } = await supertest
+            .post(`${getUrlPrefix(space.id)}/internal/alerting/rules/maintenance_window`)
+            .set('kbn-xsrf', 'foo')
+            .send({
+              title: 'test-maintenance-window-1',
+              duration: 60 * 60 * 1000, // 1 hr
+              r_rule: {
+                dtstart: moment.utc().toISOString(),
+                tzid: 'UTC',
+                freq: 0, // yearly
+                count: 1,
+              },
+            })
+            .expect(200);
+          objectRemover.add(space.id, window1.id, 'rules/maintenance_window', 'alerting', true);
+
+          const { body: window2 } = await supertest
+            .post(`${getUrlPrefix(space.id)}/internal/alerting/rules/maintenance_window`)
+            .set('kbn-xsrf', 'foo')
+            .send({
+              title: 'test-maintenance-window-2',
+              duration: 60 * 60 * 1000, // 1 hr
+              r_rule: {
+                dtstart: moment.utc().toISOString(),
+                tzid: 'UTC',
+                freq: 0, // yearly
+                count: 1,
+              },
+            })
+            .expect(200);
+          objectRemover.add(space.id, window2.id, 'rules/maintenance_window', 'alerting', true);
+
+          // Create 1 inactive maintenance window
+          const { body: window3 } = await supertest
+            .post(`${getUrlPrefix(space.id)}/internal/alerting/rules/maintenance_window`)
+            .set('kbn-xsrf', 'foo')
+            .send({
+              title: 'test-maintenance-window-3',
+              duration: 60 * 60 * 1000, // 1 hr
+              r_rule: {
+                dtstart: moment.utc().add(1, 'day').toISOString(),
+                tzid: 'UTC',
+                freq: 0, // yearly
+                count: 1,
+              },
+            })
+            .expect(200);
+          objectRemover.add(space.id, window3.id, 'rules/maintenance_window', 'alerting', true);
+
+          const { body: createdAction } = await supertest
+            .post(`${getUrlPrefix(space.id)}/api/actions/connector`)
+            .set('kbn-xsrf', 'foo')
+            .send({
+              name: 'MY action',
+              connector_type_id: 'test.noop',
+              config: {},
+              secrets: {},
+            })
+            .expect(200);
+
+          // pattern of when the alert should fire
+          const pattern = {
+            instance: [false, true, true],
+          };
+
+          const response = await supertest
+            .post(`${getUrlPrefix(space.id)}/api/alerting/rule`)
+            .set('kbn-xsrf', 'foo')
+            .send(
+              getTestRuleData({
+                rule_type_id: 'test.patternFiring',
+                schedule: { interval: '1s' },
+                throttle: null,
+                params: {
+                  pattern,
+                },
+                actions: [
+                  {
+                    id: createdAction.id,
+                    group: 'default',
+                    params: {},
+                  },
+                ],
+              })
+            );
+
+          expect(response.status).to.eql(200);
+          const alertId = response.body.id;
+          objectRemover.add(space.id, alertId, 'rule', 'alerting');
+
+          // get the events we're expecting
+          const events = await retry.try(async () => {
+            return await getEventLog({
+              getService,
+              spaceId: space.id,
+              type: 'alert',
+              id: alertId,
+              provider: 'alerting',
+              actions: new Map([
+                // make sure the counts of the # of events per type are as expected
+                ['execute-start', { gte: 4 }],
+                ['execute', { gte: 4 }],
+                ['new-instance', { equal: 1 }],
+                ['active-instance', { gte: 1 }],
+                ['recovered-instance', { equal: 1 }],
+              ]),
+            });
+          });
+
+          const actionsToCheck = ['new-instance', 'active-instance', 'recovered-instance'];
+
+          events.forEach((event) => {
+            if (actionsToCheck.includes(event?.event?.action || '')) {
+              const alertMaintenanceWindowIds =
+                event?.kibana?.alert?.maintenance_window_ids?.sort();
+              expect(alertMaintenanceWindowIds).eql([window1.id, window2.id].sort());
+            }
+          });
+        });
       });
     }
   });
diff --git a/x-pack/test/rule_registry/spaces_only/tests/trial/get_summarized_alerts.ts b/x-pack/test/rule_registry/spaces_only/tests/trial/get_summarized_alerts.ts
index 32f47b708e545..680b61cceaf20 100644
--- a/x-pack/test/rule_registry/spaces_only/tests/trial/get_summarized_alerts.ts
+++ b/x-pack/test/rule_registry/spaces_only/tests/trial/get_summarized_alerts.ts
@@ -15,6 +15,7 @@ import {
   AlertConsumers,
   ALERT_REASON,
   ALERT_INSTANCE_ID,
+  ALERT_MAINTENANCE_WINDOW_IDS,
 } from '@kbn/rule-registry-plugin/common/technical_rule_data_field_names';
 import {
   createLifecycleExecutor,
@@ -380,5 +381,141 @@ export default function createGetSummarizedAlertsTest({ getService }: FtrProvide
       expect(summarizedAlertsExcludingId2.recovered.count).to.eql(0);
       expect(get(summarizedAlertsExcludingId2.new.data[0], ALERT_INSTANCE_ID)).to.eql(id1);
     });
+
+    it('should return new, ongoing, and recovered alerts if there are active maintenance windows', async () => {
+      const id = 'host-01';
+      const maintenanceWindowIds = ['test-id-1', 'test-id-2'];
+
+      // This creates the function that will wrap the solution's rule executor with the RuleRegistry lifecycle
+      const createLifecycleRuleExecutor = createLifecycleExecutor(logger, ruleDataClient);
+      const createGetSummarizedAlerts = createGetSummarizedAlertsFn({
+        ruleDataClient,
+        useNamespace: false,
+        isLifecycleAlert: true,
+      });
+
+      // This creates the executor that is passed to the Alerting framework.
+      const executor = createLifecycleRuleExecutor<
+        MockRuleParams,
+        { shouldTriggerAlert: boolean },
+        MockAlertState,
+        MockAlertContext,
+        MockAllowedActionGroups
+      >(async function (options) {
+        const { services, state: previousState } = options;
+        const { alertWithLifecycle } = services;
+
+        const triggerAlert = previousState.shouldTriggerAlert;
+
+        if (triggerAlert) {
+          alertWithLifecycle({
+            id,
+            fields: {
+              [ALERT_REASON]: 'Test alert is firing',
+            },
+          });
+        }
+
+        return Promise.resolve({ state: { shouldTriggerAlert: triggerAlert } });
+      });
+
+      const getSummarizedAlerts = createGetSummarizedAlerts();
+
+      // Create the options with the minimal amount of values to test the lifecycle executor
+      const options = {
+        spaceId: 'default',
+        rule: {
+          id,
+          name: 'test rule',
+          ruleTypeId: 'observability.test.fake',
+          ruleTypeName: 'test',
+          consumer: 'observability',
+          producer: 'observability.test',
+        },
+        services: {
+          alertFactory: getMockAlertFactory(),
+          shouldWriteAlerts: sinon.stub().returns(true),
+        },
+        flappingSettings: DEFAULT_FLAPPING_SETTINGS,
+        maintenanceWindowIds,
+      } as unknown as RuleExecutorOptions<
+        MockRuleParams,
+        WrappedLifecycleRuleState<{ shouldTriggerAlert: boolean }>,
+        { [x: string]: unknown },
+        { [x: string]: unknown },
+        string
+      >;
+
+      const getState = (
+        shouldTriggerAlert: boolean,
+        alerts: Record<string, TrackedLifecycleAlertState>
+      ) => ({ wrapped: { shouldTriggerAlert }, trackedAlerts: alerts, trackedAlertsRecovered: {} });
+
+      // Execute the rule the first time - this creates a new alert
+      const execution1Uuid = uuidv4();
+      const execution1Result = await executor({
+        ...options,
+        startedAt: new Date(),
+        state: getState(true, {}),
+        executionId: execution1Uuid,
+      });
+
+      const execution1SummarizedAlerts = await getSummarizedAlerts({
+        ruleId: id,
+        executionUuid: execution1Uuid,
+        spaceId: 'default',
+        excludedAlertInstanceIds: [],
+      });
+      expect(execution1SummarizedAlerts.new.count).to.eql(1);
+      expect(execution1SummarizedAlerts.ongoing.count).to.eql(0);
+      expect(execution1SummarizedAlerts.recovered.count).to.eql(0);
+      expect(get(execution1SummarizedAlerts.new.data[0], ALERT_MAINTENANCE_WINDOW_IDS)).to.eql(
+        maintenanceWindowIds
+      );
+
+      // Execute again to update the existing alert
+      const execution2Uuid = uuidv4();
+      const execution2Result = await executor({
+        ...options,
+        startedAt: new Date(),
+        state: getState(true, execution1Result.state.trackedAlerts),
+        executionId: execution2Uuid,
+      });
+
+      const execution2SummarizedAlerts = await getSummarizedAlerts({
+        ruleId: id,
+        executionUuid: execution2Uuid,
+        spaceId: 'default',
+        excludedAlertInstanceIds: [],
+      });
+      expect(execution2SummarizedAlerts.new.count).to.eql(0);
+      expect(execution2SummarizedAlerts.ongoing.count).to.eql(1);
+      expect(execution2SummarizedAlerts.recovered.count).to.eql(0);
+      expect(get(execution2SummarizedAlerts.ongoing.data[0], ALERT_MAINTENANCE_WINDOW_IDS)).to.eql(
+        maintenanceWindowIds
+      );
+
+      // Execute again to recover the alert
+      const execution3Uuid = uuidv4();
+      await executor({
+        ...options,
+        startedAt: new Date(),
+        state: getState(false, execution2Result.state.trackedAlerts),
+        executionId: execution3Uuid,
+      });
+
+      const execution3SummarizedAlerts = await getSummarizedAlerts({
+        ruleId: id,
+        executionUuid: execution3Uuid,
+        spaceId: 'default',
+        excludedAlertInstanceIds: [],
+      });
+      expect(execution3SummarizedAlerts.new.count).to.eql(0);
+      expect(execution3SummarizedAlerts.ongoing.count).to.eql(0);
+      expect(execution3SummarizedAlerts.recovered.count).to.eql(1);
+      expect(
+        get(execution3SummarizedAlerts.recovered.data[0], ALERT_MAINTENANCE_WINDOW_IDS)
+      ).to.eql(maintenanceWindowIds);
+    });
   });
 }

From 54f9f11339678f7949ff7b39b5fb6e734debd9bf Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad31comp@gmail.com>
Date: Wed, 19 Apr 2023 18:10:31 +0200
Subject: [PATCH 082/100] [Synthetics] Monitor form validate inline script
 (#155185)

## Summary

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

Added inline script basic validation !!

Also adjusted Test Now button to be more user friendly !!

<img width="1353" alt="image"
src="https://user-images.githubusercontent.com/3505601/232848294-4d6fed01-8fb3-4b3c-a3da-dfbc58c1bbd6.png">

---------

Co-authored-by: Justin Kambic <jk@elastic.co>
---
 .../monitor_add_edit/form/field_config.tsx    | 22 ++++++++++++++++++-
 .../monitor_add_edit/form/run_test_btn.tsx    | 10 ++++-----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/field_config.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/field_config.tsx
index 7e1ea329fe3f8..b0de4f812da1a 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/field_config.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/field_config.tsx
@@ -895,7 +895,27 @@ export const FIELD = (readOnly?: boolean): FieldMap => ({
       isEditFlow: isEdit,
     }),
     validation: () => ({
-      validate: (value) => Boolean(value.script),
+      validate: (value) => {
+        // return false if script contains import or require statement
+        if (
+          value.script?.includes('import ') ||
+          value.script?.includes('require(') ||
+          value.script?.includes('journey(')
+        ) {
+          return i18n.translate('xpack.synthetics.monitorConfig.monitorScript.invalid', {
+            defaultMessage:
+              'Monitor script is invalid. Inline scripts cannot be full journey scripts, they may only contain step definitions.',
+          });
+        }
+        // should contain at least one step
+        if (value.script && !value.script?.includes('step(')) {
+          return i18n.translate('xpack.synthetics.monitorConfig.monitorScript.invalid.oneStep', {
+            defaultMessage:
+              'Monitor script is invalid. Inline scripts must contain at least one step definition.',
+          });
+        }
+        return Boolean(value.script);
+      },
     }),
     error: i18n.translate('xpack.synthetics.monitorConfig.monitorScript.error', {
       defaultMessage: 'Monitor script is required',
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/run_test_btn.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/run_test_btn.tsx
index 5bfc724e39f49..07497c0e6cd50 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/run_test_btn.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/run_test_btn.tsx
@@ -20,14 +20,14 @@ import {
 import { runOnceMonitor } from '../../../state/manual_test_runs/api';
 
 export const RunTestButton = () => {
-  const { watch, formState, getValues } = useFormContext();
+  const { watch, formState, getValues, handleSubmit } = useFormContext();
 
   const [inProgress, setInProgress] = useState(false);
   const [testRun, setTestRun] = useState<TestRun>();
 
   const handleTestNow = () => {
     const config = getValues() as MonitorFieldsType;
-    if (config) {
+    if (config && !Object.keys(formState.errors).length) {
       setInProgress(true);
       setTestRun({
         id: uuidv4(),
@@ -68,9 +68,7 @@ export const RunTestButton = () => {
           disabled={isDisabled}
           aria-label={TEST_NOW_ARIA_LABEL}
           iconType="play"
-          onClick={() => {
-            handleTestNow();
-          }}
+          onClick={handleSubmit(handleTestNow)}
         >
           {RUN_TEST}
         </EuiButton>
@@ -111,7 +109,7 @@ const useTooltipContent = (
 
   tooltipContent = isTestRunInProgress ? TEST_SCHEDULED_LABEL : tooltipContent;
 
-  const isDisabled = !isValid || isTestRunInProgress || !isAnyPublicLocationSelected;
+  const isDisabled = isTestRunInProgress || !isAnyPublicLocationSelected;
 
   return { tooltipContent, isDisabled };
 };

From 2fbfb33bed4aea5c2201c4719291220ce0175d72 Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad31comp@gmail.com>
Date: Wed, 19 Apr 2023 18:14:11 +0200
Subject: [PATCH 083/100] [Synthetics] Enable throttling in synthetics app
 (#154378)

## Summary

Enable throttling config in synthetics app !!

<img width="1773" alt="image"
src="https://user-images.githubusercontent.com/3505601/229875799-d87b0ad6-c318-4a17-9012-c56666841b5c.png">

---------

Co-authored-by: Dominique Clarke <dominique.clarke@elastic.co>
---
 .../group2/check_registered_types.test.ts     |   2 +-
 .../common/constants/monitor_defaults.ts      |  88 ++++++++-
 .../common/constants/monitor_management.ts    |  12 +-
 .../common/formatters/browser/formatters.ts   |  21 +-
 .../format_synthetics_policy.test.ts          |   7 +-
 .../formatters/format_synthetics_policy.ts    |   8 +
 .../monitor_management/monitor_configs.ts     |   9 -
 .../monitor_management/monitor_types.ts       |  31 +--
 .../common/types/monitor_validation.ts        |   8 +-
 .../fields/throttling/connection_profile.tsx  |  81 ++++++++
 .../throttling_config_field.test.tsx          |  81 ++++++++
 .../throttling/throttling_config_field.tsx    |  79 ++++++++
 .../throttling_disabled_callout.tsx           |  33 ++++
 .../throttling/throttling_download_field.tsx  |  91 +++++++++
 .../throttling_exceeded_callout.tsx           |  49 +++++
 .../throttling/throttling_fields.test.tsx     |  86 +++++++++
 .../fields/throttling/throttling_fields.tsx   |  97 ++++++++++
 .../throttling/throttling_latency_field.tsx   |  72 +++++++
 .../throttling/throttling_upload_field.tsx    |  87 +++++++++
 .../throttling/use_connection_profiles.tsx    |  30 +++
 .../monitor_add_edit/form/defaults.test.tsx   |  22 +--
 .../monitor_add_edit/form/field_config.tsx    |  53 ++----
 .../monitor_add_edit/form/field_wrappers.tsx  |   8 +
 .../monitor_add_edit/form/form_config.tsx     |   3 +-
 .../monitor_add_edit/form/formatter.test.tsx  |  20 +-
 .../monitor_add_edit/form/validation.tsx      |  14 +-
 .../monitor_edit_page.test.tsx                |   5 +
 .../__mocks__/synthetics_store.mock.ts        |  14 +-
 .../migrations/monitors/8.8.0.test.ts         | 106 ++++++++++-
 .../migrations/monitors/8.8.0.ts              | 120 +++++++++++-
 .../lib/saved_objects/synthetics_monitor.ts   |   7 +
 .../monitor_cruds/add_monitor_project.ts      |   2 +-
 .../monitor_cruds/monitor_validation.test.ts  |  14 +-
 .../synthetics_service/formatters/browser.ts  |  26 +--
 .../formatters/format_configs.test.ts         |  28 +--
 .../formatters/format_configs.ts              |  19 +-
 .../synthetics_private_location.test.ts       |   6 +-
 .../normalizers/browser_monitor.test.ts       | 180 ++++++++++++++++--
 .../normalizers/browser_monitor.ts            |  71 ++++---
 .../project_monitor_formatter.test.ts         |  10 -
 .../project_monitor_formatter_legacy.test.ts  |  10 -
 .../translations/translations/fr-FR.json      |   1 -
 .../translations/translations/ja-JP.json      |   1 -
 .../translations/translations/zh-CN.json      |   1 -
 .../apis/synthetics/add_monitor_project.ts    |  16 +-
 .../synthetics/add_monitor_project_legacy.ts  |  10 +-
 .../uptime/rest/fixtures/browser_monitor.json |  14 +-
 47 files changed, 1480 insertions(+), 273 deletions(-)
 create mode 100644 x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/connection_profile.tsx
 create mode 100644 x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_config_field.test.tsx
 create mode 100644 x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_config_field.tsx
 create mode 100644 x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_disabled_callout.tsx
 create mode 100644 x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_download_field.tsx
 create mode 100644 x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_exceeded_callout.tsx
 create mode 100644 x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_fields.test.tsx
 create mode 100644 x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_fields.tsx
 create mode 100644 x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_latency_field.tsx
 create mode 100644 x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_upload_field.tsx
 create mode 100644 x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/use_connection_profiles.tsx

diff --git a/src/core/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts
index a6428387f65f3..1da0a3c83c9bb 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts
@@ -138,7 +138,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "slo": "aefffabdb35d15a6c388634af2cee1fa59ede83c",
         "space": "7fc578a1f9f7708cb07479f03953d664ad9f1dae",
         "spaces-usage-stats": "084bd0f080f94fb5735d7f3cf12f13ec92f36bad",
-        "synthetics-monitor": "7136a2669a65323c56da849f26c369cdeeb3b381",
+        "synthetics-monitor": "fa988678e5d6791c75515fa1acdbbb3b2d1f916d",
         "synthetics-param": "9776c9b571d35f0d0397e8915e035ea1dc026db7",
         "synthetics-privates-locations": "7d032fc788905e32152029ae7ab3d6038c48ae44",
         "tag": "87f21f07df9cc37001b15a26e413c18f50d1fbfe",
diff --git a/x-pack/plugins/synthetics/common/constants/monitor_defaults.ts b/x-pack/plugins/synthetics/common/constants/monitor_defaults.ts
index 956dfa2af23b5..6b9cc7913019a 100644
--- a/x-pack/plugins/synthetics/common/constants/monitor_defaults.ts
+++ b/x-pack/plugins/synthetics/common/constants/monitor_defaults.ts
@@ -4,6 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { i18n } from '@kbn/i18n';
 import {
   BrowserAdvancedFields,
   BrowserSimpleFields,
@@ -22,6 +23,7 @@ import {
   SourceType,
   TCPAdvancedFields,
   TCPSimpleFields,
+  ThrottlingConfig,
   TLSFields,
   TLSVersion,
   VerificationMode,
@@ -30,6 +32,86 @@ import { ConfigKey } from './monitor_management';
 
 export const DEFAULT_NAMESPACE_STRING = 'default';
 
+export enum PROFILE_VALUES_ENUM {
+  DEFAULT = 'default',
+  CABLE = 'cable',
+  DSL = 'dsl',
+  THREE_G = '3g',
+  FOUR_G = '4g',
+  LTE = 'lte',
+  FIBRE = 'fibre',
+  NO_THROTTLING = 'no-throttling',
+  CUSTOM = 'custom',
+}
+
+export const CUSTOM_LABEL = i18n.translate('xpack.synthetics.connectionProfile.custom', {
+  defaultMessage: 'Custom',
+});
+
+export const PROFILE_VALUES: ThrottlingConfig[] = [
+  {
+    value: { download: '5', upload: '3', latency: '20' },
+    id: PROFILE_VALUES_ENUM.DEFAULT,
+    label: i18n.translate('xpack.synthetics.connectionProfile.default', {
+      defaultMessage: 'Default',
+    }),
+  },
+  {
+    value: { download: '5', upload: '1', latency: '28' },
+    id: PROFILE_VALUES_ENUM.CABLE,
+    label: i18n.translate('xpack.synthetics.connectionProfile.cable', {
+      defaultMessage: 'Cable',
+    }),
+  },
+  {
+    value: { download: '1.5', upload: '0.384', latency: '50' },
+    id: PROFILE_VALUES_ENUM.DSL,
+    label: i18n.translate('xpack.synthetics.connectionProfile.dsl', {
+      defaultMessage: 'DSL',
+    }),
+  },
+  {
+    value: { download: '1.6', upload: '0.768', latency: '300' },
+    id: PROFILE_VALUES_ENUM.THREE_G,
+    label: i18n.translate('xpack.synthetics.connectionProfile.threeG', {
+      defaultMessage: '3G',
+    }),
+  },
+  {
+    value: { download: '9', upload: '0.75', latency: '170' },
+    id: PROFILE_VALUES_ENUM.FOUR_G,
+    label: i18n.translate('xpack.synthetics.connectionProfile.fourG', {
+      defaultMessage: '4G',
+    }),
+  },
+  {
+    value: { download: '12', upload: '0.75', latency: '70' },
+    id: PROFILE_VALUES_ENUM.LTE,
+    label: i18n.translate('xpack.synthetics.connectionProfile.lte', {
+      defaultMessage: 'LTE',
+    }),
+  },
+  {
+    value: { download: '20', upload: '5', latency: '4' },
+    id: PROFILE_VALUES_ENUM.FIBRE,
+    label: i18n.translate('xpack.synthetics.connectionProfile.fibre', {
+      defaultMessage: 'Fibre',
+    }),
+  },
+  {
+    value: null,
+    id: PROFILE_VALUES_ENUM.NO_THROTTLING,
+    label: i18n.translate('xpack.synthetics.connectionProfile.noThrottling', {
+      defaultMessage: 'No throttling',
+    }),
+  },
+];
+
+export const PROFILES_MAP = PROFILE_VALUES.reduce((acc, profile) => {
+  acc[profile.id] = profile;
+  return acc;
+}, {} as { [key: string]: ThrottlingConfig });
+
 export const ALLOWED_SCHEDULES_IN_MINUTES = [
   '1',
   '3',
@@ -71,11 +153,7 @@ export const DEFAULT_BROWSER_ADVANCED_FIELDS: BrowserAdvancedFields = {
   [ConfigKey.JOURNEY_FILTERS_MATCH]: '',
   [ConfigKey.JOURNEY_FILTERS_TAGS]: [],
   [ConfigKey.IGNORE_HTTPS_ERRORS]: false,
-  [ConfigKey.IS_THROTTLING_ENABLED]: true,
-  [ConfigKey.DOWNLOAD_SPEED]: '5',
-  [ConfigKey.UPLOAD_SPEED]: '3',
-  [ConfigKey.LATENCY]: '20',
-  [ConfigKey.THROTTLING_CONFIG]: '5d/3u/20l',
+  [ConfigKey.THROTTLING_CONFIG]: PROFILES_MAP[PROFILE_VALUES_ENUM.DEFAULT],
 };
 
 export const DEFAULT_BROWSER_SIMPLE_FIELDS: BrowserSimpleFields = {
diff --git a/x-pack/plugins/synthetics/common/constants/monitor_management.ts b/x-pack/plugins/synthetics/common/constants/monitor_management.ts
index 231acff2c6230..01da8ebce5d43 100644
--- a/x-pack/plugins/synthetics/common/constants/monitor_management.ts
+++ b/x-pack/plugins/synthetics/common/constants/monitor_management.ts
@@ -65,11 +65,7 @@ export enum ConfigKey {
   TLS_VERSION = 'ssl.supported_protocols',
   TAGS = 'tags',
   TIMEOUT = 'timeout',
-  THROTTLING_CONFIG = 'throttling.config',
-  IS_THROTTLING_ENABLED = 'throttling.is_enabled',
-  DOWNLOAD_SPEED = 'throttling.download_speed',
-  UPLOAD_SPEED = 'throttling.upload_speed',
-  LATENCY = 'throttling.latency',
+  THROTTLING_CONFIG = 'throttling',
   URLS = 'urls',
   USERNAME = 'username',
   WAIT = 'wait',
@@ -106,4 +102,10 @@ export enum LegacyConfigKey {
   ZIP_URL_TLS_KEY_PASSPHRASE = 'source.zip_url.ssl.key_passphrase',
   ZIP_URL_TLS_VERIFICATION_MODE = 'source.zip_url.ssl.verification_mode',
   ZIP_URL_TLS_VERSION = 'source.zip_url.ssl.supported_protocols',
+
+  THROTTLING_CONFIG = 'throttling.config',
+  IS_THROTTLING_ENABLED = 'throttling.is_enabled',
+  DOWNLOAD_SPEED = 'throttling.download_speed',
+  UPLOAD_SPEED = 'throttling.upload_speed',
+  LATENCY = 'throttling.latency',
 }
diff --git a/x-pack/plugins/synthetics/common/formatters/browser/formatters.ts b/x-pack/plugins/synthetics/common/formatters/browser/formatters.ts
index 1ad7c055aecc3..508464c48a5f2 100644
--- a/x-pack/plugins/synthetics/common/formatters/browser/formatters.ts
+++ b/x-pack/plugins/synthetics/common/formatters/browser/formatters.ts
@@ -17,29 +17,20 @@ import { tlsFormatters } from '../tls/formatters';
 
 export type BrowserFormatMap = Record<keyof BrowserFields, Formatter>;
 
-const throttlingFormatter: Formatter = (fields) => {
-  if (!fields[ConfigKey.IS_THROTTLING_ENABLED]) return 'false';
+export const throttlingFormatter: Formatter = (fields) => {
+  const throttling = fields[ConfigKey.THROTTLING_CONFIG];
 
-  const getThrottlingValue = (v: string | undefined, suffix: 'd' | 'u' | 'l') =>
-    v !== '' && v !== undefined ? `${v}${suffix}` : null;
+  if (!throttling || throttling?.id === 'no-throttling' || !throttling?.value) {
+    return 'false';
+  }
 
-  return [
-    getThrottlingValue(fields[ConfigKey.DOWNLOAD_SPEED], 'd'),
-    getThrottlingValue(fields[ConfigKey.UPLOAD_SPEED], 'u'),
-    getThrottlingValue(fields[ConfigKey.LATENCY], 'l'),
-  ]
-    .filter((v) => v !== null)
-    .join('/');
+  return `${throttling.value.download}d/${throttling.value.upload}u/${throttling.value.latency}l`;
 };
 
 export const browserFormatters: BrowserFormatMap = {
   [ConfigKey.SOURCE_PROJECT_CONTENT]: null,
   [ConfigKey.PARAMS]: null,
   [ConfigKey.SCREENSHOTS]: null,
-  [ConfigKey.IS_THROTTLING_ENABLED]: null,
-  [ConfigKey.DOWNLOAD_SPEED]: null,
-  [ConfigKey.UPLOAD_SPEED]: null,
-  [ConfigKey.LATENCY]: null,
   [ConfigKey.IGNORE_HTTPS_ERRORS]: null,
   [ConfigKey.PLAYWRIGHT_OPTIONS]: null,
   [ConfigKey.TEXT_ASSERTION]: null,
diff --git a/x-pack/plugins/synthetics/common/formatters/format_synthetics_policy.test.ts b/x-pack/plugins/synthetics/common/formatters/format_synthetics_policy.test.ts
index a03c54fc4f34e..6be823ee0a208 100644
--- a/x-pack/plugins/synthetics/common/formatters/format_synthetics_policy.test.ts
+++ b/x-pack/plugins/synthetics/common/formatters/format_synthetics_policy.test.ts
@@ -6,6 +6,7 @@
  */
 import { ConfigKey, DataStream } from '../runtime_types';
 import { formatSyntheticsPolicy } from './format_synthetics_policy';
+import { PROFILE_VALUES_ENUM, PROFILES_MAP } from '../constants/monitor_defaults';
 
 const gParams = { proxyUrl: 'https://proxy.com' };
 describe('formatSyntheticsPolicy', () => {
@@ -1145,11 +1146,7 @@ const browserConfig: any = {
   'filter_journeys.match': '',
   'filter_journeys.tags': [],
   ignore_https_errors: false,
-  'throttling.is_enabled': true,
-  'throttling.download_speed': '5',
-  'throttling.upload_speed': '3',
-  'throttling.latency': '20',
-  'throttling.config': '5d/3u/20l',
+  throttling: PROFILES_MAP[PROFILE_VALUES_ENUM.DEFAULT],
   'ssl.certificate_authorities': '',
   'ssl.certificate': '',
   'ssl.key': '',
diff --git a/x-pack/plugins/synthetics/common/formatters/format_synthetics_policy.ts b/x-pack/plugins/synthetics/common/formatters/format_synthetics_policy.ts
index 392a50d59ed28..1a9eedd6acf2a 100644
--- a/x-pack/plugins/synthetics/common/formatters/format_synthetics_policy.ts
+++ b/x-pack/plugins/synthetics/common/formatters/format_synthetics_policy.ts
@@ -7,6 +7,8 @@
 
 import { NewPackagePolicy } from '@kbn/fleet-plugin/common';
 import { cloneDeep } from 'lodash';
+import { throttlingFormatter } from './browser/formatters';
+import { LegacyConfigKey } from '../constants/monitor_management';
 import { replaceStringWithParams } from './formatting_utils';
 import { syntheticsPolicyFormatters } from './formatters';
 import { ConfigKey, DataStream, MonitorFields } from '../runtime_types';
@@ -69,5 +71,11 @@ export const formatSyntheticsPolicy = (
     }
   });
 
+  // TODO: remove this once we remove legacy support
+  const throttling = dataStream?.vars?.[LegacyConfigKey.THROTTLING_CONFIG];
+  if (throttling) {
+    throttling.value = throttlingFormatter?.(config, ConfigKey.THROTTLING_CONFIG);
+  }
+
   return { formattedPolicy, hasDataStream: Boolean(dataStream), hasInput: Boolean(currentInput) };
 };
diff --git a/x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_configs.ts b/x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_configs.ts
index 934c534795301..e616d887df4f7 100644
--- a/x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_configs.ts
+++ b/x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_configs.ts
@@ -111,15 +111,6 @@ export enum ScreenshotOption {
 export const ScreenshotOptionCodec = tEnum<ScreenshotOption>('ScreenshotOption', ScreenshotOption);
 export type ScreenshotOptionType = t.TypeOf<typeof ScreenshotOptionCodec>;
 
-export enum ThrottlingSuffix {
-  DOWNLOAD = 'd',
-  UPLOAD = 'u',
-  LATENCY = 'l',
-}
-
-export const ThrottlingSuffixCodec = tEnum<ThrottlingSuffix>('ThrottlingSuffix', ThrottlingSuffix);
-export type ThrottlingSuffixType = t.TypeOf<typeof ThrottlingSuffixCodec>;
-
 export enum SourceType {
   UI = 'ui',
   PROJECT = 'project',
diff --git a/x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_types.ts b/x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_types.ts
index 2e639e360fd1a..97363987afcc4 100644
--- a/x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_types.ts
+++ b/x-pack/plugins/synthetics/common/runtime_types/monitor_management/monitor_types.ts
@@ -192,15 +192,6 @@ export const HTTPFieldsCodec = t.intersection([
 
 export type HTTPFields = t.TypeOf<typeof HTTPFieldsCodec>;
 
-// Browser Fields
-export const ThrottlingConfigKeyCodec = t.union([
-  t.literal(ConfigKey.DOWNLOAD_SPEED),
-  t.literal(ConfigKey.UPLOAD_SPEED),
-  t.literal(ConfigKey.LATENCY),
-]);
-
-export type ThrottlingConfigKey = t.TypeOf<typeof ThrottlingConfigKeyCodec>;
-
 export const EncryptedBrowserSimpleFieldsCodec = t.intersection([
   t.intersection([
     t.interface({
@@ -225,16 +216,28 @@ export const BrowserSensitiveSimpleFieldsCodec = t.intersection([
   CommonFieldsCodec,
 ]);
 
+export const ThrottlingConfigValueCodec = t.interface({
+  download: t.string,
+  upload: t.string,
+  latency: t.string,
+});
+
+export type ThrottlingConfigValue = t.TypeOf<typeof ThrottlingConfigValueCodec>;
+
+export const ThrottlingConfigCodec = t.interface({
+  value: t.union([ThrottlingConfigValueCodec, t.null]),
+  label: t.string,
+  id: t.string,
+});
+
+export type ThrottlingConfig = t.TypeOf<typeof ThrottlingConfigCodec>;
+
 export const EncryptedBrowserAdvancedFieldsCodec = t.interface({
   [ConfigKey.SCREENSHOTS]: t.string,
   [ConfigKey.JOURNEY_FILTERS_MATCH]: t.string,
   [ConfigKey.JOURNEY_FILTERS_TAGS]: t.array(t.string),
   [ConfigKey.IGNORE_HTTPS_ERRORS]: t.boolean,
-  [ConfigKey.IS_THROTTLING_ENABLED]: t.boolean,
-  [ConfigKey.DOWNLOAD_SPEED]: t.string,
-  [ConfigKey.UPLOAD_SPEED]: t.string,
-  [ConfigKey.LATENCY]: t.string,
-  [ConfigKey.THROTTLING_CONFIG]: t.string,
+  [ConfigKey.THROTTLING_CONFIG]: ThrottlingConfigCodec,
 });
 
 export const BrowserSimpleFieldsCodec = t.intersection([
diff --git a/x-pack/plugins/synthetics/common/types/monitor_validation.ts b/x-pack/plugins/synthetics/common/types/monitor_validation.ts
index 9d37a2d9b6104..09cf19cff4e48 100644
--- a/x-pack/plugins/synthetics/common/types/monitor_validation.ts
+++ b/x-pack/plugins/synthetics/common/types/monitor_validation.ts
@@ -5,10 +5,12 @@
  * 2.0.
  */
 
-import { ConfigKey, MonitorFields } from '../runtime_types';
+import { ConfigKey, MonitorFields, ThrottlingConfig } from '../runtime_types';
 
-export type Validator = (config: Partial<MonitorFields>) => boolean;
-export type NamespaceValidator = (config: Partial<MonitorFields>) => false | string;
+export type Validator = (config: Partial<MonitorFields & ThrottlingConfig>) => boolean;
+export type NamespaceValidator = (
+  config: Partial<MonitorFields & ThrottlingConfig>
+) => false | string;
 
 export type ConfigValidation = Omit<Record<ConfigKey, Validator>, ConfigKey.NAMESPACE> &
   Record<ConfigKey.NAMESPACE, NamespaceValidator>;
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/connection_profile.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/connection_profile.tsx
new file mode 100644
index 0000000000000..83beb1e63939f
--- /dev/null
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/connection_profile.tsx
@@ -0,0 +1,81 @@
+/*
+ * 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 { EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import React from 'react';
+import { PROFILE_VALUES_ENUM } from '../../../../../../../common/constants/monitor_defaults';
+import { ThrottlingConfig } from '../../../../../../../common/runtime_types';
+
+export const ConnectionProfile = ({
+  throttling,
+  id,
+}: {
+  throttling?: ThrottlingConfig;
+  id: string;
+}) => {
+  if (id === PROFILE_VALUES_ENUM.NO_THROTTLING) {
+    return (
+      <EuiFlexGroup alignItems="baseline" gutterSize="xs">
+        <EuiFlexItem grow={false}>
+          <EuiText>
+            <FormattedMessage
+              id="xpack.synthetics.monitorAddEdit.throttling.connectionProfile.disabled.label"
+              defaultMessage="No throttling"
+            />
+          </EuiText>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    );
+  }
+
+  if (throttling && throttling.value) {
+    const { label, value } = throttling;
+
+    return (
+      <EuiFlexGroup alignItems="baseline" gutterSize="xs">
+        <EuiFlexItem grow={false}>
+          <EuiText>{label}</EuiText>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiText size="xs" color="subdued">
+            <FormattedMessage
+              id="xpack.synthetics.monitorAddEdit.throttling.connectionProfile"
+              defaultMessage="({download} Mbps, {upload} Mbps, {latency} ms)"
+              values={{
+                download: value.download,
+                upload: value.upload,
+                latency: value.latency,
+              }}
+            />
+          </EuiText>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    );
+  } else {
+    return (
+      <EuiFlexGroup alignItems="baseline" gutterSize="xs">
+        <EuiFlexItem grow={false}>
+          <EuiText>
+            <FormattedMessage
+              id="xpack.synthetics.monitorAddEdit.throttling.connectionProfile.custom.label"
+              defaultMessage="Custom"
+            />
+          </EuiText>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiText size="xs" color="subdued">
+            <FormattedMessage
+              id="xpack.synthetics.monitorAddEdit.throttling.connectionProfile.custom"
+              defaultMessage="(X Mbps, Y Mbps, Z ms)"
+            />
+          </EuiText>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    );
+  }
+};
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_config_field.test.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_config_field.test.tsx
new file mode 100644
index 0000000000000..f0dcb655749db
--- /dev/null
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_config_field.test.tsx
@@ -0,0 +1,81 @@
+/*
+ * 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 { fireEvent, screen } from '@testing-library/react';
+import { PROFILE_OPTIONS, ThrottlingConfigField } from './throttling_config_field';
+import { render } from '../../../../utils/testing';
+import { PROFILES_MAP } from '../../../../../../../common/constants/monitor_defaults';
+
+describe('ThrottlingConfigField', () => {
+  it('renders', async () => {
+    render(
+      <ThrottlingConfigField
+        ariaLabel={'ariaLabel'}
+        initialValue={PROFILES_MAP.default}
+        value={PROFILES_MAP.default}
+        id={'id'}
+        options={PROFILE_OPTIONS}
+        onChange={() => {}}
+      />
+    );
+    expect(await screen.findByText('(5 Mbps, 3 Mbps, 20 ms)')).toBeInTheDocument();
+  });
+
+  it('selects custom values', async () => {
+    const onChange = jest.fn();
+    render(
+      <ThrottlingConfigField
+        ariaLabel={'ariaLabel'}
+        initialValue={PROFILES_MAP.default}
+        value={PROFILES_MAP.default}
+        id={'id'}
+        options={PROFILE_OPTIONS}
+        onChange={onChange}
+      />
+    );
+    expect(await screen.findByText('(5 Mbps, 3 Mbps, 20 ms)')).toBeInTheDocument();
+    fireEvent.click(screen.getByTestId('syntheticsThrottlingSelect'));
+    fireEvent.click(await screen.findByTestId('syntheticsThrottlingSelectCustom'));
+
+    const customValue = {
+      id: 'custom',
+      label: 'Custom',
+      value: { download: '5', latency: '20', upload: '3' },
+    };
+
+    expect(onChange).toHaveBeenCalledWith(customValue);
+  });
+
+  it('changes custom values', async () => {
+    const onChange = jest.fn();
+    const customValue = {
+      id: 'custom',
+      label: 'Custom',
+      value: { download: '5', latency: '20', upload: '3' },
+    };
+
+    render(
+      <ThrottlingConfigField
+        ariaLabel={'ariaLabel'}
+        initialValue={customValue}
+        value={customValue}
+        id={'id'}
+        options={PROFILE_OPTIONS}
+        onChange={onChange}
+      />
+    );
+
+    fireEvent.input(screen.getByTestId('syntheticsBrowserUploadSpeed'), {
+      target: { value: '10' },
+    });
+
+    expect(onChange).toHaveBeenCalledWith({
+      ...customValue,
+      value: { ...customValue.value, upload: '10' },
+    });
+  });
+});
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_config_field.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_config_field.tsx
new file mode 100644
index 0000000000000..9635584e13673
--- /dev/null
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_config_field.tsx
@@ -0,0 +1,79 @@
+/*
+ * 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 { EuiSuperSelect } from '@elastic/eui';
+import { useConnectionProfiles } from './use_connection_profiles';
+import { ThrottlingDisabledCallout } from './throttling_disabled_callout';
+import { ThrottlingConfig } from '../../../../../../../common/runtime_types';
+import { ThrottlingFields } from './throttling_fields';
+import { PROFILE_VALUES_ENUM, PROFILE_VALUES, PROFILES_MAP, CUSTOM_LABEL } from '../../constants';
+import { ConnectionProfile } from './connection_profile';
+
+export interface ThrottlingConfigFieldProps {
+  ariaLabel: string;
+  id: string;
+  onChange: (value: ThrottlingConfig) => void;
+  value: ThrottlingConfig;
+  placeholder?: string;
+  height?: string;
+  readOnly?: boolean;
+  disabled?: boolean;
+  fullWidth?: boolean;
+  options: typeof PROFILE_OPTIONS;
+  initialValue?: ThrottlingConfig;
+}
+
+export const ThrottlingConfigField = (props: ThrottlingConfigFieldProps) => {
+  const { value, initialValue } = props;
+
+  const isCustom = PROFILES_MAP[value?.id] === undefined;
+
+  const isThrottlingDisabled = value?.id === PROFILE_VALUES_ENUM.NO_THROTTLING;
+
+  const options = useConnectionProfiles(initialValue);
+
+  return (
+    <>
+      <EuiSuperSelect
+        data-test-subj="syntheticsThrottlingSelect"
+        options={options}
+        onChange={(newValue) => {
+          if (newValue === PROFILE_VALUES_ENUM.CUSTOM) {
+            props.onChange({
+              ...PROFILES_MAP[PROFILE_VALUES_ENUM.DEFAULT],
+              id: PROFILE_VALUES_ENUM.CUSTOM,
+              label: CUSTOM_LABEL,
+            });
+          } else {
+            props.onChange({
+              ...PROFILES_MAP[PROFILE_VALUES_ENUM.DEFAULT],
+              ...PROFILES_MAP[newValue],
+            });
+          }
+        }}
+        defaultValue={PROFILE_VALUES_ENUM.DEFAULT}
+        valueOfSelected={value?.id}
+        fullWidth={props.fullWidth}
+        readOnly={props.readOnly}
+      />
+      {isThrottlingDisabled && <ThrottlingDisabledCallout />}
+      {isCustom && (
+        <ThrottlingFields
+          throttling={props?.value}
+          setValue={props.onChange}
+          readOnly={props.readOnly}
+        />
+      )}
+    </>
+  );
+};
+
+export const PROFILE_OPTIONS = PROFILE_VALUES.map(({ id }) => ({
+  value: id,
+  inputDisplay: <ConnectionProfile throttling={PROFILES_MAP[id]} id={id} />,
+  'data-test-subj': `syntheticsThrottlingSelect-${id}`,
+}));
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_disabled_callout.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_disabled_callout.tsx
new file mode 100644
index 0000000000000..05d61b5b80d4d
--- /dev/null
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_disabled_callout.tsx
@@ -0,0 +1,33 @@
+/*
+ * 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 { EuiCallOut, EuiSpacer } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import React from 'react';
+
+export const ThrottlingDisabledCallout = () => {
+  return (
+    <>
+      <EuiSpacer size="s" />
+      <EuiCallOut
+        title={
+          <FormattedMessage
+            id="xpack.synthetics.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.automatic_node_cap.title"
+            defaultMessage="Automatic cap"
+          />
+        }
+        color="warning"
+        iconType="warning"
+      >
+        <FormattedMessage
+          id="xpack.synthetics.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.automatic_node_cap.message"
+          defaultMessage="When disabling throttling, your monitor will still have its bandwidth capped by the configurations of the Synthetics Nodes in which it's running."
+        />
+      </EuiCallOut>
+    </>
+  );
+};
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_download_field.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_download_field.tsx
new file mode 100644
index 0000000000000..918e5828cb70f
--- /dev/null
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_download_field.tsx
@@ -0,0 +1,91 @@
+/*
+ * 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 { EuiFieldNumber, EuiFormRow, EuiText } from '@elastic/eui';
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { Validation } from '../../../../../../../common/types';
+import {
+  BandwidthLimitKey,
+  ConfigKey,
+  DEFAULT_BANDWIDTH_LIMIT,
+  ThrottlingConfig,
+  ThrottlingConfigValue,
+} from '../../../../../../../common/runtime_types';
+import { ThrottlingExceededMessage } from './throttling_exceeded_callout';
+import { OptionalLabel } from '../optional_label';
+
+export const ThrottlingDownloadField = ({
+  handleInputChange,
+  readOnly,
+  onFieldBlur,
+  validate,
+  throttling,
+  throttlingValue,
+}: {
+  readOnly?: boolean;
+  handleInputChange: (value: string) => void;
+  onFieldBlur?: (field: keyof ThrottlingConfigValue) => void;
+  validate?: Validation;
+  throttling: ThrottlingConfig;
+  throttlingValue: ThrottlingConfigValue;
+}) => {
+  const maxDownload = Number(DEFAULT_BANDWIDTH_LIMIT[BandwidthLimitKey.DOWNLOAD]);
+
+  const exceedsDownloadLimits = Number(throttlingValue.download) > maxDownload;
+
+  return (
+    <EuiFormRow
+      fullWidth
+      label={DOWNLOAD_LABEL}
+      labelAppend={<OptionalLabel />}
+      isInvalid={
+        (validate ? !!validate?.[ConfigKey.THROTTLING_CONFIG]?.(throttling) : false) ||
+        exceedsDownloadLimits
+      }
+      error={
+        exceedsDownloadLimits ? (
+          <ThrottlingExceededMessage throttlingField="download" limit={maxDownload} />
+        ) : (
+          DOWNLOAD_SPEED_ERROR
+        )
+      }
+    >
+      <EuiFieldNumber
+        fullWidth
+        min={0}
+        step={0.001}
+        value={throttlingValue.download}
+        onChange={(event) => {
+          handleInputChange(event.target.value);
+        }}
+        onBlur={() => onFieldBlur?.('download')}
+        data-test-subj="syntheticsBrowserDownloadSpeed"
+        append={
+          <EuiText size="xs">
+            <strong>Mbps</strong>
+          </EuiText>
+        }
+        readOnly={readOnly}
+      />
+    </EuiFormRow>
+  );
+};
+
+export const DOWNLOAD_LABEL = i18n.translate(
+  'xpack.synthetics.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.download.label',
+  {
+    defaultMessage: 'Download Speed',
+  }
+);
+
+export const DOWNLOAD_SPEED_ERROR = i18n.translate(
+  'xpack.synthetics.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.download.error',
+  {
+    defaultMessage: 'Download speed must be greater than zero.',
+  }
+);
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_exceeded_callout.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_exceeded_callout.tsx
new file mode 100644
index 0000000000000..fe65ddb38a606
--- /dev/null
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_exceeded_callout.tsx
@@ -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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiCallOut, EuiSpacer } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import React from 'react';
+
+export const ThrottlingExceededCallout = () => {
+  return (
+    <>
+      <EuiSpacer />
+      <EuiCallOut
+        title={
+          <FormattedMessage
+            id="xpack.synthetics.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.exceeded_throttling.title"
+            defaultMessage="You've exceeded the Synthetics Node bandwidth limits"
+          />
+        }
+        color="warning"
+        iconType="warning"
+      >
+        <FormattedMessage
+          id="xpack.synthetics.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.exceeded_throttling.message"
+          defaultMessage="When using throttling values larger than a Synthetics Node bandwidth limit, your monitor will still have its bandwidth capped."
+        />
+      </EuiCallOut>
+    </>
+  );
+};
+
+export const ThrottlingExceededMessage = ({
+  throttlingField,
+  limit,
+}: {
+  throttlingField: string;
+  limit: number;
+}) => {
+  return (
+    <FormattedMessage
+      id="xpack.synthetics.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.throttling_exceeded.message"
+      defaultMessage="You have exceeded the { throttlingField } limit for Synthetic Nodes. The { throttlingField } value can't be larger than { limit }Mbps."
+      values={{ throttlingField, limit }}
+    />
+  );
+};
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_fields.test.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_fields.test.tsx
new file mode 100644
index 0000000000000..9beffa5537cd1
--- /dev/null
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_fields.test.tsx
@@ -0,0 +1,86 @@
+/*
+ * 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 { fireEvent, screen } from '@testing-library/react';
+import { render } from '../../../../utils/testing';
+import { PROFILES_MAP } from '../../../../../../../common/constants/monitor_defaults';
+import { ThrottlingFields } from './throttling_fields';
+
+describe('ThrottlingFields', () => {
+  it('renders', async () => {
+    render(<ThrottlingFields throttling={PROFILES_MAP.default} setValue={() => {}} />);
+
+    expect(await screen.findByText('Download Speed')).toBeInTheDocument();
+    expect(await screen.findByText('Upload Speed')).toBeInTheDocument();
+    expect(await screen.findByText('Latency')).toBeInTheDocument();
+  });
+
+  it('calls setValue on change', async () => {
+    const setValue = jest.fn();
+    render(<ThrottlingFields throttling={PROFILES_MAP.default} setValue={setValue} />);
+
+    const throttling = PROFILES_MAP.default;
+
+    const download = await screen.findByTestId('syntheticsBrowserDownloadSpeed');
+    fireEvent.change(download, { target: { value: '10' } });
+    expect(setValue).toHaveBeenCalledWith({
+      ...throttling,
+      label: 'Custom',
+      id: 'custom',
+      value: { download: '10', latency: '20', upload: '3' },
+    });
+
+    const upload = await screen.findByTestId('syntheticsBrowserUploadSpeed');
+    fireEvent.change(upload, { target: { value: '10' } });
+    expect(setValue).toHaveBeenLastCalledWith({
+      ...throttling,
+      label: 'Custom',
+      id: 'custom',
+      value: { download: '5', latency: '20', upload: '10' },
+    });
+
+    const latency = await screen.findByTestId('syntheticsBrowserLatency');
+    fireEvent.change(latency, { target: { value: '10' } });
+    expect(setValue).toHaveBeenLastCalledWith({
+      ...throttling,
+      label: 'Custom',
+      id: 'custom',
+      value: { download: '5', latency: '10', upload: '3' },
+    });
+  });
+
+  it('shows maximum bandwidth callout on download and upload change', async () => {
+    const setValue = jest.fn();
+    const throttling = PROFILES_MAP.default;
+
+    render(
+      <ThrottlingFields
+        throttling={{
+          ...throttling,
+          value: {
+            ...throttling.value!,
+            download: '500',
+            upload: '500',
+          },
+        }}
+        setValue={setValue}
+      />
+    );
+
+    expect(
+      await screen.findByText(
+        'When using throttling values larger than a Synthetics Node bandwidth limit, your monitor will still have its bandwidth capped.'
+      )
+    ).toBeInTheDocument();
+
+    expect(
+      await screen.findByText(
+        "You have exceeded the download limit for Synthetic Nodes. The download value can't be larger than 100Mbps."
+      )
+    ).toBeInTheDocument();
+  });
+});
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_fields.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_fields.tsx
new file mode 100644
index 0000000000000..886f482a86ed8
--- /dev/null
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_fields.tsx
@@ -0,0 +1,97 @@
+/*
+ * 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, { memo, useCallback } from 'react';
+import { EuiSpacer } from '@elastic/eui';
+import { ThrottlingUploadField } from './throttling_upload_field';
+import { ThrottlingExceededCallout } from './throttling_exceeded_callout';
+import {
+  BandwidthLimitKey,
+  DEFAULT_BANDWIDTH_LIMIT,
+  ThrottlingConfig,
+  ThrottlingConfigValue,
+} from '../../../../../../../common/runtime_types';
+import { Validation } from '../../types';
+import { ThrottlingDisabledCallout } from './throttling_disabled_callout';
+import { ThrottlingDownloadField } from './throttling_download_field';
+import { ThrottlingLatencyField } from './throttling_latency_field';
+import { CUSTOM_LABEL, PROFILE_VALUES_ENUM } from '../../constants';
+
+interface Props {
+  validate?: Validation;
+  minColumnWidth?: string;
+  onFieldBlur?: (field: keyof ThrottlingConfigValue) => void;
+  readOnly?: boolean;
+  throttling: ThrottlingConfig;
+  setValue: (value: ThrottlingConfig) => void;
+}
+
+export const ThrottlingFields = memo<Props>(
+  ({ validate, onFieldBlur, setValue, readOnly = false, throttling }) => {
+    const maxDownload = DEFAULT_BANDWIDTH_LIMIT[BandwidthLimitKey.DOWNLOAD];
+    const maxUpload = DEFAULT_BANDWIDTH_LIMIT[BandwidthLimitKey.UPLOAD];
+
+    const handleInputChange = useCallback(
+      ({ value, configKey }: { value: string; configKey: string }) => {
+        setValue({
+          ...throttling,
+          value: { ...throttling.value!, [configKey]: value },
+          label: CUSTOM_LABEL,
+          id: PROFILE_VALUES_ENUM.CUSTOM,
+        });
+      },
+      [setValue, throttling]
+    );
+
+    const exceedsDownloadLimits = Number(throttling.value?.download) > maxDownload;
+    const exceedsUploadLimits = Number(throttling.value?.upload) > maxUpload;
+    const isThrottlingEnabled = throttling.id !== PROFILE_VALUES_ENUM.NO_THROTTLING;
+
+    const hasExceededLimits = isThrottlingEnabled && (exceedsDownloadLimits || exceedsUploadLimits);
+
+    if (!isThrottlingEnabled || !throttling.value) {
+      return <ThrottlingDisabledCallout />;
+    }
+
+    return (
+      <div>
+        {hasExceededLimits && <ThrottlingExceededCallout />}
+        <EuiSpacer size="m" />
+        <ThrottlingDownloadField
+          validate={validate}
+          onFieldBlur={onFieldBlur}
+          throttling={throttling}
+          throttlingValue={throttling.value}
+          handleInputChange={(val) => {
+            handleInputChange({ value: val, configKey: 'download' });
+          }}
+          readOnly={readOnly}
+        />
+        <ThrottlingUploadField
+          throttlingValue={throttling.value}
+          validate={validate}
+          onFieldBlur={onFieldBlur}
+          throttling={throttling}
+          handleInputChange={(val) => {
+            handleInputChange({ value: val, configKey: 'upload' });
+          }}
+          readOnly={readOnly}
+        />
+        <ThrottlingLatencyField
+          throttlingValue={throttling.value}
+          validate={validate}
+          onFieldBlur={onFieldBlur}
+          throttling={throttling}
+          handleInputChange={(val) => {
+            handleInputChange({ value: val, configKey: 'latency' });
+          }}
+          readOnly={readOnly}
+        />
+      </div>
+    );
+  }
+);
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_latency_field.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_latency_field.tsx
new file mode 100644
index 0000000000000..59ebe3aa509cf
--- /dev/null
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_latency_field.tsx
@@ -0,0 +1,72 @@
+/*
+ * 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 { EuiFieldNumber, EuiFormRow, EuiText } from '@elastic/eui';
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { Validation } from '../../../../../../../common/types';
+import {
+  ConfigKey,
+  ThrottlingConfig,
+  ThrottlingConfigValue,
+} from '../../../../../../../common/runtime_types';
+import { OptionalLabel } from '../optional_label';
+
+export const ThrottlingLatencyField = ({
+  throttling,
+  readOnly,
+  onFieldBlur,
+  validate,
+  handleInputChange,
+  throttlingValue,
+}: {
+  readOnly?: boolean;
+  handleInputChange: (value: string) => void;
+  onFieldBlur?: (field: keyof ThrottlingConfigValue) => void;
+  validate?: Validation;
+  throttling: ThrottlingConfig;
+  throttlingValue: ThrottlingConfigValue;
+}) => {
+  return (
+    <EuiFormRow
+      fullWidth
+      label={LATENCY_LABEL}
+      labelAppend={<OptionalLabel />}
+      isInvalid={validate ? !!validate?.[ConfigKey.THROTTLING_CONFIG]?.(throttling) : false}
+      error={LATENCY_NEGATIVE_ERROR}
+    >
+      <EuiFieldNumber
+        fullWidth
+        min={0}
+        value={throttlingValue.latency}
+        onChange={(event) => handleInputChange(event.target.value)}
+        onBlur={() => onFieldBlur?.('latency')}
+        data-test-subj="syntheticsBrowserLatency"
+        append={
+          <EuiText size="xs">
+            <strong>ms</strong>
+          </EuiText>
+        }
+        readOnly={readOnly}
+      />
+    </EuiFormRow>
+  );
+};
+
+export const LATENCY_LABEL = i18n.translate(
+  'xpack.synthetics.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.latency.label',
+  {
+    defaultMessage: 'Latency',
+  }
+);
+
+export const LATENCY_NEGATIVE_ERROR = i18n.translate(
+  'xpack.synthetics.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.latency.error',
+  {
+    defaultMessage: 'Latency must not be negative.',
+  }
+);
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_upload_field.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_upload_field.tsx
new file mode 100644
index 0000000000000..8e245ba44c2a6
--- /dev/null
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/throttling_upload_field.tsx
@@ -0,0 +1,87 @@
+/*
+ * 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 { EuiFieldNumber, EuiFormRow, EuiText } from '@elastic/eui';
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { Validation } from '../../../../../../../common/types';
+import {
+  BandwidthLimitKey,
+  ConfigKey,
+  DEFAULT_BANDWIDTH_LIMIT,
+  ThrottlingConfig,
+  ThrottlingConfigValue,
+} from '../../../../../../../common/runtime_types';
+import { ThrottlingExceededMessage } from './throttling_exceeded_callout';
+import { OptionalLabel } from '../optional_label';
+
+export const ThrottlingUploadField = ({
+  readOnly,
+  onFieldBlur,
+  throttling,
+  validate,
+  handleInputChange,
+  throttlingValue,
+}: {
+  readOnly?: boolean;
+  handleInputChange: (value: string) => void;
+  onFieldBlur?: (field: keyof ThrottlingConfigValue) => void;
+  validate?: Validation;
+  throttling: ThrottlingConfig;
+  throttlingValue: ThrottlingConfigValue;
+}) => {
+  const maxUpload = Number(DEFAULT_BANDWIDTH_LIMIT[BandwidthLimitKey.UPLOAD]);
+
+  const exceedsUploadLimits = Number(throttlingValue.upload) > maxUpload;
+
+  return (
+    <EuiFormRow
+      fullWidth
+      label={UPLOAD_LABEL}
+      labelAppend={<OptionalLabel />}
+      isInvalid={
+        (validate ? !!validate?.[ConfigKey.THROTTLING_CONFIG]?.(throttling) : false) ||
+        exceedsUploadLimits
+      }
+      error={
+        exceedsUploadLimits ? (
+          <ThrottlingExceededMessage throttlingField="upload" limit={maxUpload} />
+        ) : (
+          UPLOAD_SPEED_ERROR
+        )
+      }
+    >
+      <EuiFieldNumber
+        fullWidth
+        min={0}
+        step={0.001}
+        value={throttlingValue.upload}
+        onChange={(event) => handleInputChange(event.target.value)}
+        onBlur={() => onFieldBlur?.('upload')}
+        data-test-subj="syntheticsBrowserUploadSpeed"
+        append={
+          <EuiText size="xs">
+            <strong>Mbps</strong>
+          </EuiText>
+        }
+        readOnly={readOnly}
+      />
+    </EuiFormRow>
+  );
+};
+
+export const UPLOAD_LABEL = i18n.translate(
+  'xpack.synthetics.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.upload.label',
+  { defaultMessage: 'Upload Speed' }
+);
+
+export const UPLOAD_SPEED_ERROR = i18n.translate(
+  'xpack.synthetics.createPackagePolicy.stepConfigure.browserAdvancedSettings.throttling.upload.error',
+  {
+    defaultMessage: 'Upload speed must be greater than zero.',
+  }
+);
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/use_connection_profiles.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/use_connection_profiles.tsx
new file mode 100644
index 0000000000000..c65fb046bbe59
--- /dev/null
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/fields/throttling/use_connection_profiles.tsx
@@ -0,0 +1,30 @@
+/*
+ * 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, { useMemo } from 'react';
+import { PROFILE_VALUES_ENUM } from '../../../../../../../common/constants/monitor_defaults';
+import { ConnectionProfile } from './connection_profile';
+import { PROFILE_OPTIONS } from './throttling_config_field';
+import { ThrottlingConfig } from '../../../../../../../common/runtime_types';
+
+export const useConnectionProfiles = (initialValue?: ThrottlingConfig) => {
+  return useMemo(() => {
+    return [
+      ...PROFILE_OPTIONS,
+      {
+        value: PROFILE_VALUES_ENUM.CUSTOM,
+        inputDisplay: (
+          <ConnectionProfile
+            id="custom"
+            throttling={initialValue?.id === PROFILE_VALUES_ENUM.CUSTOM ? initialValue : undefined}
+          />
+        ),
+        'data-test-subj': 'syntheticsThrottlingSelectCustom',
+      },
+    ];
+  }, [initialValue]);
+};
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/defaults.test.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/defaults.test.tsx
index 70521c28983f7..c2090eb0f47b0 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/defaults.test.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/defaults.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { ConfigKey, DataStream, FormMonitorType, SyntheticsMonitor } from '../types';
-import { DEFAULT_FIELDS } from '../constants';
+import { DEFAULT_FIELDS, PROFILE_VALUES_ENUM, PROFILES_MAP } from '../constants';
 import { formatDefaultFormValues } from './defaults';
 
 describe('defaults', () => {
@@ -52,11 +52,15 @@ describe('defaults', () => {
     'ssl.verification_mode': 'full',
     synthetics_args: [],
     tags: [],
-    'throttling.config': '5d/3u/20l',
-    'throttling.download_speed': '5',
-    'throttling.is_enabled': true,
-    'throttling.latency': '20',
-    'throttling.upload_speed': '3',
+    throttling: {
+      value: {
+        download: '5',
+        latency: '20',
+        upload: '3',
+      },
+      id: 'default',
+      label: 'Default',
+    },
     timeout: '16',
     type: 'browser',
     'url.port': null,
@@ -114,11 +118,7 @@ describe('defaults', () => {
       'ssl.verification_mode': 'full',
       synthetics_args: [],
       tags: [],
-      'throttling.config': '5d/3u/20l',
-      'throttling.download_speed': '5',
-      'throttling.is_enabled': true,
-      'throttling.latency': '20',
-      'throttling.upload_speed': '3',
+      throttling: PROFILES_MAP[PROFILE_VALUES_ENUM.DEFAULT],
       timeout: '16',
       type: 'browser',
       'url.port': null,
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/field_config.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/field_config.tsx
index b0de4f812da1a..0980ef1aa961d 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/field_config.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/field_config.tsx
@@ -14,8 +14,6 @@ import {
   EuiComboBoxOptionOption,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiSuperSelect,
-  EuiText,
   EuiLink,
   EuiTextArea,
   EuiSelectProps,
@@ -27,10 +25,13 @@ import {
   EuiCheckboxProps,
   EuiTextAreaProps,
   EuiButtonGroupProps,
-  EuiSuperSelectProps,
   EuiHighlight,
   EuiBadge,
 } from '@elastic/eui';
+import {
+  PROFILE_OPTIONS,
+  ThrottlingConfigFieldProps,
+} from '../fields/throttling/throttling_config_field';
 import {
   FieldText,
   FieldNumber,
@@ -53,6 +54,7 @@ import {
   ResponseBodyIndexField,
   ResponseBodyIndexFieldProps,
   ControlledFieldProp,
+  ThrottlingWrapper,
 } from './field_wrappers';
 import { getDocLinks } from '../../../../../kibana_services';
 import { useMonitorName } from '../hooks/use_monitor_name';
@@ -67,12 +69,9 @@ import {
   VerificationMode,
   FieldMap,
   FormLocation,
+  ThrottlingConfig,
 } from '../types';
-import {
-  AlertConfigKey,
-  DEFAULT_BROWSER_ADVANCED_FIELDS,
-  ALLOWED_SCHEDULES_IN_MINUTES,
-} from '../constants';
+import { AlertConfigKey, ALLOWED_SCHEDULES_IN_MINUTES } from '../constants';
 import { getDefaultFormFields } from './defaults';
 import { validate, validateHeaders, WHOLE_NUMBERS_ONLY, FLOATS_ONLY } from './validation';
 
@@ -1123,41 +1122,23 @@ export const FIELD = (readOnly?: boolean): FieldMap => ({
   },
   [ConfigKey.THROTTLING_CONFIG]: {
     fieldKey: ConfigKey.THROTTLING_CONFIG,
-    component: EuiSuperSelect,
+    component: ThrottlingWrapper,
     label: i18n.translate('xpack.synthetics.monitorConfig.throttling.label', {
       defaultMessage: 'Connection profile',
     }),
     required: true,
     controlled: true,
     helpText: i18n.translate('xpack.synthetics.monitorConfig.throttling.helpText', {
-      defaultMessage:
-        'Simulate network throttling (download, upload, latency). More options will be added in a future version.',
-    }),
-    props: (): EuiSuperSelectProps<string> => ({
-      options: [
-        {
-          value: DEFAULT_BROWSER_ADVANCED_FIELDS[ConfigKey.THROTTLING_CONFIG],
-          inputDisplay: (
-            <EuiFlexGroup alignItems="baseline" gutterSize="xs" responsive={false}>
-              <EuiFlexItem grow={false}>
-                <EuiText>
-                  {i18n.translate('xpack.synthetics.monitorConfig.throttling.options.default', {
-                    defaultMessage: 'Default',
-                  })}
-                </EuiText>
-              </EuiFlexItem>
-              <EuiFlexItem grow={false}>
-                <EuiText size="xs" color="subdued">
-                  {'(5 Mbps, 3 Mbps, 20 ms)'}
-                </EuiText>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          ),
-        },
-      ],
-      readOnly,
-      disabled: true, // currently disabled through 1.0 until we define connection profiles
+      defaultMessage: 'Simulate network throttling (download, upload, latency).',
     }),
+    props: ({ formState }): Partial<ThrottlingConfigFieldProps> => {
+      return {
+        options: PROFILE_OPTIONS,
+        readOnly,
+        disabled: false,
+        initialValue: formState.defaultValues?.[ConfigKey.THROTTLING_CONFIG] as ThrottlingConfig,
+      };
+    },
     validation: () => ({
       required: true,
     }),
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/field_wrappers.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/field_wrappers.tsx
index 80455d8dd4e4d..27a8a3ee5ab4d 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/field_wrappers.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/field_wrappers.tsx
@@ -26,6 +26,10 @@ import {
   EuiComboBox,
   EuiComboBoxProps,
 } from '@elastic/eui';
+import {
+  ThrottlingConfigField,
+  ThrottlingConfigFieldProps,
+} from '../fields/throttling/throttling_config_field';
 import { SourceField, SourceFieldProps } from '../fields/source_field';
 import {
   FormattedComboBox as DefaultFormattedComboBox,
@@ -132,3 +136,7 @@ export const RequestBodyField = React.forwardRef<unknown, DefaultRequestBodyFiel
 export const ResponseBodyIndexField = React.forwardRef<unknown, DefaultResponseBodyIndexFieldProps>(
   (props, _ref) => <DefaultResponseBodyIndexField {...props} />
 );
+
+export const ThrottlingWrapper = React.forwardRef<unknown, ThrottlingConfigFieldProps>(
+  (props, _ref) => <ThrottlingConfigField {...props} />
+);
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/form_config.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/form_config.tsx
index a33f0e14b7777..46a482512413a 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/form_config.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/form_config.tsx
@@ -121,6 +121,7 @@ export const BROWSER_ADVANCED = (readOnly: boolean) => [
       }
     ),
     components: [
+      FIELD(readOnly)[ConfigKey.THROTTLING_CONFIG],
       FIELD(readOnly)[ConfigKey.IGNORE_HTTPS_ERRORS],
       FIELD(readOnly)[ConfigKey.SYNTHETICS_ARGS],
       FIELD(readOnly)[ConfigKey.PLAYWRIGHT_OPTIONS],
@@ -209,7 +210,6 @@ export const FORM_CONFIG = (readOnly: boolean): FieldConfig => ({
       FIELD(readOnly)[ConfigKey.NAME],
       FIELD(readOnly)[ConfigKey.LOCATIONS],
       FIELD(readOnly)[`${ConfigKey.SCHEDULE}.number`],
-      FIELD(readOnly)[ConfigKey.THROTTLING_CONFIG],
       FIELD(readOnly)[ConfigKey.ENABLED],
       FIELD(readOnly)[AlertConfigKey.STATUS_ENABLED],
     ],
@@ -236,7 +236,6 @@ export const FORM_CONFIG = (readOnly: boolean): FieldConfig => ({
       FIELD(readOnly)[ConfigKey.TEXT_ASSERTION],
       FIELD(readOnly)[ConfigKey.LOCATIONS],
       FIELD(readOnly)[`${ConfigKey.SCHEDULE}.number`],
-      FIELD(readOnly)[ConfigKey.THROTTLING_CONFIG],
       FIELD(readOnly)[ConfigKey.ENABLED],
       FIELD(readOnly)[AlertConfigKey.STATUS_ENABLED],
     ],
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/formatter.test.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/formatter.test.tsx
index 6000b02cb7f87..0464c36ba2429 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/formatter.test.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/formatter.test.tsx
@@ -7,7 +7,11 @@
 
 import { format, ALLOWED_FIELDS } from './formatter';
 import { DataStream } from '../../../../../../common/runtime_types';
-import { DEFAULT_FIELDS } from '../../../../../../common/constants/monitor_defaults';
+import {
+  DEFAULT_FIELDS,
+  PROFILE_VALUES_ENUM,
+  PROFILES_MAP,
+} from '../../../../../../common/constants/monitor_defaults';
 
 describe('format', () => {
   let formValues: Record<string, unknown>;
@@ -199,11 +203,6 @@ describe('format', () => {
         'filter_journeys.match': '',
         'filter_journeys.tags': [],
         ignore_https_errors: false,
-        'throttling.is_enabled': true,
-        'throttling.download_speed': '5',
-        'throttling.upload_speed': '3',
-        'throttling.latency': '20',
-        'throttling.config': '5d/3u/20l',
         'ssl.certificate_authorities': '',
         'ssl.certificate': '',
         'ssl.key': '',
@@ -215,9 +214,7 @@ describe('format', () => {
           script: '',
           fileName: '',
         },
-        throttling: {
-          config: '5d/3u/20l',
-        },
+        throttling: PROFILES_MAP[PROFILE_VALUES_ENUM.DEFAULT],
         source: {
           inline: {
             type: scriptType,
@@ -278,11 +275,6 @@ describe('format', () => {
         'ssl.verification_mode': 'full',
         synthetics_args: [],
         tags: [],
-        'throttling.config': '5d/3u/20l',
-        'throttling.download_speed': '5',
-        'throttling.is_enabled': true,
-        'throttling.latency': '20',
-        'throttling.upload_speed': '3',
         timeout: '16',
         type: 'browser',
         'url.port': null,
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/validation.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/validation.tsx
index cc03228d755be..332ee8e6fbc55 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/validation.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/form/validation.tsx
@@ -148,11 +148,15 @@ const validateThrottleValue = (speed: string | undefined, allowZero?: boolean) =
 const validateBrowser: ValidationLibrary = {
   ...validateCommon,
   [ConfigKey.SOURCE_INLINE]: ({ [ConfigKey.SOURCE_INLINE]: inlineScript }) => !inlineScript,
-  [ConfigKey.DOWNLOAD_SPEED]: ({ [ConfigKey.DOWNLOAD_SPEED]: downloadSpeed }) =>
-    validateThrottleValue(downloadSpeed),
-  [ConfigKey.UPLOAD_SPEED]: ({ [ConfigKey.UPLOAD_SPEED]: uploadSpeed }) =>
-    validateThrottleValue(uploadSpeed),
-  [ConfigKey.LATENCY]: ({ [ConfigKey.LATENCY]: latency }) => validateThrottleValue(latency, true),
+  [ConfigKey.THROTTLING_CONFIG]: ({ throttling }) => {
+    if (!throttling || throttling.value === null) return true;
+    const { download, upload, latency } = throttling.value;
+    return (
+      validateThrottleValue(String(download)) ||
+      validateThrottleValue(String(upload)) ||
+      validateThrottleValue(String(latency), true)
+    );
+  },
   [ConfigKey.PLAYWRIGHT_OPTIONS]: ({ [ConfigKey.PLAYWRIGHT_OPTIONS]: playwrightOptions }) =>
     playwrightOptions ? !validJSONFormat(playwrightOptions) : false,
   [ConfigKey.PARAMS]: ({ [ConfigKey.PARAMS]: params }) =>
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/monitor_edit_page.test.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/monitor_edit_page.test.tsx
index bd9bc9d57c4aa..6b45a7d3920c2 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/monitor_edit_page.test.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/monitor_edit_page.test.tsx
@@ -12,6 +12,10 @@ import { MonitorEditPage } from './monitor_edit_page';
 import { ConfigKey } from '../../../../../common/runtime_types';
 
 import * as observabilityPublic from '@kbn/observability-plugin/public';
+import {
+  PROFILE_VALUES_ENUM,
+  PROFILES_MAP,
+} from '../../../../../common/constants/monitor_defaults';
 
 mockGlobals();
 
@@ -45,6 +49,7 @@ describe('MonitorEditPage', () => {
           [ConfigKey.MONITOR_SOURCE_TYPE]: 'ui',
           [ConfigKey.FORM_MONITOR_TYPE]: 'multistep',
           [ConfigKey.LOCATIONS]: [],
+          [ConfigKey.THROTTLING_CONFIG]: PROFILES_MAP[PROFILE_VALUES_ENUM.DEFAULT],
         },
       },
       refetch: () => null,
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/utils/testing/__mocks__/synthetics_store.mock.ts b/x-pack/plugins/synthetics/public/apps/synthetics/utils/testing/__mocks__/synthetics_store.mock.ts
index d65c68f2843b9..06ed54738fbda 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/utils/testing/__mocks__/synthetics_store.mock.ts
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/utils/testing/__mocks__/synthetics_store.mock.ts
@@ -430,11 +430,15 @@ function getMonitorDetailsMockSlice() {
       'filter_journeys.match': '',
       'filter_journeys.tags': [],
       ignore_https_errors: false,
-      'throttling.is_enabled': true,
-      'throttling.download_speed': '5',
-      'throttling.upload_speed': '3',
-      'throttling.latency': '20',
-      'throttling.config': '5d/3u/20l',
+      throttling: {
+        value: {
+          download: '5',
+          upload: '3',
+          latency: '20',
+        },
+        label: 'Regular 3G',
+        id: 'three_g',
+      },
       'ssl.certificate_authorities': '',
       'ssl.certificate': '',
       'ssl.key': '',
diff --git a/x-pack/plugins/synthetics/server/legacy_uptime/lib/saved_objects/migrations/monitors/8.8.0.test.ts b/x-pack/plugins/synthetics/server/legacy_uptime/lib/saved_objects/migrations/monitors/8.8.0.test.ts
index a682252be3c79..65768459dc96e 100644
--- a/x-pack/plugins/synthetics/server/legacy_uptime/lib/saved_objects/migrations/monitors/8.8.0.test.ts
+++ b/x-pack/plugins/synthetics/server/legacy_uptime/lib/saved_objects/migrations/monitors/8.8.0.test.ts
@@ -8,7 +8,11 @@ import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/s
 import { migration880 } from './8.8.0';
 import { migrationMocks } from '@kbn/core/server/mocks';
 import { ConfigKey, ScheduleUnit } from '../../../../../../common/runtime_types';
-import { ALLOWED_SCHEDULES_IN_MINUTES } from '../../../../../../common/constants/monitor_defaults';
+import {
+  ALLOWED_SCHEDULES_IN_MINUTES,
+  PROFILE_VALUES_ENUM,
+  PROFILES_MAP,
+} from '../../../../../../common/constants/monitor_defaults';
 import {
   browserUI,
   browserProject,
@@ -18,6 +22,8 @@ import {
   httpUptimeUI,
 } from './test_fixtures/8.7.0';
 import { httpUI as httpUI850 } from './test_fixtures/8.5.0';
+import { LegacyConfigKey } from '../../../../../../common/constants/monitor_management';
+import { omit } from 'lodash';
 
 const context = migrationMocks.createContext();
 const encryptedSavedObjectsSetup = encryptedSavedObjectsMock.createSetup();
@@ -151,11 +157,7 @@ describe('Monitor migrations v8.7.0 -> v8.8.0', () => {
           'ssl.supported_protocols': ['TLSv1.1', 'TLSv1.2', 'TLSv1.3'],
           'ssl.verification_mode': 'full',
           tags: [],
-          'throttling.config': '5d/3u/20l',
-          'throttling.download_speed': '5',
-          'throttling.is_enabled': true,
-          'throttling.latency': '20',
-          'throttling.upload_speed': '3',
+          throttling: PROFILES_MAP[PROFILE_VALUES_ENUM.DEFAULT],
           timeout: null,
           type: 'browser',
           'url.port': null,
@@ -195,9 +197,24 @@ describe('Monitor migrations v8.7.0 -> v8.8.0', () => {
           name: null,
         },
       };
-      // @ts-ignore specificially testing monitors with invalid values
+      // @ts-ignore specifically testing monitors with invalid values
       const actual = migration880(encryptedSavedObjectsSetup)(invalidTestMonitor, context);
-      expect(actual).toEqual(invalidTestMonitor);
+      expect(actual).toEqual({
+        ...invalidTestMonitor,
+        attributes: omit(
+          {
+            ...invalidTestMonitor.attributes,
+            throttling: PROFILES_MAP[PROFILE_VALUES_ENUM.DEFAULT],
+          },
+          [
+            LegacyConfigKey.THROTTLING_CONFIG,
+            LegacyConfigKey.IS_THROTTLING_ENABLED,
+            LegacyConfigKey.DOWNLOAD_SPEED,
+            LegacyConfigKey.UPLOAD_SPEED,
+            LegacyConfigKey.LATENCY,
+          ]
+        ),
+      });
     });
   });
 
@@ -413,4 +430,77 @@ describe('Monitor migrations v8.7.0 -> v8.8.0', () => {
       expect(actual.attributes[ConfigKey.SCHEDULE].unit).toEqual(ScheduleUnit.MINUTES);
     });
   });
+
+  describe('throttling migration', () => {
+    it('handles migrating with enabled throttling', () => {
+      const actual = migration880(encryptedSavedObjectsSetup)(browserUI, context);
+      // @ts-ignore
+      expect(actual.attributes[ConfigKey.THROTTLING_CONFIG]).toEqual(
+        PROFILES_MAP[PROFILE_VALUES_ENUM.DEFAULT]
+      );
+    });
+
+    it('handles migrating with defined throttling value', () => {
+      const testMonitor = {
+        ...browserUI,
+        attributes: {
+          ...browserUI.attributes,
+          [LegacyConfigKey.UPLOAD_SPEED]: '0.75',
+          [LegacyConfigKey.DOWNLOAD_SPEED]: '9',
+          [LegacyConfigKey.LATENCY]: '170',
+        },
+      };
+      const actual = migration880(encryptedSavedObjectsSetup)(testMonitor, context);
+      // @ts-ignore
+      expect(actual.attributes[ConfigKey.THROTTLING_CONFIG]).toEqual({
+        id: '4g',
+        label: '4G',
+        value: {
+          download: '9',
+          upload: '0.75',
+          latency: '170',
+        },
+      });
+    });
+
+    it('handles migrating with custom throttling value', () => {
+      const testMonitor = {
+        ...browserUI,
+        attributes: {
+          ...browserUI.attributes,
+          [LegacyConfigKey.UPLOAD_SPEED]: '5',
+          [LegacyConfigKey.DOWNLOAD_SPEED]: '10',
+          [LegacyConfigKey.LATENCY]: '30',
+        },
+      };
+      const actual = migration880(encryptedSavedObjectsSetup)(testMonitor, context);
+      // @ts-ignore
+      expect(actual.attributes[ConfigKey.THROTTLING_CONFIG]).toEqual({
+        id: 'custom',
+        label: 'Custom',
+        value: {
+          download: '10',
+          upload: '5',
+          latency: '30',
+        },
+      });
+    });
+
+    it('handles migrating with disabled throttling', () => {
+      const testMonitor = {
+        ...browserUI,
+        attributes: {
+          ...browserUI.attributes,
+          [LegacyConfigKey.IS_THROTTLING_ENABLED]: false,
+        },
+      };
+      const actual = migration880(encryptedSavedObjectsSetup)(testMonitor, context);
+      // @ts-ignore
+      expect(actual.attributes[ConfigKey.THROTTLING_CONFIG]).toEqual({
+        id: 'no-throttling',
+        label: 'No throttling',
+        value: null,
+      });
+    });
+  });
 });
diff --git a/x-pack/plugins/synthetics/server/legacy_uptime/lib/saved_objects/migrations/monitors/8.8.0.ts b/x-pack/plugins/synthetics/server/legacy_uptime/lib/saved_objects/migrations/monitors/8.8.0.ts
index 7df6eb0c143cf..426984969c191 100644
--- a/x-pack/plugins/synthetics/server/legacy_uptime/lib/saved_objects/migrations/monitors/8.8.0.ts
+++ b/x-pack/plugins/synthetics/server/legacy_uptime/lib/saved_objects/migrations/monitors/8.8.0.ts
@@ -6,23 +6,31 @@
  */
 import { omit } from 'lodash';
 import { EncryptedSavedObjectsPluginSetup } from '@kbn/encrypted-saved-objects-plugin/server';
-import { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+import { SavedObjectMigrationContext, SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+import { LegacyConfigKey } from '../../../../../../common/constants/monitor_management';
 import {
+  BrowserFields,
   ConfigKey,
-  SyntheticsMonitorWithSecrets,
   MonitorFields,
-  BrowserFields,
   ScheduleUnit,
+  SyntheticsMonitorWithSecrets,
+  ThrottlingConfig,
 } from '../../../../../../common/runtime_types';
-import { ALLOWED_SCHEDULES_IN_MINUTES } from '../../../../../../common/constants/monitor_defaults';
+import {
+  ALLOWED_SCHEDULES_IN_MINUTES,
+  CUSTOM_LABEL,
+  PROFILE_VALUES,
+  PROFILE_VALUES_ENUM,
+  PROFILES_MAP,
+} from '../../../../../../common/constants/monitor_defaults';
 import {
   LEGACY_SYNTHETICS_MONITOR_ENCRYPTED_TYPE,
   SYNTHETICS_MONITOR_ENCRYPTED_TYPE,
 } from '../../synthetics_monitor';
 import { validateMonitor } from '../../../../../routes/monitor_cruds/monitor_validation';
 import {
-  normalizeMonitorSecretAttributes,
   formatSecrets,
+  normalizeMonitorSecretAttributes,
 } from '../../../../../synthetics_service/utils/secrets';
 
 export const migration880 = (encryptedSavedObjects: EncryptedSavedObjectsPluginSetup) => {
@@ -61,6 +69,8 @@ export const migration880 = (encryptedSavedObjects: EncryptedSavedObjectsPluginS
         },
       };
       if (migrated.attributes.type === 'browser') {
+        migrated = updateThrottlingFields(migrated, logger);
+
         try {
           const normalizedMonitorAttributes = normalizeMonitorSecretAttributes(migrated.attributes);
           migrated = {
@@ -118,3 +128,103 @@ const omitZipUrlFields = (fields: BrowserFields) => {
 
   return formatSecrets(validationResult.decodedMonitor);
 };
+
+const updateThrottlingFields = (
+  doc: SavedObjectUnsanitizedDoc<
+    SyntheticsMonitorWithSecrets &
+      Partial<{
+        [LegacyConfigKey.THROTTLING_CONFIG]: string;
+        [LegacyConfigKey.IS_THROTTLING_ENABLED]: boolean;
+        [LegacyConfigKey.DOWNLOAD_SPEED]: string;
+        [LegacyConfigKey.UPLOAD_SPEED]: string;
+        [LegacyConfigKey.LATENCY]: string;
+        [ConfigKey.THROTTLING_CONFIG]: ThrottlingConfig;
+      }>
+  >,
+  logger: SavedObjectMigrationContext
+) => {
+  try {
+    const { attributes } = doc;
+
+    const migrated = {
+      ...doc,
+      attributes: {
+        ...doc.attributes,
+        [ConfigKey.CONFIG_HASH]: '',
+      },
+    };
+
+    const isThrottlingEnabled = attributes[LegacyConfigKey.IS_THROTTLING_ENABLED];
+    if (isThrottlingEnabled) {
+      const defaultProfileValue = PROFILES_MAP[PROFILE_VALUES_ENUM.DEFAULT].value!;
+
+      const download =
+        String(attributes[LegacyConfigKey.DOWNLOAD_SPEED]) || defaultProfileValue.download;
+      const upload = String(attributes[LegacyConfigKey.UPLOAD_SPEED]) || defaultProfileValue.upload;
+      const latency = String(attributes[LegacyConfigKey.LATENCY]) || defaultProfileValue.latency;
+
+      migrated.attributes[ConfigKey.THROTTLING_CONFIG] = getMatchingThrottlingConfig(
+        download,
+        upload,
+        latency
+      );
+    } else {
+      migrated.attributes[ConfigKey.THROTTLING_CONFIG] =
+        PROFILES_MAP[PROFILE_VALUES_ENUM.NO_THROTTLING];
+    }
+
+    // filter out legacy throttling fields
+    return {
+      ...migrated,
+      attributes: omit(migrated.attributes, [
+        LegacyConfigKey.THROTTLING_CONFIG,
+        LegacyConfigKey.IS_THROTTLING_ENABLED,
+        LegacyConfigKey.DOWNLOAD_SPEED,
+        LegacyConfigKey.UPLOAD_SPEED,
+        LegacyConfigKey.LATENCY,
+      ]),
+    };
+  } catch (e) {
+    logger.log.warn(
+      `Failed to migrate throttling fields from legacy Synthetics monitor: ${e.message}`
+    );
+    const { attributes } = doc;
+
+    attributes[ConfigKey.THROTTLING_CONFIG] = PROFILES_MAP[PROFILE_VALUES_ENUM.DEFAULT];
+
+    return {
+      ...doc,
+      attributes: omit(attributes, [
+        LegacyConfigKey.THROTTLING_CONFIG,
+        LegacyConfigKey.IS_THROTTLING_ENABLED,
+        LegacyConfigKey.DOWNLOAD_SPEED,
+        LegacyConfigKey.UPLOAD_SPEED,
+        LegacyConfigKey.LATENCY,
+      ]),
+    };
+  }
+};
+
+const getMatchingThrottlingConfig = (download: string, upload: string, latency: string) => {
+  const matchedProfile = PROFILE_VALUES.find(({ value }) => {
+    return (
+      Number(value?.download) === Number(download) &&
+      Number(value?.upload) === Number(upload) &&
+      Number(value?.latency) === Number(latency)
+    );
+  });
+
+  if (matchedProfile) {
+    return matchedProfile;
+  } else {
+    return {
+      id: PROFILE_VALUES_ENUM.CUSTOM,
+      label: CUSTOM_LABEL,
+      value: {
+        download: String(download),
+        upload: String(upload),
+        latency: String(latency),
+      },
+    };
+  }
+};
diff --git a/x-pack/plugins/synthetics/server/legacy_uptime/lib/saved_objects/synthetics_monitor.ts b/x-pack/plugins/synthetics/server/legacy_uptime/lib/saved_objects/synthetics_monitor.ts
index 3d5ddecf188a5..c8aa68f478703 100644
--- a/x-pack/plugins/synthetics/server/legacy_uptime/lib/saved_objects/synthetics_monitor.ts
+++ b/x-pack/plugins/synthetics/server/legacy_uptime/lib/saved_objects/synthetics_monitor.ts
@@ -170,6 +170,13 @@ export const getSyntheticsMonitorSavedObjectType = (
             },
           },
         },
+        throttling: {
+          properties: {
+            label: {
+              type: 'keyword',
+            },
+          },
+        },
       },
     },
     management: {
diff --git a/x-pack/plugins/synthetics/server/routes/monitor_cruds/add_monitor_project.ts b/x-pack/plugins/synthetics/server/routes/monitor_cruds/add_monitor_project.ts
index 59f798b5bc623..b2e4d050e4d7c 100644
--- a/x-pack/plugins/synthetics/server/routes/monitor_cruds/add_monitor_project.ts
+++ b/x-pack/plugins/synthetics/server/routes/monitor_cruds/add_monitor_project.ts
@@ -78,7 +78,7 @@ export const addSyntheticsProjectMonitorRoute: SyntheticsRestApiRouteFactory = (
       };
     } catch (error) {
       server.logger.error(`Error adding monitors to project ${decodedProjectName}`);
-      if (error.output.statusCode === 404) {
+      if (error.output?.statusCode === 404) {
         const spaceId = server.spaces?.spacesService.getSpaceId(request) ?? DEFAULT_SPACE_ID;
         return response.notFound({ body: { message: `Kibana space '${spaceId}' does not exist` } });
       }
diff --git a/x-pack/plugins/synthetics/server/routes/monitor_cruds/monitor_validation.test.ts b/x-pack/plugins/synthetics/server/routes/monitor_cruds/monitor_validation.test.ts
index 7678cfc54615e..12fe8306d1731 100644
--- a/x-pack/plugins/synthetics/server/routes/monitor_cruds/monitor_validation.test.ts
+++ b/x-pack/plugins/synthetics/server/routes/monitor_cruds/monitor_validation.test.ts
@@ -175,11 +175,15 @@ describe('validateMonitor', () => {
       [ConfigKey.JOURNEY_FILTERS_MATCH]: 'false',
       [ConfigKey.JOURNEY_FILTERS_TAGS]: testTags,
       [ConfigKey.IGNORE_HTTPS_ERRORS]: false,
-      [ConfigKey.IS_THROTTLING_ENABLED]: true,
-      [ConfigKey.DOWNLOAD_SPEED]: '5',
-      [ConfigKey.UPLOAD_SPEED]: '3',
-      [ConfigKey.LATENCY]: '20',
-      [ConfigKey.THROTTLING_CONFIG]: '5d/3u/20l',
+      [ConfigKey.THROTTLING_CONFIG]: {
+        value: {
+          download: '5',
+          upload: '3',
+          latency: '20',
+        },
+        id: 'test',
+        label: 'test',
+      },
     };
 
     testBrowserFields = {
diff --git a/x-pack/plugins/synthetics/server/synthetics_service/formatters/browser.ts b/x-pack/plugins/synthetics/server/synthetics_service/formatters/browser.ts
index 391556bb99649..75fa3da2dcd3d 100644
--- a/x-pack/plugins/synthetics/server/synthetics_service/formatters/browser.ts
+++ b/x-pack/plugins/synthetics/server/synthetics_service/formatters/browser.ts
@@ -15,21 +15,21 @@ import { arrayFormatter, objectFormatter, stringToObjectFormatter } from './form
 export type BrowserFormatMap = Record<keyof BrowserFields, Formatter>;
 
 const throttlingFormatter: Formatter = (fields) => {
-  if (!fields[ConfigKey.IS_THROTTLING_ENABLED]) return false;
+  const value = fields[ConfigKey.THROTTLING_CONFIG];
+  const defaultThrottling = DEFAULT_BROWSER_ADVANCED_FIELDS[ConfigKey.THROTTLING_CONFIG].value;
+
+  const thValue = value?.value;
+
+  if (!thValue || !defaultThrottling) return false;
+
+  if (thValue?.download === '0' && thValue?.upload === '0' && thValue?.latency === '0')
+    return false;
+  if (value?.label === 'no-throttling') return false;
 
   return {
-    download: parseInt(
-      fields[ConfigKey.DOWNLOAD_SPEED] || DEFAULT_BROWSER_ADVANCED_FIELDS[ConfigKey.DOWNLOAD_SPEED],
-      10
-    ),
-    upload: parseInt(
-      fields[ConfigKey.UPLOAD_SPEED] || DEFAULT_BROWSER_ADVANCED_FIELDS[ConfigKey.UPLOAD_SPEED],
-      10
-    ),
-    latency: parseInt(
-      fields[ConfigKey.LATENCY] || DEFAULT_BROWSER_ADVANCED_FIELDS[ConfigKey.LATENCY],
-      10
-    ),
+    download: Number(thValue?.download ?? defaultThrottling.download),
+    upload: Number(thValue?.upload ?? defaultThrottling.upload),
+    latency: Number(thValue?.latency ?? defaultThrottling.latency),
   };
 };
 
diff --git a/x-pack/plugins/synthetics/server/synthetics_service/formatters/format_configs.test.ts b/x-pack/plugins/synthetics/server/synthetics_service/formatters/format_configs.test.ts
index eb2b40e324249..e5ff19ddaf1c0 100644
--- a/x-pack/plugins/synthetics/server/synthetics_service/formatters/format_configs.test.ts
+++ b/x-pack/plugins/synthetics/server/synthetics_service/formatters/format_configs.test.ts
@@ -73,11 +73,15 @@ const testBrowserConfig: Partial<MonitorFields> = {
   'filter_journeys.match': '',
   'filter_journeys.tags': ['dev'],
   ignore_https_errors: false,
-  'throttling.is_enabled': true,
-  'throttling.download_speed': '5',
-  'throttling.upload_speed': '3',
-  'throttling.latency': '20',
-  'throttling.config': '5d/3u/20l',
+  throttling: {
+    value: {
+      download: '5',
+      latency: '20',
+      upload: '3',
+    },
+    id: 'default',
+    label: 'default',
+  },
   project_id: 'test-project',
 };
 
@@ -203,12 +207,16 @@ describe('browser fields', () => {
   });
 
   it('excludes UI fields', () => {
-    testBrowserConfig['throttling.is_enabled'] = false;
-    testBrowserConfig['throttling.upload_speed'] = '3';
-
     const formattedConfig = formatMonitorConfigFields(
       Object.keys(testBrowserConfig) as ConfigKey[],
-      testBrowserConfig,
+      {
+        ...testBrowserConfig,
+        throttling: {
+          value: null,
+          label: 'no-throttling',
+          id: 'no-throttling',
+        },
+      },
       logger,
       { proxyUrl: 'https://www.google.com' }
     );
@@ -216,8 +224,6 @@ describe('browser fields', () => {
     const expected = {
       ...formattedConfig,
       throttling: false,
-      'throttling.is_enabled': undefined,
-      'throttling.upload_speed': undefined,
     };
 
     expect(formattedConfig).toEqual(expected);
diff --git a/x-pack/plugins/synthetics/server/synthetics_service/formatters/format_configs.ts b/x-pack/plugins/synthetics/server/synthetics_service/formatters/format_configs.ts
index d9b12c550532f..16056d6687a70 100644
--- a/x-pack/plugins/synthetics/server/synthetics_service/formatters/format_configs.ts
+++ b/x-pack/plugins/synthetics/server/synthetics_service/formatters/format_configs.ts
@@ -23,10 +23,6 @@ const UI_KEYS_TO_SKIP = [
   ConfigKey.JOURNEY_ID,
   ConfigKey.PROJECT_ID,
   ConfigKey.METADATA,
-  ConfigKey.UPLOAD_SPEED,
-  ConfigKey.DOWNLOAD_SPEED,
-  ConfigKey.LATENCY,
-  ConfigKey.IS_THROTTLING_ENABLED,
   ConfigKey.REVISION,
   ConfigKey.CUSTOM_HEARTBEAT_ID,
   ConfigKey.FORM_MONITOR_TYPE,
@@ -36,19 +32,13 @@ const UI_KEYS_TO_SKIP = [
   'secrets',
 ];
 
-const uiToHeartbeatKeyMap = {
-  throttling: ConfigKey.THROTTLING_CONFIG,
-};
-
-type YamlKeys = keyof typeof uiToHeartbeatKeyMap;
-
 export const formatMonitorConfigFields = (
   configKeys: ConfigKey[],
   config: Partial<MonitorFields>,
   logger: Logger,
   params: Record<string, string>
 ) => {
-  const formattedMonitor = {} as Record<ConfigKey | YamlKeys, any>;
+  const formattedMonitor = {} as Record<ConfigKey, any>;
 
   configKeys.forEach((key) => {
     if (!UI_KEYS_TO_SKIP.includes(key)) {
@@ -85,13 +75,6 @@ export const formatMonitorConfigFields = (
     sslKeys.forEach((key) => (formattedMonitor[key] = null));
   }
 
-  Object.keys(uiToHeartbeatKeyMap).forEach((key) => {
-    const hbKey = key as YamlKeys;
-    const configKey = uiToHeartbeatKeyMap[hbKey];
-    formattedMonitor[hbKey] = formattedMonitor[configKey];
-    delete formattedMonitor[configKey];
-  });
-
   return omitBy(formattedMonitor, isNil) as Partial<MonitorFields>;
 };
 
diff --git a/x-pack/plugins/synthetics/server/synthetics_service/private_location/synthetics_private_location.test.ts b/x-pack/plugins/synthetics/server/synthetics_service/private_location/synthetics_private_location.test.ts
index 5f1c74d5dfb05..a334b6b406b3b 100644
--- a/x-pack/plugins/synthetics/server/synthetics_service/private_location/synthetics_private_location.test.ts
+++ b/x-pack/plugins/synthetics/server/synthetics_service/private_location/synthetics_private_location.test.ts
@@ -311,11 +311,7 @@ const dummyBrowserConfig: Partial<MonitorFields> & {
   'filter_journeys.match': '',
   'filter_journeys.tags': [],
   ignore_https_errors: false,
-  'throttling.is_enabled': true,
-  'throttling.download_speed': '5',
-  'throttling.upload_speed': '3',
-  'throttling.latency': '20',
-  'throttling.config': '5d/3u/20l',
+  throttling: { value: { download: '5', upload: '3', latency: '20' }, label: 'test', id: 'test' },
   id: '75cdd125-5b62-4459-870c-46f59bf37e89',
   config_id: '75cdd125-5b62-4459-870c-46f59bf37e89',
   fields: { config_id: '75cdd125-5b62-4459-870c-46f59bf37e89', run_once: true },
diff --git a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/browser_monitor.test.ts b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/browser_monitor.test.ts
index 0d66c944a1544..c1c6fa238b6c6 100644
--- a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/browser_monitor.test.ts
+++ b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/browser_monitor.test.ts
@@ -13,7 +13,11 @@ import {
   ProjectMonitor,
   PrivateLocation,
 } from '../../../../common/runtime_types';
-import { DEFAULT_FIELDS } from '../../../../common/constants/monitor_defaults';
+import {
+  DEFAULT_FIELDS,
+  PROFILE_VALUES_ENUM,
+  PROFILES_MAP,
+} from '../../../../common/constants/monitor_defaults';
 import { normalizeProjectMonitors } from '.';
 
 describe('browser normalizers', () => {
@@ -143,11 +147,6 @@ describe('browser normalizers', () => {
             'service.name': '',
             'source.project.content': 'test content 1',
             tags: ['tag1', 'tag2'],
-            'throttling.config': '5d/10u/20l',
-            'throttling.download_speed': '5',
-            'throttling.is_enabled': true,
-            'throttling.latency': '20',
-            'throttling.upload_speed': '10',
             params: '',
             type: 'browser',
             project_id: projectId,
@@ -157,6 +156,15 @@ describe('browser normalizers', () => {
             timeout: null,
             id: '',
             hash: testHash,
+            throttling: {
+              id: 'custom',
+              label: 'Custom',
+              value: {
+                download: '5',
+                latency: '20',
+                upload: '10',
+              },
+            },
           },
           unsupportedKeys: [],
           errors: [],
@@ -198,11 +206,6 @@ describe('browser normalizers', () => {
             'service.name': '',
             'source.project.content': 'test content 2',
             tags: ['tag3', 'tag4'],
-            'throttling.config': '10d/15u/18l',
-            'throttling.download_speed': '10',
-            'throttling.is_enabled': true,
-            'throttling.latency': '18',
-            'throttling.upload_speed': '15',
             type: 'browser',
             project_id: projectId,
             namespace: 'test_space',
@@ -211,6 +214,15 @@ describe('browser normalizers', () => {
             timeout: null,
             id: '',
             hash: testHash,
+            throttling: {
+              id: 'custom',
+              label: 'Custom',
+              value: {
+                download: '10',
+                latency: '18',
+                upload: '15',
+              },
+            },
           },
           unsupportedKeys: [],
           errors: [],
@@ -257,11 +269,6 @@ describe('browser normalizers', () => {
             'service.name': '',
             'source.project.content': 'test content 3',
             tags: ['tag3', 'tag4'],
-            'throttling.config': '5d/3u/20l',
-            'throttling.download_speed': '5',
-            'throttling.is_enabled': false,
-            'throttling.latency': '20',
-            'throttling.upload_speed': '3',
             type: 'browser',
             project_id: projectId,
             namespace: 'test_space',
@@ -270,6 +277,147 @@ describe('browser normalizers', () => {
             timeout: null,
             id: '',
             hash: testHash,
+            throttling: PROFILES_MAP[PROFILE_VALUES_ENUM.NO_THROTTLING],
+          },
+          unsupportedKeys: [],
+          errors: [],
+        },
+      ]);
+    });
+
+    it('handles defined throttling values', () => {
+      const actual = normalizeProjectMonitors({
+        locations,
+        privateLocations,
+        monitors: [
+          {
+            ...monitors[0],
+            throttling: {
+              download: 9,
+              upload: 0.75,
+              latency: 170,
+            },
+          },
+        ],
+        projectId,
+        namespace: 'test-space',
+        version: '8.5.0',
+      });
+      expect(actual).toEqual([
+        {
+          normalizedFields: {
+            ...DEFAULT_FIELDS[DataStream.BROWSER],
+            journey_id: 'test-id-1',
+            ignore_https_errors: true,
+            origin: 'project',
+            locations: [
+              {
+                geo: {
+                  lat: 33.333,
+                  lon: 73.333,
+                },
+                id: 'us_central',
+                isServiceManaged: true,
+                label: 'Test Location',
+              },
+            ],
+            name: 'test-name-1',
+            schedule: {
+              number: '3',
+              unit: 'm',
+            },
+            screenshots: 'off',
+            'service.name': '',
+            'source.project.content': 'test content 1',
+            tags: ['tag1', 'tag2'],
+            params: '',
+            type: 'browser',
+            project_id: projectId,
+            namespace: 'test_space',
+            original_space: 'test-space',
+            custom_heartbeat_id: 'test-id-1-test-project-id-test-space',
+            timeout: null,
+            id: '',
+            hash: testHash,
+            throttling: {
+              id: '4g',
+              label: '4G',
+              value: {
+                download: '9',
+                latency: '170',
+                upload: '0.75',
+              },
+            },
+          },
+          unsupportedKeys: [],
+          errors: [],
+        },
+      ]);
+    });
+
+    it('handles custom throttling values', () => {
+      const actual = normalizeProjectMonitors({
+        locations,
+        privateLocations,
+        monitors: [
+          {
+            ...monitors[0],
+            throttling: {
+              download: 10,
+              upload: 5,
+              latency: 30,
+            },
+          },
+        ],
+        projectId,
+        namespace: 'test-space',
+        version: '8.5.0',
+      });
+      expect(actual).toEqual([
+        {
+          normalizedFields: {
+            ...DEFAULT_FIELDS[DataStream.BROWSER],
+            journey_id: 'test-id-1',
+            ignore_https_errors: true,
+            origin: 'project',
+            locations: [
+              {
+                geo: {
+                  lat: 33.333,
+                  lon: 73.333,
+                },
+                id: 'us_central',
+                isServiceManaged: true,
+                label: 'Test Location',
+              },
+            ],
+            name: 'test-name-1',
+            schedule: {
+              number: '3',
+              unit: 'm',
+            },
+            screenshots: 'off',
+            'service.name': '',
+            'source.project.content': 'test content 1',
+            tags: ['tag1', 'tag2'],
+            params: '',
+            type: 'browser',
+            project_id: projectId,
+            namespace: 'test_space',
+            original_space: 'test-space',
+            custom_heartbeat_id: 'test-id-1-test-project-id-test-space',
+            timeout: null,
+            id: '',
+            hash: testHash,
+            throttling: {
+              id: 'custom',
+              label: 'Custom',
+              value: {
+                download: '10',
+                latency: '30',
+                upload: '5',
+              },
+            },
           },
           unsupportedKeys: [],
           errors: [],
diff --git a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/browser_monitor.ts b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/browser_monitor.ts
index b8c6448b9e6e0..7ddf0cb01af91 100644
--- a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/browser_monitor.ts
+++ b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/normalizers/browser_monitor.ts
@@ -10,8 +10,16 @@ import {
   ConfigKey,
   DataStream,
   FormMonitorType,
+  ProjectMonitor,
+  ThrottlingConfig,
 } from '../../../../common/runtime_types';
-import { DEFAULT_FIELDS } from '../../../../common/constants/monitor_defaults';
+import {
+  PROFILE_VALUES_ENUM,
+  DEFAULT_FIELDS,
+  PROFILES_MAP,
+  PROFILE_VALUES,
+  CUSTOM_LABEL,
+} from '../../../../common/constants/monitor_defaults';
 import {
   NormalizedProjectProps,
   NormalizerResult,
@@ -38,33 +46,15 @@ export const getNormalizeBrowserFields = ({
     version,
   });
 
+  const throttling = normalizeThrottling(monitor.throttling);
+
   const normalizedFields = {
     ...commonFields,
     [ConfigKey.MONITOR_TYPE]: DataStream.BROWSER,
     [ConfigKey.FORM_MONITOR_TYPE]: FormMonitorType.MULTISTEP,
     [ConfigKey.SOURCE_PROJECT_CONTENT]:
       monitor.content || defaultFields[ConfigKey.SOURCE_PROJECT_CONTENT],
-    [ConfigKey.THROTTLING_CONFIG]:
-      typeof monitor.throttling !== 'boolean'
-        ? `${monitor.throttling?.download}d/${monitor.throttling?.upload}u/${monitor.throttling?.latency}l`
-        : defaultFields[ConfigKey.THROTTLING_CONFIG],
-    [ConfigKey.DOWNLOAD_SPEED]: `${
-      typeof monitor.throttling !== 'boolean'
-        ? monitor.throttling?.download
-        : defaultFields[ConfigKey.DOWNLOAD_SPEED]
-    }`,
-    [ConfigKey.UPLOAD_SPEED]: `${
-      typeof monitor.throttling !== 'boolean'
-        ? monitor.throttling?.upload
-        : defaultFields[ConfigKey.UPLOAD_SPEED]
-    }`,
-    [ConfigKey.IS_THROTTLING_ENABLED]:
-      Boolean(monitor.throttling) ?? defaultFields[ConfigKey.IS_THROTTLING_ENABLED],
-    [ConfigKey.LATENCY]: `${
-      typeof monitor.throttling !== 'boolean'
-        ? monitor.throttling?.latency
-        : defaultFields[ConfigKey.LATENCY]
-    }`,
+    [ConfigKey.THROTTLING_CONFIG]: throttling,
     [ConfigKey.IGNORE_HTTPS_ERRORS]:
       monitor.ignoreHTTPSErrors || defaultFields[ConfigKey.IGNORE_HTTPS_ERRORS],
     [ConfigKey.SCREENSHOTS]: monitor.screenshot || defaultFields[ConfigKey.SCREENSHOTS],
@@ -89,3 +79,40 @@ export const getNormalizeBrowserFields = ({
     errors,
   };
 };
+
+export const normalizeThrottling = (
+  monitorThrottling: ProjectMonitor['throttling']
+): ThrottlingConfig => {
+  const defaultFields = DEFAULT_FIELDS[DataStream.BROWSER];
+
+  let throttling = defaultFields[ConfigKey.THROTTLING_CONFIG];
+  if (typeof monitorThrottling === 'boolean' && !monitorThrottling) {
+    throttling = PROFILES_MAP[PROFILE_VALUES_ENUM.NO_THROTTLING];
+  }
+  if (typeof monitorThrottling === 'object') {
+    const { download, upload, latency } = monitorThrottling;
+    const matchedProfile = PROFILE_VALUES.find(({ value }) => {
+      return (
+        Number(value?.download) === download &&
+        Number(value?.upload) === upload &&
+        Number(value?.latency) === latency
+      );
+    });
+
+    if (matchedProfile) {
+      return matchedProfile;
+    } else {
+      return {
+        id: PROFILE_VALUES_ENUM.CUSTOM,
+        label: CUSTOM_LABEL,
+        value: {
+          download: String(download),
+          upload: String(upload),
+          latency: String(latency),
+        },
+      };
+    }
+  }
+
+  return throttling;
+};
diff --git a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/project_monitor_formatter.test.ts b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/project_monitor_formatter.test.ts
index 800b8cfa0ac5e..385ec449d6c1a 100644
--- a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/project_monitor_formatter.test.ts
+++ b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/project_monitor_formatter.test.ts
@@ -485,11 +485,6 @@ const payloadData = [
     'ssl.verification_mode': 'full',
     synthetics_args: [],
     tags: [],
-    'throttling.config': '5d/3u/20l',
-    'throttling.download_speed': '5',
-    'throttling.is_enabled': true,
-    'throttling.latency': '20',
-    'throttling.upload_speed': '3',
     timeout: null,
     type: 'browser',
     'url.port': null,
@@ -540,11 +535,6 @@ const payloadData = [
     'ssl.verification_mode': 'full',
     synthetics_args: [],
     tags: [],
-    'throttling.config': '5d/3u/20l',
-    'throttling.download_speed': '5',
-    'throttling.is_enabled': true,
-    'throttling.latency': '20',
-    'throttling.upload_speed': '3',
     timeout: null,
     type: 'browser',
     'url.port': null,
diff --git a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/project_monitor_formatter_legacy.test.ts b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/project_monitor_formatter_legacy.test.ts
index c284e18dac56d..a7ae725337b06 100644
--- a/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/project_monitor_formatter_legacy.test.ts
+++ b/x-pack/plugins/synthetics/server/synthetics_service/project_monitor/project_monitor_formatter_legacy.test.ts
@@ -554,11 +554,6 @@ const payloadData = [
     'ssl.verification_mode': 'full',
     synthetics_args: [],
     tags: [],
-    'throttling.config': '5d/3u/20l',
-    'throttling.download_speed': '5',
-    'throttling.is_enabled': true,
-    'throttling.latency': '20',
-    'throttling.upload_speed': '3',
     timeout: null,
     type: 'browser',
     'url.port': null,
@@ -609,11 +604,6 @@ const payloadData = [
     'ssl.verification_mode': 'full',
     synthetics_args: [],
     tags: [],
-    'throttling.config': '5d/3u/20l',
-    'throttling.download_speed': '5',
-    'throttling.is_enabled': true,
-    'throttling.latency': '20',
-    'throttling.upload_speed': '3',
     timeout: null,
     type: 'browser',
     'url.port': null,
diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
index 72cfaa355835f..1cc24cee63e3f 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -34909,7 +34909,6 @@
     "xpack.synthetics.monitorConfig.textAssertion.label": "Assertion de texte",
     "xpack.synthetics.monitorConfig.throttling.helpText": "Simulez la régulation du réseau (téléchargement, chargement, latence). D'autres options seront ajoutées dans une prochaine version.",
     "xpack.synthetics.monitorConfig.throttling.label": "Profil de connexion",
-    "xpack.synthetics.monitorConfig.throttling.options.default": "Par défaut",
     "xpack.synthetics.monitorConfig.timeout.formatError": "Le délai d'expiration n'est pas valide.",
     "xpack.synthetics.monitorConfig.timeout.greaterThan0Error": "Le délai d'expiration doit être supérieur ou égal à 0.",
     "xpack.synthetics.monitorConfig.timeout.helpText": "Temps total autorisé pour tester la connexion et l'échange de données.",
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 5636aeac2d32d..53c0c855e1d14 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -34888,7 +34888,6 @@
     "xpack.synthetics.monitorConfig.textAssertion.label": "テキストアサーション",
     "xpack.synthetics.monitorConfig.throttling.helpText": "ネットワークスロットリングをシミュレートします（ダウンロード、アップロード、レイテンシ）。今後のバージョンではその他のオプションが追加されます。",
     "xpack.synthetics.monitorConfig.throttling.label": "接続プロファイル",
-    "xpack.synthetics.monitorConfig.throttling.options.default": "デフォルト",
     "xpack.synthetics.monitorConfig.timeout.formatError": "タイムアウトが無効です。",
     "xpack.synthetics.monitorConfig.timeout.greaterThan0Error": "タイムアウトは0以上でなければなりません。",
     "xpack.synthetics.monitorConfig.timeout.helpText": "接続のテストとデータの交換に許可された合計時間。",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 28b56ee5b92ff..f92e4a333eb58 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -34904,7 +34904,6 @@
     "xpack.synthetics.monitorConfig.textAssertion.label": "文本断言",
     "xpack.synthetics.monitorConfig.throttling.helpText": "模拟网络限制（下载、上传、延迟）。将在未来版本中添加更多选项。",
     "xpack.synthetics.monitorConfig.throttling.label": "连接配置文件",
-    "xpack.synthetics.monitorConfig.throttling.options.default": "默认",
     "xpack.synthetics.monitorConfig.timeout.formatError": "超时无效。",
     "xpack.synthetics.monitorConfig.timeout.greaterThan0Error": "超时必须大于或等于 0。",
     "xpack.synthetics.monitorConfig.timeout.helpText": "允许用于测试连接并交换数据的总时间。",
diff --git a/x-pack/test/api_integration/apis/synthetics/add_monitor_project.ts b/x-pack/test/api_integration/apis/synthetics/add_monitor_project.ts
index 6c0dad1d2ce14..b1bc58abe7113 100644
--- a/x-pack/test/api_integration/apis/synthetics/add_monitor_project.ts
+++ b/x-pack/test/api_integration/apis/synthetics/add_monitor_project.ts
@@ -12,6 +12,10 @@ import { formatKibanaNamespace } from '@kbn/synthetics-plugin/common/formatters'
 import { syntheticsMonitorType } from '@kbn/synthetics-plugin/server/legacy_uptime/lib/saved_objects/synthetics_monitor';
 import { REQUEST_TOO_LARGE } from '@kbn/synthetics-plugin/server/routes/monitor_cruds/add_monitor_project';
 import { PackagePolicy } from '@kbn/fleet-plugin/common';
+import {
+  PROFILE_VALUES_ENUM,
+  PROFILES_MAP,
+} from '@kbn/synthetics-plugin/common/constants/monitor_defaults';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { getFixtureJson } from '../uptime/rest/helper/get_fixture_json';
 import { PrivateLocationTestService } from './services/private_location_test_service';
@@ -190,11 +194,7 @@ export default function ({ getService }: FtrProviderContext) {
             'service.name': '',
             synthetics_args: [],
             tags: [],
-            'throttling.config': '5d/3u/20l',
-            'throttling.download_speed': '5',
-            'throttling.is_enabled': true,
-            'throttling.latency': '20',
-            'throttling.upload_speed': '3',
+            throttling: PROFILES_MAP[PROFILE_VALUES_ENUM.DEFAULT],
             'ssl.certificate': '',
             'ssl.certificate_authorities': '',
             'ssl.supported_protocols': ['TLSv1.1', 'TLSv1.2', 'TLSv1.3'],
@@ -253,7 +253,11 @@ export default function ({ getService }: FtrProviderContext) {
             .set('kbn-xsrf', 'true')
             .expect(200);
 
-          expect(decryptedCreatedMonitor.body.attributes['throttling.is_enabled']).to.eql(false);
+          expect(decryptedCreatedMonitor.body.attributes.throttling).to.eql({
+            value: null,
+            id: 'no-throttling',
+            label: 'No throttling',
+          });
         }
       } finally {
         await Promise.all([
diff --git a/x-pack/test/api_integration/apis/synthetics/add_monitor_project_legacy.ts b/x-pack/test/api_integration/apis/synthetics/add_monitor_project_legacy.ts
index 03477c85c3a06..65768d80a53f3 100644
--- a/x-pack/test/api_integration/apis/synthetics/add_monitor_project_legacy.ts
+++ b/x-pack/test/api_integration/apis/synthetics/add_monitor_project_legacy.ts
@@ -16,6 +16,10 @@ import { API_URLS } from '@kbn/synthetics-plugin/common/constants';
 import { formatKibanaNamespace } from '@kbn/synthetics-plugin/common/formatters';
 import { syntheticsMonitorType } from '@kbn/synthetics-plugin/server/legacy_uptime/lib/saved_objects/synthetics_monitor';
 import { PackagePolicy } from '@kbn/fleet-plugin/common';
+import {
+  PROFILE_VALUES_ENUM,
+  PROFILES_MAP,
+} from '@kbn/synthetics-plugin/common/constants/monitor_defaults';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { getFixtureJson } from '../uptime/rest/helper/get_fixture_json';
 import { PrivateLocationTestService } from './services/private_location_test_service';
@@ -175,11 +179,7 @@ export default function ({ getService }: FtrProviderContext) {
             'service.name': '',
             synthetics_args: [],
             tags: [],
-            'throttling.config': '5d/3u/20l',
-            'throttling.download_speed': '5',
-            'throttling.is_enabled': true,
-            'throttling.latency': '20',
-            'throttling.upload_speed': '3',
+            throttling: PROFILES_MAP[PROFILE_VALUES_ENUM.DEFAULT],
             'ssl.certificate': '',
             'ssl.certificate_authorities': '',
             'ssl.supported_protocols': ['TLSv1.1', 'TLSv1.2', 'TLSv1.3'],
diff --git a/x-pack/test/api_integration/apis/uptime/rest/fixtures/browser_monitor.json b/x-pack/test/api_integration/apis/uptime/rest/fixtures/browser_monitor.json
index 1a12efba9dc1c..44b1677de8a3a 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/fixtures/browser_monitor.json
+++ b/x-pack/test/api_integration/apis/uptime/rest/fixtures/browser_monitor.json
@@ -31,11 +31,15 @@
   "filter_journeys.match": "",
   "filter_journeys.tags": [],
   "ignore_https_errors": false,
-  "throttling.is_enabled": true,
-  "throttling.download_speed": "5",
-  "throttling.upload_speed": "3",
-  "throttling.latency": "20",
-  "throttling.config": "5d/3u/20l",
+  "throttling": {
+    "value": {
+      "download": "5",
+      "latency": "20",
+      "upload": "3"
+    },
+    "id": "default",
+    "label": "Default"
+  },
   "locations": [],
   "name": "Test HTTP Monitor 03",
   "namespace": "testnamespace",

From 9ec31d0397d0a600c988327150912510b15208d1 Mon Sep 17 00:00:00 2001
From: Kevin Delemme <kevin.delemme@elastic.co>
Date: Wed, 19 Apr 2023 12:15:20 -0400
Subject: [PATCH 084/100] chore(slo): Improve active alerts badge (#155290)

---
 .../slo_active_alerts_badge.tsx                | 13 +++++++------
 .../hooks/slo/use_fetch_active_alerts.ts       |  7 +++++++
 .../slo_details/components/header_title.tsx    |  2 +-
 .../slos/components/badges/slo_badges.tsx      |  2 +-
 .../helpers/alerts_page_query_filter.test.ts   | 18 ------------------
 .../slos/helpers/alerts_page_query_filter.ts   | 17 -----------------
 6 files changed, 16 insertions(+), 43 deletions(-)
 delete mode 100644 x-pack/plugins/observability/public/pages/slos/helpers/alerts_page_query_filter.test.ts
 delete mode 100644 x-pack/plugins/observability/public/pages/slos/helpers/alerts_page_query_filter.ts

diff --git a/x-pack/plugins/observability/public/components/slo/slo_status_badge/slo_active_alerts_badge.tsx b/x-pack/plugins/observability/public/components/slo/slo_status_badge/slo_active_alerts_badge.tsx
index 218f1c8bd84c3..4d5e826ab4129 100644
--- a/x-pack/plugins/observability/public/components/slo/slo_status_badge/slo_active_alerts_badge.tsx
+++ b/x-pack/plugins/observability/public/components/slo/slo_status_badge/slo_active_alerts_badge.tsx
@@ -8,17 +8,18 @@
 import { EuiBadge, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
+import { SLOWithSummaryResponse } from '@kbn/slo-schema';
+
 import { paths } from '../../../config/paths';
 import { useKibana } from '../../../utils/kibana_react';
-
 import { ActiveAlerts } from '../../../hooks/slo/use_fetch_active_alerts';
-import { toAlertsPageQueryFilter } from '../../../pages/slos/helpers/alerts_page_query_filter';
 
 export interface Props {
   activeAlerts?: ActiveAlerts;
+  slo: SLOWithSummaryResponse;
 }
 
-export function SloActiveAlertsBadge({ activeAlerts }: Props) {
+export function SloActiveAlertsBadge({ slo, activeAlerts }: Props) {
   const {
     application: { navigateToUrl },
     http: { basePath },
@@ -27,9 +28,9 @@ export function SloActiveAlertsBadge({ activeAlerts }: Props) {
   const handleActiveAlertsClick = () => {
     if (activeAlerts) {
       navigateToUrl(
-        `${basePath.prepend(paths.observability.alerts)}?_a=${toAlertsPageQueryFilter(
-          activeAlerts
-        )}`
+        `${basePath.prepend(paths.observability.alerts)}?_a=(kuery:'slo.id:"${
+          slo.id
+        }"',rangeFrom:now-15m,rangeTo:now,status:active)`
       );
     }
   };
diff --git a/x-pack/plugins/observability/public/hooks/slo/use_fetch_active_alerts.ts b/x-pack/plugins/observability/public/hooks/slo/use_fetch_active_alerts.ts
index 4e90e51060df0..b8dc07a00ab32 100644
--- a/x-pack/plugins/observability/public/hooks/slo/use_fetch_active_alerts.ts
+++ b/x-pack/plugins/observability/public/hooks/slo/use_fetch_active_alerts.ts
@@ -58,6 +58,13 @@ export function useFetchActiveAlerts({ sloIds = [] }: Params): UseFetchActiveAle
             query: {
               bool: {
                 filter: [
+                  {
+                    range: {
+                      '@timestamp': {
+                        gte: 'now-15m/m',
+                      },
+                    },
+                  },
                   {
                     term: {
                       'kibana.alert.rule.rule_type_id': 'slo.rules.burnRate',
diff --git a/x-pack/plugins/observability/public/pages/slo_details/components/header_title.tsx b/x-pack/plugins/observability/public/pages/slo_details/components/header_title.tsx
index 4ce439f290fe7..94e7bcc8acf2c 100644
--- a/x-pack/plugins/observability/public/pages/slo_details/components/header_title.tsx
+++ b/x-pack/plugins/observability/public/pages/slo_details/components/header_title.tsx
@@ -38,7 +38,7 @@ export function HeaderTitle(props: Props) {
       <EuiFlexItem grow={false}>{slo.name}</EuiFlexItem>
       <EuiFlexGroup direction="row" gutterSize="s" alignItems="center" responsive={false}>
         <SloStatusBadge slo={slo} />
-        <SloActiveAlertsBadge activeAlerts={activeAlerts[slo.id]} />
+        <SloActiveAlertsBadge slo={slo} activeAlerts={activeAlerts[slo.id]} />
       </EuiFlexGroup>
     </EuiFlexGroup>
   );
diff --git a/x-pack/plugins/observability/public/pages/slos/components/badges/slo_badges.tsx b/x-pack/plugins/observability/public/pages/slos/components/badges/slo_badges.tsx
index 15d36f3525ed1..89d5eadf4d9ad 100644
--- a/x-pack/plugins/observability/public/pages/slos/components/badges/slo_badges.tsx
+++ b/x-pack/plugins/observability/public/pages/slos/components/badges/slo_badges.tsx
@@ -31,7 +31,7 @@ export function SloBadges({ activeAlerts, rules, slo, onClickRuleBadge }: Props)
       <SloStatusBadge slo={slo} />
       <SloIndicatorTypeBadge slo={slo} />
       <SloTimeWindowBadge slo={slo} />
-      <SloActiveAlertsBadge activeAlerts={activeAlerts} />
+      <SloActiveAlertsBadge slo={slo} activeAlerts={activeAlerts} />
       <SloRulesBadge rules={rules} onClick={onClickRuleBadge} />
     </EuiFlexGroup>
   );
diff --git a/x-pack/plugins/observability/public/pages/slos/helpers/alerts_page_query_filter.test.ts b/x-pack/plugins/observability/public/pages/slos/helpers/alerts_page_query_filter.test.ts
deleted file mode 100644
index 956f5e087b6cf..0000000000000
--- a/x-pack/plugins/observability/public/pages/slos/helpers/alerts_page_query_filter.test.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * 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 { toAlertsPageQueryFilter } from './alerts_page_query_filter';
-
-describe('AlertsPageQueryFilter', () => {
-  it('computes the query filter correctly', async () => {
-    expect(
-      toAlertsPageQueryFilter({ count: 2, ruleIds: ['rule-1', 'rule-2'] })
-    ).toMatchInlineSnapshot(
-      `"(kuery:'kibana.alert.rule.uuid:\\"rule-1\\" or kibana.alert.rule.uuid:\\"rule-2\\"',rangeFrom:now-15m,rangeTo:now,status:all)"`
-    );
-  });
-});
diff --git a/x-pack/plugins/observability/public/pages/slos/helpers/alerts_page_query_filter.ts b/x-pack/plugins/observability/public/pages/slos/helpers/alerts_page_query_filter.ts
deleted file mode 100644
index 3fa407fab1bd8..0000000000000
--- a/x-pack/plugins/observability/public/pages/slos/helpers/alerts_page_query_filter.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * 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 { ActiveAlerts } from '../../../hooks/slo/use_fetch_active_alerts';
-
-export function toAlertsPageQueryFilter(activeAlerts: ActiveAlerts): string {
-  const kuery = activeAlerts.ruleIds
-    .map((ruleId) => `kibana.alert.rule.uuid:"${ruleId}"`)
-    .join(' or ');
-
-  const query = `(kuery:'${kuery}',rangeFrom:now-15m,rangeTo:now,status:all)`;
-  return query;
-}

From eb90e40da5f48fa8554b495ecd9b046f5f5978e3 Mon Sep 17 00:00:00 2001
From: Aleh Zasypkin <aleh.zasypkin@elastic.co>
Date: Wed, 19 Apr 2023 18:33:11 +0200
Subject: [PATCH 085/100] Setup Node.js environment before instrumenting Kibana
 with APM. (#155063)

---
 src/cli/dev.js        | 3 +--
 src/cli/dist.js       | 2 +-
 src/cli/tsconfig.json | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/cli/dev.js b/src/cli/dev.js
index fb61b53b6f210..f7a50ea16a7a9 100644
--- a/src/cli/dev.js
+++ b/src/cli/dev.js
@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-require('@kbn/babel-register').install();
-require('./apm')(process.env.ELASTIC_APM_SERVICE_NAME || 'kibana-proxy');
 require('../setup_node_env');
+require('./apm')(process.env.ELASTIC_APM_SERVICE_NAME || 'kibana-proxy');
 require('./cli');
diff --git a/src/cli/dist.js b/src/cli/dist.js
index fccc93cd53631..9bd7696a44561 100644
--- a/src/cli/dist.js
+++ b/src/cli/dist.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-require('./apm')();
 require('../setup_node_env/dist');
+require('./apm')();
 require('../setup_node_env/root');
 require('./cli');
diff --git a/src/cli/tsconfig.json b/src/cli/tsconfig.json
index 5ee6fa3616614..ebbbc19f75c79 100644
--- a/src/cli/tsconfig.json
+++ b/src/cli/tsconfig.json
@@ -17,7 +17,6 @@
     "@kbn/config",
     "@kbn/dev-utils",
     "@kbn/apm-config-loader",
-    "@kbn/babel-register",
   ],
   "exclude": [
     "target/**/*",

From 7a36571ce6e7312df4300c53b53844f91e532f20 Mon Sep 17 00:00:00 2001
From: Vadim Kibana <82822460+vadimkibana@users.noreply.github.com>
Date: Wed, 19 Apr 2023 18:59:49 +0200
Subject: [PATCH 086/100] Bump "ajv" dependency minor version (#155234)

## Summary

Upgrades `ajv` from `8.11` to `8.12`.
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index f898970efe8e7..58b87303d4a02 100644
--- a/package.json
+++ b/package.json
@@ -728,7 +728,7 @@
     "JSONStream": "1.3.5",
     "abort-controller": "^3.0.0",
     "adm-zip": "^0.5.9",
-    "ajv": "^8.11.0",
+    "ajv": "^8.12.0",
     "antlr4ts": "^0.5.0-alpha.3",
     "archiver": "^5.3.1",
     "async": "^3.2.3",
diff --git a/yarn.lock b/yarn.lock
index 772067b69cdca..5ab19eee75bd9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10050,10 +10050,10 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.11.0, ajv@^6.12.2, ajv@^6.12.4, ajv
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.0, ajv@^8.0.1, ajv@^8.11.0, ajv@^8.8.0:
-  version "8.11.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f"
-  integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==
+ajv@^8.0.0, ajv@^8.0.1, ajv@^8.12.0, ajv@^8.8.0:
+  version "8.12.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
+  integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
   dependencies:
     fast-deep-equal "^3.1.1"
     json-schema-traverse "^1.0.0"

From c3c55e7aa849c0cc0b8a547c325540dc6b7803fa Mon Sep 17 00:00:00 2001
From: Jan Monschke <jan.monschke@elastic.co>
Date: Wed, 19 Apr 2023 19:03:12 +0200
Subject: [PATCH 087/100] [SecuritySolution] Use correct queries and filters
 for prevalence calls (#154544)

## Summary

Bug ticket https://github.com/elastic/kibana/issues/131967 describes an
issue where the alert prevalence count is not correct for fields that
have array values (such as `process.args`).

## Solution

Getting the correct count for those fields involved adding more `term`
conditions to the prevalence query and the timeline filter. This ensures
that only alerts with the *exact* same array values match instead of
partial matches as before.




https://user-images.githubusercontent.com/68591/231395154-b5a1c968-8308-49fb-a218-f3611f8331c3.mov


### 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
- [x] Get approval from the product team

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
---
 .../investigate_in_timeline.cy.ts             | 34 +++++++++++-------
 .../cypress/screens/alerts_details.ts         |  2 --
 .../event_details/table/prevalence_cell.tsx   |  1 +
 .../table/use_action_cell_data_provider.ts    | 21 ++++++++++-
 .../containers/alerts/use_alert_prevalence.ts | 36 ++++++-------------
 .../es_archives/auditbeat/data.json           |  3 +-
 6 files changed, 56 insertions(+), 41 deletions(-)

diff --git a/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/investigate_in_timeline.cy.ts b/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/investigate_in_timeline.cy.ts
index e2d1204be84b2..213efb75e9860 100644
--- a/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/investigate_in_timeline.cy.ts
+++ b/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/investigate_in_timeline.cy.ts
@@ -8,6 +8,7 @@
 import { closeTimeline } from '../../tasks/timeline';
 import { getNewRule } from '../../objects/rule';
 import { PROVIDER_BADGE, QUERY_TAB_BUTTON, TIMELINE_TITLE } from '../../screens/timeline';
+import { FILTER_BADGE } from '../../screens/alerts';
 
 import { expandFirstAlert, investigateFirstAlertInTimeline } from '../../tasks/alerts';
 import { createRule } from '../../tasks/api_calls/rules';
@@ -23,7 +24,6 @@ import {
   INSIGHTS_RELATED_ALERTS_BY_ANCESTRY,
   INSIGHTS_RELATED_ALERTS_BY_SESSION,
   SUMMARY_VIEW_INVESTIGATE_IN_TIMELINE_BUTTON,
-  SUMMARY_VIEW_PREVALENCE_CELL,
 } from '../../screens/alerts_details';
 import { verifyInsightCount } from '../../tasks/alerts_details';
 
@@ -63,19 +63,29 @@ describe('Investigate in timeline', { testIsolation: false }, () => {
     });
 
     it('should open a new timeline from a prevalence field', () => {
-      cy.get(SUMMARY_VIEW_PREVALENCE_CELL)
-        .first()
-        .invoke('text')
-        .then((alertCount) => {
-          // Click on the first button that lets us investigate in timeline
-          cy.get(ALERT_FLYOUT).find(SUMMARY_VIEW_INVESTIGATE_IN_TIMELINE_BUTTON).first().click();
+      // Only one alert matches the exact process args in this case
+      const alertCount = 1;
 
-          // Make sure a new timeline is created and opened
-          cy.get(TIMELINE_TITLE).should('contain.text', 'Untitled timeline');
+      // Click on the last button that lets us investigate in timeline.
+      // We expect this to be the `process.args` row.
+      const investigateButton = cy
+        .get(ALERT_FLYOUT)
+        .find(SUMMARY_VIEW_INVESTIGATE_IN_TIMELINE_BUTTON)
+        .last();
+      investigateButton.should('have.text', alertCount);
+      investigateButton.click();
 
-          // The alert count in this timeline should match the count shown on the alert flyout
-          cy.get(QUERY_TAB_BUTTON).should('contain.text', alertCount);
-        });
+      // Make sure a new timeline is created and opened
+      cy.get(TIMELINE_TITLE).should('have.text', 'Untitled timeline');
+
+      // The alert count in this timeline should match the count shown on the alert flyout
+      cy.get(QUERY_TAB_BUTTON).should('contain.text', alertCount);
+
+      // The correct filter is applied to the timeline query
+      cy.get(FILTER_BADGE).should(
+        'have.text',
+        ' {"bool":{"must":[{"term":{"process.args":"-zsh"}},{"term":{"process.args":"unique"}}]}}'
+      );
     });
 
     it('should open a new timeline from an insights module', () => {
diff --git a/x-pack/plugins/security_solution/cypress/screens/alerts_details.ts b/x-pack/plugins/security_solution/cypress/screens/alerts_details.ts
index 74df1f1999373..c3a092c63a949 100644
--- a/x-pack/plugins/security_solution/cypress/screens/alerts_details.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/alerts_details.ts
@@ -68,8 +68,6 @@ export const UPDATE_ENRICHMENT_RANGE_BUTTON = '[data-test-subj="enrichment-butto
 
 export const OVERVIEW_TAB = '[data-test-subj="overviewTab"]';
 
-export const SUMMARY_VIEW_PREVALENCE_CELL = `${SUMMARY_VIEW} [data-test-subj='alert-prevalence']`;
-
 export const SUMMARY_VIEW_INVESTIGATE_IN_TIMELINE_BUTTON = `${SUMMARY_VIEW} [aria-label='Investigate in timeline']`;
 
 export const INSIGHTS_RELATED_ALERTS_BY_SESSION = `[data-test-subj='related-alerts-by-session']`;
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/table/prevalence_cell.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/table/prevalence_cell.tsx
index dca16cb5e896b..91fb095a16443 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/table/prevalence_cell.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/table/prevalence_cell.tsx
@@ -56,6 +56,7 @@ const PrevalenceCell: React.FC<AlertSummaryRow['description']> = ({
       <InvestigateInTimelineButton
         asEmptyButton={true}
         dataProviders={cellDataProviders.dataProviders}
+        filters={cellDataProviders.filters}
       >
         <span data-test-subj="alert-prevalence">{count}</span>
       </InvestigateInTimelineButton>
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/table/use_action_cell_data_provider.ts b/x-pack/plugins/security_solution/public/common/components/event_details/table/use_action_cell_data_provider.ts
index 8e35d3a7881b1..7ee53ae5d4bee 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/table/use_action_cell_data_provider.ts
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/table/use_action_cell_data_provider.ts
@@ -7,6 +7,7 @@
 
 /* eslint-disable complexity */
 
+import type { Filter } from '@kbn/es-query';
 import { escapeDataProviderId } from '@kbn/securitysolution-t-grid';
 import { isArray, isEmpty, isString } from 'lodash/fp';
 import { useMemo } from 'react';
@@ -47,6 +48,7 @@ export interface UseActionCellDataProvider {
 export interface ActionCellValuesAndDataProvider {
   values: string[];
   dataProviders: DataProvider[];
+  filters: Filter[];
 }
 
 export const getDataProvider = (
@@ -93,6 +95,23 @@ export const useActionCellDataProvider = ({
   const cellData = useMemo(() => {
     if (values === null || values === undefined) return null;
     const arrayValues = Array.isArray(values) ? values : [values];
+
+    // For fields with multiple values we need add an extra filter that makes sure
+    // that only fields that match ALL the values are queried later on.
+    let filters: Filter[] = [];
+    if (arrayValues.length > 1) {
+      filters = [
+        {
+          meta: {},
+          query: {
+            bool: {
+              must: arrayValues.map((value) => ({ term: { [field]: value } })),
+            },
+          },
+        },
+      ];
+    }
+
     return arrayValues.reduce<ActionCellValuesAndDataProvider>(
       (memo, value, index) => {
         let id: string = '';
@@ -157,7 +176,7 @@ export const useActionCellDataProvider = ({
         memo.dataProviders.push(getDataProvider(field, id, value));
         return memo;
       },
-      { values: [], dataProviders: [] }
+      { values: [], dataProviders: [], filters }
     );
   }, [
     contextId,
diff --git a/x-pack/plugins/security_solution/public/common/containers/alerts/use_alert_prevalence.ts b/x-pack/plugins/security_solution/public/common/containers/alerts/use_alert_prevalence.ts
index cbb6d144b055d..03ac3d6169351 100644
--- a/x-pack/plugins/security_solution/public/common/containers/alerts/use_alert_prevalence.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/alerts/use_alert_prevalence.ts
@@ -68,13 +68,7 @@ export const useAlertPrevalence = ({
   if (data) {
     const buckets = data.aggregations?.[ALERT_PREVALENCE_AGG]?.buckets;
     if (buckets && buckets.length > 0) {
-      /**
-       * Currently for array fields like `process.args` or potentially any `ip` fields
-       * We show the combined count of all occurences of the value, even though those values
-       * could be shared across multiple documents. To make this clearer, we should separate
-       * these values into separate table rows
-       */
-      count = buckets?.reduce((sum, bucket) => sum + (bucket?.doc_count ?? 0), 0);
+      count = buckets[0].doc_count;
     }
   }
 
@@ -132,31 +126,23 @@ const generateAlertPrevalenceQuery = (
     };
   }
 
+  // If we search for the prevalence of a field that has multiple values (e.g. process.args),
+  // we want to find alerts with the exact same values.
   if (Array.isArray(value) && value.length > 1) {
-    const shouldValues = value.map((val) => ({ match: { [field]: val } }));
     query = {
       bool: {
-        minimum_should_match: 1,
-        should: shouldValues,
+        must: value.map((term) => ({ term: { [field]: term } })) as object[],
       },
     };
     if (from !== undefined && to !== undefined) {
-      query = {
-        ...query,
-        bool: {
-          ...query.bool,
-          must: [
-            {
-              range: {
-                '@timestamp': {
-                  gte: from,
-                  lte: to,
-                },
-              },
-            },
-          ],
+      query.bool.must.push({
+        range: {
+          '@timestamp': {
+            gte: from,
+            lte: to,
+          },
         },
-      };
+      });
     }
   }
 
diff --git a/x-pack/test/security_solution_cypress/es_archives/auditbeat/data.json b/x-pack/test/security_solution_cypress/es_archives/auditbeat/data.json
index ec69dcaa9d0f7..a4e42ac0335a9 100644
--- a/x-pack/test/security_solution_cypress/es_archives/auditbeat/data.json
+++ b/x-pack/test/security_solution_cypress/es_archives/auditbeat/data.json
@@ -204,7 +204,8 @@
         "executable" : "/bin/zsh",
         "name" : "zsh",
         "args" : [
-          "-zsh"
+          "-zsh",
+          "unique"
         ],
         "entity_id" : "q6pltOhTWlQx3BCE",
         "entry_leader": {

From 0225747610d05be311d018a067bf89c2ef45016e Mon Sep 17 00:00:00 2001
From: Yan Savitski <yan.savitski@elastic.co>
Date: Wed, 19 Apr 2023 19:04:25 +0200
Subject: [PATCH 088/100] [Enterprise Search] [Behavioral analytics] Add
 Explorer page (#155077)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Implement Explorer page that consists of:

- ✔️ Tabs [Search terms, Top clicked results, No results, Referrers]
- ✔️ Search bar for searching the data
- ✔️ Data representation for top results as a table with paginations,
sorting, page size
- ✔️ Callout "Need a deeper analysis"
<img width="1168" alt="image"
src="https://user-images.githubusercontent.com/17390745/232572642-ab6374bc-a798-4d6a-93db-36acf141f931.png">

---------

Co-authored-by: Klim Markelov <klim.markelov@elastic.co>
Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
---
 ...alytics_collection_data_view_logic.test.ts |  75 ++++
 .../analytics_collection_data_view_logic.ts   |  46 +++
 ...ics_collection_explore_table_logic.test.ts | 149 -------
 ...nalytics_collection_explore_table_logic.ts | 333 ----------------
 ...ytics_collection_explore_table_formulas.ts |  71 ++++
 ...ics_collection_explore_table_logic.test.ts | 255 ++++++++++++
 ...nalytics_collection_explore_table_logic.ts | 377 ++++++++++++++++++
 ...nalytics_collection_explore_table_types.ts |   0
 .../analytics_collection_explorer.test.tsx    |  63 +++
 .../analytics_collection_explorer.tsx         |  51 +++
 .../analytics_collection_explorer_callout.tsx |  54 +++
 ...alytics_collection_explorer_table.test.tsx |  70 ++++
 .../analytics_collection_explorer_table.tsx   | 327 +++++++++++++++
 .../analytics_collection_chart.test.tsx       |   3 -
 .../analytics_collection_chart.tsx            |   4 +-
 .../analytics_collection_metric.tsx           |   2 -
 .../analytics_collection_overview.test.tsx    |   4 +-
 .../analytics_collection_overview.tsx         |   9 +-
 ...lytics_collection_overview_table.test.tsx} |  16 +-
 .../analytics_collection_overview_table.tsx}  |  20 +-
 .../analytics_collection_toolbar.test.tsx     |   6 +-
 .../analytics_collection_toolbar.tsx          | 161 ++++----
 ...analytics_collection_toolbar_logic.test.ts |  14 -
 .../analytics_collection_toolbar_logic.ts     |  15 -
 .../analytics_collection_view.tsx             |   9 +-
 .../fetch_analytics_collection_logic.ts       |   3 +-
 .../use_discover_link.ts                      |  31 ++
 .../analytics_collection_card.tsx             |   2 -
 .../analytics/hoc/with_lens_data.test.tsx     |  60 ++-
 .../analytics/hoc/with_lens_data.tsx          |  13 +-
 .../utils/find_or_create_data_view.test.ts    |  58 +++
 .../utils/find_or_create_data_view.ts         |  29 ++
 .../plugins/enterprise_search/tsconfig.json   |   1 +
 33 files changed, 1668 insertions(+), 663 deletions(-)
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_data_view_logic.test.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_data_view_logic.ts
 delete mode 100644 x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table/analytics_collection_explore_table_logic.test.ts
 delete mode 100644 x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table/analytics_collection_explore_table_logic.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table_formulas.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table_logic.test.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table_logic.ts
 rename x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/{analytics_collection_explore_table => }/analytics_collection_explore_table_types.ts (100%)
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explorer/analytics_collection_explorer.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explorer/analytics_collection_explorer.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explorer/analytics_collection_explorer_callout.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explorer/analytics_collection_explorer_table.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explorer/analytics_collection_explorer_table.tsx
 rename x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/{analytics_collection_explore_table/analytics_collection_explore_table.test.tsx => analytics_collection_overview/analytics_collection_overview_table.test.tsx} (70%)
 rename x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/{analytics_collection_explore_table/analytics_collection_explore_table.tsx => analytics_collection_overview/analytics_collection_overview_table.tsx} (94%)
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/use_discover_link.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.test.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.ts

diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_data_view_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_data_view_logic.test.ts
new file mode 100644
index 0000000000000..4c57bc4325f3e
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_data_view_logic.test.ts
@@ -0,0 +1,75 @@
+/*
+ * 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 { LogicMounter } from '../../../__mocks__/kea_logic';
+
+import { DataView } from '@kbn/data-views-plugin/common';
+
+import { AnalyticsCollection } from '../../../../../common/types/analytics';
+
+import { findOrCreateDataView } from '../../utils/find_or_create_data_view';
+
+import { AnalyticsCollectionDataViewLogic } from './analytics_collection_data_view_logic';
+import { FetchAnalyticsCollectionLogic } from './fetch_analytics_collection_logic';
+
+jest.mock('../../utils/find_or_create_data_view', () => {
+  return {
+    findOrCreateDataView: jest.fn(),
+  };
+});
+
+describe('AnalyticsCollectionDataViewLogic', () => {
+  const { mount } = new LogicMounter(AnalyticsCollectionDataViewLogic);
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    mount();
+  });
+
+  const defaultProps = {
+    dataView: null,
+  };
+
+  it('initializes with default values', () => {
+    expect(AnalyticsCollectionDataViewLogic.values).toEqual(defaultProps);
+  });
+
+  describe('reducers', () => {
+    it('should handle set dataView', () => {
+      const dataView = { id: 'test' } as DataView;
+      AnalyticsCollectionDataViewLogic.actions.setDataView(dataView);
+      expect(AnalyticsCollectionDataViewLogic.values.dataView).toBe(dataView);
+    });
+  });
+
+  describe('listeners', () => {
+    it('should find and set dataView when analytics collection fetched', async () => {
+      const dataView = { id: 'test' } as DataView;
+      (findOrCreateDataView as jest.Mock).mockResolvedValue(dataView);
+
+      await FetchAnalyticsCollectionLogic.actions.apiSuccess({
+        events_datastream: 'events1',
+        name: 'collection1',
+      } as AnalyticsCollection);
+
+      expect(AnalyticsCollectionDataViewLogic.values.dataView).toEqual(dataView);
+    });
+
+    it('should create, save and set dataView when analytics collection fetched but dataView is not found', async () => {
+      const dataView = { id: 'test' } as DataView;
+      (findOrCreateDataView as jest.Mock).mockResolvedValue(dataView);
+
+      await FetchAnalyticsCollectionLogic.actions.apiSuccess({
+        events_datastream: 'events1',
+        name: 'collection1',
+      } as AnalyticsCollection);
+
+      expect(AnalyticsCollectionDataViewLogic.values.dataView).toEqual(dataView);
+    });
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_data_view_logic.ts b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_data_view_logic.ts
new file mode 100644
index 0000000000000..8d53757db78b6
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_data_view_logic.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { kea, MakeLogicType } from 'kea';
+
+import { DataView } from '@kbn/data-views-plugin/common';
+
+import { findOrCreateDataView } from '../../utils/find_or_create_data_view';
+
+import {
+  FetchAnalyticsCollectionActions,
+  FetchAnalyticsCollectionLogic,
+} from './fetch_analytics_collection_logic';
+
+interface AnalyticsCollectionDataViewLogicValues {
+  dataView: DataView | null;
+}
+
+interface AnalyticsCollectionDataViewLogicActions {
+  fetchedAnalyticsCollection: FetchAnalyticsCollectionActions['apiSuccess'];
+  setDataView(dataView: DataView): { dataView: DataView };
+}
+
+export const AnalyticsCollectionDataViewLogic = kea<
+  MakeLogicType<AnalyticsCollectionDataViewLogicValues, AnalyticsCollectionDataViewLogicActions>
+>({
+  actions: {
+    setDataView: (dataView) => ({ dataView }),
+  },
+  connect: {
+    actions: [FetchAnalyticsCollectionLogic, ['apiSuccess as fetchedAnalyticsCollection']],
+  },
+  listeners: ({ actions }) => ({
+    fetchedAnalyticsCollection: async (collection) => {
+      actions.setDataView(await findOrCreateDataView(collection));
+    },
+  }),
+  path: ['enterprise_search', 'analytics', 'collections', 'dataView'],
+  reducers: () => ({
+    dataView: [null, { setDataView: (_, { dataView }) => dataView }],
+  }),
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table/analytics_collection_explore_table_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table/analytics_collection_explore_table_logic.test.ts
deleted file mode 100644
index 4220c30985a95..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table/analytics_collection_explore_table_logic.test.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * 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 { LogicMounter } from '../../../../__mocks__/kea_logic';
-
-import { DataView } from '@kbn/data-views-plugin/common';
-
-import { AnalyticsCollection } from '../../../../../../common/types/analytics';
-
-import { KibanaLogic } from '../../../../shared/kibana/kibana_logic';
-
-import { AnalyticsCollectionToolbarLogic } from '../analytics_collection_toolbar/analytics_collection_toolbar_logic';
-
-import {
-  AnalyticsCollectionExploreTableLogic,
-  Sorting,
-} from './analytics_collection_explore_table_logic';
-import { ExploreTableColumns, ExploreTables } from './analytics_collection_explore_table_types';
-
-jest.mock('../../../../shared/kibana/kibana_logic', () => ({
-  KibanaLogic: {
-    values: {
-      data: {
-        dataViews: {
-          find: jest.fn(() => Promise.resolve([{ id: 'some-data-view-id' }])),
-        },
-        search: {
-          search: jest.fn().mockReturnValue({ subscribe: jest.fn() }),
-        },
-      },
-    },
-  },
-}));
-
-describe('AnalyticsCollectionExplorerTablesLogic', () => {
-  const { mount } = new LogicMounter(AnalyticsCollectionExploreTableLogic);
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-
-    mount();
-  });
-
-  const defaultProps = {
-    dataView: null,
-    isLoading: false,
-    items: [],
-    selectedTable: null,
-    sorting: null,
-  };
-
-  it('initializes with default values', () => {
-    expect(AnalyticsCollectionExploreTableLogic.values).toEqual(defaultProps);
-  });
-
-  describe('reducers', () => {
-    it('should handle set dataView', () => {
-      const dataView = { id: 'test' } as DataView;
-      AnalyticsCollectionExploreTableLogic.actions.setDataView(dataView);
-      expect(AnalyticsCollectionExploreTableLogic.values.dataView).toBe(dataView);
-    });
-
-    it('should handle set items', () => {
-      const items = [
-        { count: 1, query: 'test' },
-        { count: 2, query: 'test2' },
-      ];
-      AnalyticsCollectionExploreTableLogic.actions.setItems(items);
-      expect(AnalyticsCollectionExploreTableLogic.values.items).toEqual(items);
-    });
-
-    it('should handle set selectedTable', () => {
-      const id = ExploreTables.WorsePerformers;
-      const sorting = { direction: 'desc', field: ExploreTableColumns.count } as Sorting;
-      AnalyticsCollectionExploreTableLogic.actions.setSelectedTable(id, sorting);
-      expect(AnalyticsCollectionExploreTableLogic.values.selectedTable).toEqual(id);
-      expect(AnalyticsCollectionExploreTableLogic.values.sorting).toEqual(sorting);
-    });
-
-    it('should handle set sorting', () => {
-      const sorting = { direction: 'asc', field: ExploreTableColumns.sessions } as Sorting;
-      AnalyticsCollectionExploreTableLogic.actions.setSorting(sorting);
-      expect(AnalyticsCollectionExploreTableLogic.values.sorting).toEqual(sorting);
-    });
-
-    it('should handle isLoading', () => {
-      expect(AnalyticsCollectionExploreTableLogic.values.isLoading).toEqual(false);
-
-      AnalyticsCollectionExploreTableLogic.actions.setItems([]);
-      expect(AnalyticsCollectionExploreTableLogic.values.isLoading).toEqual(false);
-
-      AnalyticsCollectionExploreTableLogic.actions.setSelectedTable(ExploreTables.WorsePerformers);
-      expect(AnalyticsCollectionExploreTableLogic.values.isLoading).toEqual(true);
-
-      AnalyticsCollectionToolbarLogic.actions.setTimeRange({ from: 'now-7d', to: 'now' });
-      expect(AnalyticsCollectionExploreTableLogic.values.isLoading).toEqual(true);
-
-      AnalyticsCollectionToolbarLogic.actions.setSearchSessionId('12345');
-      expect(AnalyticsCollectionExploreTableLogic.values.isLoading).toEqual(true);
-    });
-  });
-
-  describe('listeners', () => {
-    it('should fetch items when selectedTable changes', () => {
-      AnalyticsCollectionExploreTableLogic.actions.setSelectedTable(ExploreTables.TopReferrers);
-      expect(KibanaLogic.values.data.search.search).toHaveBeenCalledWith(expect.any(Object), {
-        indexPattern: undefined,
-        sessionId: undefined,
-      });
-    });
-
-    it('should fetch items when timeRange changes', () => {
-      AnalyticsCollectionExploreTableLogic.actions.setSelectedTable(ExploreTables.WorsePerformers);
-      (KibanaLogic.values.data.search.search as jest.Mock).mockClear();
-
-      AnalyticsCollectionToolbarLogic.actions.setTimeRange({ from: 'now-7d', to: 'now' });
-      expect(KibanaLogic.values.data.search.search).toHaveBeenCalledWith(expect.any(Object), {
-        indexPattern: undefined,
-        sessionId: undefined,
-      });
-    });
-
-    it('should fetch items when searchSessionId changes', () => {
-      AnalyticsCollectionExploreTableLogic.actions.setSelectedTable(ExploreTables.WorsePerformers);
-      (KibanaLogic.values.data.search.search as jest.Mock).mockClear();
-
-      AnalyticsCollectionToolbarLogic.actions.setSearchSessionId('1234');
-      expect(KibanaLogic.values.data.search.search).toHaveBeenCalledWith(expect.any(Object), {
-        indexPattern: undefined,
-        sessionId: '1234',
-      });
-    });
-
-    it('should find and set dataView when findDataView is called', async () => {
-      const dataView = { id: 'test' } as DataView;
-      jest.spyOn(KibanaLogic.values.data.dataViews, 'find').mockResolvedValue([dataView]);
-      await AnalyticsCollectionExploreTableLogic.actions.findDataView({
-        events_datastream: 'events1',
-        name: 'collection1',
-      } as AnalyticsCollection);
-
-      expect(AnalyticsCollectionExploreTableLogic.values.dataView).toEqual(dataView);
-    });
-  });
-});
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table/analytics_collection_explore_table_logic.ts b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table/analytics_collection_explore_table_logic.ts
deleted file mode 100644
index 46df5692aa963..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table/analytics_collection_explore_table_logic.ts
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- * 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 { kea, MakeLogicType } from 'kea';
-
-import {
-  IKibanaSearchRequest,
-  IKibanaSearchResponse,
-  isCompleteResponse,
-  TimeRange,
-} from '@kbn/data-plugin/common';
-import { DataView } from '@kbn/data-views-plugin/common';
-
-import { AnalyticsCollection } from '../../../../../../common/types/analytics';
-import { KibanaLogic } from '../../../../shared/kibana/kibana_logic';
-import { AnalyticsCollectionToolbarLogic } from '../analytics_collection_toolbar/analytics_collection_toolbar_logic';
-
-import {
-  ExploreTableColumns,
-  ExploreTableItem,
-  ExploreTables,
-  SearchTermsTable,
-  TopClickedTable,
-  TopReferrersTable,
-  WorsePerformersTable,
-} from './analytics_collection_explore_table_types';
-
-const BASE_PAGE_SIZE = 10;
-
-export interface Sorting<T extends ExploreTableItem = ExploreTableItem> {
-  direction: 'asc' | 'desc';
-  field: keyof T;
-}
-
-interface TableParams<T extends ExploreTableItem = ExploreTableItem> {
-  parseResponseToItems(response: IKibanaSearchResponse): T[];
-  requestParams(timeRange: TimeRange, sorting: Sorting<T> | null): IKibanaSearchRequest;
-}
-
-const tablesParams: {
-  [ExploreTables.SearchTerms]: TableParams<SearchTermsTable>;
-  [ExploreTables.TopClicked]: TableParams<TopClickedTable>;
-  [ExploreTables.TopReferrers]: TableParams<TopReferrersTable>;
-  [ExploreTables.WorsePerformers]: TableParams<WorsePerformersTable>;
-} = {
-  [ExploreTables.SearchTerms]: {
-    parseResponseToItems: (
-      response: IKibanaSearchResponse<{
-        aggregations: { searches: { buckets: Array<{ doc_count: number; key: string }> } };
-      }>
-    ) =>
-      response.rawResponse.aggregations.searches.buckets.map((bucket) => ({
-        [ExploreTableColumns.count]: bucket.doc_count,
-        [ExploreTableColumns.searchTerms]: bucket.key,
-      })),
-    requestParams: (timeRange, sorting) => ({
-      params: {
-        aggs: {
-          searches: {
-            terms: {
-              field: 'search.query',
-              order: sorting
-                ? {
-                    [sorting.field === ExploreTableColumns.count ? '_count' : '_key']:
-                      sorting.direction,
-                  }
-                : undefined,
-              size: BASE_PAGE_SIZE,
-            },
-          },
-        },
-        query: {
-          range: {
-            '@timestamp': {
-              gte: timeRange.from,
-              lt: timeRange.to,
-            },
-          },
-        },
-        size: 0,
-        track_total_hits: false,
-      },
-    }),
-  },
-  [ExploreTables.WorsePerformers]: {
-    parseResponseToItems: (
-      response: IKibanaSearchResponse<{
-        aggregations: {
-          formula: { searches: { buckets: Array<{ doc_count: number; key: string }> } };
-        };
-      }>
-    ) =>
-      response.rawResponse.aggregations.formula.searches.buckets.map((bucket) => ({
-        [ExploreTableColumns.count]: bucket.doc_count,
-        [ExploreTableColumns.query]: bucket.key,
-      })),
-    requestParams: (timeRange, sorting) => ({
-      params: {
-        aggs: {
-          formula: {
-            aggs: {
-              searches: {
-                terms: {
-                  field: 'search.query',
-                  order: sorting
-                    ? {
-                        [sorting?.field === ExploreTableColumns.count ? '_count' : '_key']:
-                          sorting?.direction,
-                      }
-                    : undefined,
-                  size: BASE_PAGE_SIZE,
-                },
-              },
-            },
-            filter: { term: { 'search.results.total_results': '0' } },
-          },
-        },
-        query: {
-          range: {
-            '@timestamp': {
-              gte: timeRange.from,
-              lt: timeRange.to,
-            },
-          },
-        },
-        size: 0,
-        track_total_hits: false,
-      },
-    }),
-  },
-  [ExploreTables.TopClicked]: {
-    parseResponseToItems: (
-      response: IKibanaSearchResponse<{
-        aggregations: {
-          formula: { searches: { buckets: Array<{ doc_count: number; key: string }> } };
-        };
-      }>
-    ) =>
-      response.rawResponse.aggregations.formula.searches.buckets.map((bucket) => ({
-        [ExploreTableColumns.count]: bucket.doc_count,
-        [ExploreTableColumns.page]: bucket.key,
-      })),
-    requestParams: (timeRange, sorting) => ({
-      params: {
-        aggs: {
-          formula: {
-            aggs: {
-              searches: {
-                terms: {
-                  field: 'search.results.items.page.url',
-                  order: sorting
-                    ? {
-                        [sorting.field === ExploreTableColumns.count ? '_count' : '_key']:
-                          sorting.direction,
-                      }
-                    : undefined,
-                  size: BASE_PAGE_SIZE,
-                },
-              },
-            },
-            filter: { term: { 'event.action': 'search_click' } },
-          },
-        },
-        query: {
-          range: {
-            '@timestamp': {
-              gte: timeRange.from,
-              lt: timeRange.to,
-            },
-          },
-        },
-        size: 0,
-        track_total_hits: false,
-      },
-    }),
-  },
-  [ExploreTables.TopReferrers]: {
-    parseResponseToItems: (
-      response: IKibanaSearchResponse<{
-        aggregations: {
-          formula: { searches: { buckets: Array<{ doc_count: number; key: string }> } };
-        };
-      }>
-    ) =>
-      response.rawResponse.aggregations.formula.searches.buckets.map((bucket) => ({
-        [ExploreTableColumns.sessions]: bucket.doc_count,
-        [ExploreTableColumns.page]: bucket.key,
-      })),
-    requestParams: (timeRange, sorting) => ({
-      params: {
-        aggs: {
-          formula: {
-            aggs: {
-              searches: {
-                terms: {
-                  field: 'page.referrer',
-                  order: sorting
-                    ? {
-                        [sorting?.field === ExploreTableColumns.sessions ? '_count' : '_key']:
-                          sorting?.direction,
-                      }
-                    : undefined,
-                  size: BASE_PAGE_SIZE,
-                },
-              },
-            },
-            filter: { term: { 'event.action': 'page_view' } },
-          },
-        },
-        query: {
-          range: {
-            '@timestamp': {
-              gte: timeRange.from,
-              lt: timeRange.to,
-            },
-          },
-        },
-        size: 0,
-        track_total_hits: false,
-      },
-    }),
-  },
-};
-
-export interface AnalyticsCollectionExploreTableLogicValues {
-  dataView: DataView | null;
-  isLoading: boolean;
-  items: ExploreTableItem[];
-  selectedTable: ExploreTables | null;
-  sorting: Sorting | null;
-}
-
-export interface AnalyticsCollectionExploreTableLogicActions {
-  findDataView(collection: AnalyticsCollection): { collection: AnalyticsCollection };
-  setDataView(dataView: DataView): { dataView: DataView };
-  setItems(items: ExploreTableItem[]): { items: ExploreTableItem[] };
-  setSelectedTable(
-    id: ExploreTables | null,
-    sorting?: Sorting
-  ): { id: ExploreTables | null; sorting?: Sorting };
-  setSorting(sorting?: Sorting): { sorting?: Sorting };
-}
-
-export const AnalyticsCollectionExploreTableLogic = kea<
-  MakeLogicType<
-    AnalyticsCollectionExploreTableLogicValues,
-    AnalyticsCollectionExploreTableLogicActions
-  >
->({
-  actions: {
-    findDataView: (collection) => ({ collection }),
-    setDataView: (dataView) => ({ dataView }),
-    setItems: (items) => ({ items }),
-    setSelectedTable: (id, sorting) => ({ id, sorting }),
-    setSorting: (sorting) => ({ sorting }),
-  },
-  listeners: ({ actions, values }) => {
-    const fetchItems = () => {
-      if (values.selectedTable === null || !(values.selectedTable in tablesParams)) {
-        return;
-      }
-
-      const { requestParams, parseResponseToItems } = tablesParams[
-        values.selectedTable
-      ] as TableParams;
-      const timeRange = AnalyticsCollectionToolbarLogic.values.timeRange;
-
-      const search$ = KibanaLogic.values.data.search
-        .search(requestParams(timeRange, values.sorting), {
-          indexPattern: values.dataView || undefined,
-          sessionId: AnalyticsCollectionToolbarLogic.values.searchSessionId,
-        })
-        .subscribe({
-          error: (e) => {
-            KibanaLogic.values.data.search.showError(e);
-          },
-          next: (response) => {
-            if (isCompleteResponse(response)) {
-              actions.setItems(parseResponseToItems(response));
-              search$.unsubscribe();
-            }
-          },
-        });
-    };
-
-    return {
-      findDataView: async ({ collection }) => {
-        const dataView = (
-          await KibanaLogic.values.data.dataViews.find(collection.events_datastream, 1)
-        )?.[0];
-
-        if (dataView) {
-          actions.setDataView(dataView);
-        }
-      },
-      setSelectedTable: () => {
-        fetchItems();
-      },
-      [AnalyticsCollectionToolbarLogic.actionTypes.setTimeRange]: () => {
-        fetchItems();
-      },
-      [AnalyticsCollectionToolbarLogic.actionTypes.setSearchSessionId]: () => {
-        fetchItems();
-      },
-    };
-  },
-  path: ['enterprise_search', 'analytics', 'collections', 'explore', 'table'],
-  reducers: () => ({
-    dataView: [null, { setDataView: (_, { dataView }) => dataView }],
-    isLoading: [
-      false,
-      {
-        setItems: () => false,
-        setSelectedTable: () => true,
-        [AnalyticsCollectionToolbarLogic.actionTypes.setTimeRange]: () => true,
-        [AnalyticsCollectionToolbarLogic.actionTypes.setSearchSessionId]: () => true,
-      },
-    ],
-    items: [[], { setItems: (_, { items }) => items }],
-    selectedTable: [null, { setSelectedTable: (_, { id }) => id }],
-    sorting: [
-      null,
-      {
-        setSelectedTable: (_, { sorting = null }) => sorting,
-        setSorting: (_, { sorting = null }) => sorting,
-      },
-    ],
-  }),
-});
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table_formulas.ts b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table_formulas.ts
new file mode 100644
index 0000000000000..b628d1d8e633f
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table_formulas.ts
@@ -0,0 +1,71 @@
+/*
+ * 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 { IKibanaSearchRequest, TimeRange } from '@kbn/data-plugin/common';
+
+const getSearchQueryRequestParams = (field: string, search: string): { regexp: {} } => {
+  const createRegexQuery = (queryString: string) => {
+    const query = queryString.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&');
+
+    return `.*${query}.*`;
+  };
+
+  return {
+    regexp: {
+      [field]: {
+        value: createRegexQuery(search),
+      },
+    },
+  };
+};
+export const getTotalCountRequestParams = (field: string) => ({
+  totalCount: {
+    cardinality: {
+      field,
+    },
+  },
+});
+export const getPaginationRequestSizeParams = (pageIndex: number, pageSize: number) => ({
+  size: (pageIndex + 1) * pageSize,
+});
+export const getPaginationRequestParams = (pageIndex: number, pageSize: number) => ({
+  aggs: {
+    sort: {
+      bucket_sort: {
+        from: pageIndex * pageSize,
+        size: pageSize,
+      },
+    },
+  },
+});
+
+export const getBaseSearchTemplate = (
+  aggregationFieldName: string,
+  { search, timeRange }: { search: string; timeRange: TimeRange },
+  aggs: IKibanaSearchRequest['params']['aggs']
+): IKibanaSearchRequest => ({
+  params: {
+    aggs,
+    query: {
+      bool: {
+        must: [
+          {
+            range: {
+              '@timestamp': {
+                gte: timeRange.from,
+                lt: timeRange.to,
+              },
+            },
+          },
+          ...(search ? [getSearchQueryRequestParams(aggregationFieldName, search)] : []),
+        ],
+      },
+    },
+    size: 0,
+    track_total_hits: false,
+  },
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table_logic.test.ts
new file mode 100644
index 0000000000000..6f02ab06fedfb
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table_logic.test.ts
@@ -0,0 +1,255 @@
+/*
+ * 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 { LogicMounter } from '../../../__mocks__/kea_logic';
+
+import { KibanaLogic } from '../../../shared/kibana/kibana_logic';
+
+import {
+  AnalyticsCollectionExploreTableLogic,
+  Sorting,
+} from './analytics_collection_explore_table_logic';
+import { ExploreTableColumns, ExploreTables } from './analytics_collection_explore_table_types';
+import { AnalyticsCollectionToolbarLogic } from './analytics_collection_toolbar/analytics_collection_toolbar_logic';
+
+jest.mock('../../../shared/kibana/kibana_logic', () => ({
+  KibanaLogic: {
+    values: {
+      data: {
+        search: {
+          search: jest.fn().mockReturnValue({ subscribe: jest.fn() }),
+        },
+      },
+    },
+  },
+}));
+
+describe('AnalyticsCollectionExplorerTablesLogic', () => {
+  const { mount } = new LogicMounter(AnalyticsCollectionExploreTableLogic);
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    mount();
+  });
+
+  const defaultProps = {
+    isLoading: false,
+    items: [],
+    pageIndex: 0,
+    pageSize: 10,
+    search: '',
+    selectedTable: null,
+    sorting: null,
+    totalItemsCount: 0,
+  };
+
+  it('initializes with default values', () => {
+    expect(AnalyticsCollectionExploreTableLogic.values).toEqual(defaultProps);
+  });
+
+  describe('reducers', () => {
+    it('should handle set items', () => {
+      const items = [
+        { count: 1, query: 'test' },
+        { count: 2, query: 'test2' },
+      ];
+      AnalyticsCollectionExploreTableLogic.actions.setItems(items);
+      expect(AnalyticsCollectionExploreTableLogic.values.items).toEqual(items);
+    });
+
+    it('should handle set selectedTable', () => {
+      const id = ExploreTables.WorsePerformers;
+      const sorting = { direction: 'desc', field: ExploreTableColumns.count } as Sorting;
+      AnalyticsCollectionExploreTableLogic.actions.setSelectedTable(id, sorting);
+      expect(AnalyticsCollectionExploreTableLogic.values.selectedTable).toEqual(id);
+      expect(AnalyticsCollectionExploreTableLogic.values.sorting).toEqual(sorting);
+    });
+
+    it('should handle set sorting', () => {
+      const sorting = { direction: 'asc', field: ExploreTableColumns.sessions } as Sorting;
+      AnalyticsCollectionExploreTableLogic.actions.onTableChange({
+        sort: sorting,
+      });
+      expect(AnalyticsCollectionExploreTableLogic.values.sorting).toEqual(sorting);
+    });
+
+    describe('isLoading', () => {
+      it('should handle onTableChange', () => {
+        AnalyticsCollectionExploreTableLogic.actions.onTableChange({
+          page: { index: 2, size: 10 },
+          sort: {
+            direction: 'asc',
+            field: ExploreTableColumns.sessions,
+          } as Sorting,
+        });
+        expect(AnalyticsCollectionExploreTableLogic.values.isLoading).toEqual(true);
+      });
+
+      it('should handle setSearch', () => {
+        AnalyticsCollectionExploreTableLogic.actions.setSearch('test');
+        expect(AnalyticsCollectionExploreTableLogic.values.isLoading).toEqual(true);
+      });
+
+      it('should handle setItems', () => {
+        AnalyticsCollectionExploreTableLogic.actions.setItems([]);
+        expect(AnalyticsCollectionExploreTableLogic.values.isLoading).toEqual(false);
+      });
+
+      it('should handle setSelectedTable', () => {
+        AnalyticsCollectionExploreTableLogic.actions.setSelectedTable(ExploreTables.TopReferrers);
+        expect(AnalyticsCollectionExploreTableLogic.values.isLoading).toEqual(true);
+      });
+
+      it('should handle setTimeRange', () => {
+        AnalyticsCollectionToolbarLogic.actions.setTimeRange({ from: 'now-7d', to: 'now' });
+        expect(AnalyticsCollectionExploreTableLogic.values.isLoading).toEqual(true);
+      });
+
+      it('should handle setSearchSessionId', () => {
+        AnalyticsCollectionToolbarLogic.actions.setSearchSessionId('12345');
+        expect(AnalyticsCollectionExploreTableLogic.values.isLoading).toEqual(true);
+      });
+    });
+
+    describe('pageIndex', () => {
+      it('should handle setPageIndex', () => {
+        AnalyticsCollectionExploreTableLogic.actions.onTableChange({
+          page: { index: 2, size: 10 },
+        });
+        expect(AnalyticsCollectionExploreTableLogic.values.pageIndex).toEqual(2);
+      });
+
+      it('should handle setSelectedTable', () => {
+        AnalyticsCollectionExploreTableLogic.actions.onTableChange({
+          page: { index: 2, size: 10 },
+        });
+        AnalyticsCollectionExploreTableLogic.actions.setSelectedTable(ExploreTables.TopReferrers);
+        expect(AnalyticsCollectionExploreTableLogic.values.pageIndex).toEqual(0);
+      });
+
+      it('should handle reset', () => {
+        AnalyticsCollectionExploreTableLogic.actions.onTableChange({
+          page: { index: 2, size: 10 },
+        });
+        AnalyticsCollectionExploreTableLogic.actions.reset();
+        expect(AnalyticsCollectionExploreTableLogic.values.pageIndex).toEqual(0);
+      });
+
+      it('should handle setSearch', () => {
+        AnalyticsCollectionExploreTableLogic.actions.onTableChange({
+          page: { index: 2, size: 10 },
+        });
+        AnalyticsCollectionExploreTableLogic.actions.setSearch('');
+        expect(AnalyticsCollectionExploreTableLogic.values.pageIndex).toEqual(0);
+      });
+    });
+
+    describe('pageSize', () => {
+      it('should handle setPageSize', () => {
+        AnalyticsCollectionExploreTableLogic.actions.onTableChange({
+          page: { index: 2, size: 10 },
+        });
+        expect(AnalyticsCollectionExploreTableLogic.values.pageSize).toEqual(10);
+      });
+
+      it('should handle setSelectedTable', () => {
+        AnalyticsCollectionExploreTableLogic.actions.onTableChange({
+          page: { index: 2, size: 10 },
+        });
+        AnalyticsCollectionExploreTableLogic.actions.setSelectedTable(ExploreTables.TopReferrers);
+        expect(AnalyticsCollectionExploreTableLogic.values.pageSize).toEqual(10);
+      });
+
+      it('should handle reset', () => {
+        AnalyticsCollectionExploreTableLogic.actions.onTableChange({
+          page: { index: 2, size: 10 },
+        });
+        AnalyticsCollectionExploreTableLogic.actions.reset();
+        expect(AnalyticsCollectionExploreTableLogic.values.pageSize).toEqual(10);
+      });
+    });
+
+    describe('search', () => {
+      it('should handle setSearch', () => {
+        AnalyticsCollectionExploreTableLogic.actions.setSearch('test');
+        expect(AnalyticsCollectionExploreTableLogic.values.search).toEqual('test');
+      });
+
+      it('should handle setSelectedTable', () => {
+        AnalyticsCollectionExploreTableLogic.actions.setSearch('test');
+        AnalyticsCollectionExploreTableLogic.actions.setSelectedTable(ExploreTables.TopReferrers);
+        expect(AnalyticsCollectionExploreTableLogic.values.search).toEqual('');
+      });
+
+      it('should handle reset', () => {
+        AnalyticsCollectionExploreTableLogic.actions.setSearch('test');
+        AnalyticsCollectionExploreTableLogic.actions.reset();
+        expect(AnalyticsCollectionExploreTableLogic.values.search).toEqual('');
+      });
+    });
+
+    it('should handle totalItemsCount', () => {
+      AnalyticsCollectionExploreTableLogic.actions.setTotalItemsCount(100);
+      expect(AnalyticsCollectionExploreTableLogic.values.totalItemsCount).toEqual(100);
+    });
+  });
+
+  describe('listeners', () => {
+    it('should fetch items when selectedTable changes', () => {
+      AnalyticsCollectionExploreTableLogic.actions.setSelectedTable(ExploreTables.TopReferrers);
+      expect(KibanaLogic.values.data.search.search).toHaveBeenCalledWith(expect.any(Object), {
+        indexPattern: undefined,
+        sessionId: undefined,
+      });
+    });
+
+    it('should fetch items when timeRange changes', () => {
+      AnalyticsCollectionExploreTableLogic.actions.setSelectedTable(ExploreTables.WorsePerformers);
+      (KibanaLogic.values.data.search.search as jest.Mock).mockClear();
+
+      AnalyticsCollectionToolbarLogic.actions.setTimeRange({ from: 'now-7d', to: 'now' });
+      expect(KibanaLogic.values.data.search.search).toHaveBeenCalledWith(expect.any(Object), {
+        indexPattern: undefined,
+        sessionId: undefined,
+      });
+    });
+
+    it('should fetch items when searchSessionId changes', () => {
+      AnalyticsCollectionExploreTableLogic.actions.setSelectedTable(ExploreTables.WorsePerformers);
+      (KibanaLogic.values.data.search.search as jest.Mock).mockClear();
+
+      AnalyticsCollectionToolbarLogic.actions.setSearchSessionId('1234');
+      expect(KibanaLogic.values.data.search.search).toHaveBeenCalledWith(expect.any(Object), {
+        indexPattern: undefined,
+        sessionId: '1234',
+      });
+    });
+
+    it('should fetch items when onTableChange called', () => {
+      AnalyticsCollectionExploreTableLogic.actions.setSelectedTable(ExploreTables.WorsePerformers);
+      (KibanaLogic.values.data.search.search as jest.Mock).mockClear();
+
+      AnalyticsCollectionExploreTableLogic.actions.onTableChange({});
+      expect(KibanaLogic.values.data.search.search).toHaveBeenCalledWith(expect.any(Object), {
+        indexPattern: undefined,
+        sessionId: undefined,
+      });
+    });
+
+    it('should fetch items when search changes', () => {
+      AnalyticsCollectionExploreTableLogic.actions.setSelectedTable(ExploreTables.WorsePerformers);
+      (KibanaLogic.values.data.search.search as jest.Mock).mockClear();
+
+      AnalyticsCollectionExploreTableLogic.actions.setSearch('test');
+      expect(KibanaLogic.values.data.search.search).toHaveBeenCalledWith(expect.any(Object), {
+        indexPattern: undefined,
+        sessionId: undefined,
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table_logic.ts b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table_logic.ts
new file mode 100644
index 0000000000000..cce07541a9a2e
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table_logic.ts
@@ -0,0 +1,377 @@
+/*
+ * 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 { kea, MakeLogicType } from 'kea';
+
+import {
+  IKibanaSearchRequest,
+  IKibanaSearchResponse,
+  isCompleteResponse,
+  TimeRange,
+} from '@kbn/data-plugin/common';
+
+import { KibanaLogic } from '../../../shared/kibana/kibana_logic';
+
+import { AnalyticsCollectionDataViewLogic } from './analytics_collection_data_view_logic';
+
+import {
+  getBaseSearchTemplate,
+  getPaginationRequestParams,
+  getPaginationRequestSizeParams,
+  getTotalCountRequestParams,
+} from './analytics_collection_explore_table_formulas';
+import {
+  ExploreTableColumns,
+  ExploreTableItem,
+  ExploreTables,
+  SearchTermsTable,
+  TopClickedTable,
+  TopReferrersTable,
+  WorsePerformersTable,
+} from './analytics_collection_explore_table_types';
+import { AnalyticsCollectionToolbarLogic } from './analytics_collection_toolbar/analytics_collection_toolbar_logic';
+
+const BASE_PAGE_SIZE = 10;
+
+export interface Sorting<T extends ExploreTableItem = ExploreTableItem> {
+  direction: 'asc' | 'desc';
+  field: keyof T;
+}
+
+interface TableParams<T extends ExploreTableItem = ExploreTableItem> {
+  parseResponse(response: IKibanaSearchResponse): { items: T[]; totalCount: number };
+  requestParams(props: {
+    pageIndex: number;
+    pageSize: number;
+    search: string;
+    sorting: Sorting<T> | null;
+    timeRange: TimeRange;
+  }): IKibanaSearchRequest;
+}
+
+const tablesParams: {
+  [ExploreTables.SearchTerms]: TableParams<SearchTermsTable>;
+  [ExploreTables.TopClicked]: TableParams<TopClickedTable>;
+  [ExploreTables.TopReferrers]: TableParams<TopReferrersTable>;
+  [ExploreTables.WorsePerformers]: TableParams<WorsePerformersTable>;
+} = {
+  [ExploreTables.SearchTerms]: {
+    parseResponse: (
+      response: IKibanaSearchResponse<{
+        aggregations: {
+          searches: { buckets: Array<{ doc_count: number; key: string }> };
+          totalCount: { value: number };
+        };
+      }>
+    ) => ({
+      items: response.rawResponse.aggregations.searches.buckets.map((bucket) => ({
+        [ExploreTableColumns.count]: bucket.doc_count,
+        [ExploreTableColumns.searchTerms]: bucket.key,
+      })),
+      totalCount: response.rawResponse.aggregations.totalCount.value,
+    }),
+    requestParams: (
+      { timeRange, sorting, pageIndex, pageSize, search },
+      aggregationFieldName = 'search.query'
+    ) =>
+      getBaseSearchTemplate(
+        aggregationFieldName,
+        { search, timeRange },
+        {
+          searches: {
+            terms: {
+              ...getPaginationRequestSizeParams(pageIndex, pageSize),
+              field: aggregationFieldName,
+              order: sorting
+                ? {
+                    [sorting.field === ExploreTableColumns.count ? '_count' : '_key']:
+                      sorting.direction,
+                  }
+                : undefined,
+            },
+            ...getPaginationRequestParams(pageIndex, pageSize),
+          },
+          ...getTotalCountRequestParams(aggregationFieldName),
+        }
+      ),
+  },
+  [ExploreTables.WorsePerformers]: {
+    parseResponse: (
+      response: IKibanaSearchResponse<{
+        aggregations: {
+          formula: {
+            searches: { buckets: Array<{ doc_count: number; key: string }> };
+            totalCount: { value: number };
+          };
+        };
+      }>
+    ) => ({
+      items: response.rawResponse.aggregations.formula.searches.buckets.map((bucket) => ({
+        [ExploreTableColumns.count]: bucket.doc_count,
+        [ExploreTableColumns.query]: bucket.key,
+      })),
+      totalCount: response.rawResponse.aggregations.formula.totalCount.value,
+    }),
+    requestParams: (
+      { timeRange, sorting, pageIndex, pageSize, search },
+      aggregationFieldName = 'search.query'
+    ) =>
+      getBaseSearchTemplate(
+        aggregationFieldName,
+        { search, timeRange },
+        {
+          formula: {
+            aggs: {
+              ...getTotalCountRequestParams(aggregationFieldName),
+              searches: {
+                terms: {
+                  ...getPaginationRequestSizeParams(pageIndex, pageSize),
+                  field: aggregationFieldName,
+                  order: sorting
+                    ? {
+                        [sorting?.field === ExploreTableColumns.count ? '_count' : '_key']:
+                          sorting?.direction,
+                      }
+                    : undefined,
+                },
+                ...getPaginationRequestParams(pageIndex, pageSize),
+              },
+            },
+            filter: { term: { 'search.results.total_results': '0' } },
+          },
+        }
+      ),
+  },
+  [ExploreTables.TopClicked]: {
+    parseResponse: (
+      response: IKibanaSearchResponse<{
+        aggregations: {
+          formula: {
+            searches: { buckets: Array<{ doc_count: number; key: string }> };
+            totalCount: { value: number };
+          };
+        };
+      }>
+    ) => ({
+      items: response.rawResponse.aggregations.formula.searches.buckets.map((bucket) => ({
+        [ExploreTableColumns.count]: bucket.doc_count,
+        [ExploreTableColumns.page]: bucket.key,
+      })),
+      totalCount: response.rawResponse.aggregations.formula.totalCount.value,
+    }),
+    requestParams: (
+      { timeRange, sorting, pageIndex, pageSize, search },
+      aggregationFieldName = 'search.results.items.page.url'
+    ) =>
+      getBaseSearchTemplate(
+        aggregationFieldName,
+        { search, timeRange },
+        {
+          formula: {
+            aggs: {
+              ...getTotalCountRequestParams(aggregationFieldName),
+              searches: {
+                terms: {
+                  ...getPaginationRequestSizeParams(pageIndex, pageSize),
+                  field: aggregationFieldName,
+                  order: sorting
+                    ? {
+                        [sorting.field === ExploreTableColumns.count ? '_count' : '_key']:
+                          sorting.direction,
+                      }
+                    : undefined,
+                },
+                ...getPaginationRequestParams(pageIndex, pageSize),
+              },
+            },
+            filter: { term: { 'event.action': 'search_click' } },
+          },
+        }
+      ),
+  },
+  [ExploreTables.TopReferrers]: {
+    parseResponse: (
+      response: IKibanaSearchResponse<{
+        aggregations: {
+          formula: {
+            searches: { buckets: Array<{ doc_count: number; key: string }> };
+            totalCount: { value: number };
+          };
+        };
+      }>
+    ) => ({
+      items: response.rawResponse.aggregations.formula.searches.buckets.map((bucket) => ({
+        [ExploreTableColumns.sessions]: bucket.doc_count,
+        [ExploreTableColumns.page]: bucket.key,
+      })),
+      totalCount: response.rawResponse.aggregations.formula.totalCount.value,
+    }),
+    requestParams: (
+      { timeRange, sorting, pageIndex, pageSize, search },
+      aggregationFieldName = 'page.referrer'
+    ) =>
+      getBaseSearchTemplate(
+        aggregationFieldName,
+        { search, timeRange },
+        {
+          formula: {
+            aggs: {
+              ...getTotalCountRequestParams(aggregationFieldName),
+              searches: {
+                terms: {
+                  ...getPaginationRequestSizeParams(pageIndex, pageSize),
+                  field: aggregationFieldName,
+                  order: sorting
+                    ? {
+                        [sorting?.field === ExploreTableColumns.sessions ? '_count' : '_key']:
+                          sorting?.direction,
+                      }
+                    : undefined,
+                },
+                ...getPaginationRequestParams(pageIndex, pageSize),
+              },
+            },
+            filter: { term: { 'event.action': 'page_view' } },
+          },
+        }
+      ),
+  },
+};
+
+export interface AnalyticsCollectionExploreTableLogicValues {
+  isLoading: boolean;
+  items: ExploreTableItem[];
+  pageIndex: number;
+  pageSize: number;
+  search: string;
+  selectedTable: ExploreTables | null;
+  sorting: Sorting | null;
+  totalItemsCount: number;
+}
+
+export interface AnalyticsCollectionExploreTableLogicActions {
+  onTableChange(state: { page?: { index: number; size: number }; sort?: Sorting }): {
+    page?: { index: number; size: number };
+    sort?: Sorting;
+  };
+  reset(): void;
+  setItems(items: ExploreTableItem[]): { items: ExploreTableItem[] };
+  setSearch(search: string): { search: string };
+  setSelectedTable(
+    id: ExploreTables | null,
+    sorting?: Sorting
+  ): { id: ExploreTables | null; sorting?: Sorting };
+  setTotalItemsCount(count: number): { count: number };
+}
+
+export const AnalyticsCollectionExploreTableLogic = kea<
+  MakeLogicType<
+    AnalyticsCollectionExploreTableLogicValues,
+    AnalyticsCollectionExploreTableLogicActions
+  >
+>({
+  actions: {
+    onTableChange: ({ page, sort }) => ({ page, sort }),
+    reset: true,
+    setItems: (items) => ({ items }),
+    setSearch: (search) => ({ search }),
+    setSelectedTable: (id, sorting) => ({ id, sorting }),
+    setTotalItemsCount: (count) => ({ count }),
+  },
+  listeners: ({ actions, values }) => {
+    const fetchItems = () => {
+      if (values.selectedTable === null || !(values.selectedTable in tablesParams)) {
+        return;
+      }
+
+      const { requestParams, parseResponse } = tablesParams[values.selectedTable] as TableParams;
+      const timeRange = AnalyticsCollectionToolbarLogic.values.timeRange;
+
+      const search$ = KibanaLogic.values.data.search
+        .search(
+          requestParams({
+            pageIndex: values.pageIndex,
+            pageSize: values.pageSize,
+            search: values.search,
+            sorting: values.sorting,
+            timeRange,
+          }),
+          {
+            indexPattern: AnalyticsCollectionDataViewLogic.values.dataView || undefined,
+            sessionId: AnalyticsCollectionToolbarLogic.values.searchSessionId,
+          }
+        )
+        .subscribe({
+          error: (e) => {
+            KibanaLogic.values.data.search.showError(e);
+          },
+          next: (response) => {
+            if (isCompleteResponse(response)) {
+              const { items, totalCount } = parseResponse(response);
+
+              actions.setItems(items);
+              actions.setTotalItemsCount(totalCount);
+              search$.unsubscribe();
+            }
+          },
+        });
+    };
+
+    return {
+      onTableChange: fetchItems,
+      setSearch: fetchItems,
+      setSelectedTable: fetchItems,
+      [AnalyticsCollectionToolbarLogic.actionTypes.setTimeRange]: fetchItems,
+      [AnalyticsCollectionToolbarLogic.actionTypes.setSearchSessionId]: fetchItems,
+    };
+  },
+  path: ['enterprise_search', 'analytics', 'collections', 'explore', 'table'],
+  reducers: () => ({
+    isLoading: [
+      false,
+      {
+        onTableChange: () => true,
+        setItems: () => false,
+        setSearch: () => true,
+        setSelectedTable: () => true,
+        setTableState: () => true,
+        [AnalyticsCollectionToolbarLogic.actionTypes.setTimeRange]: () => true,
+        [AnalyticsCollectionToolbarLogic.actionTypes.setSearchSessionId]: () => true,
+      },
+    ],
+    items: [[], { setItems: (_, { items }) => items }],
+    pageIndex: [
+      0,
+      {
+        onTableChange: (_, { page }) => page?.index || 0,
+        reset: () => 0,
+        setSearch: () => 0,
+        setSelectedTable: () => 0,
+      },
+    ],
+    pageSize: [
+      BASE_PAGE_SIZE,
+      {
+        onTableChange: (_, { page }) => page?.size || BASE_PAGE_SIZE,
+        reset: () => BASE_PAGE_SIZE,
+      },
+    ],
+    search: [
+      '',
+      { reset: () => '', setSearch: (_, { search }) => search, setSelectedTable: () => '' },
+    ],
+    selectedTable: [null, { setSelectedTable: (_, { id }) => id }],
+    sorting: [
+      null,
+      {
+        onTableChange: (_, { sort = null }) => sort,
+        setSelectedTable: (_, { sorting = null }) => sorting,
+      },
+    ],
+    totalItemsCount: [0, { setTotalItemsCount: (_, { count }) => count }],
+  }),
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table/analytics_collection_explore_table_types.ts b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table_types.ts
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table/analytics_collection_explore_table_types.ts
rename to x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table_types.ts
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explorer/analytics_collection_explorer.test.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explorer/analytics_collection_explorer.test.tsx
new file mode 100644
index 0000000000000..bc9d1206ff41a
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explorer/analytics_collection_explorer.test.tsx
@@ -0,0 +1,63 @@
+/*
+ * 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 { setMockActions, setMockValues } from '../../../../__mocks__/kea_logic';
+
+import React from 'react';
+
+import { shallow } from 'enzyme';
+
+import { EnterpriseSearchAnalyticsPageTemplate } from '../../layout/page_template';
+
+import { AnalyticsCollectionToolbar } from '../analytics_collection_toolbar/analytics_collection_toolbar';
+
+import { AnalyticsCollectionExplorer } from './analytics_collection_explorer';
+import { AnalyticsCollectionExplorerTable } from './analytics_collection_explorer_table';
+
+describe('AnalyticsCollectionExplorer', () => {
+  const mockValues = {
+    analyticsCollection: { event_data_stream: 'test_data_stream', name: 'Mock Collection' },
+    refreshInterval: { pause: false, value: 1000 },
+    timeRange: { from: 'now-15m', to: 'now' },
+  };
+  const mockActions = { reset: jest.fn() };
+
+  beforeAll(() => {
+    jest.clearAllMocks();
+
+    setMockValues(mockValues);
+    setMockActions(mockActions);
+  });
+
+  afterAll(() => {
+    jest.resetAllMocks();
+  });
+
+  it('renders the AnalyticsCollectionExplorerTable', () => {
+    const wrapper = shallow(<AnalyticsCollectionExplorer />);
+    expect(wrapper.find(AnalyticsCollectionExplorerTable)).toHaveLength(1);
+  });
+
+  it('renders the EnterpriseSearchAnalyticsPageTemplate', () => {
+    const wrapper = shallow(<AnalyticsCollectionExplorer />);
+    expect(wrapper.find(EnterpriseSearchAnalyticsPageTemplate)).toHaveLength(1);
+  });
+
+  it('passes the expected props to EnterpriseSearchAnalyticsPageTemplate', () => {
+    const wrapper = shallow(<AnalyticsCollectionExplorer />).find(
+      EnterpriseSearchAnalyticsPageTemplate
+    );
+
+    expect(wrapper.prop('pageChrome')).toEqual([mockValues.analyticsCollection.name]);
+    expect(wrapper.prop('analyticsName')).toEqual(mockValues.analyticsCollection.name);
+    expect(wrapper.prop('pageHeader')).toEqual({
+      bottomBorder: false,
+      pageTitle: 'Explorer',
+      rightSideItems: [<AnalyticsCollectionToolbar />],
+    });
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explorer/analytics_collection_explorer.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explorer/analytics_collection_explorer.tsx
new file mode 100644
index 0000000000000..80a4b87f27d92
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explorer/analytics_collection_explorer.tsx
@@ -0,0 +1,51 @@
+/*
+ * 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, { useEffect } from 'react';
+
+import { useActions, useValues } from 'kea';
+
+import { i18n } from '@kbn/i18n';
+
+import { EnterpriseSearchAnalyticsPageTemplate } from '../../layout/page_template';
+import { AnalyticsCollectionExploreTableLogic } from '../analytics_collection_explore_table_logic';
+import { AnalyticsCollectionToolbar } from '../analytics_collection_toolbar/analytics_collection_toolbar';
+import { FetchAnalyticsCollectionLogic } from '../fetch_analytics_collection_logic';
+
+import { AnalyticsCollectionExplorerTable } from './analytics_collection_explorer_table';
+
+export const AnalyticsCollectionExplorer: React.FC = ({}) => {
+  const { analyticsCollection } = useValues(FetchAnalyticsCollectionLogic);
+  const { reset } = useActions(AnalyticsCollectionExploreTableLogic);
+
+  useEffect(() => {
+    return () => {
+      reset();
+    };
+  }, []);
+
+  return (
+    <EnterpriseSearchAnalyticsPageTemplate
+      restrictWidth
+      pageChrome={[analyticsCollection?.name]}
+      analyticsName={analyticsCollection?.name}
+      pageViewTelemetry={`View Analytics Collection - explorer`}
+      pageHeader={{
+        bottomBorder: false,
+        pageTitle: i18n.translate(
+          'xpack.enterpriseSearch.analytics.collectionsView.explorerView.title',
+          {
+            defaultMessage: 'Explorer',
+          }
+        ),
+        rightSideItems: [<AnalyticsCollectionToolbar />],
+      }}
+    >
+      <AnalyticsCollectionExplorerTable />
+    </EnterpriseSearchAnalyticsPageTemplate>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explorer/analytics_collection_explorer_callout.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explorer/analytics_collection_explorer_callout.tsx
new file mode 100644
index 0000000000000..da24d06f81be8
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explorer/analytics_collection_explorer_callout.tsx
@@ -0,0 +1,54 @@
+/*
+ * 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 { EuiButton, EuiCallOut } from '@elastic/eui';
+
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { RedirectAppLinks } from '@kbn/shared-ux-link-redirect-app';
+
+import { KibanaLogic } from '../../../../shared/kibana';
+import { useDiscoverLink } from '../use_discover_link';
+
+export const AnalyticsCollectionExplorerCallout: React.FC = () => {
+  const { application } = useValues(KibanaLogic);
+  const discoverLink = useDiscoverLink();
+
+  return discoverLink ? (
+    <EuiCallOut
+      title={i18n.translate(
+        'xpack.enterpriseSearch.analytics.collectionsView.explorer.callout.title',
+        { defaultMessage: 'Need a deeper analysis?' }
+      )}
+      iconType="inspect"
+    >
+      <p>
+        <FormattedMessage
+          id="xpack.enterpriseSearch.analytics.collectionsView.explorer.callout.description"
+          defaultMessage="Review your event logs in Discover to get more insights about your application metrics."
+        />
+      </p>
+
+      <RedirectAppLinks coreStart={{ application }}>
+        <EuiButton
+          fill
+          href={discoverLink}
+          data-telemetry-id="entSearch-analytics-explorer-callout-exploreLink"
+        >
+          <FormattedMessage
+            id="xpack.enterpriseSearch.analytics.collectionsView.explorer.callout.button"
+            defaultMessage="Explore"
+          />
+        </EuiButton>
+      </RedirectAppLinks>
+    </EuiCallOut>
+  ) : null;
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explorer/analytics_collection_explorer_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explorer/analytics_collection_explorer_table.test.tsx
new file mode 100644
index 0000000000000..fc702a0493369
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explorer/analytics_collection_explorer_table.test.tsx
@@ -0,0 +1,70 @@
+/*
+ * 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 { setMockActions, setMockValues } from '../../../../__mocks__/kea_logic';
+
+import React from 'react';
+
+import { mount, shallow } from 'enzyme';
+
+import { ExploreTables } from '../analytics_collection_explore_table_types';
+
+import { AnalyticsCollectionExplorerTable } from './analytics_collection_explorer_table';
+
+describe('AnalyticsCollectionExplorerTable', () => {
+  const mockActions = {
+    onTableChange: jest.fn(),
+    setPageIndex: jest.fn(),
+    setPageSize: jest.fn(),
+    setSearch: jest.fn(),
+    setSelectedTable: jest.fn(),
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    setMockValues({ items: [], selectedTable: ExploreTables.TopClicked });
+    setMockActions(mockActions);
+  });
+
+  it('should set default selectedTable', () => {
+    setMockValues({ items: [], selectedTable: null });
+    const wrapper = mount(<AnalyticsCollectionExplorerTable />);
+
+    wrapper.update();
+
+    expect(mockActions.setSelectedTable).toHaveBeenCalledWith(ExploreTables.SearchTerms, {
+      direction: 'desc',
+      field: 'count',
+    });
+  });
+
+  it('should call setSelectedTable when click on a tab', () => {
+    const tabs = shallow(<AnalyticsCollectionExplorerTable />).find('EuiTab');
+
+    expect(tabs.length).toBe(4);
+
+    tabs.at(2).simulate('click');
+    expect(mockActions.setSelectedTable).toHaveBeenCalledWith(ExploreTables.WorsePerformers, {
+      direction: 'desc',
+      field: 'count',
+    });
+  });
+
+  it('should call onTableChange when table called onChange', () => {
+    const table = shallow(<AnalyticsCollectionExplorerTable />).find('EuiBasicTable');
+
+    table.simulate('change', {
+      page: { index: 23, size: 44 },
+      sort: { direction: 'asc', field: 'test' },
+    });
+    expect(mockActions.onTableChange).toHaveBeenCalledWith({
+      page: { index: 23, size: 44 },
+      sort: { direction: 'asc', field: 'test' },
+    });
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explorer/analytics_collection_explorer_table.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explorer/analytics_collection_explorer_table.tsx
new file mode 100644
index 0000000000000..fe55aae3d1692
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explorer/analytics_collection_explorer_table.tsx
@@ -0,0 +1,327 @@
+/*
+ * 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, { useEffect } from 'react';
+
+import { useActions, useValues } from 'kea';
+
+import {
+  Criteria,
+  EuiBasicTable,
+  EuiBasicTableColumn,
+  EuiFieldSearch,
+  EuiFlexGroup,
+  EuiHorizontalRule,
+  EuiSpacer,
+  EuiTab,
+  EuiTabs,
+  EuiText,
+  useEuiTheme,
+} from '@elastic/eui';
+import {
+  EuiTableFieldDataColumnType,
+  EuiTableSortingType,
+} from '@elastic/eui/src/components/basic_table/table_types';
+import { UseEuiTheme } from '@elastic/eui/src/services/theme/hooks';
+
+import { i18n } from '@kbn/i18n';
+
+import { FormattedMessage } from '@kbn/i18n-react';
+
+import { AnalyticsCollectionExploreTableLogic } from '../analytics_collection_explore_table_logic';
+import {
+  ExploreTableColumns,
+  ExploreTableItem,
+  ExploreTables,
+  SearchTermsTable,
+  TopClickedTable,
+  TopReferrersTable,
+  WorsePerformersTable,
+} from '../analytics_collection_explore_table_types';
+
+import { AnalyticsCollectionExplorerCallout } from './analytics_collection_explorer_callout';
+
+interface TableSetting<T = ExploreTableItem, K = T> {
+  columns: Array<
+    EuiBasicTableColumn<T & K> & {
+      render?: (euiTheme: UseEuiTheme['euiTheme']) => EuiTableFieldDataColumnType<T & K>['render'];
+    }
+  >;
+  sorting: EuiTableSortingType<T>;
+}
+
+const tabs: Array<{ id: ExploreTables; name: string }> = [
+  {
+    id: ExploreTables.SearchTerms,
+    name: i18n.translate(
+      'xpack.enterpriseSearch.analytics.collections.collectionsView.explorer.searchTermsTab',
+      { defaultMessage: 'Search terms' }
+    ),
+  },
+  {
+    id: ExploreTables.TopClicked,
+    name: i18n.translate(
+      'xpack.enterpriseSearch.analytics.collections.collectionsView.explorer.topClickedTab',
+      { defaultMessage: 'Top clicked results' }
+    ),
+  },
+  {
+    id: ExploreTables.WorsePerformers,
+    name: i18n.translate(
+      'xpack.enterpriseSearch.analytics.collections.collectionsView.explorer.noResultsTab',
+      { defaultMessage: 'No results' }
+    ),
+  },
+  {
+    id: ExploreTables.TopReferrers,
+    name: i18n.translate(
+      'xpack.enterpriseSearch.analytics.collections.collectionsView.explorer.referrersTab',
+      { defaultMessage: 'Referrers' }
+    ),
+  },
+];
+
+const tableSettings: {
+  [ExploreTables.SearchTerms]: TableSetting<SearchTermsTable>;
+  [ExploreTables.TopClicked]: TableSetting<TopClickedTable>;
+  [ExploreTables.TopReferrers]: TableSetting<TopReferrersTable>;
+  [ExploreTables.WorsePerformers]: TableSetting<WorsePerformersTable>;
+} = {
+  [ExploreTables.SearchTerms]: {
+    columns: [
+      {
+        field: ExploreTableColumns.searchTerms,
+        name: i18n.translate(
+          'xpack.enterpriseSearch.analytics.collections.collectionsView.exploreTable.searchTerms',
+          { defaultMessage: 'Search Terms' }
+        ),
+        sortable: true,
+        truncateText: true,
+      },
+      {
+        align: 'right',
+        field: ExploreTableColumns.count,
+        name: i18n.translate(
+          'xpack.enterpriseSearch.analytics.collections.collectionsView.exploreTable.count',
+          { defaultMessage: 'Count' }
+        ),
+        sortable: true,
+        truncateText: true,
+      },
+    ],
+    sorting: {
+      sort: {
+        direction: 'desc',
+        field: ExploreTableColumns.count,
+      },
+    },
+  },
+  [ExploreTables.WorsePerformers]: {
+    columns: [
+      {
+        field: ExploreTableColumns.query,
+        name: i18n.translate(
+          'xpack.enterpriseSearch.analytics.collections.collectionsView.exploreTable.query',
+          { defaultMessage: 'Query' }
+        ),
+        sortable: true,
+        truncateText: true,
+      },
+      {
+        align: 'right',
+        field: ExploreTableColumns.count,
+        name: i18n.translate(
+          'xpack.enterpriseSearch.analytics.collections.collectionsView.exploreTable.count',
+          { defaultMessage: 'Count' }
+        ),
+        sortable: true,
+        truncateText: true,
+      },
+    ],
+    sorting: {
+      sort: {
+        direction: 'desc',
+        field: ExploreTableColumns.count,
+      },
+    },
+  },
+  [ExploreTables.TopClicked]: {
+    columns: [
+      {
+        field: ExploreTableColumns.page,
+        name: i18n.translate(
+          'xpack.enterpriseSearch.analytics.collections.collectionsView.exploreTable.page',
+          { defaultMessage: 'Page' }
+        ),
+        render: (euiTheme: UseEuiTheme['euiTheme']) => (value: string) =>
+          (
+            <EuiText size="s" color={euiTheme.colors.primaryText}>
+              <p>{value}</p>
+            </EuiText>
+          ),
+        sortable: true,
+        truncateText: true,
+      },
+      {
+        align: 'right',
+        field: ExploreTableColumns.count,
+        name: i18n.translate(
+          'xpack.enterpriseSearch.analytics.collections.collectionsView.exploreTable.count',
+          { defaultMessage: 'Count' }
+        ),
+        sortable: true,
+        truncateText: true,
+      },
+    ],
+    sorting: {
+      sort: {
+        direction: 'desc',
+        field: ExploreTableColumns.count,
+      },
+    },
+  },
+  [ExploreTables.TopReferrers]: {
+    columns: [
+      {
+        field: ExploreTableColumns.page,
+        name: i18n.translate(
+          'xpack.enterpriseSearch.analytics.collections.collectionsView.exploreTable.page',
+          { defaultMessage: 'Page' }
+        ),
+        render: (euiTheme: UseEuiTheme['euiTheme']) => (value: string) =>
+          (
+            <EuiText size="s" color={euiTheme.colors.primaryText}>
+              <p>{value}</p>
+            </EuiText>
+          ),
+        sortable: true,
+        truncateText: true,
+      },
+      {
+        align: 'right',
+        field: ExploreTableColumns.sessions,
+        name: i18n.translate(
+          'xpack.enterpriseSearch.analytics.collections.collectionsView.exploreTable.session',
+          { defaultMessage: 'Session' }
+        ),
+        sortable: true,
+        truncateText: true,
+      },
+    ],
+    sorting: {
+      sort: {
+        direction: 'desc',
+        field: ExploreTableColumns.sessions,
+      },
+    },
+  },
+};
+
+export const AnalyticsCollectionExplorerTable = () => {
+  const { euiTheme } = useEuiTheme();
+  const { onTableChange, setSelectedTable, setSearch } = useActions(
+    AnalyticsCollectionExploreTableLogic
+  );
+  const { items, isLoading, pageIndex, pageSize, search, selectedTable, sorting, totalItemsCount } =
+    useValues(AnalyticsCollectionExploreTableLogic);
+  let table = selectedTable !== null && (tableSettings[selectedTable] as TableSetting);
+  if (table) {
+    table = {
+      ...table,
+      columns: table.columns.map((column) => ({
+        ...column,
+        render: column.render?.(euiTheme),
+      })) as TableSetting['columns'],
+      sorting: { ...table.sorting, sort: sorting || undefined },
+    };
+  }
+  const handleTableChange = ({ sort, page }: Criteria<ExploreTableItem>) => {
+    onTableChange({ page, sort });
+  };
+
+  useEffect(() => {
+    if (!selectedTable) {
+      const firstTabId = tabs[0].id;
+
+      setSelectedTable(firstTabId, (tableSettings[firstTabId] as TableSetting)?.sorting?.sort);
+    }
+  }, []);
+
+  return (
+    <EuiFlexGroup direction="column" gutterSize="l">
+      <EuiTabs>
+        {tabs?.map(({ id, name }) => (
+          <EuiTab
+            key={id}
+            onClick={() => setSelectedTable(id, (tableSettings[id] as TableSetting)?.sorting?.sort)}
+            isSelected={id === selectedTable}
+          >
+            {name}
+          </EuiTab>
+        ))}
+      </EuiTabs>
+
+      {table && (
+        <EuiFlexGroup direction="column" gutterSize="none">
+          <EuiFieldSearch
+            placeholder={i18n.translate(
+              'xpack.enterpriseSearch.analytics.collectionsView.explorer.searchPlaceholder',
+              {
+                defaultMessage: 'Search',
+              }
+            )}
+            value={search}
+            onChange={(event) => setSearch(event.target.value)}
+            isClearable
+            incremental
+            fullWidth
+          />
+
+          <EuiSpacer size="xl" />
+
+          <EuiText size="xs">
+            <FormattedMessage
+              id="xpack.enterpriseSearch.analytics.collectionsView.explorer.tableSummary"
+              defaultMessage="Showing {items} of {totalItemsCount}"
+              values={{
+                items: (
+                  <strong>
+                    {pageSize * pageIndex + Number(!!items.length)}-
+                    {pageSize * pageIndex + items.length}
+                  </strong>
+                ),
+                totalItemsCount,
+              }}
+            />
+          </EuiText>
+
+          <EuiSpacer size="m" />
+
+          <EuiHorizontalRule margin="none" />
+
+          <EuiBasicTable
+            columns={table.columns}
+            itemId={selectedTable || undefined}
+            items={items}
+            loading={isLoading}
+            sorting={table.sorting}
+            pagination={{
+              pageIndex,
+              pageSize,
+              pageSizeOptions: [10, 20, 50],
+              showPerPageOptions: true,
+              totalItemCount: totalItemsCount,
+            }}
+            onChange={handleTableChange}
+          />
+        </EuiFlexGroup>
+      )}
+
+      <AnalyticsCollectionExplorerCallout />
+    </EuiFlexGroup>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_chart.test.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_chart.test.tsx
index 31831805a7f4f..ff0b8f4788df7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_chart.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_chart.test.tsx
@@ -35,12 +35,9 @@ describe('AnalyticsCollectionChart', () => {
     from: moment().subtract(7, 'days').toISOString(),
     to: moment().toISOString(),
   };
-  const mockedDataViewQuery = 'mockedDataViewQuery';
 
   const defaultProps = {
     data: {},
-    dataViewQuery: mockedDataViewQuery,
-    id: 'mockedId',
     isLoading: false,
     selectedChart: FilterBy.Searches,
     setSelectedChart: jest.fn(),
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_chart.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_chart.tsx
index 9a86c758bf585..b518bc8326662 100644
--- a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_chart.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_chart.tsx
@@ -42,8 +42,7 @@ const DEFAULT_STROKE_WIDTH = 1;
 const HOVER_STROKE_WIDTH = 3;
 const CHART_HEIGHT = 490;
 
-interface AnalyticsCollectionChartProps extends WithLensDataInputProps {
-  dataViewQuery: string;
+interface AnalyticsCollectionChartProps extends Pick<WithLensDataInputProps, 'timeRange'> {
   selectedChart: FilterBy | null;
   setSelectedChart(chart: FilterBy): void;
 }
@@ -303,6 +302,5 @@ export const AnalyticsCollectionChartWithLens = withLensData<
       visualizationType: 'lnsXY',
     };
   },
-  getDataViewQuery: (props) => props.dataViewQuery,
   initialValues,
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_metric.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_metric.tsx
index 7660c9e92fa47..9c0e44c02e2f6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_metric.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_metric.tsx
@@ -54,7 +54,6 @@ const getMetricStatus = (metric: number): MetricStatus => {
 };
 
 interface AnalyticsCollectionViewMetricProps {
-  dataViewQuery: string;
   getFormula: (shift?: string) => string;
   isSelected?: boolean;
   name: string;
@@ -230,6 +229,5 @@ export const AnalyticsCollectionViewMetricWithLens = withLensData<
       visualizationType: 'lnsMetric',
     };
   },
-  getDataViewQuery: (props) => props.dataViewQuery,
   initialValues,
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_overview.test.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_overview.test.tsx
index b9e54854978fd..30cc657a22c2f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_overview.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_overview.test.tsx
@@ -38,9 +38,9 @@ const mockValues = {
 };
 
 const mockActions = {
+  analyticsEventsExist: jest.fn(),
   fetchAnalyticsCollection: jest.fn(),
   fetchAnalyticsCollectionDataViewId: jest.fn(),
-  analyticsEventsExist: jest.fn(),
   setTimeRange: jest.fn(),
 };
 
@@ -92,7 +92,7 @@ describe('AnalyticsOverView', () => {
     );
     expect(wrapper?.find(AnalyticsCollectionChartWithLens)).toHaveLength(1);
     expect(wrapper?.find(AnalyticsCollectionChartWithLens).props()).toEqual({
-      dataViewQuery: 'analytics-events-example',
+      collection: mockValues.analyticsCollection,
       id: 'analytics-collection-chart-Analytics-Collection-1',
       searchSessionId: 'session-id',
       selectedChart: 'Searches',
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_overview.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_overview.tsx
index 04a8ab8f675c5..5ec96b3103929 100644
--- a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_overview.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_overview.tsx
@@ -18,14 +18,13 @@ import { FilterBy, getFormulaByFilter } from '../../../utils/get_formula_by_filt
 
 import { EnterpriseSearchAnalyticsPageTemplate } from '../../layout/page_template';
 
-import { AnalyticsCollectionExploreTable } from '../analytics_collection_explore_table/analytics_collection_explore_table';
-
 import { AnalyticsCollectionNoEventsCallout } from '../analytics_collection_no_events_callout/analytics_collection_no_events_callout';
 import { AnalyticsCollectionToolbar } from '../analytics_collection_toolbar/analytics_collection_toolbar';
 import { AnalyticsCollectionToolbarLogic } from '../analytics_collection_toolbar/analytics_collection_toolbar_logic';
 
 import { AnalyticsCollectionChartWithLens } from './analytics_collection_chart';
 import { AnalyticsCollectionViewMetricWithLens } from './analytics_collection_metric';
+import { AnalyticsCollectionOverviewTable } from './analytics_collection_overview_table';
 
 const filters = [
   {
@@ -107,7 +106,7 @@ export const AnalyticsCollectionOverview: React.FC<AnalyticsCollectionOverviewPr
 
                 setFilterBy(id);
               }}
-              dataViewQuery={analyticsCollection.events_datastream}
+              collection={analyticsCollection}
               timeRange={timeRange}
               searchSessionId={searchSessionId}
               getFormula={getFormulaByFilter.bind(null, id)}
@@ -117,7 +116,7 @@ export const AnalyticsCollectionOverview: React.FC<AnalyticsCollectionOverviewPr
 
         <AnalyticsCollectionChartWithLens
           id={'analytics-collection-chart-' + analyticsCollection.name}
-          dataViewQuery={analyticsCollection.events_datastream}
+          collection={analyticsCollection}
           timeRange={timeRange}
           setTimeRange={setTimeRange}
           searchSessionId={searchSessionId}
@@ -125,7 +124,7 @@ export const AnalyticsCollectionOverview: React.FC<AnalyticsCollectionOverviewPr
           setSelectedChart={setFilterBy}
         />
 
-        <AnalyticsCollectionExploreTable filterBy={filterBy} />
+        <AnalyticsCollectionOverviewTable filterBy={filterBy} />
       </EuiFlexGroup>
     </EnterpriseSearchAnalyticsPageTemplate>
   );
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table/analytics_collection_explore_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_overview_table.test.tsx
similarity index 70%
rename from x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table/analytics_collection_explore_table.test.tsx
rename to x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_overview_table.test.tsx
index f949639d534a9..e6e553dc51792 100644
--- a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table/analytics_collection_explore_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_overview_table.test.tsx
@@ -15,10 +15,11 @@ import { EuiBasicTable, EuiTab } from '@elastic/eui';
 
 import { FilterBy } from '../../../utils/get_formula_by_filter';
 
-import { AnalyticsCollectionExploreTable } from './analytics_collection_explore_table';
-import { ExploreTables } from './analytics_collection_explore_table_types';
+import { ExploreTables } from '../analytics_collection_explore_table_types';
 
-describe('AnalyticsCollectionExploreTable', () => {
+import { AnalyticsCollectionOverviewTable } from './analytics_collection_overview_table';
+
+describe('AnalyticsCollectionOverviewTable', () => {
   const mockValues = {
     activeTableId: 'search_terms',
     analyticsCollection: {
@@ -41,7 +42,7 @@ describe('AnalyticsCollectionExploreTable', () => {
   });
 
   it('should call setSelectedTable with the correct table id when a tab is clicked', () => {
-    const wrapper = shallow(<AnalyticsCollectionExploreTable filterBy={FilterBy.Sessions} />);
+    const wrapper = shallow(<AnalyticsCollectionOverviewTable filterBy={FilterBy.Sessions} />);
 
     const topReferrersTab = wrapper.find(EuiTab).at(0);
     topReferrersTab.simulate('click');
@@ -53,14 +54,9 @@ describe('AnalyticsCollectionExploreTable', () => {
     });
   });
 
-  it('should call findDataView with the active table ID and search filter when mounted', () => {
-    mount(<AnalyticsCollectionExploreTable filterBy={FilterBy.Sessions} />);
-    expect(mockActions.findDataView).toHaveBeenCalledWith(mockValues.analyticsCollection);
-  });
-
   it('should render a table with the selectedTable', () => {
     setMockValues({ ...mockValues, selectedTable: ExploreTables.WorsePerformers });
-    const wrapper = mount(<AnalyticsCollectionExploreTable filterBy={FilterBy.Sessions} />);
+    const wrapper = mount(<AnalyticsCollectionOverviewTable filterBy={FilterBy.Sessions} />);
     expect(wrapper.find(EuiBasicTable).prop('itemId')).toBe(ExploreTables.WorsePerformers);
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table/analytics_collection_explore_table.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_overview_table.tsx
similarity index 94%
rename from x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table/analytics_collection_explore_table.tsx
rename to x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_overview_table.tsx
index 7b77cdb05cf61..8538b11f748fe 100644
--- a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explore_table/analytics_collection_explore_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_overview/analytics_collection_overview_table.tsx
@@ -33,9 +33,8 @@ import { generateEncodedPath } from '../../../../shared/encode_path_params';
 import { KibanaLogic } from '../../../../shared/kibana';
 import { COLLECTION_EXPLORER_PATH } from '../../../routes';
 import { FilterBy } from '../../../utils/get_formula_by_filter';
-import { FetchAnalyticsCollectionLogic } from '../fetch_analytics_collection_logic';
 
-import { AnalyticsCollectionExploreTableLogic } from './analytics_collection_explore_table_logic';
+import { AnalyticsCollectionExploreTableLogic } from '../analytics_collection_explore_table_logic';
 import {
   ExploreTableColumns,
   ExploreTableItem,
@@ -44,7 +43,8 @@ import {
   TopClickedTable,
   TopReferrersTable,
   WorsePerformersTable,
-} from './analytics_collection_explore_table_types';
+} from '../analytics_collection_explore_table_types';
+import { FetchAnalyticsCollectionLogic } from '../fetch_analytics_collection_logic';
 
 const tabsByFilter: Record<FilterBy, Array<{ id: ExploreTables; name: string }>> = {
   [FilterBy.Searches]: [
@@ -230,28 +230,22 @@ const tableSettings: {
   },
 };
 
-interface AnalyticsCollectionExploreTableProps {
+interface AnalyticsCollectionOverviewTableProps {
   filterBy: FilterBy;
 }
 
-export const AnalyticsCollectionExploreTable: React.FC<AnalyticsCollectionExploreTableProps> = ({
+export const AnalyticsCollectionOverviewTable: React.FC<AnalyticsCollectionOverviewTableProps> = ({
   filterBy,
 }) => {
   const { euiTheme } = useEuiTheme();
   const { navigateToUrl } = useValues(KibanaLogic);
   const { analyticsCollection } = useValues(FetchAnalyticsCollectionLogic);
-  const { findDataView, setSelectedTable, setSorting } = useActions(
-    AnalyticsCollectionExploreTableLogic
-  );
+  const { onTableChange, setSelectedTable } = useActions(AnalyticsCollectionExploreTableLogic);
   const { items, isLoading, selectedTable, sorting } = useValues(
     AnalyticsCollectionExploreTableLogic
   );
   const tabs = tabsByFilter[filterBy];
 
-  useEffect(() => {
-    findDataView(analyticsCollection);
-  }, [analyticsCollection]);
-
   useEffect(() => {
     const firstTableInTabsId = tabs[0].id;
 
@@ -292,7 +286,7 @@ export const AnalyticsCollectionExploreTable: React.FC<AnalyticsCollectionExplor
               loading={isLoading}
               sorting={table.sorting}
               onChange={({ sort }) => {
-                setSorting(sort);
+                onTableChange({ sort });
               }}
             />
           )
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_toolbar/analytics_collection_toolbar.test.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_toolbar/analytics_collection_toolbar.test.tsx
index 438d533d126f2..0cdf0fb5d45fa 100644
--- a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_toolbar/analytics_collection_toolbar.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_toolbar/analytics_collection_toolbar.test.tsx
@@ -37,7 +37,7 @@ describe('AnalyticsCollectionToolbar', () => {
         events_datastream: 'test-events',
         name: 'test',
       } as AnalyticsCollection,
-      dataViewId: 'data-view-test',
+      dataView: { id: 'data-view-test' },
       isLoading: false,
       refreshInterval: { pause: false, value: 10000 },
       timeRange: { from: 'now-90d', to: 'now' },
@@ -93,7 +93,9 @@ describe('AnalyticsCollectionToolbar', () => {
 
     expect(exploreInDiscoverItem).toHaveLength(1);
 
-    expect(exploreInDiscoverItem.prop('href')).toBe("/app/discover#/?_a=(index:'data-view-test')");
+    expect(exploreInDiscoverItem.prop('href')).toBe(
+      "/app/discover#/?_a=(index:'data-view-test')&_g=(filters:!(),refreshInterval:(pause:!f,value:10000),time:(from:now-90d,to:now))"
+    );
   });
 
   it('should correct link to the manage datastream link', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_toolbar/analytics_collection_toolbar.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_toolbar/analytics_collection_toolbar.tsx
index 4162b13569089..66122502afb78 100644
--- a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_toolbar/analytics_collection_toolbar.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_toolbar/analytics_collection_toolbar.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
 
 import { useActions, useValues } from 'kea';
 
@@ -23,10 +23,12 @@ import {
 import { OnTimeChangeProps } from '@elastic/eui/src/components/date_picker/super_date_picker/super_date_picker';
 
 import { OnRefreshChangeProps } from '@elastic/eui/src/components/date_picker/types';
+
 import { i18n } from '@kbn/i18n';
 
 import { FormattedMessage } from '@kbn/i18n-react';
-import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
+
+import { RedirectAppLinks } from '@kbn/shared-ux-link-redirect-app';
 
 import { generateEncodedPath } from '../../../../shared/encode_path_params';
 
@@ -34,6 +36,7 @@ import { KibanaLogic } from '../../../../shared/kibana';
 import { COLLECTION_INTEGRATE_PATH } from '../../../routes';
 import { DeleteAnalyticsCollectionLogic } from '../delete_analytics_collection_logic';
 import { FetchAnalyticsCollectionLogic } from '../fetch_analytics_collection_logic';
+import { useDiscoverLink } from '../use_discover_link';
 
 import { AnalyticsCollectionToolbarLogic } from './analytics_collection_toolbar_logic';
 
@@ -76,18 +79,16 @@ const defaultQuickRanges: EuiSuperDatePickerCommonRange[] = [
 ];
 
 export const AnalyticsCollectionToolbar: React.FC = () => {
+  const discoverLink = useDiscoverLink();
   const [isPopoverOpen, setPopover] = useState(false);
   const { application, navigateToUrl } = useValues(KibanaLogic);
   const { analyticsCollection } = useValues(FetchAnalyticsCollectionLogic);
-  const { setTimeRange, setRefreshInterval, findDataViewId, onTimeRefresh } = useActions(
+  const { setTimeRange, setRefreshInterval, onTimeRefresh } = useActions(
     AnalyticsCollectionToolbarLogic
   );
-  const { refreshInterval, timeRange, dataViewId } = useValues(AnalyticsCollectionToolbarLogic);
+  const { refreshInterval, timeRange } = useValues(AnalyticsCollectionToolbarLogic);
   const { deleteAnalyticsCollection } = useActions(DeleteAnalyticsCollectionLogic);
   const { isLoading } = useValues(DeleteAnalyticsCollectionLogic);
-  const discoverUrl = application.getUrlForApp('discover', {
-    path: `#/?_a=(index:'${dataViewId}')`,
-  });
   const manageDatastreamUrl = application.getUrlForApp('management', {
     path: '/data/index_management/data_streams/' + analyticsCollection.events_datastream,
   });
@@ -104,10 +105,6 @@ export const AnalyticsCollectionToolbar: React.FC = () => {
     setRefreshInterval({ pause, value });
   };
 
-  useEffect(() => {
-    if (analyticsCollection) findDataViewId(analyticsCollection);
-  }, [analyticsCollection]);
-
   return (
     <EuiFlexGroup gutterSize="m">
       <EuiFlexItem grow={false}>
@@ -126,88 +123,92 @@ export const AnalyticsCollectionToolbar: React.FC = () => {
         />
       </EuiFlexItem>
 
-      <EuiFlexItem grow={false}>
-        <EuiPopover
-          button={
-            <EuiButton iconType="arrowDown" iconSide="right" onClick={togglePopover}>
-              <FormattedMessage
-                id="xpack.enterpriseSearch.analytics.collectionsView.manageButton"
-                defaultMessage="Manage"
-              />
-            </EuiButton>
-          }
-          isOpen={isPopoverOpen}
-          closePopover={closePopover}
-          anchorPosition="downRight"
-          panelPaddingSize="none"
-        >
-          <EuiContextMenuPanel>
-            <EuiContextMenuItem
-              icon="link"
-              size="s"
-              data-telemetry-id={'entSearch-analytics-overview-toolbar-integrate-tracker-link'}
-              onClick={() =>
-                navigateToUrl(
-                  generateEncodedPath(COLLECTION_INTEGRATE_PATH, {
-                    name: analyticsCollection.name,
-                  })
-                )
-              }
-            >
-              <FormattedMessage
-                id="xpack.enterpriseSearch.analytics.collectionsView.integrateTracker"
-                defaultMessage="Integrate JS tracker"
-              />
-            </EuiContextMenuItem>
-
-            <RedirectAppLinks application={application}>
+      <RedirectAppLinks coreStart={{ application }}>
+        <EuiFlexItem grow={false}>
+          <EuiPopover
+            button={
+              <EuiButton iconType="arrowDown" iconSide="right" onClick={togglePopover}>
+                <FormattedMessage
+                  id="xpack.enterpriseSearch.analytics.collectionsView.manageButton"
+                  defaultMessage="Manage"
+                />
+              </EuiButton>
+            }
+            isOpen={isPopoverOpen}
+            closePopover={closePopover}
+            anchorPosition="downRight"
+            panelPaddingSize="none"
+          >
+            <EuiContextMenuPanel>
               <EuiContextMenuItem
-                icon="database"
+                icon="link"
                 size="s"
-                href={manageDatastreamUrl}
-                data-telemetry-id={'entSearch-analytics-overview-toolbar-manage-datastream-link'}
+                data-telemetry-id={'entSearch-analytics-overview-toolbar-integrate-tracker-link'}
+                onClick={() =>
+                  navigateToUrl(
+                    generateEncodedPath(COLLECTION_INTEGRATE_PATH, {
+                      name: analyticsCollection.name,
+                    })
+                  )
+                }
               >
                 <FormattedMessage
-                  id="xpack.enterpriseSearch.analytics.collectionsView.manageEventsDatastream"
-                  defaultMessage="Manage events datastream"
+                  id="xpack.enterpriseSearch.analytics.collectionsView.integrateTracker"
+                  defaultMessage="Integrate JS tracker"
                 />
               </EuiContextMenuItem>
 
               <EuiContextMenuItem
-                icon="visArea"
-                href={discoverUrl}
+                icon="database"
                 size="s"
-                data-telemetry-id={'entSearch-analytics-overview-toolbar-manage-discover-link'}
+                href={manageDatastreamUrl}
+                data-telemetry-id={'entSearch-analytics-overview-toolbar-manage-datastream-link'}
               >
                 <FormattedMessage
-                  id="xpack.enterpriseSearch.analytics.collectionsView.openInDiscover"
-                  defaultMessage="Create dashboards in Discover"
+                  id="xpack.enterpriseSearch.analytics.collectionsView.manageEventsDatastream"
+                  defaultMessage="Manage events datastream"
                 />
               </EuiContextMenuItem>
-            </RedirectAppLinks>
-
-            <EuiPopoverFooter paddingSize="m">
-              <EuiButton
-                type="submit"
-                color="danger"
-                fullWidth
-                isLoading={!isLoading}
-                disabled={!isLoading}
-                data-telemetry-id={'entSearch-analytics-overview-toolbar-delete-collection-button'}
-                size="s"
-                onClick={() => {
-                  deleteAnalyticsCollection(analyticsCollection.name);
-                }}
-              >
-                <FormattedMessage
-                  id="xpack.enterpriseSearch.analytics.collections.collectionsView.delete.buttonTitle"
-                  defaultMessage="Delete collection"
-                />
-              </EuiButton>
-            </EuiPopoverFooter>
-          </EuiContextMenuPanel>
-        </EuiPopover>
-      </EuiFlexItem>
+
+              {discoverLink && (
+                <EuiContextMenuItem
+                  icon="visArea"
+                  href={discoverLink}
+                  size="s"
+                  data-telemetry-id={'entSearch-analytics-overview-toolbar-manage-discover-link'}
+                >
+                  <FormattedMessage
+                    id="xpack.enterpriseSearch.analytics.collectionsView.openInDiscover"
+                    defaultMessage="Create dashboards in Discover"
+                  />
+                </EuiContextMenuItem>
+              )}
+
+              <EuiPopoverFooter paddingSize="m">
+                <EuiButton
+                  type="submit"
+                  color="danger"
+                  fullWidth
+                  isLoading={!isLoading}
+                  disabled={!isLoading}
+                  data-telemetry-id={
+                    'entSearch-analytics-overview-toolbar-delete-collection-button'
+                  }
+                  size="s"
+                  onClick={() => {
+                    deleteAnalyticsCollection(analyticsCollection.name);
+                  }}
+                >
+                  <FormattedMessage
+                    id="xpack.enterpriseSearch.analytics.collections.collectionsView.delete.buttonTitle"
+                    defaultMessage="Delete collection"
+                  />
+                </EuiButton>
+              </EuiPopoverFooter>
+            </EuiContextMenuPanel>
+          </EuiPopover>
+        </EuiFlexItem>
+      </RedirectAppLinks>
     </EuiFlexGroup>
   );
 };
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_toolbar/analytics_collection_toolbar_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_toolbar/analytics_collection_toolbar_logic.test.ts
index f9c2ac5f4bfb5..ae78ff6198830 100644
--- a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_toolbar/analytics_collection_toolbar_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_toolbar/analytics_collection_toolbar_logic.test.ts
@@ -44,7 +44,6 @@ describe('AnalyticsCollectionToolbarLogic', () => {
   });
   const defaultProps: AnalyticsCollectionToolbarLogicValues = {
     _searchSessionId: null,
-    dataViewId: null,
     refreshInterval: { pause: true, value: 10000 },
     searchSessionId: undefined,
     timeRange: { from: 'now-7d', to: 'now' },
@@ -62,11 +61,6 @@ describe('AnalyticsCollectionToolbarLogic', () => {
       );
     });
 
-    it('sets dataViewId', () => {
-      AnalyticsCollectionToolbarLogic.actions.setDataViewId('sample_data_view_id');
-      expect(AnalyticsCollectionToolbarLogic.values.dataViewId).toEqual('sample_data_view_id');
-    });
-
     it('sets refreshInterval', () => {
       const refreshInterval: RefreshInterval = { pause: false, value: 5000 };
       AnalyticsCollectionToolbarLogic.actions.setRefreshInterval(refreshInterval);
@@ -81,14 +75,6 @@ describe('AnalyticsCollectionToolbarLogic', () => {
   });
 
   describe('listeners', () => {
-    it('should set dataViewId when findDataViewId called', async () => {
-      await AnalyticsCollectionToolbarLogic.actions.findDataViewId({
-        events_datastream: 'some-collection',
-        name: 'some-collection-name',
-      });
-      expect(AnalyticsCollectionToolbarLogic.values.dataViewId).toBe('some-data-view-id');
-    });
-
     it('should set searchSessionId when onTimeRefresh called', () => {
       jest.spyOn(AnalyticsCollectionToolbarLogic.actions, 'setSearchSessionId');
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_toolbar/analytics_collection_toolbar_logic.ts b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_toolbar/analytics_collection_toolbar_logic.ts
index 23e97a022fed3..412e3c502ab44 100644
--- a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_toolbar/analytics_collection_toolbar_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_toolbar/analytics_collection_toolbar_logic.ts
@@ -11,11 +11,9 @@ import { RefreshInterval } from '@kbn/data-plugin/common';
 
 import { TimeRange } from '@kbn/es-query';
 
-import { AnalyticsCollection } from '../../../../../../common/types/analytics';
 import { KibanaLogic } from '../../../../shared/kibana/kibana_logic';
 
 export interface AnalyticsCollectionToolbarLogicActions {
-  findDataViewId(collection: AnalyticsCollection): { collection: AnalyticsCollection };
   onTimeRefresh(): void;
   setDataViewId(id: string): { id: string };
   setRefreshInterval(refreshInterval: RefreshInterval): RefreshInterval;
@@ -27,7 +25,6 @@ export interface AnalyticsCollectionToolbarLogicActions {
 export interface AnalyticsCollectionToolbarLogicValues {
   // kea forbid to set undefined as a value
   _searchSessionId: string | null;
-  dataViewId: string | null;
   refreshInterval: RefreshInterval;
   searchSessionId: string | undefined;
   timeRange: TimeRange;
@@ -40,23 +37,12 @@ export const AnalyticsCollectionToolbarLogic = kea<
   MakeLogicType<AnalyticsCollectionToolbarLogicValues, AnalyticsCollectionToolbarLogicActions>
 >({
   actions: {
-    findDataViewId: (collection) => ({ collection }),
     onTimeRefresh: true,
-    setDataViewId: (id) => ({ id }),
     setRefreshInterval: ({ pause, value }) => ({ pause, value }),
     setSearchSessionId: (searchSessionId) => ({ searchSessionId }),
     setTimeRange: ({ from, to }) => ({ from, to }),
   },
   listeners: ({ actions }) => ({
-    findDataViewId: async ({ collection }) => {
-      const dataViewId = (
-        await KibanaLogic.values.data.dataViews.find(collection.events_datastream, 1)
-      )?.[0]?.id;
-
-      if (dataViewId) {
-        actions.setDataViewId(dataViewId);
-      }
-    },
     onTimeRefresh() {
       actions.setSearchSessionId(KibanaLogic.values.data.search.session.start());
     },
@@ -75,7 +61,6 @@ export const AnalyticsCollectionToolbarLogic = kea<
       null,
       { setSearchSessionId: (state, { searchSessionId }) => searchSessionId },
     ],
-    dataViewId: [null, { setDataViewId: (_, { id }) => id }],
     refreshInterval: [
       DEFAULT_REFRESH_INTERVAL,
       {
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_view.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_view.tsx
index 0db1d77ba6b49..b51dfa0c1f5bd 100644
--- a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_view.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_view.tsx
@@ -25,6 +25,10 @@ import { AddAnalyticsCollection } from '../add_analytics_collections/add_analyti
 
 import { EnterpriseSearchAnalyticsPageTemplate } from '../layout/page_template';
 
+import { AnalyticsCollectionDataViewLogic } from './analytics_collection_data_view_logic';
+
+import { AnalyticsCollectionExplorer } from './analytics_collection_explorer/analytics_collection_explorer';
+
 import { AnalyticsCollectionIntegrateView } from './analytics_collection_integrate/analytics_collection_integrate_view';
 import { AnalyticsCollectionOverview } from './analytics_collection_overview/analytics_collection_overview';
 import { AnalyticsCollectionToolbarLogic } from './analytics_collection_toolbar/analytics_collection_toolbar_logic';
@@ -33,6 +37,7 @@ import { FetchAnalyticsCollectionLogic } from './fetch_analytics_collection_logi
 
 export const AnalyticsCollectionView: React.FC = () => {
   useMountedLogic(AnalyticsCollectionToolbarLogic);
+  useMountedLogic(AnalyticsCollectionDataViewLogic);
   const { fetchAnalyticsCollection } = useActions(FetchAnalyticsCollectionLogic);
   const { analyticsCollection, isLoading } = useValues(FetchAnalyticsCollectionLogic);
   const { name } = useParams<{ name: string }>();
@@ -52,7 +57,9 @@ export const AnalyticsCollectionView: React.FC = () => {
           <AnalyticsCollectionIntegrateView analyticsCollection={analyticsCollection} />
         </Route>
 
-        <Route exact path={COLLECTION_EXPLORER_PATH} />
+        <Route exact path={COLLECTION_EXPLORER_PATH}>
+          <AnalyticsCollectionExplorer />
+        </Route>
       </Switch>
     );
   }
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/fetch_analytics_collection_logic.ts b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/fetch_analytics_collection_logic.ts
index 19d54b5b9dad7..3d96d20f74e76 100644
--- a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/fetch_analytics_collection_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/fetch_analytics_collection_logic.ts
@@ -16,6 +16,7 @@ import {
 } from '../../api/fetch_analytics_collection/fetch_analytics_collection_api_logic';
 
 export interface FetchAnalyticsCollectionActions {
+  apiSuccess: Actions<{}, FetchAnalyticsCollectionApiLogicResponse>['apiSuccess'];
   fetchAnalyticsCollection(name: string): AnalyticsCollection;
   makeRequest: Actions<{}, FetchAnalyticsCollectionApiLogicResponse>['makeRequest'];
 }
@@ -33,7 +34,7 @@ export const FetchAnalyticsCollectionLogic = kea<
     fetchAnalyticsCollection: (name) => ({ name }),
   },
   connect: {
-    actions: [FetchAnalyticsCollectionAPILogic, ['makeRequest']],
+    actions: [FetchAnalyticsCollectionAPILogic, ['makeRequest', 'apiSuccess']],
     values: [FetchAnalyticsCollectionAPILogic, ['data', 'status']],
   },
   listeners: ({ actions }) => ({
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/use_discover_link.ts b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/use_discover_link.ts
new file mode 100644
index 0000000000000..825cf1d1c3d15
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/use_discover_link.ts
@@ -0,0 +1,31 @@
+/*
+ * 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 { useValues } from 'kea';
+
+import { KibanaLogic } from '../../../shared/kibana';
+
+import { AnalyticsCollectionDataViewLogic } from './analytics_collection_data_view_logic';
+import { AnalyticsCollectionToolbarLogic } from './analytics_collection_toolbar/analytics_collection_toolbar_logic';
+
+export const useDiscoverLink = (): string | null => {
+  const { application } = useValues(KibanaLogic);
+  const { dataView } = useValues(AnalyticsCollectionDataViewLogic);
+  const { refreshInterval, timeRange } = useValues(AnalyticsCollectionToolbarLogic);
+
+  return dataView
+    ? application.getUrlForApp('discover', {
+        path: `#/?_a=(index:'${
+          dataView.id
+        }')&_g=(filters:!(),refreshInterval:(pause:!${refreshInterval.pause
+          .toString()
+          .charAt(0)},value:${refreshInterval.value}),time:(from:${timeRange.from},to:${
+          timeRange.to
+        }))`,
+      })
+    : null;
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_overview/analytics_collection_card/analytics_collection_card.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_overview/analytics_collection_card/analytics_collection_card.tsx
index 031212489213b..c3022d2ea11ef 100644
--- a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_overview/analytics_collection_card/analytics_collection_card.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_overview/analytics_collection_card/analytics_collection_card.tsx
@@ -93,7 +93,6 @@ const getChartStatus = (metric: number | null): ChartStatus => {
   if (metric && metric < 0) return ChartStatus.DECREASE;
   return ChartStatus.CONSTANT;
 };
-
 export const AnalyticsCollectionCard: React.FC<
   AnalyticsCollectionCardProps & AnalyticsCollectionCardLensProps
 > = ({ collection, isLoading, isCreatedByEngine, subtitle, data, metric, secondaryMetric }) => {
@@ -332,6 +331,5 @@ export const AnalyticsCollectionCardWithLens = withLensData<
       visualizationType: 'lnsMetric',
     };
   },
-  getDataViewQuery: ({ collection }) => collection.events_datastream,
   initialValues,
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/hoc/with_lens_data.test.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/hoc/with_lens_data.test.tsx
index 03d09f145a4bb..f4883c5e9b4ca 100644
--- a/x-pack/plugins/enterprise_search/public/applications/analytics/hoc/with_lens_data.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/hoc/with_lens_data.test.tsx
@@ -13,10 +13,10 @@ import { mount, shallow } from 'enzyme';
 
 import { act } from 'react-dom/test-utils';
 
-import { DataView } from '@kbn/data-views-plugin/common';
-
 import { FormulaPublicApi } from '@kbn/lens-plugin/public';
 
+import { findOrCreateDataView } from '../utils/find_or_create_data_view';
+
 import { withLensData } from './with_lens_data';
 
 interface MockComponentProps {
@@ -29,6 +29,20 @@ interface MockComponentLensProps {
 
 const flushPromises = () => new Promise((resolve) => setImmediate(resolve));
 
+const mockCollection = {
+  event_retention_day_length: 180,
+  events_datastream: 'analytics-events-example2',
+  id: 'example2',
+  name: 'example2',
+};
+const mockDataView = { id: 'test-data-view-id' };
+
+jest.mock('../utils/find_or_create_data_view', () => {
+  return {
+    findOrCreateDataView: jest.fn(),
+  };
+});
+
 describe('withLensData', () => {
   const MockComponent: React.FC<MockComponentProps> = ({ name }) => <div>{name}</div>;
 
@@ -48,85 +62,91 @@ describe('withLensData', () => {
           return { data: 'initial data' };
         }),
         getAttributes: jest.fn(),
-        getDataViewQuery: jest.fn(),
         initialValues: { data: 'initial data' },
       }
     );
 
-    const props = { name: 'John Doe' };
+    const props = { collection: mockCollection, name: 'John Doe' };
     const wrapper = shallow(
       <WrappedComponent id={'id'} timeRange={{ from: 'now-10d', to: 'now' }} {...props} />
     );
     expect(wrapper.find(MockComponent).prop('data')).toEqual('initial data');
   });
 
-  it('should call getDataViewQuery with props', async () => {
-    const getDataViewQuery = jest.fn();
-    getDataViewQuery.mockReturnValue('title-collection');
-    const findMock = jest.spyOn(mockKibanaValues.data.dataViews, 'find').mockResolvedValueOnce([]);
+  it('should call findOrCreateDataView with collection', async () => {
     const WrappedComponent = withLensData<MockComponentProps, MockComponentLensProps>(
       MockComponent,
       {
         dataLoadTransform: jest.fn(),
         getAttributes: jest.fn(),
-        getDataViewQuery,
         initialValues: { data: 'initial data' },
       }
     );
 
-    const props = { id: 'id', name: 'John Doe', timeRange: { from: 'now-10d', to: 'now' } };
+    const props = {
+      collection: mockCollection,
+      id: 'id',
+      name: 'John Doe',
+      timeRange: { from: 'now-10d', to: 'now' },
+    };
     mount(<WrappedComponent {...props} />);
     await act(async () => {
       await flushPromises();
     });
 
-    expect(getDataViewQuery).toHaveBeenCalledWith(props);
-    expect(findMock).toHaveBeenCalledWith('title-collection', 1);
+    expect(findOrCreateDataView).toHaveBeenCalledWith(mockCollection);
   });
 
   it('should call getAttributes with the correct arguments when dataView and formula are available', async () => {
     const getAttributes = jest.fn();
-    const dataView = {} as DataView;
     const formula = {} as FormulaPublicApi;
     mockKibanaValues.lens.stateHelperApi = jest.fn().mockResolvedValueOnce({ formula });
-    jest.spyOn(mockKibanaValues.data.dataViews, 'find').mockResolvedValueOnce([dataView]);
+    (findOrCreateDataView as jest.Mock).mockResolvedValueOnce(mockDataView);
 
     const WrappedComponent = withLensData<MockComponentProps, MockComponentLensProps>(
       MockComponent,
       {
         dataLoadTransform: jest.fn(),
         getAttributes,
-        getDataViewQuery: jest.fn(),
         initialValues: { data: 'initial data' },
       }
     );
 
-    const props = { id: 'id', name: 'John Doe', timeRange: { from: 'now-10d', to: 'now' } };
+    const props = {
+      collection: mockCollection,
+      id: 'id',
+      name: 'John Doe',
+      timeRange: { from: 'now-10d', to: 'now' },
+    };
     mount(<WrappedComponent {...props} />);
     await act(async () => {
       await flushPromises();
     });
 
-    expect(getAttributes).toHaveBeenCalledWith(dataView, formula, props);
+    expect(getAttributes).toHaveBeenCalledWith(mockDataView, formula, props);
   });
 
   it('should not call getAttributes when dataView is not available', async () => {
     const getAttributes = jest.fn();
     const formula = {} as FormulaPublicApi;
     mockKibanaValues.lens.stateHelperApi = jest.fn().mockResolvedValueOnce({ formula });
-    jest.spyOn(mockKibanaValues.data.dataViews, 'find').mockResolvedValueOnce([]);
+    (findOrCreateDataView as jest.Mock).mockResolvedValueOnce(undefined);
 
     const WrappedComponent = withLensData<MockComponentProps, MockComponentLensProps>(
       MockComponent,
       {
         dataLoadTransform: jest.fn(),
         getAttributes,
-        getDataViewQuery: jest.fn(),
         initialValues: { data: 'initial data' },
       }
     );
 
-    const props = { id: 'id', name: 'John Doe', timeRange: { from: 'now-10d', to: 'now' } };
+    const props = {
+      collection: mockCollection,
+      id: 'id',
+      name: 'John Doe',
+      timeRange: { from: 'now-10d', to: 'now' },
+    };
     mount(<WrappedComponent {...props} />);
     await act(async () => {
       await flushPromises();
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/hoc/with_lens_data.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/hoc/with_lens_data.tsx
index 7e9ecbbb5ac8c..64df74a011c88 100644
--- a/x-pack/plugins/enterprise_search/public/applications/analytics/hoc/with_lens_data.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/hoc/with_lens_data.tsx
@@ -17,9 +17,13 @@ import { TimeRange } from '@kbn/es-query';
 import { DefaultInspectorAdapters } from '@kbn/expressions-plugin/common';
 import { FormulaPublicApi, TypedLensByValueInput } from '@kbn/lens-plugin/public';
 
+import { AnalyticsCollection } from '../../../../common/types/analytics';
+
 import { KibanaLogic } from '../../shared/kibana';
+import { findOrCreateDataView } from '../utils/find_or_create_data_view';
 
 export interface WithLensDataInputProps {
+  collection: AnalyticsCollection;
   id: string;
   searchSessionId?: string;
   setTimeRange?(timeRange: TimeRange): void;
@@ -36,7 +40,6 @@ interface WithLensDataParams<Props, OutputState> {
     formulaApi: FormulaPublicApi,
     props: Props
   ) => TypedLensByValueInput['attributes'];
-  getDataViewQuery: (props: Props) => string;
   initialValues: OutputState;
 }
 
@@ -45,14 +48,12 @@ export const withLensData = <T extends {} = {}, OutputState extends {} = {}>(
   {
     dataLoadTransform,
     getAttributes,
-    getDataViewQuery,
     initialValues,
   }: WithLensDataParams<Omit<T, keyof OutputState>, OutputState>
 ) => {
   const ComponentWithLensData: React.FC<T & WithLensDataInputProps> = (props) => {
     const {
       lens: { EmbeddableComponent, stateHelperApi },
-      data: { dataViews },
     } = useValues(KibanaLogic);
     const [dataView, setDataView] = useState<DataView | null>(null);
     const [data, setData] = useState<OutputState>(initialValues);
@@ -73,11 +74,7 @@ export const withLensData = <T extends {} = {}, OutputState extends {} = {}>(
 
     useEffect(() => {
       (async () => {
-        const [target] = await dataViews.find(getDataViewQuery(props), 1);
-
-        if (target) {
-          setDataView(target);
-        }
+        setDataView(await findOrCreateDataView(props.collection));
       })();
     }, [props]);
     useEffect(() => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.test.ts b/x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.test.ts
new file mode 100644
index 0000000000000..a9362b622176c
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.test.ts
@@ -0,0 +1,58 @@
+/*
+ * 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 { DataView } from '@kbn/data-views-plugin/common';
+
+import { AnalyticsCollection } from '../../../../common/types/analytics';
+import { KibanaLogic } from '../../shared/kibana/kibana_logic';
+
+import { findOrCreateDataView } from './find_or_create_data_view';
+
+jest.mock('../../shared/kibana/kibana_logic', () => ({
+  KibanaLogic: {
+    values: {
+      data: {
+        dataViews: {
+          createAndSave: jest.fn(),
+          find: jest.fn(() => Promise.resolve([])),
+        },
+      },
+    },
+  },
+}));
+
+describe('findOrCreateDataView', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should find and set dataView when analytics collection fetched', async () => {
+    const dataView = { id: 'test', title: 'events1' } as DataView;
+    jest.spyOn(KibanaLogic.values.data.dataViews, 'find').mockResolvedValueOnce([dataView]);
+
+    expect(
+      await findOrCreateDataView({
+        events_datastream: 'events1',
+        name: 'collection1',
+      } as AnalyticsCollection)
+    ).toEqual(dataView);
+    expect(KibanaLogic.values.data.dataViews.createAndSave).not.toHaveBeenCalled();
+  });
+
+  it('should create, save and set dataView when analytics collection fetched but dataView is not found', async () => {
+    const dataView = { id: 'test21' } as DataView;
+    jest.spyOn(KibanaLogic.values.data.dataViews, 'createAndSave').mockResolvedValueOnce(dataView);
+
+    expect(
+      await findOrCreateDataView({
+        events_datastream: 'events1',
+        name: 'collection1',
+      } as AnalyticsCollection)
+    ).toEqual(dataView);
+    expect(KibanaLogic.values.data.dataViews.createAndSave).toHaveBeenCalled();
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.ts b/x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.ts
new file mode 100644
index 0000000000000..52ead6c0dd247
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.ts
@@ -0,0 +1,29 @@
+/*
+ * 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 { AnalyticsCollection } from '../../../../common/types/analytics';
+import { KibanaLogic } from '../../shared/kibana/kibana_logic';
+
+export const findOrCreateDataView = async (collection: AnalyticsCollection) => {
+  const dataView = (
+    await KibanaLogic.values.data.dataViews.find(collection.events_datastream, 1)
+  ).find((result) => result.title === collection.events_datastream);
+
+  if (dataView) {
+    return dataView;
+  }
+
+  return await KibanaLogic.values.data.dataViews.createAndSave(
+    {
+      allowNoIndex: true,
+      name: `behavioral_analytics.events-${collection.name}`,
+      timeFieldName: '@timestamp',
+      title: collection.events_datastream,
+    },
+    true
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/tsconfig.json b/x-pack/plugins/enterprise_search/tsconfig.json
index af660c1169d5a..4ba8f2b48d814 100644
--- a/x-pack/plugins/enterprise_search/tsconfig.json
+++ b/x-pack/plugins/enterprise_search/tsconfig.json
@@ -58,5 +58,6 @@
     "@kbn/react-field",
     "@kbn/field-types",
     "@kbn/core-elasticsearch-server-mocks",
+    "@kbn/shared-ux-link-redirect-app",
   ]
 }

From cac928b95622a6d08b79f54deeea52f920fd11e2 Mon Sep 17 00:00:00 2001
From: Julia Rechkunova <julia.rechkunova@elastic.co>
Date: Wed, 19 Apr 2023 19:17:54 +0200
Subject: [PATCH 089/100] [Discover] Drag & drop for adding columns to the
 table (#153538)

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

## Summary

This PR:
- changes design of field list item in Lens and Discover
- changes design of dimension triggers in Lens panels
- changes design "Add layers" button
- adds "+" action to field items in Lens
- unifies the logic of rendering Lens field items for text-based and
form-based views
- adds Drag&Drop functionality to Discover to add columns to the table
by dragging a field from the sidebar
- adds functional tests for drag&drop in Discover
- shows fields popover in text-based mode too so users can copy field
names


[Figma](https://www.figma.com/file/SvpfCqaZPb2iAYnPtd0Gnr/KUI-Library?node-id=674%3A198901&t=OnQH2EQ4fdBjsRLp-0)

<details>
<summary>Gifs</summary>

![Apr-04-2023
14-38-47](https://user-images.githubusercontent.com/1415710/229795117-712267ba-f5e0-42ca-a2e5-e23759d5ddda.gif)
![Apr-04-2023
14-40-59](https://user-images.githubusercontent.com/1415710/229795133-7b618566-e73a-4303-97d7-b2840d1fc006.gif)

</details>


### 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))
- [x] This was checked for [cross-browser
compatibility](https://www.elastic.co/support/matrix#matrix_browsers)

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: Andrea Del Rio <delrio.andre@gmail.com>
Co-authored-by: Stratoula Kalafateli <efstratia.kalafateli@elastic.co>
---
 packages/kbn-dom-drag-drop/index.ts           |   2 +
 packages/kbn-dom-drag-drop/src/constants.ts   |   2 +
 .../kbn-dom-drag-drop/src/drag_drop.test.tsx  |  10 +-
 packages/kbn-dom-drag-drop/src/drag_drop.tsx  |  21 +-
 .../src/drop_overlay_wrapper.tsx              |  52 +++
 packages/kbn-dom-drag-drop/src/index.ts       |   1 +
 .../src/providers/reorder_provider.tsx        |   9 +-
 .../kbn-dom-drag-drop/src/sass/drag_drop.scss |  58 +++-
 .../src/sass/drag_drop_mixins.scss            |  15 +-
 .../__snapshots__/field_button.test.tsx.snap  |  69 +++-
 .../src/field_button/field_button.scss        |  58 ++--
 .../src/field_button/field_button.test.tsx    |  19 +-
 .../src/field_button/field_button.tsx         |  39 ++-
 .../components/layout/discover_layout.tsx     |  17 +-
 .../layout/discover_main_content.tsx          | 114 ++++---
 .../sidebar/discover_field.test.tsx           |  14 +-
 .../components/sidebar/discover_field.tsx     | 316 +++++++-----------
 .../components/sidebar/discover_sidebar.scss  |  26 --
 .../components/sidebar/discover_sidebar.tsx   |   7 +-
 .../application/main/discover_main_app.tsx    |  29 +-
 src/plugins/discover/tsconfig.json            |   1 +
 .../field_item_button.test.tsx.snap           | 278 +++++++++++++++
 .../field_item_button/field_item_button.scss  |  35 +-
 .../field_item_button.test.tsx                | 150 +++++++++
 .../field_item_button/field_item_button.tsx   | 165 ++++++++-
 .../unified_field_list/public/index.ts        |   1 +
 src/plugins/unified_field_list/tsconfig.json  |   1 +
 .../apps/discover/group3/_drag_drop.ts        |  71 ++++
 test/functional/apps/discover/group3/index.ts |   1 +
 test/functional/page_objects/discover_page.ts |  49 ++-
 .../public/datasources/common/field_item.scss |   4 +
 .../field_item.test.tsx                       |  31 +-
 .../{form_based => common}/field_item.tsx     | 198 ++++++-----
 .../common/get_field_item_actions.tsx         |  56 ++++
 .../datasources/form_based/datapanel.test.tsx |  23 +-
 .../datasources/form_based/datapanel.tsx      |  12 +-
 .../datasources/form_based/field_item.scss    |  26 --
 .../datasources/text_based/datapanel.test.tsx |  13 +-
 .../datasources/text_based/datapanel.tsx      |  43 ++-
 .../text_based/text_based_languages.tsx       |  18 +-
 .../editor_frame/config_panel/add_layer.tsx   |   6 +-
 .../config_panel/buttons/dimension_button.tsx |  58 ++--
 .../buttons/empty_dimension_button.tsx        |   2 +-
 .../config_panel/layer_panel.scss             |  46 ++-
 .../config_panel/layer_panel.test.tsx         |   5 +-
 .../editor_frame/config_panel/layer_panel.tsx |  79 +++--
 .../dimension_trigger/index.tsx               |  16 +-
 .../translations/translations/fr-FR.json      |   8 -
 .../translations/translations/ja-JP.json      |   8 -
 .../translations/translations/zh-CN.json      |   8 -
 .../apps/lens/group1/smokescreen.ts           |   6 +-
 .../test/functional/page_objects/lens_page.ts |  10 +-
 .../functional/services/transform/wizard.ts   |   4 +-
 .../localization/tests/lens/smokescreen.ts    |   6 +-
 54 files changed, 1598 insertions(+), 718 deletions(-)
 create mode 100644 packages/kbn-dom-drag-drop/src/drop_overlay_wrapper.tsx
 create mode 100644 src/plugins/unified_field_list/public/components/field_item_button/__snapshots__/field_item_button.test.tsx.snap
 create mode 100644 src/plugins/unified_field_list/public/components/field_item_button/field_item_button.test.tsx
 create mode 100644 test/functional/apps/discover/group3/_drag_drop.ts
 create mode 100644 x-pack/plugins/lens/public/datasources/common/field_item.scss
 rename x-pack/plugins/lens/public/datasources/{form_based => common}/field_item.test.tsx (94%)
 rename x-pack/plugins/lens/public/datasources/{form_based => common}/field_item.tsx (72%)
 create mode 100644 x-pack/plugins/lens/public/datasources/common/get_field_item_actions.tsx
 delete mode 100644 x-pack/plugins/lens/public/datasources/form_based/field_item.scss

diff --git a/packages/kbn-dom-drag-drop/index.ts b/packages/kbn-dom-drag-drop/index.ts
index 618613deca73e..7a7f599934890 100644
--- a/packages/kbn-dom-drag-drop/index.ts
+++ b/packages/kbn-dom-drag-drop/index.ts
@@ -16,6 +16,8 @@ export {
   RootDragDropProvider,
   ChildDragDropProvider,
   ReorderProvider,
+  DropOverlayWrapper,
+  type DropOverlayWrapperProps,
 } from './src';
 
 export { DropTargetSwapDuplicateCombine } from './src/drop_targets';
diff --git a/packages/kbn-dom-drag-drop/src/constants.ts b/packages/kbn-dom-drag-drop/src/constants.ts
index 2cc21a99c7013..e6b211c314048 100644
--- a/packages/kbn-dom-drag-drop/src/constants.ts
+++ b/packages/kbn-dom-drag-drop/src/constants.ts
@@ -7,3 +7,5 @@
  */
 
 export const DEFAULT_DATA_TEST_SUBJ = 'domDragDrop';
+export const REORDER_ITEM_HEIGHT = 32;
+export const REORDER_ITEM_MARGIN = 8;
diff --git a/packages/kbn-dom-drag-drop/src/drag_drop.test.tsx b/packages/kbn-dom-drag-drop/src/drag_drop.test.tsx
index 498d6a0fa8664..fac4b76f2a33d 100644
--- a/packages/kbn-dom-drag-drop/src/drag_drop.test.tsx
+++ b/packages/kbn-dom-drag-drop/src/drag_drop.test.tsx
@@ -468,7 +468,7 @@ describe('DragDrop', () => {
         ghost: {
           children: <button>Hi!</button>,
           style: {
-            height: 0,
+            minHeight: 0,
             width: 0,
           },
         },
@@ -1100,12 +1100,12 @@ describe('DragDrop', () => {
       expect(
         component.find('[data-test-subj="testDragDrop-translatableDrop"]').at(0).prop('style')
       ).toEqual({
-        transform: 'translateY(-8px)',
+        transform: 'translateY(-4px)',
       });
       expect(
         component.find('[data-test-subj="testDragDrop-translatableDrop"]').at(1).prop('style')
       ).toEqual({
-        transform: 'translateY(-8px)',
+        transform: 'translateY(-4px)',
       });
 
       component
@@ -1258,12 +1258,12 @@ describe('DragDrop', () => {
       expect(
         component.find('[data-test-subj="testDragDrop-reorderableDrag"]').at(0).prop('style')
       ).toEqual({
-        transform: 'translateY(+8px)',
+        transform: 'translateY(+4px)',
       });
       expect(
         component.find('[data-test-subj="testDragDrop-translatableDrop"]').at(0).prop('style')
       ).toEqual({
-        transform: 'translateY(-40px)',
+        transform: 'translateY(-32px)',
       });
       expect(
         component.find('[data-test-subj="testDragDrop-translatableDrop"]').at(1).prop('style')
diff --git a/packages/kbn-dom-drag-drop/src/drag_drop.tsx b/packages/kbn-dom-drag-drop/src/drag_drop.tsx
index 47909a818cea9..ce3d6147d813f 100644
--- a/packages/kbn-dom-drag-drop/src/drag_drop.tsx
+++ b/packages/kbn-dom-drag-drop/src/drag_drop.tsx
@@ -24,6 +24,7 @@ import {
   Ghost,
 } from './providers';
 import { DropType } from './types';
+import { REORDER_ITEM_MARGIN } from './constants';
 import './sass/drag_drop.scss';
 
 /**
@@ -71,11 +72,15 @@ interface BaseProps {
    * The React element which will be passed the draggable handlers
    */
   children: ReactElement;
+
+  /**
+   * Disable any drag & drop behaviour
+   */
+  isDisabled?: boolean;
   /**
    * Indicates whether or not this component is draggable.
    */
   draggable?: boolean;
-
   /**
    * Additional class names to apply when another element is over the drop target
    */
@@ -152,7 +157,7 @@ interface DropsInnerProps extends BaseProps {
   isNotDroppable: boolean;
 }
 
-const lnsLayerPanelDimensionMargin = 8;
+const REORDER_OFFSET = REORDER_ITEM_MARGIN / 2;
 
 /**
  * DragDrop component
@@ -174,6 +179,10 @@ export const DragDrop = (props: BaseProps) => {
     onTrackUICounterEvent,
   } = useContext(DragContext);
 
+  if (props.isDisabled) {
+    return props.children;
+  }
+
   const { value, draggable, dropTypes, reorderableGroup } = props;
   const isDragging = !!(draggable && value.id === dragging?.id);
 
@@ -358,7 +367,7 @@ const DragInner = memo(function DragInner({
         ghost: keyboardModeOn
           ? {
               children,
-              style: { width: currentTarget.offsetWidth, height: currentTarget.offsetHeight },
+              style: { width: currentTarget.offsetWidth, minHeight: currentTarget?.offsetHeight },
             }
           : undefined,
       });
@@ -417,12 +426,14 @@ const DragInner = memo(function DragInner({
     keyboardMode &&
     activeDropTarget &&
     activeDropTarget.dropType !== 'reorder';
+
   return (
     <div
       className={classNames(className, {
         'domDragDrop-isHidden':
           (activeDraggingProps && dragType === 'move' && !keyboardMode) ||
           shouldShowGhostImageInstead,
+        'domDragDrop--isDragStarted': activeDraggingProps,
       })}
       data-test-subj={`${dataTestSubjPrefix}_draggable-${value.humanData.label}`}
     >
@@ -772,7 +783,7 @@ const ReorderableDrag = memo(function ReorderableDrag(
       | KeyboardEvent<HTMLButtonElement>['currentTarget']
   ) => {
     if (currentTarget) {
-      const height = currentTarget.offsetHeight + lnsLayerPanelDimensionMargin;
+      const height = currentTarget.offsetHeight + REORDER_OFFSET;
       setReorderState((s: ReorderState) => ({
         ...s,
         draggingHeight: height,
@@ -875,7 +886,7 @@ const ReorderableDrag = memo(function ReorderableDrag(
         areItemsReordered
           ? {
               transform: `translateY(${direction === '+' ? '-' : '+'}${reorderedItems.reduce(
-                (acc, cur) => acc + Number(cur.height || 0) + lnsLayerPanelDimensionMargin,
+                (acc, cur) => acc + Number(cur.height || 0) + REORDER_OFFSET,
                 0
               )}px)`,
             }
diff --git a/packages/kbn-dom-drag-drop/src/drop_overlay_wrapper.tsx b/packages/kbn-dom-drag-drop/src/drop_overlay_wrapper.tsx
new file mode 100644
index 0000000000000..590106157f304
--- /dev/null
+++ b/packages/kbn-dom-drag-drop/src/drop_overlay_wrapper.tsx
@@ -0,0 +1,52 @@
+/*
+ * 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 classnames from 'classnames';
+
+/**
+ * DropOverlayWrapper Props
+ */
+export interface DropOverlayWrapperProps {
+  isVisible: boolean;
+  className?: string;
+  overlayProps?: object;
+}
+
+/**
+ * This prevents the in-place droppable styles (under children) and allows to rather show an overlay with droppable styles (on top of children)
+ * @param isVisible
+ * @param children
+ * @param overlayProps
+ * @param className
+ * @param otherProps
+ * @constructor
+ */
+export const DropOverlayWrapper: React.FC<DropOverlayWrapperProps> = ({
+  isVisible,
+  children,
+  overlayProps,
+  className,
+  ...otherProps
+}) => {
+  return (
+    <div
+      className={classnames('domDragDrop__dropOverlayWrapper', className)}
+      {...(otherProps || {})}
+    >
+      {children}
+      {isVisible && (
+        <div
+          className="domDragDrop__dropOverlay"
+          data-test-subj="domDragDrop__dropOverlay"
+          {...(overlayProps || {})}
+        />
+      )}
+    </div>
+  );
+};
diff --git a/packages/kbn-dom-drag-drop/src/index.ts b/packages/kbn-dom-drag-drop/src/index.ts
index 340dba349612c..9fa4f37103522 100644
--- a/packages/kbn-dom-drag-drop/src/index.ts
+++ b/packages/kbn-dom-drag-drop/src/index.ts
@@ -9,3 +9,4 @@
 export * from './types';
 export * from './providers';
 export * from './drag_drop';
+export { DropOverlayWrapper, type DropOverlayWrapperProps } from './drop_overlay_wrapper';
diff --git a/packages/kbn-dom-drag-drop/src/providers/reorder_provider.tsx b/packages/kbn-dom-drag-drop/src/providers/reorder_provider.tsx
index 5dc83dbce915f..c2aa11eb8bc8d 100644
--- a/packages/kbn-dom-drag-drop/src/providers/reorder_provider.tsx
+++ b/packages/kbn-dom-drag-drop/src/providers/reorder_provider.tsx
@@ -8,7 +8,7 @@
 
 import React, { useState, useMemo } from 'react';
 import classNames from 'classnames';
-import { DEFAULT_DATA_TEST_SUBJ } from '../constants';
+import { DEFAULT_DATA_TEST_SUBJ, REORDER_ITEM_HEIGHT } from '../constants';
 
 /**
  * Reorder state
@@ -54,7 +54,7 @@ export const ReorderContext = React.createContext<ReorderContextState>({
   reorderState: {
     reorderedItems: [],
     direction: '-',
-    draggingHeight: 40,
+    draggingHeight: REORDER_ITEM_HEIGHT,
     isReorderOn: false,
     groupId: '',
   },
@@ -66,6 +66,7 @@ export const ReorderContext = React.createContext<ReorderContextState>({
  * @param id
  * @param children
  * @param className
+ * @param draggingHeight
  * @param dataTestSubj
  * @constructor
  */
@@ -73,17 +74,19 @@ export function ReorderProvider({
   id,
   children,
   className,
+  draggingHeight = REORDER_ITEM_HEIGHT,
   dataTestSubj = DEFAULT_DATA_TEST_SUBJ,
 }: {
   id: string;
   children: React.ReactNode;
   className?: string;
+  draggingHeight?: number;
   dataTestSubj?: string;
 }) {
   const [state, setState] = useState<ReorderContextState['reorderState']>({
     reorderedItems: [],
     direction: '-',
-    draggingHeight: 40,
+    draggingHeight,
     isReorderOn: false,
     groupId: id,
   });
diff --git a/packages/kbn-dom-drag-drop/src/sass/drag_drop.scss b/packages/kbn-dom-drag-drop/src/sass/drag_drop.scss
index d5587ae8ec6a4..56ce648266e7b 100644
--- a/packages/kbn-dom-drag-drop/src/sass/drag_drop.scss
+++ b/packages/kbn-dom-drag-drop/src/sass/drag_drop.scss
@@ -1,7 +1,6 @@
 @import './drag_drop_mixins';
 
 .domDragDrop {
-  user-select: none;
   transition: $euiAnimSpeedFast ease-in-out;
   transition-property: background-color, border-color, opacity;
   z-index: $domDragDropZLevel1;
@@ -12,11 +11,11 @@
   border: $euiBorderWidthThin dashed $euiBorderColor;
   position: absolute !important;  // sass-lint:disable-line no-important
   margin: 0 !important;  // sass-lint:disable-line no-important
-  bottom: 100%;
+  top: 0;
   width: 100%;
   left: 0;
   opacity: .9;
-  transform: translate(-12px, 8px);
+  transform: translate($euiSizeXS, $euiSizeXS);
   z-index: $domDragDropZLevel3;
   pointer-events: none;
   outline: $euiFocusRingSize solid currentColor; // Safari & Firefox
@@ -29,7 +28,8 @@
   @include mixinDomDragDropHover;
 
   // Include a possible nested button like when using FieldButton
-  > .kbnFieldButton__button {
+  & .kbnFieldButton__button,
+  & .euiLink {
     cursor: grab;
   }
 
@@ -39,14 +39,17 @@
 }
 
 // Drop area
-.domDragDrop-isDroppable {
+.domDragDrop-isDroppable:not(.domDragDrop__dropOverlayWrapper) {
   @include mixinDomDroppable;
 }
 
 // Drop area when there's an item being dragged
 .domDragDrop-isDropTarget {
-  @include mixinDomDroppable;
-  @include mixinDomDroppableActive;
+  &:not(.domDragDrop__dropOverlayWrapper) {
+    @include mixinDomDroppable;
+    @include mixinDomDroppableActive;
+  }
+
   > * {
     pointer-events: none;
   }
@@ -57,7 +60,7 @@
 }
 
 // Drop area while hovering with item
-.domDragDrop-isActiveDropTarget {
+.domDragDrop-isActiveDropTarget:not(.domDragDrop__dropOverlayWrapper) {
   z-index: $domDragDropZLevel3;
   @include mixinDomDroppableActiveHover;
 }
@@ -72,9 +75,9 @@
   text-decoration: line-through;
 }
 
-.domDragDrop-notCompatible {
+.domDragDrop-notCompatible:not(.domDragDrop__dropOverlayWrapper) {
   background-color: $euiColorHighlight !important;
-  border: $euiBorderWidthThin dashed $euiBorderColor !important;
+  border: $euiBorderWidthThin dashed $euiColorVis5 !important;
   &.domDragDrop-isActiveDropTarget {
     background-color: rgba(251, 208, 17, .25) !important;
     border-color: $euiColorVis5 !important;
@@ -91,12 +94,12 @@
   }
 }
 
-$lnsLayerPanelDimensionMargin: 8px;
+$reorderItemMargin: $euiSizeS;
 .domDragDrop__reorderableDrop {
   position: absolute;
   width: 100%;
   top: 0;
-  height: calc(100% + #{$lnsLayerPanelDimensionMargin});
+  height: calc(100% + #{$reorderItemMargin / 2});
 }
 
 .domDragDrop-translatableDrop {
@@ -146,6 +149,10 @@ $lnsLayerPanelDimensionMargin: 8px;
   }
 }
 
+.domDragDrop--isDragStarted {
+  opacity: .5;
+}
+
 .domDragDrop__extraDrops {
   opacity: 0;
   visibility: hidden;
@@ -193,7 +200,7 @@ $lnsLayerPanelDimensionMargin: 8px;
 
 .domDragDrop__extraDrop {
   position: relative;
-  height: $euiSizeXS * 10;
+  height: $euiSizeXS * 8;
   min-width: $euiSize * 7;
   color: $euiColorSuccessText;
   padding: $euiSizeXS;
@@ -201,3 +208,28 @@ $lnsLayerPanelDimensionMargin: 8px;
     color: $euiColorWarningText;
   }
 }
+
+.domDragDrop__dropOverlayWrapper {
+  position: relative;
+  height: 100%;
+}
+
+.domDragDrop__dropOverlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: $domDragDropZLevel3;
+  transition: $euiAnimSpeedFast ease-in-out;
+  transition-property: background-color, border-color, opacity;
+
+  .domDragDrop-isDropTarget & {
+    @include mixinDomDroppable($euiBorderWidthThick);
+    @include mixinDomDroppableActive($euiBorderWidthThick);
+  }
+
+  .domDragDrop-isActiveDropTarget & {
+    @include mixinDomDroppableActiveHover($euiBorderWidthThick);
+  }
+}
diff --git a/packages/kbn-dom-drag-drop/src/sass/drag_drop_mixins.scss b/packages/kbn-dom-drag-drop/src/sass/drag_drop_mixins.scss
index fbd460a67f7d0..fb495b4fcfba4 100644
--- a/packages/kbn-dom-drag-drop/src/sass/drag_drop_mixins.scss
+++ b/packages/kbn-dom-drag-drop/src/sass/drag_drop_mixins.scss
@@ -13,31 +13,32 @@ $domDragDropZLevel3: 3;
 @mixin mixinDomDraggable {
   @include euiSlightShadow;
   background: $euiColorEmptyShade;
-  border: $euiBorderWidthThin dashed transparent;
   cursor: grab;
 }
 
 // Static styles for a drop area
-@mixin mixinDomDroppable {
-  border: $euiBorderWidthThin dashed $euiBorderColor !important;
+@mixin mixinDomDroppable($borderWidth: $euiBorderWidthThin) {
+  border: $borderWidth dashed transparent;
 }
 
 // Hovering state for drag item and drop area
 @mixin mixinDomDragDropHover {
   &:hover {
-    border: $euiBorderWidthThin dashed $euiColorMediumShade !important;
+    transform: translateX($euiSizeXS);
+    transition: transform $euiAnimSpeedSlow ease-out;
   }
 }
 
 // Style for drop area when there's an item being dragged
-@mixin mixinDomDroppableActive {
+@mixin mixinDomDroppableActive($borderWidth: $euiBorderWidthThin) {
   background-color: transparentize($euiColorVis0, .9) !important;
+  border: $borderWidth dashed $euiColorVis0 !important;
 }
 
 // Style for drop area while hovering with item
-@mixin mixinDomDroppableActiveHover {
+@mixin mixinDomDroppableActiveHover($borderWidth: $euiBorderWidthThin) {
   background-color: transparentize($euiColorVis0, .75) !important;
-  border: $euiBorderWidthThin dashed $euiColorVis0 !important;
+  border: $borderWidth dashed $euiColorVis0 !important;
 }
 
 // Style for drop area that is not allowed for current item
diff --git a/packages/kbn-react-field/src/field_button/__snapshots__/field_button.test.tsx.snap b/packages/kbn-react-field/src/field_button/__snapshots__/field_button.test.tsx.snap
index e65b5fcb8fbbd..0b4ceaf06e863 100644
--- a/packages/kbn-react-field/src/field_button/__snapshots__/field_button.test.tsx.snap
+++ b/packages/kbn-react-field/src/field_button/__snapshots__/field_button.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`fieldAction is rendered 1`] = `
 <div
-  className="kbnFieldButton"
+  className="kbnFieldButton kbnFieldButton--s"
 >
   <button
     className="kbn-resetFocusState kbnFieldButton__button"
@@ -11,7 +11,11 @@ exports[`fieldAction is rendered 1`] = `
     <span
       className="kbnFieldButton__name"
     >
-      name
+      <span
+        className="kbnFieldButton__nameInner"
+      >
+        name
+      </span>
     </span>
   </button>
   <div
@@ -26,7 +30,7 @@ exports[`fieldAction is rendered 1`] = `
 
 exports[`fieldIcon is rendered 1`] = `
 <div
-  className="kbnFieldButton"
+  className="kbnFieldButton kbnFieldButton--s"
 >
   <button
     className="kbn-resetFocusState kbnFieldButton__button"
@@ -42,7 +46,11 @@ exports[`fieldIcon is rendered 1`] = `
     <span
       className="kbnFieldButton__name"
     >
-      name
+      <span
+        className="kbnFieldButton__nameInner"
+      >
+        name
+      </span>
     </span>
   </button>
 </div>
@@ -50,7 +58,7 @@ exports[`fieldIcon is rendered 1`] = `
 
 exports[`isActive defaults to false 1`] = `
 <div
-  className="kbnFieldButton"
+  className="kbnFieldButton kbnFieldButton--s"
 >
   <button
     className="kbn-resetFocusState kbnFieldButton__button"
@@ -59,7 +67,11 @@ exports[`isActive defaults to false 1`] = `
     <span
       className="kbnFieldButton__name"
     >
-      name
+      <span
+        className="kbnFieldButton__nameInner"
+      >
+        name
+      </span>
     </span>
   </button>
 </div>
@@ -67,7 +79,7 @@ exports[`isActive defaults to false 1`] = `
 
 exports[`isActive renders true 1`] = `
 <div
-  className="kbnFieldButton kbnFieldButton-isActive"
+  className="kbnFieldButton kbnFieldButton--s kbnFieldButton-isActive"
 >
   <button
     className="kbn-resetFocusState kbnFieldButton__button"
@@ -76,15 +88,19 @@ exports[`isActive renders true 1`] = `
     <span
       className="kbnFieldButton__name"
     >
-      name
+      <span
+        className="kbnFieldButton__nameInner"
+      >
+        name
+      </span>
     </span>
   </button>
 </div>
 `;
 
-exports[`isDraggable is rendered 1`] = `
+exports[`sizes s is applied 1`] = `
 <div
-  className="kbnFieldButton kbnFieldButton--isDraggable"
+  className="kbnFieldButton kbnFieldButton--s"
 >
   <button
     className="kbn-resetFocusState kbnFieldButton__button"
@@ -93,15 +109,19 @@ exports[`isDraggable is rendered 1`] = `
     <span
       className="kbnFieldButton__name"
     >
-      name
+      <span
+        className="kbnFieldButton__nameInner"
+      >
+        name
+      </span>
     </span>
   </button>
 </div>
 `;
 
-exports[`sizes m is applied 1`] = `
+exports[`sizes xs is applied 1`] = `
 <div
-  className="kbnFieldButton"
+  className="kbnFieldButton kbnFieldButton--xs"
 >
   <button
     className="kbn-resetFocusState kbnFieldButton__button"
@@ -110,16 +130,27 @@ exports[`sizes m is applied 1`] = `
     <span
       className="kbnFieldButton__name"
     >
-      name
+      <span
+        className="kbnFieldButton__nameInner"
+      >
+        name
+      </span>
     </span>
   </button>
 </div>
 `;
 
-exports[`sizes s is applied 1`] = `
+exports[`with drag handle is rendered 1`] = `
 <div
-  className="kbnFieldButton kbnFieldButton--small"
+  className="kbnFieldButton kbnFieldButton--s"
 >
+  <div
+    className="kbnFieldButton__dragHandle"
+  >
+    <span>
+      drag
+    </span>
+  </div>
   <button
     className="kbn-resetFocusState kbnFieldButton__button"
     onClick={[Function]}
@@ -127,7 +158,11 @@ exports[`sizes s is applied 1`] = `
     <span
       className="kbnFieldButton__name"
     >
-      name
+      <span
+        className="kbnFieldButton__nameInner"
+      >
+        name
+      </span>
     </span>
   </button>
 </div>
diff --git a/packages/kbn-react-field/src/field_button/field_button.scss b/packages/kbn-react-field/src/field_button/field_button.scss
index f71e097ab7138..5fd87c38b930e 100644
--- a/packages/kbn-react-field/src/field_button/field_button.scss
+++ b/packages/kbn-react-field/src/field_button/field_button.scss
@@ -2,8 +2,9 @@
   @include euiFontSizeS;
   border-radius: $euiBorderRadius;
   margin-bottom: $euiSizeXS;
+  padding: 0 $euiSizeS;
   display: flex;
-  align-items: center;
+  align-items: flex-start;
   transition: box-shadow $euiAnimSpeedFast $euiAnimSlightResistance,
     background-color $euiAnimSpeedFast $euiAnimSlightResistance; // sass-lint:disable-line indentation
 
@@ -13,29 +14,10 @@
   }
 }
 
-.kbnFieldButton--isDraggable {
-  background: lightOrDarkTheme($euiColorEmptyShade, $euiColorLightestShade);
-
-  &:hover,
-  &:focus,
-  &:focus-within {
-    @include euiBottomShadowMedium;
-    border-radius: $euiBorderRadius;
-    z-index: 2;
-  }
-
-  .kbnFieldButton__button {
-    &:hover,
-    &:focus {
-      cursor: grab;
-    }
-  }
-}
-
 .kbnFieldButton__button {
   flex-grow: 1;
   text-align: left;
-  padding: $euiSizeS;
+  padding: $euiSizeS 0;
   display: flex;
   align-items: flex-start;
   line-height: normal;
@@ -44,33 +26,55 @@
 .kbnFieldButton__fieldIcon {
   flex-shrink: 0;
   line-height: 0;
-  margin-right: $euiSizeS;
 }
 
 .kbnFieldButton__name {
   flex-grow: 1;
   word-break: break-word;
+  padding: 0 $euiSizeS;
 }
 
 .kbnFieldButton__infoIcon {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  min-height: $euiSize;
   flex-shrink: 0;
-  margin-left: $euiSizeXS;
+  line-height: 0;
 }
 
 .kbnFieldButton__fieldAction {
+  margin-left: $euiSizeS;
+}
+
+.kbnFieldButton__dragHandle {
   margin-right: $euiSizeS;
 }
 
+.kbnFieldButton__fieldAction,
+.kbnFieldButton__dragHandle {
+  line-height: $euiSizeXL;
+}
+
 // Reduce text size and spacing for the small size
-.kbnFieldButton--small {
+.kbnFieldButton--xs {
   font-size: $euiFontSizeXS;
 
   .kbnFieldButton__button {
-    padding: $euiSizeXS;
+    padding: $euiSizeXS 0;
   }
 
-  .kbnFieldButton__fieldIcon,
   .kbnFieldButton__fieldAction {
-    margin-right: $euiSizeXS;
+    margin-left: $euiSizeXS;
+  }
+
+  .kbnFieldButton__fieldAction,
+  .kbnFieldButton__dragHandle {
+    line-height: $euiSizeL;
   }
 }
+
+.kbnFieldButton--flushBoth {
+  padding-left: 0;
+  padding-right: 0;
+}
diff --git a/packages/kbn-react-field/src/field_button/field_button.test.tsx b/packages/kbn-react-field/src/field_button/field_button.test.tsx
index e61b41187ba7e..270144c7d346b 100644
--- a/packages/kbn-react-field/src/field_button/field_button.test.tsx
+++ b/packages/kbn-react-field/src/field_button/field_button.test.tsx
@@ -21,9 +21,11 @@ describe('sizes', () => {
   });
 });
 
-describe('isDraggable', () => {
+describe('with drag handle', () => {
   it('is rendered', () => {
-    const component = shallow(<FieldButton onClick={noop} fieldName="name" isDraggable />);
+    const component = shallow(
+      <FieldButton size="s" onClick={noop} fieldName="name" dragHandle={<span>drag</span>} />
+    );
     expect(component).toMatchSnapshot();
   });
 });
@@ -31,7 +33,7 @@ describe('isDraggable', () => {
 describe('fieldIcon', () => {
   it('is rendered', () => {
     const component = shallow(
-      <FieldButton onClick={noop} fieldName="name" fieldIcon={<span>fieldIcon</span>} />
+      <FieldButton size="s" onClick={noop} fieldName="name" fieldIcon={<span>fieldIcon</span>} />
     );
     expect(component).toMatchSnapshot();
   });
@@ -40,7 +42,12 @@ describe('fieldIcon', () => {
 describe('fieldAction', () => {
   it('is rendered', () => {
     const component = shallow(
-      <FieldButton onClick={noop} fieldName="name" fieldAction={<span>fieldAction</span>} />
+      <FieldButton
+        size="s"
+        onClick={noop}
+        fieldName="name"
+        fieldAction={<span>fieldAction</span>}
+      />
     );
     expect(component).toMatchSnapshot();
   });
@@ -48,11 +55,11 @@ describe('fieldAction', () => {
 
 describe('isActive', () => {
   it('defaults to false', () => {
-    const component = shallow(<FieldButton onClick={noop} fieldName="name" />);
+    const component = shallow(<FieldButton size="s" onClick={noop} fieldName="name" />);
     expect(component).toMatchSnapshot();
   });
   it('renders true', () => {
-    const component = shallow(<FieldButton onClick={noop} fieldName="name" isActive />);
+    const component = shallow(<FieldButton size="s" onClick={noop} fieldName="name" isActive />);
     expect(component).toMatchSnapshot();
   });
 });
diff --git a/packages/kbn-react-field/src/field_button/field_button.tsx b/packages/kbn-react-field/src/field_button/field_button.tsx
index 4871fea049710..8d87e0e04cb63 100644
--- a/packages/kbn-react-field/src/field_button/field_button.tsx
+++ b/packages/kbn-react-field/src/field_button/field_button.tsx
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import './field_button.scss';
 import classNames from 'classnames';
 import React, { ReactNode, HTMLAttributes, ButtonHTMLAttributes } from 'react';
 import { CommonProps } from '@elastic/eui';
+import './field_button.scss';
 
 export interface FieldButtonProps extends HTMLAttributes<HTMLDivElement> {
   /**
@@ -34,13 +34,20 @@ export interface FieldButtonProps extends HTMLAttributes<HTMLDivElement> {
    */
   isActive?: boolean;
   /**
-   * Styles the component differently to indicate it is draggable
+   * Custom drag handle element
+   */
+  dragHandle?: React.ReactElement;
+  /**
+   * Use the xs size in condensed areas
    */
-  isDraggable?: boolean;
+  size: ButtonSize;
   /**
-   * Use the small size in condensed areas
+   * Whether to skip side paddings
+   */
+  flush?: 'both';
+  /**
+   * Custom class name
    */
-  size?: ButtonSize;
   className?: string;
   /**
    * The component will render a `<button>` when provided an `onClick`
@@ -57,8 +64,8 @@ export interface FieldButtonProps extends HTMLAttributes<HTMLDivElement> {
 }
 
 const sizeToClassNameMap = {
-  s: 'kbnFieldButton--small',
-  m: null,
+  xs: 'kbnFieldButton--xs',
+  s: 'kbnFieldButton--s',
 } as const;
 
 export type ButtonSize = keyof typeof sizeToClassNameMap;
@@ -66,14 +73,15 @@ export type ButtonSize = keyof typeof sizeToClassNameMap;
 export const SIZES = Object.keys(sizeToClassNameMap) as ButtonSize[];
 
 export function FieldButton({
-  size = 'm',
+  size,
   isActive = false,
   fieldIcon,
   fieldName,
   fieldInfoIcon,
   fieldAction,
+  flush,
   className,
-  isDraggable = false,
+  dragHandle,
   onClick,
   dataTestSubj,
   buttonProps,
@@ -82,8 +90,10 @@ export function FieldButton({
   const classes = classNames(
     'kbnFieldButton',
     size ? sizeToClassNameMap[size] : null,
-    { 'kbnFieldButton-isActive': isActive },
-    { 'kbnFieldButton--isDraggable': isDraggable },
+    {
+      'kbnFieldButton-isActive': isActive,
+      'kbnFieldButton--flushBoth': flush === 'both',
+    },
     className
   );
 
@@ -92,13 +102,18 @@ export function FieldButton({
   const innerContent = (
     <>
       {fieldIcon && <span className="kbnFieldButton__fieldIcon">{fieldIcon}</span>}
-      {fieldName && <span className="kbnFieldButton__name">{fieldName}</span>}
+      {fieldName && (
+        <span className="kbnFieldButton__name">
+          <span className="kbnFieldButton__nameInner">{fieldName}</span>
+        </span>
+      )}
       {fieldInfoIcon && <div className="kbnFieldButton__infoIcon">{fieldInfoIcon}</div>}
     </>
   );
 
   return (
     <div className={classes} {...rest}>
+      {dragHandle && <div className="kbnFieldButton__dragHandle">{dragHandle}</div>}
       {onClick ? (
         <button
           onClick={(e) => {
diff --git a/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx b/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx
index b162d53564e91..74118cf674dad 100644
--- a/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx
+++ b/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import './discover_layout.scss';
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
 import {
   EuiButtonIcon,
   EuiFlexGroup,
@@ -21,6 +21,7 @@ import { i18n } from '@kbn/i18n';
 import { METRIC_TYPE } from '@kbn/analytics';
 import classNames from 'classnames';
 import { generateFilters } from '@kbn/data-plugin/public';
+import { DragContext } from '@kbn/dom-drag-drop';
 import { DataView, DataViewField, DataViewType } from '@kbn/data-views-plugin/public';
 import { VIEW_MODE } from '../../../../../common/constants';
 import { useInternalStateSelector } from '../../services/discover_internal_state_container';
@@ -207,6 +208,17 @@ export function DiscoverLayout({
 
   const resizeRef = useRef<HTMLDivElement>(null);
 
+  const dragDropContext = useContext(DragContext);
+  const draggingFieldName = dragDropContext.dragging?.id;
+
+  const onDropFieldToTable = useMemo(() => {
+    if (!draggingFieldName || currentColumns.includes(draggingFieldName)) {
+      return undefined;
+    }
+
+    return () => onAddColumn(draggingFieldName);
+  }, [onAddColumn, draggingFieldName, currentColumns]);
+
   const mainDisplay = useMemo(() => {
     if (resultState === 'none') {
       const globalQueryState = data.query.getState();
@@ -245,6 +257,7 @@ export function DiscoverLayout({
           onFieldEdited={onFieldEdited}
           resizeRef={resizeRef}
           inspectorAdapters={inspectorAdapters}
+          onDropFieldToTable={onDropFieldToTable}
         />
         {resultState === 'loading' && <LoadingSpinner />}
       </>
@@ -265,7 +278,9 @@ export function DiscoverLayout({
     savedSearch,
     stateContainer,
     viewMode,
+    onDropFieldToTable,
   ]);
+
   return (
     <EuiPage className="dscPage" data-fetch-counter={fetchCounter.current}>
       <h1
diff --git a/src/plugins/discover/public/application/main/components/layout/discover_main_content.tsx b/src/plugins/discover/public/application/main/components/layout/discover_main_content.tsx
index 9bde350774bf4..d8f8c5463dbab 100644
--- a/src/plugins/discover/public/application/main/components/layout/discover_main_content.tsx
+++ b/src/plugins/discover/public/application/main/components/layout/discover_main_content.tsx
@@ -8,6 +8,7 @@
 
 import { EuiFlexGroup, EuiFlexItem, EuiHorizontalRule } from '@elastic/eui';
 import { SavedSearch } from '@kbn/saved-search-plugin/public';
+import { DragDrop, type DropType, DropOverlayWrapper } from '@kbn/dom-drag-drop';
 import React, { useCallback } from 'react';
 import { DataView } from '@kbn/data-views-plugin/common';
 import { METRIC_TYPE } from '@kbn/analytics';
@@ -23,6 +24,19 @@ import { DOCUMENTS_VIEW_CLICK, FIELD_STATISTICS_VIEW_CLICK } from '../field_stat
 import { ErrorCallout } from '../../../../components/common/error_callout';
 import { useDataState } from '../../hooks/use_data_state';
 
+const DROP_PROPS = {
+  value: {
+    id: 'dscDropZoneTable',
+    humanData: {
+      label: i18n.translate('discover.dropZoneTableLabel', {
+        defaultMessage: 'Drop zone to add field as a column to the table',
+      }),
+    },
+  },
+  order: [1, 0, 0, 0],
+  types: ['field_add'] as DropType[],
+};
+
 export interface DiscoverMainContentProps {
   dataView: DataView;
   savedSearch: SavedSearch;
@@ -32,6 +46,7 @@ export interface DiscoverMainContentProps {
   viewMode: VIEW_MODE;
   onAddFilter: DocViewFilterFn | undefined;
   onFieldEdited: () => Promise<void>;
+  onDropFieldToTable?: () => void;
   columns: string[];
 }
 
@@ -45,6 +60,7 @@ export const DiscoverMainContent = ({
   columns,
   stateContainer,
   savedSearch,
+  onDropFieldToTable,
 }: DiscoverMainContentProps) => {
   const { trackUiMetric } = useDiscoverServices();
 
@@ -64,49 +80,65 @@ export const DiscoverMainContent = ({
   );
 
   const dataState = useDataState(stateContainer.dataState.data$.main$);
+  const isDropAllowed = Boolean(onDropFieldToTable);
 
   return (
-    <EuiFlexGroup
-      className="eui-fullHeight"
-      direction="column"
-      gutterSize="none"
-      responsive={false}
+    <DragDrop
+      draggable={false}
+      dropTypes={isDropAllowed ? DROP_PROPS.types : undefined}
+      value={DROP_PROPS.value}
+      order={DROP_PROPS.order}
+      onDrop={onDropFieldToTable}
     >
-      <EuiFlexItem grow={false}>
-        <EuiHorizontalRule margin="none" />
-        {!isPlainRecord && (
-          <DocumentViewModeToggle viewMode={viewMode} setDiscoverViewMode={setDiscoverViewMode} />
-        )}
-      </EuiFlexItem>
-      {dataState.error && (
-        <ErrorCallout
-          title={i18n.translate('discover.documentsErrorTitle', {
-            defaultMessage: 'Search error',
-          })}
-          error={dataState.error}
-          inline
-          data-test-subj="discoverMainError"
-        />
-      )}
-      {viewMode === VIEW_MODE.DOCUMENT_LEVEL ? (
-        <DiscoverDocuments
-          dataView={dataView}
-          navigateTo={navigateTo}
-          onAddFilter={!isPlainRecord ? onAddFilter : undefined}
-          savedSearch={savedSearch}
-          stateContainer={stateContainer}
-          onFieldEdited={!isPlainRecord ? onFieldEdited : undefined}
-        />
-      ) : (
-        <FieldStatisticsTab
-          savedSearch={savedSearch}
-          dataView={dataView}
-          columns={columns}
-          stateContainer={stateContainer}
-          onAddFilter={!isPlainRecord ? onAddFilter : undefined}
-          trackUiMetric={trackUiMetric}
-        />
-      )}
-    </EuiFlexGroup>
+      <DropOverlayWrapper isVisible={isDropAllowed}>
+        <EuiFlexGroup
+          className="eui-fullHeight"
+          direction="column"
+          gutterSize="none"
+          responsive={false}
+          data-test-subj="dscMainContent"
+        >
+          <EuiFlexItem grow={false}>
+            <EuiHorizontalRule margin="none" />
+            {!isPlainRecord && (
+              <DocumentViewModeToggle
+                viewMode={viewMode}
+                setDiscoverViewMode={setDiscoverViewMode}
+              />
+            )}
+          </EuiFlexItem>
+          {dataState.error && (
+            <ErrorCallout
+              title={i18n.translate('discover.documentsErrorTitle', {
+                defaultMessage: 'Search error',
+              })}
+              error={dataState.error}
+              inline
+              data-test-subj="discoverMainError"
+            />
+          )}
+
+          {viewMode === VIEW_MODE.DOCUMENT_LEVEL ? (
+            <DiscoverDocuments
+              dataView={dataView}
+              navigateTo={navigateTo}
+              onAddFilter={!isPlainRecord ? onAddFilter : undefined}
+              savedSearch={savedSearch}
+              stateContainer={stateContainer}
+              onFieldEdited={!isPlainRecord ? onFieldEdited : undefined}
+            />
+          ) : (
+            <FieldStatisticsTab
+              savedSearch={savedSearch}
+              dataView={dataView}
+              columns={columns}
+              stateContainer={stateContainer}
+              onAddFilter={!isPlainRecord ? onAddFilter : undefined}
+              trackUiMetric={trackUiMetric}
+            />
+          )}
+        </EuiFlexGroup>
+      </DropOverlayWrapper>
+    </DragDrop>
   );
 };
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_field.test.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_field.test.tsx
index 31919d1e2de20..778de3c3e8f94 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_field.test.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_field.test.tsx
@@ -7,7 +7,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { EuiPopover, EuiProgress, EuiButtonIcon } from '@elastic/eui';
+import { EuiButtonIcon, EuiPopover, EuiProgress } from '@elastic/eui';
 import React from 'react';
 import { BehaviorSubject } from 'rxjs';
 import { findTestSubject } from '@elastic/eui/lib/test';
@@ -23,6 +23,7 @@ import { DataDocuments$ } from '../../services/discover_data_state_container';
 import { getDataTableRecords } from '../../../../__fixtures__/real_hits';
 import * as DetailsUtil from './deprecated_stats/get_details';
 import { createDiscoverServicesMock } from '../../../../__mocks__/services';
+import { FieldItemButton } from '@kbn/unified-field-list-plugin/public';
 
 jest.spyOn(DetailsUtil, 'getDetails');
 
@@ -97,7 +98,10 @@ async function getComponent({
     onEditField: jest.fn(),
     onRemoveField: jest.fn(),
     showFieldStats,
-    selected,
+    isSelected: selected,
+    isEmpty: false,
+    groupIndex: 1,
+    itemIndex: 0,
     contextualFields: [],
   };
   const services = {
@@ -206,7 +210,7 @@ describe('discover sidebar field', function () {
     findTestSubject(comp, 'field-bytes-showDetails').simulate('click');
     expect(DetailsUtil.getDetails).toHaveBeenCalledTimes(1);
   });
-  it('should not return the popover if onAddFilter is not provided', async function () {
+  it('should not enable the popover if onAddFilter is not provided', async function () {
     const field = new DataViewField({
       name: '_source',
       type: '_source',
@@ -220,8 +224,8 @@ describe('discover sidebar field', function () {
       field,
       onAddFilterExists: false,
     });
-    const popover = findTestSubject(comp, 'discoverFieldListPanelPopover');
-    expect(popover.length).toBe(0);
+
+    expect(comp.find(FieldItemButton).prop('onClick')).toBeUndefined();
   });
   it('should request field stats', async function () {
     const field = new DataViewField({
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_field.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_field.tsx
index aa5fafe691fd8..b26f1dae2164d 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_field.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_field.tsx
@@ -8,162 +8,69 @@
 
 import './discover_field.scss';
 
-import React, { useState, useCallback, memo, useMemo } from 'react';
-import {
-  EuiButtonIcon,
-  EuiToolTip,
-  EuiTitle,
-  EuiIcon,
-  EuiSpacer,
-  EuiHighlight,
-} from '@elastic/eui';
+import React, { memo, useCallback, useMemo, useState } from 'react';
+import { EuiSpacer, EuiTitle } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { UiCounterMetricType } from '@kbn/analytics';
-import classNames from 'classnames';
-import { FieldButton } from '@kbn/react-field';
-import type { DataViewField, DataView } from '@kbn/data-views-plugin/public';
+import type { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import {
-  FieldIcon,
+  FieldItemButton,
+  type FieldItemButtonProps,
   FieldPopover,
   FieldPopoverHeader,
   FieldPopoverHeaderProps,
   FieldPopoverVisualize,
-  getFieldIconProps,
 } from '@kbn/unified-field-list-plugin/public';
+import { DragDrop } from '@kbn/dom-drag-drop';
 import { DiscoverFieldStats } from './discover_field_stats';
 import { DiscoverFieldDetails } from './deprecated_stats/discover_field_details';
 import { useDiscoverServices } from '../../../../hooks/use_discover_services';
-import { SHOW_LEGACY_FIELD_TOP_VALUES, PLUGIN_ID } from '../../../../../common';
+import { PLUGIN_ID, SHOW_LEGACY_FIELD_TOP_VALUES } from '../../../../../common';
 import { getUiActions } from '../../../../kibana_services';
 import { type DataDocuments$ } from '../../services/discover_data_state_container';
 
-const FieldInfoIcon: React.FC = memo(() => (
-  <EuiToolTip
-    position="bottom"
-    content={i18n.translate('discover.field.mappingConflict', {
-      defaultMessage:
-        'This field is defined as several types (string, integer, etc) across the indices that match this pattern.' +
-        'You may still be able to use this conflicting field, but it will be unavailable for functions that require Kibana to know their type. Correcting this issue will require reindexing your data.',
-    })}
-  >
-    <EuiIcon
-      tabIndex={0}
-      type="warning"
-      title={i18n.translate('discover.field.mappingConflict.title', {
-        defaultMessage: 'Mapping Conflict',
-      })}
-      size="s"
-    />
-  </EuiToolTip>
-));
-
-const DiscoverFieldTypeIcon: React.FC<{ field: DataViewField }> = memo(({ field }) => {
-  return <FieldIcon {...getFieldIconProps(field)} />;
-});
-
-const FieldName: React.FC<{ field: DataViewField; highlight?: string }> = memo(
-  ({ field, highlight }) => {
-    const title =
-      field.displayName !== field.name
-        ? i18n.translate('discover.field.title', {
-            defaultMessage: '{fieldName} ({fieldDisplayName})',
-            values: {
-              fieldName: field.name,
-              fieldDisplayName: field.displayName,
-            },
-          })
-        : field.displayName;
-
-    return (
-      <EuiHighlight
-        search={highlight || ''}
-        data-test-subj={`field-${field.name}`}
-        title={title}
-        className="dscSidebarField__name"
-      >
-        {field.displayName}
-      </EuiHighlight>
-    );
-  }
-);
-
-interface ActionButtonProps {
+interface GetCommonFieldItemButtonPropsParams {
   field: DataViewField;
-  isSelected?: boolean;
-  alwaysShow: boolean;
+  isSelected: boolean;
   toggleDisplay: (field: DataViewField, isSelected?: boolean) => void;
 }
 
-const ActionButton: React.FC<ActionButtonProps> = memo(
-  ({ field, isSelected, alwaysShow, toggleDisplay }) => {
-    const actionBtnClassName = classNames('dscSidebarItem__action', {
-      ['dscSidebarItem__mobile']: alwaysShow,
-    });
-    if (field.name === '_source') {
-      return null;
-    }
-    if (!isSelected) {
-      return (
-        <EuiToolTip
-          delay="long"
-          content={i18n.translate('discover.fieldChooser.discoverField.addFieldTooltip', {
-            defaultMessage: 'Add field as column',
-          })}
-        >
-          <EuiButtonIcon
-            iconType="plusInCircleFilled"
-            className={actionBtnClassName}
-            onClick={(ev: React.MouseEvent<HTMLButtonElement>) => {
-              if (ev.type === 'click') {
-                ev.currentTarget.focus();
-              }
-              ev.preventDefault();
-              ev.stopPropagation();
-              toggleDisplay(field, isSelected);
-            }}
-            data-test-subj={`fieldToggle-${field.name}`}
-            aria-label={i18n.translate('discover.fieldChooser.discoverField.addButtonAriaLabel', {
-              defaultMessage: 'Add {field} to table',
-              values: { field: field.name },
-            })}
-          />
-        </EuiToolTip>
-      );
-    } else {
-      return (
-        <EuiToolTip
-          key={`tooltip-${field.name}-${field.count || 0}-${isSelected}`}
-          delay="long"
-          content={i18n.translate('discover.fieldChooser.discoverField.removeFieldTooltip', {
-            defaultMessage: 'Remove field from table',
-          })}
-        >
-          <EuiButtonIcon
-            color="danger"
-            iconType="cross"
-            className={actionBtnClassName}
-            onClick={(ev: React.MouseEvent<HTMLButtonElement>) => {
-              if (ev.type === 'click') {
-                ev.currentTarget.focus();
-              }
-              ev.preventDefault();
-              ev.stopPropagation();
-              toggleDisplay(field, isSelected);
-            }}
-            data-test-subj={`fieldToggle-${field.name}`}
-            aria-label={i18n.translate(
-              'discover.fieldChooser.discoverField.removeButtonAriaLabel',
-              {
-                defaultMessage: 'Remove {field} from table',
-                values: { field: field.name },
-              }
-            )}
-          />
-        </EuiToolTip>
-      );
-    }
-  }
-);
+function getCommonFieldItemButtonProps({
+  field,
+  isSelected,
+  toggleDisplay,
+}: GetCommonFieldItemButtonPropsParams): {
+  field: FieldItemButtonProps<DataViewField>['field'];
+  isSelected: FieldItemButtonProps<DataViewField>['isSelected'];
+  dataTestSubj: FieldItemButtonProps<DataViewField>['dataTestSubj'];
+  buttonAddFieldToWorkspaceProps: FieldItemButtonProps<DataViewField>['buttonAddFieldToWorkspaceProps'];
+  buttonRemoveFieldFromWorkspaceProps: FieldItemButtonProps<DataViewField>['buttonRemoveFieldFromWorkspaceProps'];
+  onAddFieldToWorkspace: FieldItemButtonProps<DataViewField>['onAddFieldToWorkspace'];
+  onRemoveFieldFromWorkspace: FieldItemButtonProps<DataViewField>['onRemoveFieldFromWorkspace'];
+} {
+  const dataTestSubj = `fieldToggle-${field.name}`;
+  const handler =
+    field.name === '_source' ? undefined : (f: DataViewField) => toggleDisplay(f, isSelected);
+  return {
+    field,
+    isSelected,
+    dataTestSubj: `field-${field.name}-showDetails`,
+    buttonAddFieldToWorkspaceProps: {
+      'aria-label': i18n.translate('discover.fieldChooser.discoverField.addFieldTooltip', {
+        defaultMessage: 'Add field as column',
+      }),
+      'data-test-subj': dataTestSubj,
+    },
+    buttonRemoveFieldFromWorkspaceProps: {
+      'aria-label': i18n.translate('discover.fieldChooser.discoverField.removeFieldTooltip', {
+        defaultMessage: 'Remove field from table',
+      }),
+      'data-test-subj': dataTestSubj,
+    },
+    onAddFieldToWorkspace: handler,
+    onRemoveFieldFromWorkspace: handler,
+  };
+}
 
 interface MultiFieldsProps {
   multiFields: NonNullable<DiscoverFieldProps['multiFields']>;
@@ -183,22 +90,20 @@ const MultiFields: React.FC<MultiFieldsProps> = memo(
       </EuiTitle>
       <EuiSpacer size="xs" />
       {multiFields.map((entry) => (
-        <FieldButton
-          size="s"
+        <FieldItemButton
+          key={entry.field.name}
+          size="xs"
           className="dscSidebarItem dscSidebarItem--multi"
+          flush="both"
+          isEmpty={false}
           isActive={false}
-          dataTestSubj={`field-${entry.field.name}-showDetails`}
-          fieldIcon={<DiscoverFieldTypeIcon field={entry.field} />}
-          fieldAction={
-            <ActionButton
-              field={entry.field}
-              isSelected={entry.isSelected}
-              alwaysShow={alwaysShowActionButton}
-              toggleDisplay={toggleDisplay}
-            />
-          }
-          fieldName={<FieldName field={entry.field} />}
-          key={entry.field.name}
+          shouldAlwaysShowAction={alwaysShowActionButton}
+          onClick={undefined}
+          {...getCommonFieldItemButtonProps({
+            field: entry.field,
+            isSelected: entry.isSelected,
+            toggleDisplay,
+          })}
         />
       ))}
     </React.Fragment>
@@ -235,10 +140,14 @@ export interface DiscoverFieldProps {
    * @param fieldName
    */
   onRemoveField: (fieldName: string) => void;
+  /**
+   * Determines whether the field is empty
+   */
+  isEmpty: boolean;
   /**
    * Determines whether the field is selected
    */
-  selected?: boolean;
+  isSelected: boolean;
   /**
    * Metric tracking function
    * @param metricType
@@ -273,6 +182,16 @@ export interface DiscoverFieldProps {
    * Search by field name
    */
   highlight?: string;
+
+  /**
+   * Group index in the field list
+   */
+  groupIndex: number;
+
+  /**
+   * Item index in the field list
+   */
+  itemIndex: number;
 }
 
 function DiscoverFieldComponent({
@@ -284,13 +203,16 @@ function DiscoverFieldComponent({
   onAddField,
   onRemoveField,
   onAddFilter,
-  selected,
+  isEmpty,
+  isSelected,
   trackUiMetric,
   multiFields,
   onEditField,
   onDeleteField,
   showFieldStats,
   contextualFields,
+  groupIndex,
+  itemIndex,
 }: DiscoverFieldProps) {
   const services = useDiscoverServices();
   const [infoIsOpen, setOpen] = useState(false);
@@ -315,7 +237,7 @@ function DiscoverFieldComponent({
     setOpen(false);
   }, [setOpen]);
 
-  const toggleDisplay: ActionButtonProps['toggleDisplay'] = useCallback(
+  const toggleDisplay: GetCommonFieldItemButtonPropsParams['toggleDisplay'] = useCallback(
     (f, isCurrentlySelected) => {
       closePopover();
       if (isCurrentlySelected) {
@@ -349,51 +271,6 @@ function DiscoverFieldComponent({
     [field.name]
   );
 
-  if (field.type === '_source') {
-    return (
-      <FieldButton
-        size="s"
-        className="dscSidebarItem"
-        dataTestSubj={`field-${field.name}-showDetails`}
-        fieldIcon={<DiscoverFieldTypeIcon field={field} />}
-        fieldAction={
-          <ActionButton
-            field={field}
-            isSelected={selected}
-            alwaysShow={alwaysShowActionButton}
-            toggleDisplay={toggleDisplay}
-          />
-        }
-        fieldName={<FieldName field={field} />}
-      />
-    );
-  }
-
-  const button = (
-    <FieldButton
-      size="s"
-      className="dscSidebarItem"
-      isActive={infoIsOpen}
-      onClick={isDocumentRecord ? togglePopover : undefined}
-      dataTestSubj={`field-${field.name}-showDetails`}
-      fieldIcon={<DiscoverFieldTypeIcon field={field} />}
-      fieldAction={
-        <ActionButton
-          field={field}
-          isSelected={selected}
-          alwaysShow={alwaysShowActionButton}
-          toggleDisplay={toggleDisplay}
-        />
-      }
-      fieldName={<FieldName field={field} highlight={highlight} />}
-      fieldInfoIcon={field.type === 'conflict' && <FieldInfoIcon />}
-    />
-  );
-
-  if (!isDocumentRecord) {
-    return button;
-  }
-
   const renderPopover = () => {
     const showLegacyFieldStats = services.uiSettings.get(SHOW_LEGACY_FIELD_TOP_VALUES);
 
@@ -443,24 +320,57 @@ function DiscoverFieldComponent({
     );
   };
 
+  const value = useMemo(
+    () => ({
+      id: field.name,
+      humanData: {
+        label: field.displayName,
+        position: itemIndex + 1,
+      },
+    }),
+    [field, itemIndex]
+  );
+  const order = useMemo(() => [0, groupIndex, itemIndex], [groupIndex, itemIndex]);
+
   return (
     <FieldPopover
       isOpen={infoIsOpen}
-      button={button}
+      button={
+        <DragDrop
+          draggable
+          order={order}
+          value={value}
+          onDragStart={closePopover}
+          isDisabled={alwaysShowActionButton}
+          dataTestSubj={`dscFieldListPanelField-${field.name}`}
+        >
+          <FieldItemButton
+            size="xs"
+            fieldSearchHighlight={highlight}
+            className="dscSidebarItem"
+            isEmpty={isEmpty}
+            isActive={infoIsOpen}
+            flush={alwaysShowActionButton ? 'both' : undefined}
+            shouldAlwaysShowAction={alwaysShowActionButton}
+            onClick={field.type !== '_source' ? togglePopover : undefined}
+            {...getCommonFieldItemButtonProps({ field, isSelected, toggleDisplay })}
+          />
+        </DragDrop>
+      }
       closePopover={closePopover}
       data-test-subj="discoverFieldListPanelPopover"
       renderHeader={() => (
         <FieldPopoverHeader
           field={field}
           closePopover={closePopover}
-          onAddFieldToWorkspace={!selected ? toggleDisplay : undefined}
+          onAddFieldToWorkspace={!isSelected ? toggleDisplay : undefined}
           onAddFilter={onAddFilter}
           onEditField={onEditField}
           onDeleteField={onDeleteField}
           {...customPopoverHeaderProps}
         />
       )}
-      renderContent={renderPopover}
+      renderContent={isDocumentRecord ? renderPopover : undefined}
     />
   );
 }
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.scss b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.scss
index 806893269da34..d8e320822f5f7 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.scss
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.scss
@@ -38,29 +38,3 @@
 .dscSidebar__flyoutHeader {
   align-items: center;
 }
-
-.dscSidebarItem {
-  &:hover,
-  &:focus-within,
-  &[class*='-isActive'] {
-    .dscSidebarItem__action {
-      opacity: 1;
-    }
-  }
-}
-
-/**
- * 1. Only visually hide the action, so that it's still accessible to screen readers.
- * 2. When tabbed to, this element needs to be visible for keyboard accessibility.
- */
-.dscSidebarItem__action {
-  opacity: 0; /* 1 */
-
-  &.dscSidebarItem__mobile {
-    opacity: 1;
-  }
-
-  &:focus {
-    opacity: 1; /* 2 */
-  }
-}
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.tsx
index 2bea887c21a62..b335054ec9960 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.tsx
@@ -223,7 +223,7 @@ export function DiscoverSidebarComponent({
   });
 
   const renderFieldItem: FieldListGroupedProps<DataViewField>['renderFieldItem'] = useCallback(
-    ({ field, groupName, fieldSearchHighlight }) => (
+    ({ field, groupName, groupIndex, itemIndex, fieldSearchHighlight }) => (
       <li key={`field${field.name}`} data-attr-field={field.name}>
         <DiscoverField
           alwaysShowActionButton={alwaysShowActionButtons}
@@ -240,7 +240,10 @@ export function DiscoverSidebarComponent({
           onDeleteField={deleteField}
           showFieldStats={showFieldStats}
           contextualFields={columns}
-          selected={
+          groupIndex={groupIndex}
+          itemIndex={itemIndex}
+          isEmpty={groupName === FieldsGroupNames.EmptyFields}
+          isSelected={
             groupName === FieldsGroupNames.SelectedFields ||
             Boolean(selectedFieldsState.selectedFieldsMap[field.name])
           }
diff --git a/src/plugins/discover/public/application/main/discover_main_app.tsx b/src/plugins/discover/public/application/main/discover_main_app.tsx
index 176fd2a3044af..047cca9f33d57 100644
--- a/src/plugins/discover/public/application/main/discover_main_app.tsx
+++ b/src/plugins/discover/public/application/main/discover_main_app.tsx
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 import React, { useCallback, useEffect } from 'react';
+import { RootDragDropProvider } from '@kbn/dom-drag-drop';
 import { useHistory } from 'react-router-dom';
 import { SavedSearch } from '@kbn/saved-search-plugin/public';
 import { DataViewListItem } from '@kbn/data-views-plugin/public';
@@ -102,19 +103,21 @@ export function DiscoverMainApp(props: DiscoverMainProps) {
 
   return (
     <DiscoverMainProvider value={stateContainer}>
-      <DiscoverLayoutMemoized
-        inspectorAdapters={inspectorAdapters}
-        onChangeDataView={onChangeDataView}
-        onUpdateQuery={onUpdateQuery}
-        resetSavedSearch={resetCurrentSavedSearch}
-        navigateTo={navigateTo}
-        savedSearch={savedSearch}
-        searchSource={searchSource}
-        stateContainer={stateContainer}
-        persistDataView={persistDataView}
-        updateAdHocDataViewId={updateAdHocDataViewId}
-        updateDataViewList={updateDataViewList}
-      />
+      <RootDragDropProvider>
+        <DiscoverLayoutMemoized
+          inspectorAdapters={inspectorAdapters}
+          onChangeDataView={onChangeDataView}
+          onUpdateQuery={onUpdateQuery}
+          resetSavedSearch={resetCurrentSavedSearch}
+          navigateTo={navigateTo}
+          savedSearch={savedSearch}
+          searchSource={searchSource}
+          stateContainer={stateContainer}
+          persistDataView={persistDataView}
+          updateAdHocDataViewId={updateAdHocDataViewId}
+          updateDataViewList={updateDataViewList}
+        />
+      </RootDragDropProvider>
     </DiscoverMainProvider>
   );
 }
diff --git a/src/plugins/discover/tsconfig.json b/src/plugins/discover/tsconfig.json
index 546c1cd431b6a..1f9beedd297ac 100644
--- a/src/plugins/discover/tsconfig.json
+++ b/src/plugins/discover/tsconfig.json
@@ -52,6 +52,7 @@
     "@kbn/config-schema",
     "@kbn/storybook",
     "@kbn/shared-ux-router",
+    "@kbn/dom-drag-drop",
   ],
   "exclude": [
     "target/**/*",
diff --git a/src/plugins/unified_field_list/public/components/field_item_button/__snapshots__/field_item_button.test.tsx.snap b/src/plugins/unified_field_list/public/components/field_item_button/__snapshots__/field_item_button.test.tsx.snap
new file mode 100644
index 0000000000000..d1068660c1eaa
--- /dev/null
+++ b/src/plugins/unified_field_list/public/components/field_item_button/__snapshots__/field_item_button.test.tsx.snap
@@ -0,0 +1,278 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`UnifiedFieldList <FieldItemButton /> renders properly 1`] = `
+<FieldButton
+  buttonProps={
+    Object {
+      "aria-label": "Preview bytes: number",
+    }
+  }
+  className="unifiedFieldListItemButton unifiedFieldListItemButton--number unifiedFieldListItemButton--exists"
+  fieldIcon={
+    <WrappedFieldIcon
+      scripted={false}
+      type="number"
+    />
+  }
+  fieldName={
+    <EuiHighlight
+      data-test-subj="field-bytes"
+      search="by"
+      title="bytes"
+    >
+      bytes
+    </EuiHighlight>
+  }
+  isActive={false}
+  key="field-item-button-bytes"
+  onClick={[MockFunction]}
+  size="s"
+/>
+`;
+
+exports[`UnifiedFieldList <FieldItemButton /> renders properly for Records (Lens field) 1`] = `
+<FieldButton
+  buttonProps={
+    Object {
+      "aria-label": "Preview Records: document",
+    }
+  }
+  className="unifiedFieldListItemButton unifiedFieldListItemButton--document unifiedFieldListItemButton--exists"
+  fieldIcon={
+    <WrappedFieldIcon
+      scripted={false}
+      type="document"
+    />
+  }
+  fieldName={
+    <EuiHighlight
+      data-test-subj="field-___records___"
+      search="re"
+      title="Records"
+    >
+      Records
+    </EuiHighlight>
+  }
+  isActive={true}
+  key="field-item-button-___records___"
+  onClick={[MockFunction]}
+  size="s"
+/>
+`;
+
+exports[`UnifiedFieldList <FieldItemButton /> renders properly for text-based column field 1`] = `
+<FieldButton
+  buttonProps={
+    Object {
+      "aria-label": "Preview agent: string",
+    }
+  }
+  className="unifiedFieldListItemButton unifiedFieldListItemButton--string unifiedFieldListItemButton--exists"
+  fieldIcon={
+    <WrappedFieldIcon
+      type="string"
+    />
+  }
+  fieldName={
+    <EuiHighlight
+      data-test-subj="field-agent"
+      search="ag"
+      title="agent"
+    >
+      agent
+    </EuiHighlight>
+  }
+  isActive={false}
+  key="field-item-button-agent"
+  size="s"
+/>
+`;
+
+exports[`UnifiedFieldList <FieldItemButton /> renders properly when a conflict field 1`] = `
+<FieldButton
+  buttonProps={
+    Object {
+      "aria-label": "Preview custom_user_field: conflict",
+    }
+  }
+  className="unifiedFieldListItemButton unifiedFieldListItemButton--conflict unifiedFieldListItemButton--exists"
+  fieldIcon={
+    <WrappedFieldIcon
+      scripted={false}
+      type="conflict"
+    />
+  }
+  fieldInfoIcon={<FieldConflictInfoIcon />}
+  fieldName={
+    <EuiHighlight
+      data-test-subj="field-custom_user_field"
+      search=""
+      title="custom_user_field"
+    >
+      custom_user_field
+    </EuiHighlight>
+  }
+  isActive={true}
+  key="field-item-button-custom_user_field"
+  onClick={[MockFunction]}
+  size="s"
+/>
+`;
+
+exports[`UnifiedFieldList <FieldItemButton /> renders properly when empty 1`] = `
+<FieldButton
+  buttonProps={
+    Object {
+      "aria-label": "Preview script date: date",
+    }
+  }
+  className="unifiedFieldListItemButton unifiedFieldListItemButton--date unifiedFieldListItemButton--missing"
+  fieldIcon={
+    <WrappedFieldIcon
+      scripted={true}
+      type="date"
+    />
+  }
+  fieldName={
+    <EuiHighlight
+      data-test-subj="field-script date"
+      search=""
+      title="script date"
+    >
+      script date
+    </EuiHighlight>
+  }
+  isActive={false}
+  key="field-item-button-script date"
+  onClick={[MockFunction]}
+  size="s"
+/>
+`;
+
+exports[`UnifiedFieldList <FieldItemButton /> renders properly with a drag handle 1`] = `
+<FieldButton
+  buttonProps={
+    Object {
+      "aria-label": "Preview bytes: number",
+    }
+  }
+  className="unifiedFieldListItemButton unifiedFieldListItemButton--number unifiedFieldListItemButton--exists custom"
+  dataTestSubj="test-subj"
+  dragHandle={
+    <span>
+      dragHandle
+    </span>
+  }
+  fieldIcon={
+    <WrappedFieldIcon
+      scripted={false}
+      type="number"
+    />
+  }
+  fieldName={
+    <EuiHighlight
+      data-test-subj="field-bytes"
+      search=""
+      title="bytes"
+    >
+      bytes
+    </EuiHighlight>
+  }
+  isActive={false}
+  key="field-item-button-bytes"
+  size="xs"
+/>
+`;
+
+exports[`UnifiedFieldList <FieldItemButton /> renders properly with an action when deselected 1`] = `
+<FieldButton
+  buttonProps={
+    Object {
+      "aria-label": "Preview bytes: number",
+    }
+  }
+  className="unifiedFieldListItemButton unifiedFieldListItemButton--number unifiedFieldListItemButton--exists"
+  fieldAction={
+    <EuiToolTip
+      content="Add \\"bytes\\" field"
+      delay="regular"
+      display="inlineBlock"
+      position="top"
+    >
+      <EuiButtonIcon
+        aria-label="Add \\"bytes\\" field"
+        className="unifiedFieldListItemButton__action unifiedFieldListItemButton__action--always"
+        color="text"
+        data-test-subj="unifiedFieldListItem_addField-bytes"
+        iconType="plusInCircle"
+        onClick={[Function]}
+      />
+    </EuiToolTip>
+  }
+  fieldIcon={
+    <WrappedFieldIcon
+      scripted={false}
+      type="number"
+    />
+  }
+  fieldName={
+    <EuiHighlight
+      data-test-subj="field-bytes"
+      search=""
+      title="bytes"
+    >
+      bytes
+    </EuiHighlight>
+  }
+  isActive={false}
+  key="field-item-button-bytes"
+  size="s"
+/>
+`;
+
+exports[`UnifiedFieldList <FieldItemButton /> renders properly with an action when selected 1`] = `
+<FieldButton
+  buttonProps={
+    Object {
+      "aria-label": "Preview bytes: number",
+    }
+  }
+  className="unifiedFieldListItemButton unifiedFieldListItemButton--number unifiedFieldListItemButton--exists"
+  fieldAction={
+    <EuiToolTip
+      content="Remove \\"bytes\\" field"
+      delay="regular"
+      display="inlineBlock"
+      position="top"
+    >
+      <EuiButtonIcon
+        aria-label="Remove \\"bytes\\" field"
+        className="unifiedFieldListItemButton__action"
+        color="danger"
+        data-test-subj="unifiedFieldListItem_removeField-bytes"
+        iconType="cross"
+        onClick={[Function]}
+      />
+    </EuiToolTip>
+  }
+  fieldIcon={
+    <WrappedFieldIcon
+      scripted={false}
+      type="number"
+    />
+  }
+  fieldName={
+    <EuiHighlight
+      data-test-subj="field-bytes"
+      search=""
+      title="bytes"
+    >
+      bytes
+    </EuiHighlight>
+  }
+  isActive={false}
+  key="field-item-button-bytes"
+  onClick={[MockFunction click]}
+  size="s"
+/>
+`;
diff --git a/src/plugins/unified_field_list/public/components/field_item_button/field_item_button.scss b/src/plugins/unified_field_list/public/components/field_item_button/field_item_button.scss
index 591ed14133907..70073c37ea31c 100644
--- a/src/plugins/unified_field_list/public/components/field_item_button/field_item_button.scss
+++ b/src/plugins/unified_field_list/public/components/field_item_button/field_item_button.scss
@@ -24,13 +24,25 @@
   }
 }
 
-.unifiedFieldItemButton {
-  width: 100%;
+/**
+ * 1. Only visually hide the action, so that it's still accessible to screen readers.
+ * 2. When tabbed to, this element needs to be visible for keyboard accessibility.
+ */
+.unifiedFieldListItemButton__action {
+  opacity: 0; /* 1 */
 
-  &:hover:not([class*='isActive']) {
-    cursor: grab;
+  &--always {
+    opacity: 1;
   }
 
+  &:focus {
+    opacity: 1; /* 2 */
+  }
+}
+
+.unifiedFieldListItemButton {
+  width: 100%;
+
   &.kbnFieldButton {
     &:focus-within,
     &-isActive {
@@ -39,15 +51,22 @@
   }
 
   .kbnFieldButton__button:focus {
-    @include passDownFocusRing('.kbnFieldButton__name > span');
+    @include passDownFocusRing('.kbnFieldButton__nameInner');
+  }
+
+  & button .kbnFieldButton__nameInner:hover {
+    text-decoration: underline;
+  }
 
-    .kbnFieldButton__name > span {
-      text-decoration: underline;
+  &:hover,
+  &[class*='-isActive'] {
+    .unifiedFieldListItemButton__action {
+      opacity: 1;
     }
   }
 }
 
-.unifiedFieldItemButton--missing {
+.unifiedFieldListItemButton--missing {
   background: lightOrDarkTheme(transparentize($euiColorMediumShade, .9), $euiColorEmptyShade);
   color: $euiColorDarkShade;
 }
diff --git a/src/plugins/unified_field_list/public/components/field_item_button/field_item_button.test.tsx b/src/plugins/unified_field_list/public/components/field_item_button/field_item_button.test.tsx
new file mode 100644
index 0000000000000..e8f5be35815ae
--- /dev/null
+++ b/src/plugins/unified_field_list/public/components/field_item_button/field_item_button.test.tsx
@@ -0,0 +1,150 @@
+/*
+ * 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 { shallow } from 'enzyme';
+import { DataViewField } from '@kbn/data-views-plugin/common';
+import { DatatableColumn } from '@kbn/expressions-plugin/common';
+import { stubLogstashDataView as dataView } from '@kbn/data-views-plugin/common/data_view.stub';
+import { FieldItemButton } from './field_item_button';
+
+const bytesField = dataView.getFieldByName('bytes')!;
+const scriptedField = dataView.getFieldByName('script date')!;
+const conflictField = dataView.getFieldByName('custom_user_field')!;
+
+describe('UnifiedFieldList <FieldItemButton />', () => {
+  test('renders properly', () => {
+    const component = shallow(
+      <FieldItemButton
+        field={bytesField}
+        fieldSearchHighlight="by"
+        isEmpty={false}
+        isSelected={false}
+        isActive={false}
+        onClick={jest.fn()}
+      />
+    );
+    expect(component).toMatchSnapshot();
+  });
+
+  test('renders properly when empty', () => {
+    const component = shallow(
+      <FieldItemButton
+        field={scriptedField}
+        fieldSearchHighlight={undefined}
+        isEmpty={true}
+        isSelected={true}
+        isActive={false}
+        onClick={jest.fn()}
+      />
+    );
+    expect(component).toMatchSnapshot();
+  });
+
+  test('renders properly when a conflict field', () => {
+    const component = shallow(
+      <FieldItemButton
+        field={conflictField}
+        fieldSearchHighlight={undefined}
+        isEmpty={false}
+        isSelected={false}
+        isActive={true}
+        onClick={jest.fn()}
+      />
+    );
+    expect(component).toMatchSnapshot();
+  });
+
+  test('renders properly for Records (Lens field)', () => {
+    const component = shallow(
+      <FieldItemButton
+        field={
+          new DataViewField({
+            name: '___records___',
+            customLabel: 'Records',
+            type: 'document',
+            searchable: false,
+            aggregatable: true,
+          })
+        }
+        fieldSearchHighlight="re"
+        isEmpty={false}
+        isSelected={false}
+        isActive={true}
+        onClick={jest.fn()}
+      />
+    );
+    expect(component).toMatchSnapshot();
+  });
+
+  test('renders properly with an action when selected', () => {
+    const component = shallow(
+      <FieldItemButton
+        field={bytesField}
+        fieldSearchHighlight={undefined}
+        isEmpty={false}
+        isSelected={true}
+        isActive={false}
+        onClick={jest.fn().mockName('click')}
+        onAddFieldToWorkspace={jest.fn().mockName('add')}
+        onRemoveFieldFromWorkspace={jest.fn().mockName('remove')}
+      />
+    );
+    expect(component).toMatchSnapshot();
+  });
+
+  test('renders properly with an action when deselected', () => {
+    const component = shallow(
+      <FieldItemButton
+        field={bytesField}
+        fieldSearchHighlight={undefined}
+        isEmpty={false}
+        isSelected={false}
+        isActive={false}
+        onClick={undefined}
+        shouldAlwaysShowAction
+        onAddFieldToWorkspace={jest.fn().mockName('add')}
+        onRemoveFieldFromWorkspace={jest.fn().mockName('remove')}
+      />
+    );
+    expect(component).toMatchSnapshot();
+  });
+
+  test('renders properly with a drag handle', () => {
+    const component = shallow(
+      <FieldItemButton
+        size="xs"
+        className="custom"
+        dataTestSubj="test-subj"
+        dragHandle={<span>dragHandle</span>}
+        field={bytesField}
+        fieldSearchHighlight={undefined}
+        isEmpty={false}
+        isSelected={false}
+        isActive={false}
+        onClick={undefined}
+      />
+    );
+    expect(component).toMatchSnapshot();
+  });
+
+  test('renders properly for text-based column field', () => {
+    const component = shallow(
+      <FieldItemButton<DatatableColumn>
+        field={{ id: 'test', name: 'agent', meta: { type: 'string' } }}
+        fieldSearchHighlight="ag"
+        getCustomFieldType={(f) => f.meta.type}
+        isEmpty={false}
+        isSelected={false}
+        isActive={false}
+        onClick={undefined}
+      />
+    );
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/src/plugins/unified_field_list/public/components/field_item_button/field_item_button.tsx b/src/plugins/unified_field_list/public/components/field_item_button/field_item_button.tsx
index 4e9019f5692cd..df24125027e2f 100644
--- a/src/plugins/unified_field_list/public/components/field_item_button/field_item_button.tsx
+++ b/src/plugins/unified_field_list/public/components/field_item_button/field_item_button.tsx
@@ -10,7 +10,7 @@ import React from 'react';
 import { i18n } from '@kbn/i18n';
 import classnames from 'classnames';
 import { FieldButton, type FieldButtonProps } from '@kbn/react-field';
-import { EuiHighlight } from '@elastic/eui';
+import { EuiButtonIcon, EuiButtonIconProps, EuiHighlight, EuiIcon, EuiToolTip } from '@elastic/eui';
 import type { DataViewField } from '@kbn/data-views-plugin/common';
 import { type FieldListItem, type GetCustomFieldType } from '../../types';
 import { FieldIcon, getFieldIconProps } from '../field_icon';
@@ -22,72 +22,211 @@ import './field_item_button.scss';
 export interface FieldItemButtonProps<T extends FieldListItem> {
   field: T;
   fieldSearchHighlight?: string;
-  isActive?: FieldButtonProps['isActive'];
-  isEmpty?: boolean; // whether the field has data or not
+  isSelected: boolean; // whether a field is under Selected section
+  isActive: FieldButtonProps['isActive']; // whether a popover is open
+  isEmpty: boolean; // whether the field has data or not
   infoIcon?: FieldButtonProps['fieldInfoIcon'];
   className?: FieldButtonProps['className'];
+  flush?: FieldButtonProps['flush'];
+  dragHandle?: FieldButtonProps['dragHandle'];
   getCustomFieldType?: GetCustomFieldType<T>;
+  dataTestSubj?: string;
+  size?: FieldButtonProps['size'];
   onClick: FieldButtonProps['onClick'];
+  shouldAlwaysShowAction?: boolean; // should the field action be visible on hover or always
+  buttonAddFieldToWorkspaceProps?: Partial<EuiButtonIconProps>;
+  buttonRemoveFieldFromWorkspaceProps?: Partial<EuiButtonIconProps>;
+  onAddFieldToWorkspace?: (field: T) => unknown;
+  onRemoveFieldFromWorkspace?: (field: T) => unknown;
 }
 
 /**
- * Inner part of field list item
+ * Field list item component
  * @param field
  * @param fieldSearchHighlight
+ * @param isSelected
  * @param isActive
  * @param isEmpty
  * @param infoIcon
  * @param className
  * @param getCustomFieldType
+ * @param dataTestSubj
+ * @param size
  * @param onClick
+ * @param shouldAlwaysShowAction
+ * @param buttonAddFieldToWorkspaceProps
+ * @param buttonRemoveFieldFromWorkspaceProps
+ * @param onAddFieldToWorkspace
+ * @param onRemoveFieldFromWorkspace
  * @param otherProps
  * @constructor
  */
 export function FieldItemButton<T extends FieldListItem = DataViewField>({
   field,
   fieldSearchHighlight,
+  isSelected,
   isActive,
   isEmpty,
   infoIcon,
   className,
   getCustomFieldType,
+  dataTestSubj,
+  size,
   onClick,
+  shouldAlwaysShowAction,
+  buttonAddFieldToWorkspaceProps,
+  buttonRemoveFieldFromWorkspaceProps,
+  onAddFieldToWorkspace,
+  onRemoveFieldFromWorkspace,
   ...otherProps
 }: FieldItemButtonProps<T>) {
   const displayName = field.displayName || field.name;
+  const title =
+    displayName !== field.name && field.name !== '___records___'
+      ? i18n.translate('unifiedFieldList.fieldItemButton.fieldTitle', {
+          defaultMessage: '{fieldDisplayName} ({fieldName})',
+          values: {
+            fieldName: field.name,
+            fieldDisplayName: displayName,
+          },
+        })
+      : displayName;
+
   const iconProps = getCustomFieldType
     ? { type: getCustomFieldType(field) }
     : getFieldIconProps(field);
   const type = iconProps.type;
 
   const classes = classnames(
-    'unifiedFieldItemButton',
+    'unifiedFieldListItemButton',
     {
-      [`unifiedFieldItemButton--${type}`]: type,
-      [`unifiedFieldItemButton--exists`]: !isEmpty,
-      [`unifiedFieldItemButton--missing`]: isEmpty,
+      [`unifiedFieldListItemButton--${type}`]: type,
+      [`unifiedFieldListItemButton--exists`]: !isEmpty,
+      [`unifiedFieldListItemButton--missing`]: isEmpty,
     },
     className
   );
 
+  const addFieldToWorkspaceTooltip =
+    buttonAddFieldToWorkspaceProps?.['aria-label'] ??
+    i18n.translate('unifiedFieldList.fieldItemButton.addFieldToWorkspaceLabel', {
+      defaultMessage: 'Add "{field}" field',
+      values: {
+        field: field.displayName,
+      },
+    });
+
+  const removeFieldFromWorkspaceTooltip =
+    buttonRemoveFieldFromWorkspaceProps?.['aria-label'] ??
+    i18n.translate('unifiedFieldList.fieldItemButton.removeFieldToWorkspaceLabel', {
+      defaultMessage: 'Remove "{field}" field',
+      values: {
+        field: field.displayName,
+      },
+    });
+
+  const fieldActionClassName = classnames('unifiedFieldListItemButton__action', {
+    'unifiedFieldListItemButton__action--always': shouldAlwaysShowAction,
+  });
+  const fieldAction = isSelected
+    ? onRemoveFieldFromWorkspace && (
+        <EuiToolTip
+          key={`selected-to-remove-${field.name}-${removeFieldFromWorkspaceTooltip}`}
+          content={removeFieldFromWorkspaceTooltip}
+        >
+          <EuiButtonIcon
+            data-test-subj={`unifiedFieldListItem_removeField-${field.name}`}
+            aria-label={removeFieldFromWorkspaceTooltip}
+            {...(buttonRemoveFieldFromWorkspaceProps || {})}
+            className={classnames(
+              fieldActionClassName,
+              buttonRemoveFieldFromWorkspaceProps?.className
+            )}
+            color="danger"
+            iconType="cross"
+            onClick={(event: React.MouseEvent<HTMLButtonElement>) => {
+              event.preventDefault();
+              event.stopPropagation();
+              onRemoveFieldFromWorkspace(field);
+            }}
+          />
+        </EuiToolTip>
+      )
+    : onAddFieldToWorkspace && (
+        <EuiToolTip
+          key={`deselected-to-add-${field.name}-${addFieldToWorkspaceTooltip}`}
+          content={addFieldToWorkspaceTooltip}
+        >
+          <EuiButtonIcon
+            data-test-subj={`unifiedFieldListItem_addField-${field.name}`}
+            aria-label={addFieldToWorkspaceTooltip}
+            {...(buttonAddFieldToWorkspaceProps || {})}
+            className={classnames(fieldActionClassName, buttonAddFieldToWorkspaceProps?.className)}
+            color="text"
+            iconType="plusInCircle"
+            onClick={(event: React.MouseEvent<HTMLButtonElement>) => {
+              event.preventDefault();
+              event.stopPropagation();
+              onAddFieldToWorkspace(field);
+            }}
+          />
+        </EuiToolTip>
+      );
+
+  const conflictInfoIcon = field.type === 'conflict' ? <FieldConflictInfoIcon /> : null;
+
   return (
     <FieldButton
+      key={`field-item-button-${field.name}`}
+      dataTestSubj={dataTestSubj}
+      size={size || 's'}
       className={classes}
       isActive={isActive}
       buttonProps={{
-        ['aria-label']: i18n.translate('unifiedFieldList.fieldItemButtonAriaLabel', {
-          defaultMessage: 'Preview {fieldName}: {fieldType}',
+        ['aria-label']: i18n.translate('unifiedFieldList.fieldItemButton.ariaLabel', {
+          defaultMessage: 'Preview {fieldDisplayName}: {fieldType}',
           values: {
-            fieldName: displayName,
+            fieldDisplayName: displayName,
             fieldType: getCustomFieldType ? getCustomFieldType(field) : field.type,
           },
         }),
       }}
       fieldIcon={<FieldIcon {...iconProps} />}
-      fieldName={<EuiHighlight search={fieldSearchHighlight || ''}>{displayName}</EuiHighlight>}
-      fieldInfoIcon={infoIcon}
+      fieldName={
+        <EuiHighlight
+          search={fieldSearchHighlight || ''}
+          title={title}
+          data-test-subj={`field-${field.name}`}
+        >
+          {displayName}
+        </EuiHighlight>
+      }
+      fieldAction={fieldAction}
+      fieldInfoIcon={conflictInfoIcon || infoIcon}
       onClick={onClick}
       {...otherProps}
     />
   );
 }
+
+function FieldConflictInfoIcon() {
+  return (
+    <EuiToolTip
+      position="bottom"
+      content={i18n.translate('unifiedFieldList.fieldItemButton.mappingConflictDescription', {
+        defaultMessage:
+          'This field is defined as several types (string, integer, etc) across the indices that match this pattern.' +
+          'You may still be able to use this conflicting field, but it will be unavailable for functions that require Kibana to know their type. Correcting this issue will require reindexing your data.',
+      })}
+    >
+      <EuiIcon
+        tabIndex={0}
+        type="warning"
+        title={i18n.translate('unifiedFieldList.fieldItemButton.mappingConflictTitle', {
+          defaultMessage: 'Mapping Conflict',
+        })}
+        size="s"
+      />
+    </EuiToolTip>
+  );
+}
diff --git a/src/plugins/unified_field_list/public/index.ts b/src/plugins/unified_field_list/public/index.ts
index 5ea557dccca08..1ffeb955d344a 100755
--- a/src/plugins/unified_field_list/public/index.ts
+++ b/src/plugins/unified_field_list/public/index.ts
@@ -60,6 +60,7 @@ export type {
   FieldListGroups,
   FieldsGroupDetails,
   FieldTypeKnown,
+  FieldListItem,
   GetCustomFieldType,
 } from './types';
 export { ExistenceFetchStatus, FieldsGroupNames } from './types';
diff --git a/src/plugins/unified_field_list/tsconfig.json b/src/plugins/unified_field_list/tsconfig.json
index 23726803a1096..bf24189ddaeb7 100644
--- a/src/plugins/unified_field_list/tsconfig.json
+++ b/src/plugins/unified_field_list/tsconfig.json
@@ -28,6 +28,7 @@
     "@kbn/core-lifecycle-browser",
     "@kbn/react-field",
     "@kbn/field-types",
+    "@kbn/expressions-plugin",
   ],
   "exclude": [
     "target/**/*",
diff --git a/test/functional/apps/discover/group3/_drag_drop.ts b/test/functional/apps/discover/group3/_drag_drop.ts
new file mode 100644
index 0000000000000..49fa1ea16f5eb
--- /dev/null
+++ b/test/functional/apps/discover/group3/_drag_drop.ts
@@ -0,0 +1,71 @@
+/*
+ * 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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function ({ getService, getPageObjects }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const kibanaServer = getService('kibanaServer');
+  const PageObjects = getPageObjects(['common', 'discover', 'timePicker', 'header']);
+
+  describe('discover drag and drop', function describeIndexTests() {
+    before(async function () {
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
+    });
+
+    beforeEach(async () => {
+      await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover');
+      await kibanaServer.uiSettings.replace({
+        defaultIndex: 'logstash-*',
+      });
+      await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
+      await PageObjects.common.navigateToApp('discover');
+      await PageObjects.discover.waitUntilSearchingHasFinished();
+    });
+
+    afterEach(async () => {
+      await kibanaServer.importExport.unload('test/functional/fixtures/kbn_archiver/discover');
+      await kibanaServer.savedObjects.cleanStandardList();
+      await kibanaServer.uiSettings.replace({});
+      await PageObjects.discover.cleanSidebarLocalStorage();
+    });
+
+    describe('should add fields as columns via drag and drop', function () {
+      it('should support dragging and dropping a field onto the grid', async function () {
+        await PageObjects.header.waitUntilLoadingHasFinished();
+        await PageObjects.discover.waitUntilSidebarHasLoaded();
+
+        expect(await PageObjects.discover.getSidebarAriaDescription()).to.be(
+          '53 available fields. 0 empty fields. 3 meta fields.'
+        );
+        expect((await PageObjects.discover.getColumnHeaders()).join(', ')).to.be(
+          '@timestamp, Document'
+        );
+
+        await PageObjects.discover.dragFieldToTable('extension');
+
+        expect((await PageObjects.discover.getColumnHeaders()).join(', ')).to.be(
+          '@timestamp, extension'
+        );
+
+        await PageObjects.discover.dragFieldWithKeyboardToTable('@message');
+
+        expect((await PageObjects.discover.getColumnHeaders()).join(', ')).to.be(
+          '@timestamp, extension, @message'
+        );
+
+        await PageObjects.discover.waitUntilSearchingHasFinished();
+
+        expect(
+          (await PageObjects.discover.getSidebarSectionFieldNames('selected')).join(', ')
+        ).to.be('extension, @message');
+      });
+    });
+  });
+}
diff --git a/test/functional/apps/discover/group3/index.ts b/test/functional/apps/discover/group3/index.ts
index acaa8424c5284..a6481a8e7b82b 100644
--- a/test/functional/apps/discover/group3/index.ts
+++ b/test/functional/apps/discover/group3/index.ts
@@ -20,6 +20,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
       await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
     });
 
+    loadTestFile(require.resolve('./_drag_drop'));
     loadTestFile(require.resolve('./_sidebar'));
   });
 }
diff --git a/test/functional/page_objects/discover_page.ts b/test/functional/page_objects/discover_page.ts
index 0187825a03130..7873e70494569 100644
--- a/test/functional/page_objects/discover_page.ts
+++ b/test/functional/page_objects/discover_page.ts
@@ -394,7 +394,7 @@ export class DiscoverPageObject extends FtrService {
   public async getAllFieldNames() {
     const sidebar = await this.testSubjects.find('discover-sidebar');
     const $ = await sidebar.parseDomContent();
-    return $('.dscSidebarField__name')
+    return $('.kbnFieldButton__name')
       .toArray()
       .map((field) => $(field).text());
   }
@@ -868,4 +868,51 @@ export class DiscoverPageObject extends FtrService {
     await this.fieldEditor.save();
     await this.header.waitUntilLoadingHasFinished();
   }
+
+  private async waitForDropToFinish() {
+    await this.retry.try(async () => {
+      const exists = await this.find.existsByCssSelector('.domDragDrop-isActiveGroup');
+      if (exists) {
+        throw new Error('UI still in drag/drop mode');
+      }
+    });
+    await this.header.waitUntilLoadingHasFinished();
+    await this.waitUntilSearchingHasFinished();
+  }
+
+  /**
+   * Drags field to add as a column
+   *
+   * @param fieldName
+   * */
+  public async dragFieldToTable(fieldName: string) {
+    await this.waitUntilSidebarHasLoaded();
+
+    const from = `dscFieldListPanelField-${fieldName}`;
+    await this.find.existsByCssSelector(from);
+    await this.browser.html5DragAndDrop(
+      this.testSubjects.getCssSelector(from),
+      this.testSubjects.getCssSelector('dscMainContent')
+    );
+    await this.waitForDropToFinish();
+  }
+
+  /**
+   * Drags field with keyboard actions to add as a column
+   *
+   * @param fieldName
+   * */
+  public async dragFieldWithKeyboardToTable(fieldName: string) {
+    const field = await this.find.byCssSelector(
+      `[data-test-subj="domDragDrop_draggable-${fieldName}"] [data-test-subj="domDragDrop-keyboardHandler"]`
+    );
+    await field.focus();
+    await this.retry.try(async () => {
+      await this.browser.pressKeys(this.browser.keys.ENTER);
+      await this.testSubjects.exists('.domDragDrop-isDropTarget'); // checks if we're in dnd mode and there's any drop target active
+    });
+    await this.browser.pressKeys(this.browser.keys.RIGHT);
+    await this.browser.pressKeys(this.browser.keys.ENTER);
+    await this.waitForDropToFinish();
+  }
 }
diff --git a/x-pack/plugins/lens/public/datasources/common/field_item.scss b/x-pack/plugins/lens/public/datasources/common/field_item.scss
new file mode 100644
index 0000000000000..4e1949c19fc4a
--- /dev/null
+++ b/x-pack/plugins/lens/public/datasources/common/field_item.scss
@@ -0,0 +1,4 @@
+.lnsFieldItem__fieldPanel {
+  min-width: 260px;
+  max-width: 300px;
+}
diff --git a/x-pack/plugins/lens/public/datasources/form_based/field_item.test.tsx b/x-pack/plugins/lens/public/datasources/common/field_item.test.tsx
similarity index 94%
rename from x-pack/plugins/lens/public/datasources/form_based/field_item.test.tsx
rename to x-pack/plugins/lens/public/datasources/common/field_item.test.tsx
index 982a66fc05876..04362f5433c5d 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/field_item.test.tsx
+++ b/x-pack/plugins/lens/public/datasources/common/field_item.test.tsx
@@ -9,16 +9,15 @@ import React, { ReactElement } from 'react';
 import { ReactWrapper } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import { EuiLoadingSpinner, EuiPopover } from '@elastic/eui';
-import { InnerFieldItem, FieldItemProps } from './field_item';
+import { InnerFieldItem, FieldItemIndexPatternFieldProps } from './field_item';
 import { coreMock } from '@kbn/core/public/mocks';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { fieldFormatsServiceMock } from '@kbn/field-formats-plugin/public/mocks';
 import { IndexPattern } from '../../types';
 import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
-import { documentField } from './document_field';
+import { documentField } from '../form_based/document_field';
 import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
-import { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
@@ -32,12 +31,10 @@ jest.mock('@kbn/unified-field-list-plugin/public/services/field_stats', () => ({
   loadFieldStats: jest.fn().mockResolvedValue({}),
 }));
 
-const chartsThemeService = chartPluginMock.createSetupContract().theme;
-
 const clickField = async (wrapper: ReactWrapper, field: string) => {
   await act(async () => {
     await wrapper
-      .find(`[data-test-subj="lnsFieldListPanelField-${field}"] button`)
+      .find(`[data-test-subj="lnsFieldListPanelField-${field}"] .kbnFieldButton__button`)
       .simulate('click');
   });
 };
@@ -47,6 +44,7 @@ const mockedServices = {
   dataViews: dataViewPluginMocks.createStartContract(),
   fieldFormats: fieldFormatsServiceMock.createStartContract(),
   charts: chartPluginMock.createSetupContract(),
+  uiActions: uiActionsPluginMock.createStartContract(),
   uiSettings: coreMock.createStart().uiSettings,
   share: {
     url: {
@@ -64,7 +62,7 @@ const mockedServices = {
   },
 };
 
-const InnerFieldItemWrapper: React.FC<FieldItemProps> = (props) => {
+const InnerFieldItemWrapper: React.FC<FieldItemIndexPatternFieldProps> = (props) => {
   return (
     <KibanaContextProvider services={mockedServices}>
       <InnerFieldItem {...props} />
@@ -72,7 +70,7 @@ const InnerFieldItemWrapper: React.FC<FieldItemProps> = (props) => {
   );
 };
 
-async function getComponent(props: FieldItemProps) {
+async function getComponent(props: FieldItemIndexPatternFieldProps) {
   const instance = await mountWithIntl(<InnerFieldItemWrapper {...props} />);
   // wait for lazy modules
   await new Promise((resolve) => setTimeout(resolve, 0));
@@ -80,8 +78,8 @@ async function getComponent(props: FieldItemProps) {
   return instance;
 }
 
-describe('IndexPattern Field Item', () => {
-  let defaultProps: FieldItemProps;
+describe('Lens Field Item', () => {
+  let defaultProps: FieldItemIndexPatternFieldProps;
   let indexPattern: IndexPattern;
   let dataView: DataView;
 
@@ -146,13 +144,6 @@ describe('IndexPattern Field Item', () => {
 
     defaultProps = {
       indexPattern,
-      fieldFormats: {
-        ...fieldFormatsServiceMock.createStartContract(),
-        getDefaultInstance: jest.fn(() => ({
-          convert: jest.fn((s: unknown) => JSON.stringify(s)),
-        })),
-      } as unknown as FieldFormatsStart,
-      core: coreMock.createStart(),
       highlight: '',
       dateRange: {
         fromDate: 'now-7d',
@@ -168,17 +159,17 @@ describe('IndexPattern Field Item', () => {
         searchable: true,
       },
       exists: true,
-      chartsThemeService,
       groupIndex: 0,
       itemIndex: 0,
       dropOntoWorkspace: () => {},
       hasSuggestionForField: () => false,
-      uiActions: uiActionsPluginMock.createStartContract(),
     };
 
     dataView = {
       ...indexPattern,
-      getFormatterForField: defaultProps.fieldFormats.getDefaultInstance,
+      getFormatterForField: jest.fn(() => ({
+        convert: jest.fn((s: unknown) => JSON.stringify(s)),
+      })),
     } as unknown as DataView;
 
     (mockedServices.dataViews.get as jest.Mock).mockImplementation(() => {
diff --git a/x-pack/plugins/lens/public/datasources/form_based/field_item.tsx b/x-pack/plugins/lens/public/datasources/common/field_item.tsx
similarity index 72%
rename from x-pack/plugins/lens/public/datasources/form_based/field_item.tsx
rename to x-pack/plugins/lens/public/datasources/common/field_item.tsx
index 5774a803b5985..4d070138d81d3 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/field_item.tsx
+++ b/x-pack/plugins/lens/public/datasources/common/field_item.tsx
@@ -8,14 +8,11 @@
 import './field_item.scss';
 
 import React, { useCallback, useState, useMemo } from 'react';
-import { EuiText, EuiButton, EuiPopoverFooter, EuiIconTip } from '@elastic/eui';
+import { EuiText, EuiButton, EuiPopoverFooter } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
-import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import { Filter, Query } from '@kbn/es-query';
 import { DataViewField, type DataView } from '@kbn/data-views-plugin/common';
-import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
-import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import {
   AddFieldFilterHandler,
   FieldStats,
@@ -23,37 +20,59 @@ import {
   FieldPopoverHeader,
   FieldPopoverVisualize,
   FieldItemButton,
+  type GetCustomFieldType,
 } from '@kbn/unified-field-list-plugin/public';
 import { DragDrop } from '@kbn/dom-drag-drop';
 import { generateFilters, getEsQueryConfig } from '@kbn/data-plugin/public';
+import { type DatatableColumn } from '@kbn/expressions-plugin/common';
 import { DatasourceDataPanelProps } from '../../types';
 import type { IndexPattern, IndexPatternField } from '../../types';
 import type { LensAppServices } from '../../app_plugin/types';
 import { APP_ID, DOCUMENT_FIELD_NAME } from '../../../common/constants';
 import { combineQueryAndFilters } from '../../app_plugin/show_underlying_data';
+import { getFieldItemActions } from './get_field_item_actions';
 
-export interface FieldItemProps {
-  core: DatasourceDataPanelProps['core'];
-  fieldFormats: FieldFormatsStart;
-  field: IndexPatternField;
-  indexPattern: IndexPattern;
+type LensFieldListItem = IndexPatternField | DatatableColumn | DataViewField;
+
+function isTextBasedColumnField(field: LensFieldListItem): field is DatatableColumn {
+  return !('type' in field) && Boolean(field?.meta.type);
+}
+
+interface FieldItemBaseProps {
   highlight?: string;
   exists: boolean;
-  query: Query;
-  dateRange: DatasourceDataPanelProps['dateRange'];
-  chartsThemeService: ChartsPluginSetup['theme'];
-  filters: Filter[];
   hideDetails?: boolean;
   itemIndex: number;
   groupIndex: number;
   dropOntoWorkspace: DatasourceDataPanelProps['dropOntoWorkspace'];
+  hasSuggestionForField: DatasourceDataPanelProps['hasSuggestionForField'];
+}
+
+export interface FieldItemIndexPatternFieldProps extends FieldItemBaseProps {
+  field: IndexPatternField;
+  indexPattern: IndexPattern;
+  query: Query;
+  dateRange: DatasourceDataPanelProps['dateRange'];
+  filters: Filter[];
   editField?: (name: string) => void;
   removeField?: (name: string) => void;
-  hasSuggestionForField: DatasourceDataPanelProps['hasSuggestionForField'];
-  uiActions: UiActionsStart;
+  getCustomFieldType?: never;
 }
 
-export const InnerFieldItem = function InnerFieldItem(props: FieldItemProps) {
+export interface FieldItemDatatableColumnProps extends FieldItemBaseProps {
+  field: DatatableColumn;
+  indexPattern?: never;
+  query?: never;
+  dateRange?: never;
+  filters?: never;
+  editField?: never;
+  removeField?: never;
+  getCustomFieldType: GetCustomFieldType<DatatableColumn>;
+}
+
+export type FieldItemProps = FieldItemIndexPatternFieldProps | FieldItemDatatableColumnProps;
+
+export function InnerFieldItem(props: FieldItemProps) {
   const {
     field,
     indexPattern,
@@ -66,9 +85,21 @@ export const InnerFieldItem = function InnerFieldItem(props: FieldItemProps) {
     hasSuggestionForField,
     editField,
     removeField,
+    getCustomFieldType,
   } = props;
-
-  const dataViewField = useMemo(() => new DataViewField(field), [field]);
+  const dataViewField = useMemo(() => {
+    // DatatableColumn type
+    if (isTextBasedColumnField(field)) {
+      return new DataViewField({
+        name: field.name,
+        type: field.meta?.type ?? 'unknown',
+        searchable: true,
+        aggregatable: true,
+      });
+    }
+    // IndexPatternField type
+    return new DataViewField(field);
+  }, [field]);
   const services = useKibana<LensAppServices>().services;
   const filterManager = services?.data?.query?.filterManager;
   const [infoIsOpen, setOpen] = useState(false);
@@ -83,7 +114,7 @@ export const InnerFieldItem = function InnerFieldItem(props: FieldItemProps) {
 
   const addFilterAndClose: AddFieldFilterHandler | undefined = useMemo(
     () =>
-      filterManager
+      filterManager && indexPattern
         ? (clickedField, values, operation) => {
             closePopover();
             const newFilters = generateFilters(
@@ -121,52 +152,45 @@ export const InnerFieldItem = function InnerFieldItem(props: FieldItemProps) {
     [removeField, closePopover]
   );
 
+  const indexPatternId = indexPattern?.id;
   const value = useMemo(
-    () => ({
-      field,
-      indexPatternId: indexPattern.id,
-      id: field.name,
-      humanData: {
-        label: field.displayName,
-        position: itemIndex + 1,
-      },
-    }),
-    [field, indexPattern.id, itemIndex]
+    () =>
+      isTextBasedColumnField(field)
+        ? {
+            field: field.name,
+            id: field.id,
+            humanData: { label: field.name },
+          }
+        : {
+            field,
+            indexPatternId,
+            id: field.name,
+            humanData: {
+              label: field.displayName,
+              position: itemIndex + 1,
+            },
+          },
+    [field, indexPatternId, itemIndex]
   );
 
-  const dropOntoWorkspaceAndClose = useCallback(() => {
-    closePopover();
-    dropOntoWorkspace(value);
-  }, [dropOntoWorkspace, closePopover, value]);
-
-  const onDragStart = useCallback(() => {
-    setOpen(false);
-  }, [setOpen]);
-
   const order = useMemo(() => [0, groupIndex, itemIndex], [groupIndex, itemIndex]);
 
-  const lensInfoIcon = (
-    <EuiIconTip
-      anchorClassName="lnsFieldItem__infoIcon"
-      content={
-        hideDetails
-          ? i18n.translate('xpack.lens.indexPattern.fieldItemTooltip', {
-              defaultMessage: 'Drag and drop to visualize.',
-            })
-          : exists
-          ? i18n.translate('xpack.lens.indexPattern.fieldStatsButtonLabel', {
-              defaultMessage: 'Click for a field preview, or drag and drop to visualize.',
-            })
-          : i18n.translate('xpack.lens.indexPattern.fieldStatsButtonEmptyLabel', {
-              defaultMessage:
-                'This field doesn’t have any data but you can still drag and drop to visualize.',
-            })
-      }
-      type="iInCircle"
-      color="subdued"
-      size="s"
-    />
-  );
+  const { buttonAddFieldToWorkspaceProps, onAddFieldToWorkspace } = getFieldItemActions({
+    value,
+    hasSuggestionForField,
+    dropOntoWorkspace,
+    closeFieldPopover: closePopover,
+  });
+
+  const commonFieldItemButtonProps = {
+    isSelected: false, // multiple selections are allowed
+    isEmpty: !exists,
+    isActive: infoIsOpen,
+    fieldSearchHighlight: highlight,
+    onClick: togglePopover,
+    buttonAddFieldToWorkspaceProps,
+    onAddFieldToWorkspace,
+  };
 
   return (
     <li>
@@ -187,41 +211,26 @@ export const InnerFieldItem = function InnerFieldItem(props: FieldItemProps) {
             order={order}
             value={value}
             dataTestSubj={`lnsFieldListPanelField-${field.name}`}
-            onDragStart={onDragStart}
+            onDragStart={closePopover}
           >
-            <FieldItemButton<IndexPatternField>
-              isEmpty={!exists}
-              isActive={infoIsOpen}
-              infoIcon={lensInfoIcon}
-              field={field}
-              fieldSearchHighlight={highlight}
-              onClick={togglePopover}
-            />
+            {isTextBasedColumnField(field) ? (
+              <FieldItemButton<DatatableColumn>
+                field={field}
+                getCustomFieldType={getCustomFieldType}
+                {...commonFieldItemButtonProps}
+              />
+            ) : (
+              <FieldItemButton field={field} {...commonFieldItemButtonProps} />
+            )}
           </DragDrop>
         }
         renderHeader={() => {
-          const canAddToWorkspace = hasSuggestionForField(value);
-          const buttonTitle = canAddToWorkspace
-            ? i18n.translate('xpack.lens.indexPattern.moveToWorkspace', {
-                defaultMessage: 'Add {field} to workspace',
-                values: {
-                  field: value.field.name,
-                },
-              })
-            : i18n.translate('xpack.lens.indexPattern.moveToWorkspaceNotAvailable', {
-                defaultMessage:
-                  'To visualize this field, please add it directly to the desired layer. Adding this field to the workspace is not supported based on your current configuration.',
-              });
-
           return (
             <FieldPopoverHeader
               field={dataViewField}
               closePopover={closePopover}
-              buttonAddFieldToWorkspaceProps={{
-                isDisabled: !canAddToWorkspace,
-                'aria-label': buttonTitle,
-              }}
-              onAddFieldToWorkspace={dropOntoWorkspaceAndClose}
+              buttonAddFieldToWorkspaceProps={buttonAddFieldToWorkspaceProps}
+              onAddFieldToWorkspace={onAddFieldToWorkspace}
               onAddFilter={addFilterAndClose}
               onEditField={editFieldAndClose}
               onDeleteField={removeFieldAndClose}
@@ -242,9 +251,9 @@ export const InnerFieldItem = function InnerFieldItem(props: FieldItemProps) {
       />
     </li>
   );
-};
+}
 
-export const FieldItem = React.memo(InnerFieldItem);
+export const FieldItem = React.memo(InnerFieldItem) as typeof InnerFieldItem;
 
 function FieldItemPopoverContents(
   props: FieldItemProps & {
@@ -252,10 +261,13 @@ function FieldItemPopoverContents(
     onAddFilter: AddFieldFilterHandler | undefined;
   }
 ) {
-  const { query, filters, indexPattern, dataViewField, dateRange, onAddFilter, uiActions } = props;
+  const { query, filters, indexPattern, dataViewField, dateRange, onAddFilter } = props;
   const services = useKibana<LensAppServices>().services;
 
   const exploreInDiscover = useMemo(() => {
+    if (!indexPattern) {
+      return null;
+    }
     const meta = {
       id: indexPattern.id,
       columns: [dataViewField.name],
@@ -290,6 +302,10 @@ function FieldItemPopoverContents(
     });
   }, [dataViewField.name, filters, indexPattern, query, services]);
 
+  if (!indexPattern) {
+    return null;
+  }
+
   return (
     <>
       <FieldStats
@@ -330,7 +346,7 @@ function FieldItemPopoverContents(
           field={dataViewField}
           dataView={{ ...indexPattern, toSpec: () => indexPattern.spec } as unknown as DataView}
           originatingApp={APP_ID}
-          uiActions={uiActions}
+          uiActions={services.uiActions}
           buttonProps={{
             'data-test-subj': `lensVisualize-GeoField-${dataViewField.name}`,
           }}
diff --git a/x-pack/plugins/lens/public/datasources/common/get_field_item_actions.tsx b/x-pack/plugins/lens/public/datasources/common/get_field_item_actions.tsx
new file mode 100644
index 0000000000000..70f4d58fd6ce4
--- /dev/null
+++ b/x-pack/plugins/lens/public/datasources/common/get_field_item_actions.tsx
@@ -0,0 +1,56 @@
+/*
+ * 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 DragDropIdentifier } from '@kbn/dom-drag-drop';
+import type { FieldItemButtonProps, FieldListItem } from '@kbn/unified-field-list-plugin/public';
+import { i18n } from '@kbn/i18n';
+import { type DataViewField } from '@kbn/data-views-plugin/common';
+
+interface GetFieldItemActionsParams<T extends FieldListItem> {
+  value: DragDropIdentifier;
+  dropOntoWorkspace: (value: DragDropIdentifier) => void;
+  hasSuggestionForField: (value: DragDropIdentifier) => boolean;
+  closeFieldPopover?: () => void;
+}
+
+interface GetFieldItemActionsResult<T extends FieldListItem> {
+  buttonAddFieldToWorkspaceProps: FieldItemButtonProps<T>['buttonAddFieldToWorkspaceProps'];
+  onAddFieldToWorkspace: FieldItemButtonProps<T | DataViewField>['onAddFieldToWorkspace'];
+}
+
+export function getFieldItemActions<T extends FieldListItem>({
+  value,
+  hasSuggestionForField,
+  dropOntoWorkspace,
+  closeFieldPopover,
+}: GetFieldItemActionsParams<T>): GetFieldItemActionsResult<T> {
+  const canAddToWorkspace = hasSuggestionForField(value);
+  const addToWorkplaceButtonTitle = canAddToWorkspace
+    ? i18n.translate('xpack.lens.indexPattern.moveToWorkspace', {
+        defaultMessage: 'Add {field} to workspace',
+        values: {
+          field: value.humanData.label,
+        },
+      })
+    : i18n.translate('xpack.lens.indexPattern.moveToWorkspaceNotAvailable', {
+        defaultMessage:
+          'To visualize this field, please add it directly to the desired layer. Adding this field to the workspace is not supported based on your current configuration.',
+      });
+
+  const dropOntoWorkspaceAndClose = () => {
+    closeFieldPopover?.();
+    dropOntoWorkspace(value);
+  };
+
+  return {
+    buttonAddFieldToWorkspaceProps: {
+      isDisabled: !canAddToWorkspace,
+      'aria-label': addToWorkplaceButtonTitle,
+    },
+    onAddFieldToWorkspace: dropOntoWorkspaceAndClose,
+  };
+}
diff --git a/x-pack/plugins/lens/public/datasources/form_based/datapanel.test.tsx b/x-pack/plugins/lens/public/datasources/form_based/datapanel.test.tsx
index 364e811740737..c32ac66051eae 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/datapanel.test.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/datapanel.test.tsx
@@ -17,7 +17,7 @@ import { InnerFormBasedDataPanel, FormBasedDataPanel } from './datapanel';
 import { FieldListGrouped } from '@kbn/unified-field-list-plugin/public';
 import * as UseExistingFieldsApi from '@kbn/unified-field-list-plugin/public/hooks/use_existing_fields';
 import * as ExistingFieldsServiceApi from '@kbn/unified-field-list-plugin/public/services/field_existing/load_field_existing';
-import { FieldItem } from './field_item';
+import { FieldItem } from '../common/field_item';
 import { act } from 'react-dom/test-utils';
 import { coreMock } from '@kbn/core/public/mocks';
 import { FormBasedPrivateState } from './types';
@@ -37,6 +37,7 @@ import { DataViewsState } from '../../state_management';
 import { DataView } from '@kbn/data-views-plugin/public';
 import { UI_SETTINGS } from '@kbn/data-plugin/public';
 import { ReactWrapper } from 'enzyme';
+import { IndexPatternField } from '../../types';
 
 const fieldsOne = [
   {
@@ -787,7 +788,11 @@ describe('FormBased Data Panel', () => {
     it('should list all supported fields in the pattern sorted alphabetically in groups', async () => {
       const wrapper = await mountAndWaitForLazyModules(<InnerFormBasedDataPanel {...props} />);
 
-      expect(wrapper.find(FieldItem).first().prop('field').displayName).toEqual('Records');
+      expect(wrapper.find(FieldItem).first().prop('field')).toEqual(
+        expect.objectContaining({
+          displayName: 'Records',
+        })
+      );
       const availableAccordion = wrapper.find('[data-test-subj="lnsIndexPatternAvailableFields"]');
       expect(
         availableAccordion.find(FieldItem).map((fieldItem) => fieldItem.prop('field').name)
@@ -803,7 +808,9 @@ describe('FormBased Data Panel', () => {
         emptyAccordion.find(FieldItem).map((fieldItem) => fieldItem.prop('field').name)
       ).toEqual(['client', 'source', 'timestamp']);
       expect(
-        emptyAccordion.find(FieldItem).map((fieldItem) => fieldItem.prop('field').displayName)
+        emptyAccordion
+          .find(FieldItem)
+          .map((fieldItem) => (fieldItem.prop('field') as IndexPatternField).displayName)
       ).toEqual(['client', 'source', 'timestampLabel']);
       expect(emptyAccordion.find(FieldItem).at(1).prop('exists')).toEqual(false);
     });
@@ -872,7 +879,7 @@ describe('FormBased Data Panel', () => {
         wrapper
           .find('[data-test-subj="lnsIndexPatternEmptyFields"]')
           .find(FieldItem)
-          .map((fieldItem) => fieldItem.prop('field').displayName)
+          .map((fieldItem) => (fieldItem.prop('field') as IndexPatternField).displayName)
       ).toEqual(['amemory', 'bytes', 'client', 'source', 'timestampLabel']);
     });
 
@@ -974,7 +981,9 @@ describe('FormBased Data Panel', () => {
       wrapper.find('[data-test-subj="typeFilter-number"]').first().simulate('click');
 
       expect(
-        wrapper.find(FieldItem).map((fieldItem) => fieldItem.prop('field').displayName)
+        wrapper
+          .find(FieldItem)
+          .map((fieldItem) => (fieldItem.prop('field') as IndexPatternField).displayName)
       ).toEqual(['amemory', 'bytes']);
     });
 
@@ -1010,7 +1019,9 @@ describe('FormBased Data Panel', () => {
         .first()
         .simulate('click');
       expect(
-        wrapper.find(FieldItem).map((fieldItem) => fieldItem.prop('field').displayName)
+        wrapper
+          .find(FieldItem)
+          .map((fieldItem) => (fieldItem.prop('field') as IndexPatternField).displayName)
       ).toEqual(['Records', 'amemory', 'bytes', 'client', 'source', 'timestampLabel']);
     });
 
diff --git a/x-pack/plugins/lens/public/datasources/form_based/datapanel.tsx b/x-pack/plugins/lens/public/datasources/form_based/datapanel.tsx
index e1b561cb66509..b82dadcabcc88 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/datapanel.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/datapanel.tsx
@@ -37,7 +37,7 @@ import type {
 } from '../../types';
 import type { FormBasedPrivateState } from './types';
 import { IndexPatternServiceAPI } from '../../data_views_service/service';
-import { FieldItem } from './field_item';
+import { FieldItem } from '../common/field_item';
 
 export type Props = Omit<
   DatasourceDataPanelProps<FormBasedPrivateState>,
@@ -175,9 +175,7 @@ export const InnerFormBasedDataPanel = function InnerFormBasedDataPanel({
   core,
   data,
   dataViews,
-  fieldFormats,
   indexPatternFieldEditor,
-  charts,
   dropOntoWorkspace,
   hasSuggestionForField,
   uiActions,
@@ -380,30 +378,22 @@ export const InnerFormBasedDataPanel = function InnerFormBasedDataPanel({
         hasSuggestionForField={hasSuggestionForField}
         editField={editField}
         removeField={removeField}
-        uiActions={uiActions}
-        core={core}
-        fieldFormats={fieldFormats}
         indexPattern={currentIndexPattern}
         highlight={fieldSearchHighlight}
         dateRange={dateRange}
         query={query}
         filters={filters}
-        chartsThemeService={charts.theme}
       />
     ),
     [
-      core,
-      fieldFormats,
       currentIndexPattern,
       dateRange,
       query,
       filters,
-      charts.theme,
       dropOntoWorkspace,
       hasSuggestionForField,
       editField,
       removeField,
-      uiActions,
     ]
   );
 
diff --git a/x-pack/plugins/lens/public/datasources/form_based/field_item.scss b/x-pack/plugins/lens/public/datasources/form_based/field_item.scss
deleted file mode 100644
index 62ba6135aca52..0000000000000
--- a/x-pack/plugins/lens/public/datasources/form_based/field_item.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-.kbnFieldButton {
-  .lnsFieldItem__infoIcon {
-    visibility: hidden;
-    opacity: 0;
-  }
-
-  &:hover:not([class*='isActive']) {
-    .lnsFieldItem__infoIcon {
-      visibility: visible;
-      opacity: 1;
-      transition: opacity $euiAnimSpeedFast ease-in-out 1s;
-    }
-  }
-}
-
-.kbnFieldButton.domDragDrop_ghost {
-  .lnsFieldItem__infoIcon {
-    visibility: hidden;
-    opacity: 0;
-  }
-}
-
-.lnsFieldItem__fieldPanel {
-  min-width: 260px;
-  max-width: 300px;
-}
diff --git a/x-pack/plugins/lens/public/datasources/text_based/datapanel.test.tsx b/x-pack/plugins/lens/public/datasources/text_based/datapanel.test.tsx
index 9e9b76ceaf0ff..abc84813ce9a2 100644
--- a/x-pack/plugins/lens/public/datasources/text_based/datapanel.test.tsx
+++ b/x-pack/plugins/lens/public/datasources/text_based/datapanel.test.tsx
@@ -18,7 +18,7 @@ import {
   Start as DataViewPublicStart,
 } from '@kbn/data-views-plugin/public/mocks';
 import type { DatatableColumn } from '@kbn/expressions-plugin/public';
-import { EuiHighlight } from '@elastic/eui';
+import { EuiHighlight, EuiToken } from '@elastic/eui';
 
 import { type TextBasedDataPanelProps, TextBasedDataPanel } from './datapanel';
 
@@ -274,4 +274,15 @@ describe('TextBased Query Languages Data Panel', () => {
         .map((item) => item.prop('children'))
     ).toEqual(['memory']);
   });
+
+  it('should render correct field type icons', async () => {
+    const wrapper = await mountAndWaitForLazyModules(<TextBasedDataPanel {...defaultProps} />);
+
+    expect(
+      wrapper
+        .find('[data-test-subj="lnsTextBasedLanguagesAvailableFields"]')
+        .find(EuiToken)
+        .map((item) => item.prop('iconType'))
+    ).toEqual(['tokenNumber', 'tokenNumber', 'tokenDate']);
+  });
 });
diff --git a/x-pack/plugins/lens/public/datasources/text_based/datapanel.tsx b/x-pack/plugins/lens/public/datasources/text_based/datapanel.tsx
index 9bdc052cbae47..0f62b52d29068 100644
--- a/x-pack/plugins/lens/public/datasources/text_based/datapanel.tsx
+++ b/x-pack/plugins/lens/public/datasources/text_based/datapanel.tsx
@@ -18,17 +18,17 @@ import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import {
   FieldList,
   FieldListFilters,
-  FieldItemButton,
-  GetCustomFieldType,
   FieldListGrouped,
   FieldListGroupedProps,
   FieldsGroupNames,
+  GetCustomFieldType,
   useGroupedFields,
 } from '@kbn/unified-field-list-plugin/public';
-import { ChildDragDropProvider, DragDrop } from '@kbn/dom-drag-drop';
+import { ChildDragDropProvider } from '@kbn/dom-drag-drop';
 import type { DatasourceDataPanelProps } from '../../types';
 import type { TextBasedPrivateState } from './types';
 import { getStateFromAggregateQuery } from './utils';
+import { FieldItem } from '../common/field_item';
 
 const getCustomFieldType: GetCustomFieldType<DatatableColumn> = (field) => field?.meta.type;
 
@@ -52,6 +52,8 @@ export function TextBasedDataPanel({
   expressions,
   dataViews,
   layerFields,
+  hasSuggestionForField,
+  dropOntoWorkspace,
 }: TextBasedDataPanelProps) {
   const prevQuery = usePrevious(query);
   const [dataHasLoaded, setDataHasLoaded] = useState(false);
@@ -108,33 +110,26 @@ export function TextBasedDataPanel({
   });
 
   const renderFieldItem: FieldListGroupedProps<DatatableColumn>['renderFieldItem'] = useCallback(
-    ({ field, itemIndex, fieldSearchHighlight }) => {
+    ({ field, groupIndex, itemIndex, fieldSearchHighlight, groupName }) => {
       if (!field) {
         return <></>;
       }
+
       return (
-        <DragDrop
-          draggable
-          order={[itemIndex]}
-          value={{
-            field: field.name,
-            id: field.id,
-            humanData: { label: field.name },
-          }}
-          dataTestSubj={`lnsFieldListPanelField-${field.name}`}
-        >
-          <FieldItemButton<DatatableColumn>
-            isEmpty={false}
-            isActive={false}
-            field={field}
-            fieldSearchHighlight={fieldSearchHighlight}
-            getCustomFieldType={getCustomFieldType}
-            onClick={() => {}}
-          />
-        </DragDrop>
+        <FieldItem
+          field={field}
+          exists
+          hideDetails
+          itemIndex={itemIndex}
+          groupIndex={groupIndex}
+          dropOntoWorkspace={dropOntoWorkspace}
+          hasSuggestionForField={hasSuggestionForField}
+          highlight={fieldSearchHighlight}
+          getCustomFieldType={getCustomFieldType}
+        />
       );
     },
-    []
+    [hasSuggestionForField, dropOntoWorkspace]
   );
 
   return (
diff --git a/x-pack/plugins/lens/public/datasources/text_based/text_based_languages.tsx b/x-pack/plugins/lens/public/datasources/text_based/text_based_languages.tsx
index 1d20433893a61..c3da573af3433 100644
--- a/x-pack/plugins/lens/public/datasources/text_based/text_based_languages.tsx
+++ b/x-pack/plugins/lens/public/datasources/text_based/text_based_languages.tsx
@@ -13,7 +13,7 @@ import { i18n } from '@kbn/i18n';
 import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import type { AggregateQuery } from '@kbn/es-query';
 import type { SavedObjectReference } from '@kbn/core/public';
-import { EuiButtonEmpty, EuiFormRow } from '@elastic/eui';
+import { EuiFormRow } from '@elastic/eui';
 import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import type { ExpressionsStart, DatatableColumnType } from '@kbn/expressions-plugin/public';
 import type { DataViewsPublicPluginStart, DataView } from '@kbn/data-views-plugin/public';
@@ -42,6 +42,7 @@ import type {
 import { FieldSelect } from './field_select';
 import type { Datasource, IndexPatternMap } from '../../types';
 import { LayerPanel } from './layerpanel';
+import { DimensionTrigger } from '../../shared_components/dimension_trigger';
 
 function getLayerReferenceName(layerId: string) {
   return `textBasedLanguages-datasource-layer-${layerId}`;
@@ -377,16 +378,17 @@ export function getTextBasedDatasource({
       }
 
       render(
-        <EuiButtonEmpty
+        <DimensionTrigger
+          id={props.columnId}
           color={customLabel && selectedField ? 'primary' : 'danger'}
-          onClick={() => {}}
-          data-test-subj="lns-dimensionTrigger-textBased"
-        >
-          {customLabel ??
+          dataTestSubj="lns-dimensionTrigger-textBased"
+          label={
+            customLabel ??
             i18n.translate('xpack.lens.textBasedLanguages.missingField', {
               defaultMessage: 'Missing field',
-            })}
-        </EuiButtonEmpty>,
+            })
+          }
+        />,
         domElement
       );
     },
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/add_layer.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/add_layer.tsx
index 430ce019aaa20..299f2b81fc5bb 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/add_layer.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/add_layer.tsx
@@ -66,13 +66,12 @@ export function AddLayerButton({
         position="bottom"
       >
         <EuiButton
+          size="s"
           fullWidth
           data-test-subj="lnsLayerAddButton"
           aria-label={i18n.translate('xpack.lens.configPanel.addLayerButton', {
             defaultMessage: 'Add layer',
           })}
-          fill
-          color="text"
           onClick={() => onAddLayerClick(supportedLayers[0].type)}
           iconType="layers"
         >
@@ -89,13 +88,12 @@ export function AddLayerButton({
       data-test-subj="lnsConfigPanel__addLayerPopover"
       button={
         <EuiButton
+          size="s"
           fullWidth
           data-test-subj="lnsLayerAddButton"
           aria-label={i18n.translate('xpack.lens.configPanel.addLayerButton', {
             defaultMessage: 'Add layer',
           })}
-          fill
-          color="text"
           onClick={() => toggleLayersChoice(!showLayersChoice)}
           iconType="layers"
         >
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/buttons/dimension_button.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/buttons/dimension_button.tsx
index ad3ae44a2b3e6..71f7a2928bc41 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/buttons/dimension_button.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/buttons/dimension_button.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { EuiButtonIcon, EuiLink, EuiToolTip } from '@elastic/eui';
+import { EuiButtonIcon, EuiLink, EuiToolTip, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { css } from '@emotion/react';
 import { euiThemeVars } from '@kbn/ui-theme';
@@ -28,7 +28,9 @@ export function DimensionButton({
   accessorConfig,
   label,
   message,
+  ...otherProps // from Drag&Drop integration
 }: {
+  className?: string;
   group: VisualizationDimensionGroupConfig;
   children: React.ReactElement;
   onClick: (id: string) => void;
@@ -38,32 +40,34 @@ export function DimensionButton({
   message: UserMessage | undefined;
 }) {
   return (
-    <>
-      <div>
-        <EuiToolTip
-          content={message?.shortMessage || message?.longMessage || undefined}
-          position="left"
-        >
-          <EuiLink
-            className="lnsLayerPanel__dimensionLink"
-            data-test-subj="lnsLayerPanel-dimensionLink"
-            onClick={() => onClick(accessorConfig.columnId)}
-            aria-label={triggerLinkA11yText(label)}
-            title={triggerLinkA11yText(label)}
-            color={
-              message?.severity === 'error'
-                ? 'danger'
-                : message?.severity === 'warning'
-                ? 'warning'
-                : undefined
-            }
+    <div {...otherProps}>
+      <EuiFlexGroup direction="row" alignItems="center" gutterSize="none" responsive={false}>
+        <EuiFlexItem>
+          <EuiToolTip
+            content={message?.shortMessage || message?.longMessage || undefined}
+            position="left"
           >
-            <DimensionButtonIcon message={message} accessorConfig={accessorConfig}>
-              {children}
-            </DimensionButtonIcon>
-          </EuiLink>
-        </EuiToolTip>
-      </div>
+            <EuiLink
+              className="lnsLayerPanel__dimensionLink"
+              data-test-subj="lnsLayerPanel-dimensionLink"
+              onClick={() => onClick(accessorConfig.columnId)}
+              aria-label={triggerLinkA11yText(label)}
+              title={triggerLinkA11yText(label)}
+              color={
+                message?.severity === 'error'
+                  ? 'danger'
+                  : message?.severity === 'warning'
+                  ? 'warning'
+                  : 'text'
+              }
+            >
+              <DimensionButtonIcon message={message} accessorConfig={accessorConfig}>
+                {children}
+              </DimensionButtonIcon>
+            </EuiLink>
+          </EuiToolTip>
+        </EuiFlexItem>
+      </EuiFlexGroup>
       <EuiButtonIcon
         className="lnsLayerPanel__dimensionRemove"
         data-test-subj="indexPattern-dimension-remove"
@@ -87,6 +91,6 @@ export function DimensionButton({
         `}
       />
       <PaletteIndicator accessorConfig={accessorConfig} />
-    </>
+    </div>
   );
 }
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/buttons/empty_dimension_button.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/buttons/empty_dimension_button.tsx
index 2159ac29327b2..f0ef1508c5076 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/buttons/empty_dimension_button.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/buttons/empty_dimension_button.tsx
@@ -60,7 +60,7 @@ const DefaultEmptyButton = ({ columnId, group, onClick }: EmptyButtonProps) => {
       className="lnsLayerPanel__triggerText"
       color="text"
       size="s"
-      iconType="plusInCircleFilled"
+      iconType="plus"
       contentProps={{
         className: 'lnsLayerPanel__triggerTextContent',
       }}
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.scss b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.scss
index ff0c03fdc8f73..1ff1cd513cee9 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.scss
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.scss
@@ -54,7 +54,7 @@
   &,
   .euiFormRow__fieldWrapper {
     & > * + * {
-      margin-top: $euiSize;
+      margin-top: $euiSizeS;
     }
   }
 }
@@ -64,22 +64,39 @@
   padding: $euiSizeS $euiSize;
 }
 
+.lnsLayerPanel__dimensionRemove {
+  margin-right: $euiSizeS;
+  visibility: hidden;
+  opacity: 0;
+}
+
 .lnsLayerPanel__dimension {
   @include euiFontSizeS;
   border-radius: $euiBorderRadius;
   display: flex;
   align-items: center;
   overflow: hidden;
-  min-height: $euiSizeXXL;
+  min-height: $euiSizeXL;
   position: relative;
 
   // NativeRenderer is messing this up
   > div {
     flex-grow: 1;
   }
+
+  &:hover,
+  &:focus {
+    .lnsLayerPanel__dimensionRemove {
+      visibility: visible;
+      opacity: 1;
+      transition: opacity $euiAnimSpeedFast ease-in-out;
+    }
+  }
 }
 
 .lnsLayerPanel__dimension--empty {
+  border: $euiBorderWidthThin dashed $euiBorderColor !important;
+
   &:focus,
   &:focus-within {
     @include euiFocusRing;
@@ -94,26 +111,31 @@
   }
 }
 
-.lnsLayerPanel__dimensionRemove {
-  margin-right: $euiSizeS;
-}
-
 .lnsLayerPanel__triggerText {
   width: 100%;
-  padding: $euiSizeS;
-  min-height: $euiSizeXXL - 2;
+  padding: $euiSizeXS $euiSizeS;
   word-break: break-word;
   font-weight: $euiFontWeightRegular;
 }
 
-.domDragDrop-isReplacing {
-  .lnsLayerPanel__triggerText {
-    text-decoration: line-through;
+.lnsLayerPanel__dimensionLink {
+  &:hover {
+    text-decoration: none;
   }
 }
 
 .lnsLayerPanel__triggerTextLabel {
   transition: background-color $euiAnimSpeedFast ease-in-out;
+
+  &:hover {
+    text-decoration: underline;
+  }
+}
+
+.domDragDrop-isReplacing {
+  .lnsLayerPanel__triggerText {
+    text-decoration: line-through;
+  }
 }
 
 .lnsLayerPanel__triggerTextContent {
@@ -139,6 +161,7 @@
 }
 
 .lnsLayerPanel__palette {
+  height: $euiSizeXS / 2;
   border-radius: 0 0 ($euiBorderRadius - 1px) ($euiBorderRadius - 1px);
 
   &::after {
@@ -153,5 +176,6 @@
   &:focus {
     @include passDownFocusRing('.lnsLayerPanel__triggerTextLabel');
     background-color: transparent;
+    text-decoration-thickness: $euiBorderWidthThin !important;
   }
 }
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx
index eaec08cf3f0e5..18b5acd160aaf 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.test.tsx
@@ -826,7 +826,8 @@ describe('LayerPanel', () => {
       const dragDropElement = instance
         .find('[data-test-subj="lnsGroup"] DragDrop')
         .first()
-        .find('.lnsLayerPanel__dimension');
+        .find('.lnsLayerPanel__dimension')
+        .first();
 
       dragDropElement.simulate('dragOver');
       dragDropElement.simulate('drop');
@@ -906,7 +907,7 @@ describe('LayerPanel', () => {
 
       const updatedDragDropElement = instance
         .find('[data-test-subj="lnsGroupB"] DragDrop .domDragDrop')
-        .at(2);
+        .last();
 
       updatedDragDropElement.simulate('dragOver');
       updatedDragDropElement.simulate('drop');
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx
index f8b17d330b5e5..1873e563f05a3 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx
@@ -557,46 +557,45 @@ export function LayerPanel(
                             onDrop={onDrop}
                             indexPatterns={dataViews.indexPatterns}
                           >
-                            <div className="lnsLayerPanel__dimension">
-                              <DimensionButton
-                                accessorConfig={accessorConfig}
-                                label={columnLabelMap?.[accessorConfig.columnId] ?? ''}
-                                group={group}
-                                onClick={(id: string) => {
-                                  setActiveDimension({
-                                    isNew: false,
-                                    activeGroup: group,
-                                    activeId: id,
-                                  });
-                                }}
-                                onRemoveClick={(id: string) => {
-                                  props.onRemoveDimension({ columnId: id, layerId });
-                                  removeButtonRef(id);
-                                }}
-                                message={messages[0]}
-                              >
-                                {layerDatasource ? (
-                                  <NativeRenderer
-                                    render={layerDatasource.renderDimensionTrigger}
-                                    nativeProps={{
-                                      ...layerDatasourceConfigProps,
-                                      columnId: accessorConfig.columnId,
-                                      groupId: group.groupId,
-                                      filterOperations: group.filterOperations,
-                                      indexPatterns: dataViews.indexPatterns,
-                                    }}
-                                  />
-                                ) : (
-                                  <>
-                                    {activeVisualization?.renderDimensionTrigger?.({
-                                      columnId,
-                                      label: columnLabelMap?.[columnId] ?? '',
-                                      hideTooltip,
-                                    })}
-                                  </>
-                                )}
-                              </DimensionButton>
-                            </div>
+                            <DimensionButton
+                              className="lnsLayerPanel__dimension"
+                              accessorConfig={accessorConfig}
+                              label={columnLabelMap?.[accessorConfig.columnId] ?? ''}
+                              group={group}
+                              onClick={(id: string) => {
+                                setActiveDimension({
+                                  isNew: false,
+                                  activeGroup: group,
+                                  activeId: id,
+                                });
+                              }}
+                              onRemoveClick={(id: string) => {
+                                props.onRemoveDimension({ columnId: id, layerId });
+                                removeButtonRef(id);
+                              }}
+                              message={messages[0]}
+                            >
+                              {layerDatasource ? (
+                                <NativeRenderer
+                                  render={layerDatasource.renderDimensionTrigger}
+                                  nativeProps={{
+                                    ...layerDatasourceConfigProps,
+                                    columnId: accessorConfig.columnId,
+                                    groupId: group.groupId,
+                                    filterOperations: group.filterOperations,
+                                    indexPatterns: dataViews.indexPatterns,
+                                  }}
+                                />
+                              ) : (
+                                <>
+                                  {activeVisualization?.renderDimensionTrigger?.({
+                                    columnId,
+                                    label: columnLabelMap?.[columnId] ?? '',
+                                    hideTooltip,
+                                  })}
+                                </>
+                              )}
+                            </DimensionButton>
                           </DraggableDimensionButton>
                         );
                       })}
diff --git a/x-pack/plugins/lens/public/shared_components/dimension_trigger/index.tsx b/x-pack/plugins/lens/public/shared_components/dimension_trigger/index.tsx
index b4cd1dcc0d828..d705c50017a8d 100644
--- a/x-pack/plugins/lens/public/shared_components/dimension_trigger/index.tsx
+++ b/x-pack/plugins/lens/public/shared_components/dimension_trigger/index.tsx
@@ -7,6 +7,7 @@
 import { EuiText, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
+import { EuiTextProps } from '@elastic/eui/src/components/text/text';
 
 export const defaultDimensionTriggerTooltip = (
   <p>
@@ -20,13 +21,24 @@ export const defaultDimensionTriggerTooltip = (
   </p>
 );
 
-export const DimensionTrigger = ({ id, label }: { label: string; id: string }) => {
+export const DimensionTrigger = ({
+  id,
+  label,
+  color,
+  dataTestSubj,
+}: {
+  label: string;
+  id: string;
+  color?: EuiTextProps['color'];
+  dataTestSubj?: string;
+}) => {
   return (
     <EuiText
       size="s"
       id={id}
+      color={color}
       className="lnsLayerPanel__triggerText"
-      data-test-subj="lns-dimensionTrigger"
+      data-test-subj={dataTestSubj || 'lns-dimensionTrigger'}
     >
       <EuiFlexItem grow={true}>
         <span>
diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
index 1cc24cee63e3f..3e37a243f85b4 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -2147,13 +2147,10 @@
     "discover.docTable.totalDocuments": "{totalDocuments} documents",
     "discover.dscTour.stepAddFields.description": "Cliquez sur {plusIcon} pour ajouter les champs qui vous intéressent.",
     "discover.dscTour.stepExpand.description": "Cliquez sur {expandIcon} pour afficher, comparer et filtrer les documents.",
-    "discover.field.title": "{fieldName} ({fieldDisplayName})",
     "discover.fieldChooser.detailViews.existsInRecordsText": "Existe dans {value} / {totalValue} enregistrements",
     "discover.fieldChooser.detailViews.filterOutValueButtonAriaLabel": "Exclure {field} : \"{value}\"",
     "discover.fieldChooser.detailViews.filterValueButtonAriaLabel": "Filtrer sur {field} : \"{value}\"",
     "discover.fieldChooser.detailViews.valueOfRecordsText": "{value} / {totalValue} enregistrements",
-    "discover.fieldChooser.discoverField.addButtonAriaLabel": "Ajouter {field} au tableau",
-    "discover.fieldChooser.discoverField.removeButtonAriaLabel": "Retirer {field} du tableau",
     "discover.fieldChooser.fieldCalculator.fieldIsNotPresentInDocumentsErrorMessage": "Ce champ est présent dans votre mapping Elasticsearch, mais pas dans les {hitsLength} documents affichés dans le tableau des documents. Cependant, vous pouvez toujours le consulter ou effectuer une recherche dessus.",
     "discover.grid.copyClipboardButtonTitle": "Copier la valeur de {column}",
     "discover.grid.copyColumnValuesToClipboard.toastTitle": "Valeurs de la colonne \"{column}\" copiées dans le presse-papiers",
@@ -2337,8 +2334,6 @@
     "discover.embeddable.inspectorRequestDataTitle": "Données",
     "discover.embeddable.inspectorRequestDescription": "Cette requête interroge Elasticsearch afin de récupérer les données pour la recherche.",
     "discover.embeddable.search.displayName": "rechercher",
-    "discover.field.mappingConflict": "Ce champ est défini avec plusieurs types (chaîne, entier, etc.) dans les différents index qui correspondent à ce modèle. Vous pouvez toujours utiliser ce champ conflictuel, mais il sera indisponible pour les fonctions qui nécessitent que Kibana en connaisse le type. Pour corriger ce problème, vous devrez réindexer vos données.",
-    "discover.field.mappingConflict.title": "Conflit de mapping",
     "discover.fieldChooser.addField.label": "Ajouter un champ",
     "discover.fieldChooser.availableFieldsTooltip": "Champs disponibles pour l'affichage dans le tableau.",
     "discover.fieldChooser.detailViews.emptyStringText": "Chaîne vide",
@@ -19529,10 +19524,7 @@
     "xpack.lens.indexPattern.emptyFieldsLabel": "Champs vides",
     "xpack.lens.indexPattern.enableAccuracyMode": "Activer le mode de précision",
     "xpack.lens.indexPattern.fieldExploreInDiscover": "Explorer dans Discover",
-    "xpack.lens.indexPattern.fieldItemTooltip": "Effectuez un glisser-déposer pour visualiser.",
     "xpack.lens.indexPattern.fieldPlaceholder": "Champ",
-    "xpack.lens.indexPattern.fieldStatsButtonEmptyLabel": "Ce champ ne comporte aucune donnée mais vous pouvez toujours effectuer un glisser-déposer pour visualiser.",
-    "xpack.lens.indexPattern.fieldStatsButtonLabel": "Cliquez pour obtenir un aperçu du champ, ou effectuez un glisser-déposer pour visualiser.",
     "xpack.lens.indexPattern.fieldStatsNoData": "Lens ne peut pas créer de visualisation avec ce champ, car il ne contient pas de données. Pour créer une visualisation, glissez-déposez un autre champ.",
     "xpack.lens.indexPattern.filterBy.clickToEdit": "Cliquer pour modifier",
     "xpack.lens.indexPattern.filterBy.emptyFilterQuery": "(vide)",
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 53c0c855e1d14..99d0120204cc0 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -2147,13 +2147,10 @@
     "discover.docTable.totalDocuments": "{totalDocuments}ドキュメント",
     "discover.dscTour.stepAddFields.description": "{plusIcon}をクリックして、関心があるフィールドを追加します。",
     "discover.dscTour.stepExpand.description": "{expandIcon}をクリックすると、ドキュメントを表示、比較、フィルタリングできます。",
-    "discover.field.title": "{fieldName}（{fieldDisplayName}）",
     "discover.fieldChooser.detailViews.existsInRecordsText": "{value} / {totalValue}レコードに存在します",
     "discover.fieldChooser.detailViews.filterOutValueButtonAriaLabel": "{field}を除外：\"{value}\"",
     "discover.fieldChooser.detailViews.filterValueButtonAriaLabel": "{field}のフィルター：\"{value}\"",
     "discover.fieldChooser.detailViews.valueOfRecordsText": "{value} / {totalValue}レコード",
-    "discover.fieldChooser.discoverField.addButtonAriaLabel": "{field}をテーブルに追加",
-    "discover.fieldChooser.discoverField.removeButtonAriaLabel": "{field}をテーブルから削除",
     "discover.fieldChooser.fieldCalculator.fieldIsNotPresentInDocumentsErrorMessage": "このフィールドはElasticsearchマッピングに表示されますが、ドキュメントテーブルの{hitsLength}件のドキュメントには含まれません。可視化や検索は可能な場合があります。",
     "discover.grid.copyClipboardButtonTitle": "{column}の値をコピー",
     "discover.grid.copyColumnValuesToClipboard.toastTitle": "\"{column}\"列の値がクリップボードにコピーされました",
@@ -2337,8 +2334,6 @@
     "discover.embeddable.inspectorRequestDataTitle": "データ",
     "discover.embeddable.inspectorRequestDescription": "このリクエストはElasticsearchにクエリをかけ、検索データを取得します。",
     "discover.embeddable.search.displayName": "検索",
-    "discover.field.mappingConflict": "このフィールドは、このパターンと一致するインデックス全体に対して複数の型（文字列、整数など）として定義されています。この競合フィールドを使用することはできますが、Kibana で型を認識する必要がある関数では使用できません。この問題を修正するにはデータのレンダリングが必要です。",
-    "discover.field.mappingConflict.title": "マッピングの矛盾",
     "discover.fieldChooser.addField.label": "フィールドを追加",
     "discover.fieldChooser.availableFieldsTooltip": "フィールドをテーブルに表示できます。",
     "discover.fieldChooser.detailViews.emptyStringText": "空の文字列",
@@ -19529,10 +19524,7 @@
     "xpack.lens.indexPattern.emptyFieldsLabel": "空のフィールド",
     "xpack.lens.indexPattern.enableAccuracyMode": "精度モードを有効にする",
     "xpack.lens.indexPattern.fieldExploreInDiscover": "Discoverで探索",
-    "xpack.lens.indexPattern.fieldItemTooltip": "可視化するには、ドラッグアンドドロップします。",
     "xpack.lens.indexPattern.fieldPlaceholder": "フィールド",
-    "xpack.lens.indexPattern.fieldStatsButtonEmptyLabel": "このフィールドにはデータがありませんが、ドラッグアンドドロップで可視化できます。",
-    "xpack.lens.indexPattern.fieldStatsButtonLabel": "フィールドプレビューを表示するには、クリックします。可視化するには、ドラッグアンドドロップします。",
     "xpack.lens.indexPattern.fieldStatsNoData": "Lensはこのフィールドのビジュアライゼーションを作成できません。フィールドにデータがありません。ビジュアライゼーションを作成するには、別のフィールドをドラッグします。",
     "xpack.lens.indexPattern.filterBy.clickToEdit": "クリックして編集",
     "xpack.lens.indexPattern.filterBy.emptyFilterQuery": "（空）",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index f92e4a333eb58..79f4533163a39 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -2147,13 +2147,10 @@
     "discover.docTable.totalDocuments": "{totalDocuments} 个文档",
     "discover.dscTour.stepAddFields.description": "单击 {plusIcon} 以添加您感兴趣的字段。",
     "discover.dscTour.stepExpand.description": "单击 {expandIcon} 以查看、比较和筛选文档。",
-    "discover.field.title": "{fieldName} ({fieldDisplayName})",
     "discover.fieldChooser.detailViews.existsInRecordsText": "存在于 {value}/{totalValue} 条记录中",
     "discover.fieldChooser.detailViews.filterOutValueButtonAriaLabel": "筛除 {field}“{value}”",
     "discover.fieldChooser.detailViews.filterValueButtonAriaLabel": "筛留 {field}“{value}”",
     "discover.fieldChooser.detailViews.valueOfRecordsText": "{value}/{totalValue} 条记录",
-    "discover.fieldChooser.discoverField.addButtonAriaLabel": "将 {field} 添加到表中",
-    "discover.fieldChooser.discoverField.removeButtonAriaLabel": "从表中移除 {field}",
     "discover.fieldChooser.fieldCalculator.fieldIsNotPresentInDocumentsErrorMessage": "此字段在您的 Elasticsearch 映射中，但不在文档表中显示的 {hitsLength} 个文档中。您可能仍能够基于它可视化或搜索。",
     "discover.grid.copyClipboardButtonTitle": "复制 {column} 的值",
     "discover.grid.copyColumnValuesToClipboard.toastTitle": "“{column}”列的值已复制到剪贴板",
@@ -2337,8 +2334,6 @@
     "discover.embeddable.inspectorRequestDataTitle": "数据",
     "discover.embeddable.inspectorRequestDescription": "此请求将查询 Elasticsearch 以获取搜索的数据。",
     "discover.embeddable.search.displayName": "搜索",
-    "discover.field.mappingConflict": "此字段在匹配此模式的各个索引中已定义为若干类型（字符串、整数等）。您可能仍可以使用此冲突字段，但它无法用于需要 Kibana 知道其类型的函数。要解决此问题，需要重新索引您的数据。",
-    "discover.field.mappingConflict.title": "映射冲突",
     "discover.fieldChooser.addField.label": "添加字段",
     "discover.fieldChooser.availableFieldsTooltip": "适用于在表中显示的字段。",
     "discover.fieldChooser.detailViews.emptyStringText": "空字符串",
@@ -19530,10 +19525,7 @@
     "xpack.lens.indexPattern.emptyFieldsLabel": "空字段",
     "xpack.lens.indexPattern.enableAccuracyMode": "启用准确性模式",
     "xpack.lens.indexPattern.fieldExploreInDiscover": "在 Discover 中浏览",
-    "xpack.lens.indexPattern.fieldItemTooltip": "拖放以可视化。",
     "xpack.lens.indexPattern.fieldPlaceholder": "字段",
-    "xpack.lens.indexPattern.fieldStatsButtonEmptyLabel": "此字段不包含任何数据，但您仍然可以拖放以进行可视化。",
-    "xpack.lens.indexPattern.fieldStatsButtonLabel": "单击以进行字段预览，或拖放以进行可视化。",
     "xpack.lens.indexPattern.fieldStatsNoData": "Lens 无法使用此字段创建可视化，因为其中未包含数据。要创建可视化，请拖放其他字段。",
     "xpack.lens.indexPattern.filterBy.clickToEdit": "单击以编辑",
     "xpack.lens.indexPattern.filterBy.emptyFilterQuery": "（空）",
diff --git a/x-pack/test/functional/apps/lens/group1/smokescreen.ts b/x-pack/test/functional/apps/lens/group1/smokescreen.ts
index 53a51b89f2bcc..cd277f45fecb5 100644
--- a/x-pack/test/functional/apps/lens/group1/smokescreen.ts
+++ b/x-pack/test/functional/apps/lens/group1/smokescreen.ts
@@ -148,7 +148,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await listingTable.searchForItemWithName('lnsXYvis');
       await PageObjects.lens.clickVisualizeListItemTitle('lnsXYvis');
       await PageObjects.lens.goToTimeRange();
-      await testSubjects.click('lnsXY_splitDimensionPanel > indexPattern-dimension-remove');
+      await PageObjects.lens.removeDimension('lnsXY_splitDimensionPanel');
       await PageObjects.lens.switchToVisualization('line');
       await PageObjects.lens.configureDimension({
         dimension: 'lnsXY_yDimensionPanel > lns-dimensionTrigger',
@@ -200,9 +200,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_yDimensionPanel')).to.eql(
         longLabel
       );
-      expect(
-        await testSubjects.isDisplayed('lnsXY_yDimensionPanel >  indexPattern-dimension-remove')
-      ).to.equal(true);
+      expect(await PageObjects.lens.canRemoveDimension('lnsXY_yDimensionPanel')).to.equal(true);
       await PageObjects.lens.removeDimension('lnsXY_yDimensionPanel');
       await testSubjects.missingOrFail('lnsXY_yDimensionPanel > lns-dimensionTrigger');
     });
diff --git a/x-pack/test/functional/page_objects/lens_page.ts b/x-pack/test/functional/page_objects/lens_page.ts
index a246ef54b8dd6..acd78cb0da0ea 100644
--- a/x-pack/test/functional/page_objects/lens_page.ts
+++ b/x-pack/test/functional/page_objects/lens_page.ts
@@ -626,10 +626,18 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
     async isTopLevelAggregation() {
       return await testSubjects.isEuiSwitchChecked('indexPattern-nesting-switch');
     },
+    /**
+     * Cen remove the dimension matching a specific test subject?
+     */
+    async canRemoveDimension(dimensionTestSubj: string) {
+      await testSubjects.moveMouseTo(`${dimensionTestSubj} > indexPattern-dimension-remove`);
+      return await testSubjects.isDisplayed(`${dimensionTestSubj} > indexPattern-dimension-remove`);
+    },
     /**
      * Removes the dimension matching a specific test subject
      */
     async removeDimension(dimensionTestSubj: string) {
+      await testSubjects.moveMouseTo(`${dimensionTestSubj} > indexPattern-dimension-remove`);
       await testSubjects.click(`${dimensionTestSubj} > indexPattern-dimension-remove`);
     },
     /**
@@ -1663,7 +1671,7 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
     ) {
       const groupCapitalized = `${group[0].toUpperCase()}${group.slice(1).toLowerCase()}`;
       const allFieldsForType = await find.allByCssSelector(
-        `[data-test-subj="lnsIndexPattern${groupCapitalized}Fields"] .unifiedFieldItemButton--${type}`
+        `[data-test-subj="lnsIndexPattern${groupCapitalized}Fields"] .unifiedFieldListItemButton--${type}`
       );
       // map to testSubjId
       return Promise.all(allFieldsForType.map((el) => el.getAttribute('data-test-subj')));
diff --git a/x-pack/test/functional/services/transform/wizard.ts b/x-pack/test/functional/services/transform/wizard.ts
index 69332c8947d58..c48a097de9213 100644
--- a/x-pack/test/functional/services/transform/wizard.ts
+++ b/x-pack/test/functional/services/transform/wizard.ts
@@ -1052,9 +1052,7 @@ export function TransformWizardProvider({ getService, getPageObjects }: FtrProvi
       await retry.tryForTime(60 * 1000, async () => {
         const allFields = await pageObjects.discover.getAllFieldNames();
         if (Array.isArray(allFields)) {
-          // For some reasons, Discover returns fields with dot (e.g '.avg') with extra space
-          const fields = allFields.map((n) => n.replace('.​', '.'));
-          expect(fields).to.contain(
+          expect(allFields).to.contain(
             field,
             `Expected Discover to contain field ${field}, got ${allFields.join()}`
           );
diff --git a/x-pack/test/localization/tests/lens/smokescreen.ts b/x-pack/test/localization/tests/lens/smokescreen.ts
index fc8aba2131504..6788556724c6b 100644
--- a/x-pack/test/localization/tests/lens/smokescreen.ts
+++ b/x-pack/test/localization/tests/lens/smokescreen.ts
@@ -292,7 +292,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await listingTable.searchForItemWithName('lnsXYvis');
       await PageObjects.lens.clickVisualizeListItemTitle('lnsXYvis');
       await PageObjects.lens.goToTimeRange();
-      await testSubjects.click('lnsXY_splitDimensionPanel > indexPattern-dimension-remove');
+      await PageObjects.lens.removeDimension('lnsXY_splitDimensionPanel');
       await PageObjects.lens.switchToVisualization('line', termTranslator('line'));
       await PageObjects.lens.configureDimension({
         dimension: 'lnsXY_yDimensionPanel > lns-dimensionTrigger',
@@ -344,9 +344,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_yDimensionPanel')).to.eql(
         longLabel
       );
-      expect(
-        await testSubjects.isDisplayed('lnsXY_yDimensionPanel >  indexPattern-dimension-remove')
-      ).to.equal(true);
+      expect(await PageObjects.lens.canRemoveDimension('lnsXY_yDimensionPanel')).to.equal(true);
       await PageObjects.lens.removeDimension('lnsXY_yDimensionPanel');
       await testSubjects.missingOrFail('lnsXY_yDimensionPanel > lns-dimensionTrigger');
     });

From eda5b154ce2938d3a6e0a448e07f9f38a116ee33 Mon Sep 17 00:00:00 2001
From: Thom Heymann <190132+thomheymann@users.noreply.github.com>
Date: Wed, 19 Apr 2023 19:50:26 +0100
Subject: [PATCH 090/100] Add remote index privileges to role management
 (#154948)

Resolves #142399

## Summary

Add remote index privileges section to role management screen.

## Release note

Added ability to configure remote index privileges directly from within
the role management screen.

## Screenshots

### Platinum license

<img width="986" alt="231859070-fd916155-6b34-4cb4-9601-065e33cc7456-2"
src="https://user-images.githubusercontent.com/190132/232503738-584c3e14-ed28-4a7c-8bba-933ec46d7061.png">

### Basic license

<img width="559" alt="Screenshot 2023-04-19 at 16 10 18"
src="https://user-images.githubusercontent.com/190132/233120010-464624c6-c07d-4f5c-9f71-232f9240ab03.png">
---
 .../common/licensing/license_features.ts      |   5 +
 .../common/licensing/license_service.test.ts  |   9 +
 .../common/licensing/license_service.ts       |   3 +
 x-pack/plugins/security/common/model/index.ts |   7 +-
 x-pack/plugins/security/common/model/role.ts  |   5 +
 .../__snapshots__/validate_role.test.ts.snap  |   2 +
 .../roles/edit_role/edit_role_page.tsx        |   3 +-
 .../cluster_privileges.test.tsx.snap          |   1 +
 .../elasticsearch_privileges.test.tsx.snap    |  96 +++++-
 .../index_privilege_form.test.tsx.snap        | 269 ++++++++--------
 .../index_privileges.test.tsx.snap            |   1 +
 .../privileges/es/cluster_privileges.tsx      |   4 +
 .../es/elasticsearch_privileges.test.tsx      |  25 +-
 .../es/elasticsearch_privileges.tsx           |  54 ++--
 .../es/index_privilege_form.test.tsx          | 165 ++++++----
 .../privileges/es/index_privilege_form.tsx    | 288 ++++++++++++------
 .../privileges/es/index_privileges.test.tsx   | 165 +++++++---
 .../privileges/es/index_privileges.tsx        | 111 +++++--
 .../roles/edit_role/validate_role.test.ts     |  95 +++++-
 .../roles/edit_role/validate_role.ts          | 141 ++++++++-
 .../management/roles/roles_api_client.test.ts |   8 +
 .../management/roles/roles_api_client.ts      |  20 +-
 .../authorization/roles/elasticsearch_role.ts |   2 +
 .../privilege_deprecations.test.ts            |   2 +
 .../security/server/lib/role_schema.ts        |  49 +++
 .../roles/model/put_payload.test.ts           |  41 +++
 .../authorization/roles/model/put_payload.ts  |   8 +-
 .../routes/authorization/roles/put.test.ts    |  10 +
 .../server/routes/views/login.test.ts         |   1 +
 .../translations/translations/fr-FR.json      |   1 -
 .../translations/translations/ja-JP.json      |   1 -
 .../translations/translations/zh-CN.json      |   1 -
 32 files changed, 1168 insertions(+), 425 deletions(-)

diff --git a/x-pack/plugins/security/common/licensing/license_features.ts b/x-pack/plugins/security/common/licensing/license_features.ts
index 9069788a3c304..c5f05c83c8e48 100644
--- a/x-pack/plugins/security/common/licensing/license_features.ts
+++ b/x-pack/plugins/security/common/licensing/license_features.ts
@@ -54,6 +54,11 @@ export interface SecurityLicenseFeatures {
    */
   readonly allowRoleFieldLevelSecurity: boolean;
 
+  /**
+   * Indicates whether we allow users to define remote index privileges in roles.
+   */
+  readonly allowRoleRemoteIndexPrivileges: boolean;
+
   /**
    * Indicates whether we allow Role-based access control (RBAC).
    */
diff --git a/x-pack/plugins/security/common/licensing/license_service.test.ts b/x-pack/plugins/security/common/licensing/license_service.test.ts
index d7c5a9084ef68..8bf9f4a030051 100644
--- a/x-pack/plugins/security/common/licensing/license_service.test.ts
+++ b/x-pack/plugins/security/common/licensing/license_service.test.ts
@@ -25,6 +25,7 @@ describe('license features', function () {
       allowAccessAgreement: false,
       allowRoleDocumentLevelSecurity: false,
       allowRoleFieldLevelSecurity: false,
+      allowRoleRemoteIndexPrivileges: false,
       layout: 'error-es-unavailable',
       allowRbac: false,
       allowSubFeaturePrivileges: false,
@@ -48,6 +49,7 @@ describe('license features', function () {
       allowAccessAgreement: false,
       allowRoleDocumentLevelSecurity: false,
       allowRoleFieldLevelSecurity: false,
+      allowRoleRemoteIndexPrivileges: false,
       layout: 'error-xpack-unavailable',
       allowRbac: false,
       allowSubFeaturePrivileges: false,
@@ -78,6 +80,7 @@ describe('license features', function () {
             "allowRbac": false,
             "allowRoleDocumentLevelSecurity": false,
             "allowRoleFieldLevelSecurity": false,
+            "allowRoleRemoteIndexPrivileges": false,
             "allowSubFeaturePrivileges": false,
             "allowUserProfileCollaboration": false,
             "layout": "error-xpack-unavailable",
@@ -100,6 +103,7 @@ describe('license features', function () {
             "allowRbac": true,
             "allowRoleDocumentLevelSecurity": true,
             "allowRoleFieldLevelSecurity": true,
+            "allowRoleRemoteIndexPrivileges": true,
             "allowSubFeaturePrivileges": true,
             "allowUserProfileCollaboration": true,
             "showLinks": true,
@@ -132,6 +136,7 @@ describe('license features', function () {
       allowAccessAgreement: false,
       allowRoleDocumentLevelSecurity: false,
       allowRoleFieldLevelSecurity: false,
+      allowRoleRemoteIndexPrivileges: false,
       allowRbac: true,
       allowSubFeaturePrivileges: false,
       allowAuditLogging: false,
@@ -158,6 +163,7 @@ describe('license features', function () {
       allowAccessAgreement: false,
       allowRoleDocumentLevelSecurity: false,
       allowRoleFieldLevelSecurity: false,
+      allowRoleRemoteIndexPrivileges: false,
       allowRbac: false,
       allowSubFeaturePrivileges: false,
       allowAuditLogging: false,
@@ -183,6 +189,7 @@ describe('license features', function () {
       allowAccessAgreement: false,
       allowRoleDocumentLevelSecurity: false,
       allowRoleFieldLevelSecurity: false,
+      allowRoleRemoteIndexPrivileges: false,
       allowRbac: true,
       allowSubFeaturePrivileges: false,
       allowAuditLogging: false,
@@ -208,6 +215,7 @@ describe('license features', function () {
       allowAccessAgreement: true,
       allowRoleDocumentLevelSecurity: false,
       allowRoleFieldLevelSecurity: false,
+      allowRoleRemoteIndexPrivileges: false,
       allowRbac: true,
       allowSubFeaturePrivileges: true,
       allowAuditLogging: true,
@@ -233,6 +241,7 @@ describe('license features', function () {
       allowAccessAgreement: true,
       allowRoleDocumentLevelSecurity: true,
       allowRoleFieldLevelSecurity: true,
+      allowRoleRemoteIndexPrivileges: true,
       allowRbac: true,
       allowSubFeaturePrivileges: true,
       allowAuditLogging: true,
diff --git a/x-pack/plugins/security/common/licensing/license_service.ts b/x-pack/plugins/security/common/licensing/license_service.ts
index b315c875bb3b8..cbb658dde9888 100644
--- a/x-pack/plugins/security/common/licensing/license_service.ts
+++ b/x-pack/plugins/security/common/licensing/license_service.ts
@@ -84,6 +84,7 @@ export class SecurityLicenseService {
         allowAuditLogging: false,
         allowRoleDocumentLevelSecurity: false,
         allowRoleFieldLevelSecurity: false,
+        allowRoleRemoteIndexPrivileges: false,
         allowRbac: false,
         allowSubFeaturePrivileges: false,
         allowUserProfileCollaboration: false,
@@ -104,6 +105,7 @@ export class SecurityLicenseService {
         allowAuditLogging: false,
         allowRoleDocumentLevelSecurity: false,
         allowRoleFieldLevelSecurity: false,
+        allowRoleRemoteIndexPrivileges: false,
         allowRbac: false,
         allowSubFeaturePrivileges: false,
         allowUserProfileCollaboration: false,
@@ -124,6 +126,7 @@ export class SecurityLicenseService {
       // Only platinum and trial licenses are compliant with field- and document-level security.
       allowRoleDocumentLevelSecurity: isLicensePlatinumOrBetter,
       allowRoleFieldLevelSecurity: isLicensePlatinumOrBetter,
+      allowRoleRemoteIndexPrivileges: isLicensePlatinumOrBetter,
       allowRbac: true,
       allowUserProfileCollaboration: isLicenseStandardOrBetter,
     };
diff --git a/x-pack/plugins/security/common/model/index.ts b/x-pack/plugins/security/common/model/index.ts
index 78275d72434c8..a1f3e88fdf56c 100644
--- a/x-pack/plugins/security/common/model/index.ts
+++ b/x-pack/plugins/security/common/model/index.ts
@@ -35,7 +35,12 @@ export { shouldProviderUseLoginForm } from './authentication_provider';
 export type { BuiltinESPrivileges } from './builtin_es_privileges';
 export type { RawKibanaPrivileges, RawKibanaFeaturePrivileges } from './raw_kibana_privileges';
 export type { FeaturesPrivileges } from './features_privileges';
-export type { Role, RoleIndexPrivilege, RoleKibanaPrivilege } from './role';
+export type {
+  Role,
+  RoleIndexPrivilege,
+  RoleRemoteIndexPrivilege,
+  RoleKibanaPrivilege,
+} from './role';
 export {
   copyRole,
   isRoleDeprecated,
diff --git a/x-pack/plugins/security/common/model/role.ts b/x-pack/plugins/security/common/model/role.ts
index 31ff3cc484b8f..17971905fc1ed 100644
--- a/x-pack/plugins/security/common/model/role.ts
+++ b/x-pack/plugins/security/common/model/role.ts
@@ -21,6 +21,10 @@ export interface RoleIndexPrivilege {
   query?: string;
 }
 
+export interface RoleRemoteIndexPrivilege extends RoleIndexPrivilege {
+  clusters: string[];
+}
+
 export interface RoleKibanaPrivilege {
   spaces: string[];
   base: string[];
@@ -33,6 +37,7 @@ export interface Role {
   elasticsearch: {
     cluster: string[];
     indices: RoleIndexPrivilege[];
+    remote_indices?: RoleRemoteIndexPrivilege[];
     run_as: string[];
   };
   kibana: RoleKibanaPrivilege[];
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/__snapshots__/validate_role.test.ts.snap b/x-pack/plugins/security/public/management/roles/edit_role/__snapshots__/validate_role.test.ts.snap
index faf1f4704ce0d..8cb1c41ed06ae 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/__snapshots__/validate_role.test.ts.snap
+++ b/x-pack/plugins/security/public/management/roles/edit_role/__snapshots__/validate_role.test.ts.snap
@@ -1,3 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`validateIndexPrivileges it throws when indices is not an array 1`] = `"Expected \\"role.elasticsearch.indices\\" to be an array"`;
+
+exports[`validateRemoteIndexPrivileges it throws when indices is not an array 1`] = `"Expected \\"role.elasticsearch.remote_indices\\" to be an array"`;
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.tsx b/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.tsx
index eb99bcb24a8bc..e5e5736ca5833 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/edit_role_page.tsx
@@ -180,7 +180,8 @@ function useRole(
           return;
         }
 
-        if (fetchedRole.elasticsearch.indices.length === 0) {
+        const isEditingExistingRole = !!roleName && action === 'edit';
+        if (!isEditingExistingRole && fetchedRole.elasticsearch.indices.length === 0) {
           const emptyOption: RoleIndexPrivilege = {
             names: [],
             privileges: [],
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/cluster_privileges.test.tsx.snap b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/cluster_privileges.test.tsx.snap
index ae57c00324ccd..4769f7d79ae8f 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/cluster_privileges.test.tsx.snap
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/cluster_privileges.test.tsx.snap
@@ -28,6 +28,7 @@ exports[`it renders without crashing 1`] = `
           },
         ]
       }
+      placeholder="Add an action…"
       selectedOptions={Array []}
       singleSelection={false}
       sortMatchesBy="none"
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/elasticsearch_privileges.test.tsx.snap b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/elasticsearch_privileges.test.tsx.snap
index 25196b9929f5a..988f463f49fd1 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/elasticsearch_privileges.test.tsx.snap
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/elasticsearch_privileges.test.tsx.snap
@@ -165,6 +165,7 @@ exports[`it renders without crashing 1`] = `
     }
     editable={true}
     indexPatterns={Array []}
+    indexType="indices"
     indicesAPIClient={
       Object {
         "getFields": [MockFunction],
@@ -199,18 +200,89 @@ exports[`it renders without crashing 1`] = `
       }
     }
   />
-  <EuiHorizontalRule />
-  <EuiButton
-    color="primary"
-    iconType="plusInCircle"
-    onClick={[Function]}
-    size="m"
+  <EuiSpacer />
+  <EuiSpacer />
+  <EuiTitle
+    size="xs"
   >
-    <FormattedMessage
-      defaultMessage="Add index privilege"
-      id="xpack.security.management.editRole.elasticSearchPrivileges.addIndexPrivilegesButtonLabel"
-      values={Object {}}
-    />
-  </EuiButton>
+    <h3>
+      <FormattedMessage
+        defaultMessage="Remote index privileges"
+        id="xpack.security.management.editRole.elasticSearchPrivileges.remoteIndexPrivilegesTitle"
+        values={Object {}}
+      />
+    </h3>
+  </EuiTitle>
+  <EuiSpacer
+    size="s"
+  />
+  <EuiText
+    color="subdued"
+    size="s"
+  >
+    <p>
+      <FormattedMessage
+        defaultMessage="Control access to the data in remote clusters. "
+        id="xpack.security.management.editRole.elasticSearchPrivileges.controlAccessToRemoteClusterDataDescription"
+        values={Object {}}
+      />
+      <EuiLink
+        className="editRole__learnMore"
+        href="https://www.elastic.co/guide/en/elasticsearch/reference/mocked-test-branch/security-privileges.html#privileges-list-indices"
+        target="_blank"
+      >
+        <FormattedMessage
+          defaultMessage="Learn more"
+          id="xpack.security.management.editRole.elasticSearchPrivileges.learnMoreLinkText"
+          values={Object {}}
+        />
+      </EuiLink>
+    </p>
+  </EuiText>
+  <IndexPrivileges
+    availableIndexPrivileges={
+      Array [
+        "all",
+        "read",
+        "write",
+        "index",
+      ]
+    }
+    editable={true}
+    indexType="remote_indices"
+    indicesAPIClient={
+      Object {
+        "getFields": [MockFunction],
+      }
+    }
+    license={
+      Object {
+        "features$": Observable {
+          "_subscribe": [Function],
+        },
+        "getFeatures": [MockFunction],
+        "hasAtLeast": [MockFunction],
+        "isEnabled": [MockFunction],
+        "isLicenseAvailable": [MockFunction],
+      }
+    }
+    onChange={[MockFunction]}
+    role={
+      Object {
+        "elasticsearch": Object {
+          "cluster": Array [],
+          "indices": Array [],
+          "run_as": Array [],
+        },
+        "kibana": Array [],
+        "name": "",
+      }
+    }
+    validator={
+      RoleValidator {
+        "shouldValidate": undefined,
+      }
+    }
+  />
 </CollapsiblePanel>
 `;
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/index_privilege_form.test.tsx.snap b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/index_privilege_form.test.tsx.snap
index 90ee476659584..98ef1cb598f34 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/index_privilege_form.test.tsx.snap
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/index_privilege_form.test.tsx.snap
@@ -2,152 +2,155 @@
 
 exports[`it renders without crashing 1`] = `
 <Fragment>
-  <EuiHorizontalRule />
+  <EuiSpacer
+    size="m"
+  />
   <EuiFlexGroup
+    alignItems="center"
     className="index-privilege-form"
+    responsive={false}
   >
     <EuiFlexItem>
-      <EuiFlexGroup>
-        <EuiFlexItem>
-          <EuiFormRow
-            describedByIds={Array []}
-            display="row"
-            fullWidth={true}
-            hasChildLabel={true}
-            hasEmptyLabelSpace={false}
-            isInvalid={false}
-            label={
-              <FormattedMessage
-                defaultMessage="Indices"
-                id="xpack.security.management.editRole.indexPrivilegeForm.indicesFormRowLabel"
-                values={Object {}}
+      <EuiPanel
+        color="subdued"
+      >
+        <EuiFlexGroup>
+          <EuiFlexItem>
+            <EuiFormRow
+              describedByIds={Array []}
+              display="row"
+              fullWidth={true}
+              hasChildLabel={true}
+              hasEmptyLabelSpace={false}
+              isInvalid={false}
+              label={
+                <FormattedMessage
+                  defaultMessage="Indices"
+                  id="xpack.security.management.editRole.indexPrivilegeForm.indicesFormRowLabel"
+                  values={Object {}}
+                />
+              }
+              labelType="label"
+            >
+              <EuiComboBox
+                async={false}
+                compressed={false}
+                data-test-subj="indicesInput0"
+                fullWidth={true}
+                isClearable={true}
+                isDisabled={false}
+                onChange={[Function]}
+                onCreateOption={[Function]}
+                options={Array []}
+                placeholder="Add an index pattern…"
+                selectedOptions={Array []}
+                singleSelection={false}
+                sortMatchesBy="none"
               />
-            }
-            labelType="label"
-          >
-            <EuiComboBox
-              async={false}
-              compressed={false}
-              data-test-subj="indicesInput0"
-              fullWidth={false}
-              isClearable={true}
-              isDisabled={false}
-              onChange={[Function]}
-              onCreateOption={[Function]}
-              options={Array []}
-              selectedOptions={Array []}
-              singleSelection={false}
-              sortMatchesBy="none"
-            />
-          </EuiFormRow>
-        </EuiFlexItem>
-        <EuiFlexItem>
-          <EuiFormRow
-            describedByIds={Array []}
-            display="row"
-            fullWidth={true}
-            hasChildLabel={true}
-            hasEmptyLabelSpace={false}
-            label={
-              <FormattedMessage
-                defaultMessage="Privileges"
-                id="xpack.security.management.editRole.indexPrivilegeForm.privilegesFormRowLabel"
-                values={Object {}}
+            </EuiFormRow>
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <EuiFormRow
+              describedByIds={Array []}
+              display="row"
+              fullWidth={true}
+              hasChildLabel={true}
+              hasEmptyLabelSpace={false}
+              isInvalid={false}
+              label={
+                <FormattedMessage
+                  defaultMessage="Privileges"
+                  id="xpack.security.management.editRole.indexPrivilegeForm.privilegesFormRowLabel"
+                  values={Object {}}
+                />
+              }
+              labelType="label"
+            >
+              <EuiComboBox
+                async={false}
+                compressed={false}
+                data-test-subj="privilegesInput0"
+                fullWidth={true}
+                isClearable={true}
+                isDisabled={false}
+                onChange={[Function]}
+                onCreateOption={[Function]}
+                options={
+                  Array [
+                    Object {
+                      "label": "all",
+                    },
+                    Object {
+                      "label": "read",
+                    },
+                    Object {
+                      "label": "write",
+                    },
+                    Object {
+                      "label": "index",
+                    },
+                  ]
+                }
+                placeholder="Add an action…"
+                selectedOptions={Array []}
+                singleSelection={false}
+                sortMatchesBy="none"
               />
-            }
-            labelType="label"
-          >
-            <EuiComboBox
-              async={false}
-              compressed={false}
-              data-test-subj="privilegesInput0"
-              fullWidth={false}
-              isClearable={true}
-              isDisabled={false}
+            </EuiFormRow>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+        <EuiSpacer />
+        <EuiFlexGroup
+          direction="column"
+        >
+          <EuiFlexItem>
+            <EuiSwitch
+              checked={false}
+              compressed={true}
+              data-test-subj="restrictFieldsQuery0"
+              label={
+                <FormattedMessage
+                  defaultMessage="Grant access to specific fields"
+                  id="xpack.security.management.editRoles.indexPrivilegeForm.grantFieldPrivilegesLabel"
+                  values={Object {}}
+                />
+              }
               onChange={[Function]}
-              onCreateOption={[Function]}
-              options={
-                Array [
-                  Object {
-                    "label": "all",
-                  },
-                  Object {
-                    "label": "read",
-                  },
-                  Object {
-                    "label": "write",
-                  },
-                  Object {
-                    "label": "index",
-                  },
-                ]
+            />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+        <EuiSpacer />
+        <EuiFlexGroup
+          direction="column"
+        >
+          <EuiFlexItem>
+            <EuiSwitch
+              checked={false}
+              compressed={true}
+              data-test-subj="restrictDocumentsQuery0"
+              disabled={false}
+              label={
+                <FormattedMessage
+                  defaultMessage="Grant read privileges to specific documents"
+                  id="xpack.security.management.editRole.indexPrivilegeForm.grantReadPrivilegesLabel"
+                  values={Object {}}
+                />
               }
-              selectedOptions={Array []}
-              singleSelection={false}
-              sortMatchesBy="none"
+              onChange={[Function]}
             />
-          </EuiFormRow>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-      <EuiSpacer />
-      <EuiFlexGroup
-        direction="column"
-      >
-        <EuiFlexItem>
-          <EuiSwitch
-            checked={false}
-            compressed={true}
-            data-test-subj="restrictFieldsQuery0"
-            label={
-              <FormattedMessage
-                defaultMessage="Grant access to specific fields"
-                id="xpack.security.management.editRoles.indexPrivilegeForm.grantFieldPrivilegesLabel"
-                values={Object {}}
-              />
-            }
-            onChange={[Function]}
-          />
-        </EuiFlexItem>
-      </EuiFlexGroup>
-      <EuiSpacer />
-      <EuiFlexGroup
-        direction="column"
-      >
-        <EuiFlexItem>
-          <EuiSwitch
-            checked={false}
-            compressed={true}
-            data-test-subj="restrictDocumentsQuery0"
-            disabled={false}
-            label={
-              <FormattedMessage
-                defaultMessage="Grant read privileges to specific documents"
-                id="xpack.security.management.editRole.indexPrivilegeForm.grantReadPrivilegesLabel"
-                values={Object {}}
-              />
-            }
-            onChange={[Function]}
-          />
-        </EuiFlexItem>
-      </EuiFlexGroup>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiPanel>
     </EuiFlexItem>
     <EuiFlexItem
       grow={false}
     >
-      <EuiFormRow
-        describedByIds={Array []}
-        display="row"
-        hasChildLabel={true}
-        hasEmptyLabelSpace={true}
-        labelType="label"
-      >
-        <EuiButtonIcon
-          aria-label="Delete index privilege"
-          color="danger"
-          iconType="trash"
-          onClick={[MockFunction]}
-        />
-      </EuiFormRow>
+      <EuiButtonIcon
+        aria-label="Delete index privilege"
+        color="danger"
+        iconType="trash"
+        onClick={[MockFunction]}
+      />
     </EuiFlexItem>
   </EuiFlexGroup>
 </Fragment>
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/index_privileges.test.tsx.snap b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/index_privileges.test.tsx.snap
index 722fdf32a62b3..a193988ffd224 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/index_privileges.test.tsx.snap
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/__snapshots__/index_privileges.test.tsx.snap
@@ -12,6 +12,7 @@ exports[`it renders without crashing 1`] = `
   }
   editable={true}
   indexPatterns={Array []}
+  indexType="indices"
   indicesAPIClient={
     Object {
       "getFields": [MockFunction],
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/cluster_privileges.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/cluster_privileges.tsx
index 4eb9827990849..c5463c4458b11 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/cluster_privileges.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/cluster_privileges.tsx
@@ -53,6 +53,10 @@ export class ClusterPrivileges extends Component<Props, {}> {
           onChange={this.onClusterPrivilegesChange}
           onCreateOption={this.onCreateCustomPrivilege}
           isDisabled={isRoleReadOnly(role) || !editable}
+          placeholder={i18n.translate(
+            'xpack.security.management.editRole.clusterPrivileges.placeholder',
+            { defaultMessage: 'Add an action…' }
+          )}
         />
       </EuiFlexItem>
     );
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.test.tsx
index 52feba5ae83ad..13a4143890a86 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.test.tsx
@@ -8,14 +8,12 @@
 import React from 'react';
 
 import { coreMock } from '@kbn/core/public/mocks';
-import { mountWithIntl, shallowWithIntl } from '@kbn/test-jest-helpers';
+import { shallowWithIntl } from '@kbn/test-jest-helpers';
 
 import { licenseMock } from '../../../../../../common/licensing/index.mock';
 import { indicesAPIClientMock } from '../../../index.mock';
 import { RoleValidator } from '../../validate_role';
-import { ClusterPrivileges } from './cluster_privileges';
 import { ElasticsearchPrivileges } from './elasticsearch_privileges';
-import { IndexPrivileges } from './index_privileges';
 
 function getProps() {
   const license = licenseMock.create();
@@ -56,20 +54,25 @@ test('it renders without crashing', () => {
 });
 
 test('it renders ClusterPrivileges', () => {
-  expect(
-    mountWithIntl(<ElasticsearchPrivileges {...getProps()} />).find(ClusterPrivileges)
-  ).toHaveLength(1);
+  const wrapper = shallowWithIntl(<ElasticsearchPrivileges {...getProps()} />);
+  expect(wrapper.find('ClusterPrivileges')).toHaveLength(1);
 });
 
-test('it renders IndexPrivileges', () => {
-  expect(
-    mountWithIntl(<ElasticsearchPrivileges {...getProps()} />).find(IndexPrivileges)
-  ).toHaveLength(1);
+test('it renders index privileges section', () => {
+  const wrapper = shallowWithIntl(<ElasticsearchPrivileges {...getProps()} />);
+  expect(wrapper.find('IndexPrivileges[indexType="indices"]')).toHaveLength(1);
+});
+
+test('it renders remote index privileges section', () => {
+  const wrapper = shallowWithIntl(<ElasticsearchPrivileges {...getProps()} />);
+  expect(wrapper.find('IndexPrivileges[indexType="remote_indices"]')).toHaveLength(1);
 });
 
 test('it renders fields as disabled when not editable', () => {
   const wrapper = shallowWithIntl(<ElasticsearchPrivileges {...getProps()} editable={false} />);
   expect(wrapper.find('EuiComboBox').prop('isDisabled')).toBe(true);
   expect(wrapper.find('ClusterPrivileges').prop('editable')).toBe(false);
-  expect(wrapper.find('IndexPrivileges').prop('editable')).toBe(false);
+  expect(
+    wrapper.find('IndexPrivileges').everyWhere((component) => component.prop('editable'))
+  ).toBe(false);
 });
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.tsx
index 6ae205c62cfa7..88e0c953711fa 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/elasticsearch_privileges.tsx
@@ -6,11 +6,9 @@
  */
 
 import {
-  EuiButton,
   EuiComboBox,
   EuiDescribedFormGroup,
   EuiFormRow,
-  EuiHorizontalRule,
   EuiLink,
   EuiSpacer,
   EuiText,
@@ -141,10 +139,9 @@ export class ElasticsearchPrivileges extends Component<Props, {}> {
             isDisabled={!editable}
           />
         </EuiDescribedFormGroup>
-
         <EuiSpacer />
 
-        <EuiTitle size={'xs'}>
+        <EuiTitle size="xs">
           <h3>
             <FormattedMessage
               id="xpack.security.management.editRole.elasticSearchPrivileges.indexPrivilegesTitle"
@@ -152,8 +149,8 @@ export class ElasticsearchPrivileges extends Component<Props, {}> {
             />
           </h3>
         </EuiTitle>
-        <EuiSpacer size={'s'} />
-        <EuiText size={'s'} color={'subdued'}>
+        <EuiSpacer size="s" />
+        <EuiText size="s" color="subdued">
           <p>
             <FormattedMessage
               id="xpack.security.management.editRole.elasticSearchPrivileges.controlAccessToClusterDataDescription"
@@ -162,29 +159,48 @@ export class ElasticsearchPrivileges extends Component<Props, {}> {
             {this.learnMore(docLinks.links.security.indicesPrivileges)}
           </p>
         </EuiText>
-
         <IndexPrivileges
+          indexType="indices"
+          indexPatterns={indexPatterns}
           role={role}
           indicesAPIClient={indicesAPIClient}
           validator={validator}
-          indexPatterns={indexPatterns}
           license={license}
           onChange={onChange}
           availableIndexPrivileges={builtinESPrivileges.index}
           editable={editable}
         />
+        <EuiSpacer />
+        <EuiSpacer />
 
-        {editable && (
-          <>
-            <EuiHorizontalRule />
-            <EuiButton iconType={'plusInCircle'} onClick={this.addIndexPrivilege}>
-              <FormattedMessage
-                id="xpack.security.management.editRole.elasticSearchPrivileges.addIndexPrivilegesButtonLabel"
-                defaultMessage="Add index privilege"
-              />
-            </EuiButton>
-          </>
-        )}
+        <EuiTitle size="xs">
+          <h3>
+            <FormattedMessage
+              id="xpack.security.management.editRole.elasticSearchPrivileges.remoteIndexPrivilegesTitle"
+              defaultMessage="Remote index privileges"
+            />
+          </h3>
+        </EuiTitle>
+        <EuiSpacer size="s" />
+        <EuiText size="s" color="subdued">
+          <p>
+            <FormattedMessage
+              id="xpack.security.management.editRole.elasticSearchPrivileges.controlAccessToRemoteClusterDataDescription"
+              defaultMessage="Control access to the data in remote clusters. "
+            />
+            {this.learnMore(docLinks.links.security.indicesPrivileges)}
+          </p>
+        </EuiText>
+        <IndexPrivileges
+          indexType="remote_indices"
+          role={role}
+          indicesAPIClient={indicesAPIClient}
+          validator={validator}
+          license={license}
+          onChange={onChange}
+          availableIndexPrivileges={builtinESPrivileges.index}
+          editable={editable}
+        />
       </Fragment>
     );
   };
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.test.tsx
index 793bc2f45433c..8ed57e646326f 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.test.tsx
@@ -17,68 +17,125 @@ import { RoleValidator } from '../../validate_role';
 import { IndexPrivilegeForm } from './index_privilege_form';
 
 test('it renders without crashing', () => {
-  const props = {
-    indexPrivilege: {
-      names: [],
-      privileges: [],
-      query: '',
-      field_security: {
-        grant: [],
-      },
-    },
-    formIndex: 0,
-    indexPatterns: [],
-    indicesAPIClient: indicesAPIClientMock.create(),
-    availableIndexPrivileges: ['all', 'read', 'write', 'index'],
-    isRoleReadOnly: false,
-    allowDocumentLevelSecurity: true,
-    allowFieldLevelSecurity: true,
-    validator: new RoleValidator(),
-    onChange: jest.fn(),
-    onDelete: jest.fn(),
-    intl: {} as any,
-  };
-
-  const wrapper = shallowWithIntl(<IndexPrivilegeForm {...props} />);
+  const wrapper = shallowWithIntl(
+    <IndexPrivilegeForm
+      indexType="indices"
+      indexPrivilege={{
+        names: [],
+        privileges: [],
+        query: '',
+        field_security: {
+          grant: [],
+        },
+      }}
+      formIndex={0}
+      indexPatterns={[]}
+      indicesAPIClient={indicesAPIClientMock.create()}
+      availableIndexPrivileges={['all', 'read', 'write', 'index']}
+      isRoleReadOnly={false}
+      allowDocumentLevelSecurity
+      allowFieldLevelSecurity
+      validator={new RoleValidator()}
+      onChange={jest.fn()}
+      onDelete={jest.fn()}
+    />
+  );
   expect(wrapper).toMatchSnapshot();
 });
 
 test('it allows for custom index privileges', () => {
-  const props = {
-    indexPrivilege: {
-      names: ['foo'],
-      privileges: ['existing-custom', 'read'],
-      query: '',
-      field_security: {
-        grant: [],
-      },
-    },
-    formIndex: 0,
-    indexPatterns: [],
-    indicesAPIClient: indicesAPIClientMock.create(),
-    availableIndexPrivileges: ['all', 'read', 'write', 'index'],
-    isRoleReadOnly: false,
-    allowDocumentLevelSecurity: true,
-    allowFieldLevelSecurity: true,
-    validator: new RoleValidator(),
-    onChange: jest.fn(),
-    onDelete: jest.fn(),
-    intl: {} as any,
-  };
-
-  const wrapper = mountWithIntl(<IndexPrivilegeForm {...props} />);
+  const onChange = jest.fn();
+  const wrapper = mountWithIntl(
+    <IndexPrivilegeForm
+      indexType="indices"
+      indexPrivilege={{
+        names: ['foo'],
+        privileges: ['existing-custom', 'read'],
+        query: '',
+        field_security: {
+          grant: [],
+        },
+      }}
+      formIndex={0}
+      indexPatterns={[]}
+      indicesAPIClient={indicesAPIClientMock.create()}
+      availableIndexPrivileges={['all', 'read', 'write', 'index']}
+      isRoleReadOnly={false}
+      allowDocumentLevelSecurity={true}
+      allowFieldLevelSecurity={true}
+      validator={new RoleValidator()}
+      onChange={onChange}
+      onDelete={jest.fn()}
+    />
+  );
 
   const indexPrivsSelect = wrapper.find('EuiComboBox[data-test-subj="privilegesInput0"]');
 
   (indexPrivsSelect.props() as any).onCreateOption('custom-index-privilege');
 
-  expect(props.onChange).toHaveBeenCalledWith(
+  expect(onChange).toHaveBeenCalledWith(
     expect.objectContaining({ privileges: ['existing-custom', 'read', 'custom-index-privilege'] })
   );
 });
 
+test('should not render clusters field for local indices', () => {
+  const wrapper = shallowWithIntl(
+    <IndexPrivilegeForm
+      indexType="indices"
+      indexPrivilege={{
+        names: [],
+        privileges: [],
+        query: '',
+        field_security: {
+          grant: [],
+        },
+      }}
+      formIndex={0}
+      indexPatterns={[]}
+      indicesAPIClient={indicesAPIClientMock.create()}
+      availableIndexPrivileges={['all', 'read', 'write', 'index']}
+      isRoleReadOnly={false}
+      allowDocumentLevelSecurity
+      allowFieldLevelSecurity
+      validator={new RoleValidator()}
+      onChange={jest.fn()}
+      onDelete={jest.fn()}
+    />
+  );
+  expect(wrapper.find('[data-test-subj="clustersInput0"]')).toHaveLength(0);
+});
+
+test('should render clusters field for remote indices', () => {
+  const wrapper = shallowWithIntl(
+    <IndexPrivilegeForm
+      indexType="remote_indices"
+      indexPrivilege={{
+        clusters: [],
+        names: [],
+        privileges: [],
+        query: '',
+        field_security: {
+          grant: [],
+        },
+      }}
+      formIndex={0}
+      indexPatterns={[]}
+      indicesAPIClient={indicesAPIClientMock.create()}
+      availableIndexPrivileges={['all', 'read', 'write', 'index']}
+      isRoleReadOnly={false}
+      allowDocumentLevelSecurity
+      allowFieldLevelSecurity
+      validator={new RoleValidator()}
+      onChange={jest.fn()}
+      onDelete={jest.fn()}
+    />
+  );
+  expect(wrapper.find('[data-test-subj="clustersInput0"]')).toHaveLength(1);
+});
+
 describe('delete button', () => {
   const props = {
+    indexType: 'indices' as const,
     indexPrivilege: {
       names: [],
       privileges: [],
@@ -131,6 +188,7 @@ describe('delete button', () => {
 
 describe(`document level security`, () => {
   const props = {
+    indexType: 'indices' as const,
     indexPrivilege: {
       names: [],
       privileges: [],
@@ -178,13 +236,9 @@ describe(`document level security`, () => {
   });
 
   test('both inputs are shown when allowed, and query is not empty', () => {
-    const testProps = {
-      ...props,
-    };
-
     const wrapper = mountWithIntl(
       <KibanaContextProvider services={coreMock.createStart()}>
-        <IndexPrivilegeForm {...testProps} />
+        <IndexPrivilegeForm {...props} />
       </KibanaContextProvider>
     );
     expect(wrapper.find('EuiSwitch[data-test-subj="restrictDocumentsQuery0"]')).toHaveLength(1);
@@ -194,6 +248,7 @@ describe(`document level security`, () => {
 
 describe('field level security', () => {
   const props = {
+    indexType: 'indices' as const,
     indexPrivilege: {
       names: [],
       privileges: [],
@@ -380,11 +435,7 @@ describe('field level security', () => {
   });
 
   test('it does not display a warning when fields are granted', () => {
-    const testProps = {
-      ...props,
-    };
-
-    const wrapper = mountWithIntl(<IndexPrivilegeForm {...testProps} />);
+    const wrapper = mountWithIntl(<IndexPrivilegeForm {...props} />);
     expect(wrapper.find('div.indexPrivilegeForm__grantedFieldsRow')).toHaveLength(1);
     expect(wrapper.find('div.indexPrivilegeForm__deniedFieldsRow')).toHaveLength(1);
     expect(wrapper.find('.euiFormHelpText')).toHaveLength(0);
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.tsx
index 934de8921ec88..58d1bd8061bf8 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privilege_form.tsx
@@ -12,7 +12,7 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
   EuiFormRow,
-  EuiHorizontalRule,
+  EuiPanel,
   EuiSpacer,
   EuiSwitch,
 } from '@elastic/eui';
@@ -25,7 +25,7 @@ import { CodeEditorField } from '@kbn/kibana-react-plugin/public';
 import type { monaco } from '@kbn/monaco';
 import type { PublicMethodsOf } from '@kbn/utility-types';
 
-import type { RoleIndexPrivilege } from '../../../../../../common/model';
+import type { RoleIndexPrivilege, RoleRemoteIndexPrivilege } from '../../../../../../common/model';
 import type { IndicesAPIClient } from '../../../indices_api_client';
 import type { RoleValidator } from '../../validate_role';
 
@@ -34,11 +34,12 @@ const toOption = (value: string) => ({ label: value });
 
 interface Props {
   formIndex: number;
-  indexPrivilege: RoleIndexPrivilege;
+  indexType: 'indices' | 'remote_indices';
+  indexPrivilege: RoleIndexPrivilege | RoleRemoteIndexPrivilege;
   indexPatterns: string[];
   availableIndexPrivileges: string[];
   indicesAPIClient: PublicMethodsOf<IndicesAPIClient>;
-  onChange: (indexPrivilege: RoleIndexPrivilege) => void;
+  onChange: (indexPrivilege: RoleIndexPrivilege | RoleRemoteIndexPrivilege) => void;
   onDelete: () => void;
   isRoleReadOnly: boolean;
   allowDocumentLevelSecurity: boolean;
@@ -89,22 +90,29 @@ export class IndexPrivilegeForm extends Component<Props, State> {
   public render() {
     return (
       <Fragment>
-        <EuiHorizontalRule />
-        <EuiFlexGroup className="index-privilege-form">
-          <EuiFlexItem>{this.getPrivilegeForm()}</EuiFlexItem>
+        <EuiSpacer size="m" />
+        <EuiFlexGroup alignItems="center" responsive={false} className="index-privilege-form">
+          <EuiFlexItem>
+            <EuiPanel color="subdued">{this.getPrivilegeForm()}</EuiPanel>
+          </EuiFlexItem>
           {!this.props.isRoleReadOnly && (
             <EuiFlexItem grow={false}>
-              <EuiFormRow hasEmptyLabelSpace>
-                <EuiButtonIcon
-                  aria-label={i18n.translate(
-                    'xpack.security.management.editRole.indexPrivilegeForm.deleteSpacePrivilegeAriaLabel',
-                    { defaultMessage: 'Delete index privilege' }
-                  )}
-                  color={'danger'}
-                  onClick={this.props.onDelete}
-                  iconType={'trash'}
-                />
-              </EuiFormRow>
+              <EuiButtonIcon
+                aria-label={
+                  this.props.indexType === 'remote_indices'
+                    ? i18n.translate(
+                        'xpack.security.management.editRole.indexPrivilegeForm.deleteRemoteIndexPrivilegeAriaLabel',
+                        { defaultMessage: 'Delete remote index privilege' }
+                      )
+                    : i18n.translate(
+                        'xpack.security.management.editRole.indexPrivilegeForm.deleteIndexPrivilegeAriaLabel',
+                        { defaultMessage: 'Delete index privilege' }
+                      )
+                }
+                color={'danger'}
+                onClick={this.props.onDelete}
+                iconType={'trash'}
+              />
             </EuiFlexItem>
           )}
         </EuiFlexGroup>
@@ -114,18 +122,58 @@ export class IndexPrivilegeForm extends Component<Props, State> {
 
   private getPrivilegeForm = () => {
     return (
-      <Fragment>
+      <>
         <EuiFlexGroup>
+          {this.props.indexType === 'remote_indices' ? (
+            <EuiFlexItem>
+              <EuiFormRow
+                label={
+                  <FormattedMessage
+                    id="xpack.security.management.editRole.indexPrivilegeForm.clustersFormRowLabel"
+                    defaultMessage="Remote clusters"
+                  />
+                }
+                fullWidth
+                {...this.props.validator.validateRemoteIndexPrivilegeClustersField(
+                  this.props.indexPrivilege as RoleRemoteIndexPrivilege
+                )}
+              >
+                <EuiComboBox
+                  data-test-subj={`clustersInput${this.props.formIndex}`}
+                  selectedOptions={('clusters' in this.props.indexPrivilege &&
+                  this.props.indexPrivilege.clusters
+                    ? this.props.indexPrivilege.clusters
+                    : []
+                  ).map(toOption)}
+                  onCreateOption={this.onCreateClusterOption}
+                  onChange={this.onClustersChange}
+                  isDisabled={this.props.isRoleReadOnly}
+                  placeholder={i18n.translate(
+                    'xpack.security.management.editRole.indexPrivilegeForm.clustersPlaceholder',
+                    { defaultMessage: 'Add a remote cluster…' }
+                  )}
+                  fullWidth
+                />
+              </EuiFormRow>
+            </EuiFlexItem>
+          ) : null}
           <EuiFlexItem>
             <EuiFormRow
               label={
-                <FormattedMessage
-                  id="xpack.security.management.editRole.indexPrivilegeForm.indicesFormRowLabel"
-                  defaultMessage="Indices"
-                />
+                this.props.indexType === 'remote_indices' ? (
+                  <FormattedMessage
+                    id="xpack.security.management.editRole.indexPrivilegeForm.remoteIndicesFormRowLabel"
+                    defaultMessage="Remote indices"
+                  />
+                ) : (
+                  <FormattedMessage
+                    id="xpack.security.management.editRole.indexPrivilegeForm.indicesFormRowLabel"
+                    defaultMessage="Indices"
+                  />
+                )
               }
-              fullWidth={true}
-              {...this.props.validator.validateIndexPrivilege(this.props.indexPrivilege)}
+              fullWidth
+              {...this.props.validator.validateIndexPrivilegeNamesField(this.props.indexPrivilege)}
             >
               <EuiComboBox
                 data-test-subj={`indicesInput${this.props.formIndex}`}
@@ -134,6 +182,11 @@ export class IndexPrivilegeForm extends Component<Props, State> {
                 onCreateOption={this.onCreateIndexPatternOption}
                 onChange={this.onIndexPatternsChange}
                 isDisabled={this.props.isRoleReadOnly}
+                placeholder={i18n.translate(
+                  'xpack.security.management.editRole.indexPrivilegeForm.indicesPlaceholder',
+                  { defaultMessage: 'Add an index pattern…' }
+                )}
+                fullWidth
               />
             </EuiFormRow>
           </EuiFlexItem>
@@ -145,7 +198,10 @@ export class IndexPrivilegeForm extends Component<Props, State> {
                   defaultMessage="Privileges"
                 />
               }
-              fullWidth={true}
+              fullWidth
+              {...this.props.validator.validateIndexPrivilegePrivilegesField(
+                this.props.indexPrivilege
+              )}
             >
               <EuiComboBox
                 data-test-subj={`privilegesInput${this.props.formIndex}`}
@@ -154,17 +210,19 @@ export class IndexPrivilegeForm extends Component<Props, State> {
                 onChange={this.onPrivilegeChange}
                 onCreateOption={this.onCreateCustomPrivilege}
                 isDisabled={this.props.isRoleReadOnly}
+                placeholder={i18n.translate(
+                  'xpack.security.management.editRole.indexPrivilegeForm.privilegesPlaceholder',
+                  { defaultMessage: 'Add an action…' }
+                )}
+                fullWidth
               />
             </EuiFormRow>
           </EuiFlexItem>
         </EuiFlexGroup>
 
-        <EuiSpacer />
-
         {this.getFieldLevelControls()}
-
         {this.getGrantedDocumentsControl()}
-      </Fragment>
+      </>
     );
   };
 
@@ -189,17 +247,20 @@ export class IndexPrivilegeForm extends Component<Props, State> {
   };
 
   private getFieldLevelControls = () => {
-    const { allowFieldLevelSecurity, allowDocumentLevelSecurity, indexPrivilege, isRoleReadOnly } =
-      this.props;
+    const { allowFieldLevelSecurity, indexPrivilege, isRoleReadOnly } = this.props;
+    const { grant, except } = this.getFieldSecurity(indexPrivilege);
 
     if (!allowFieldLevelSecurity) {
       return null;
     }
 
-    const { grant, except } = this.getFieldSecurity(indexPrivilege);
+    if (isRoleReadOnly && !this.state.fieldSecurityExpanded) {
+      return null;
+    }
 
     return (
       <>
+        <EuiSpacer />
         <EuiFlexGroup direction="column">
           {!isRoleReadOnly && (
             <EuiFlexItem>
@@ -230,7 +291,7 @@ export class IndexPrivilegeForm extends Component<Props, State> {
                         defaultMessage="Granted fields"
                       />
                     }
-                    fullWidth={true}
+                    fullWidth
                     className="indexPrivilegeForm__grantedFieldsRow"
                     helpText={
                       !isRoleReadOnly && grant.length === 0 ? (
@@ -250,6 +311,11 @@ export class IndexPrivilegeForm extends Component<Props, State> {
                       isDisabled={this.props.isRoleReadOnly}
                       async={true}
                       isLoading={this.state.isFieldListLoading}
+                      placeholder={i18n.translate(
+                        'xpack.security.management.editRole.indexPrivilegeForm.fieldPlaceholder',
+                        { defaultMessage: 'Add a field pattern…' }
+                      )}
+                      fullWidth
                     />
                   </EuiFormRow>
                 </EuiFlexItem>
@@ -261,7 +327,7 @@ export class IndexPrivilegeForm extends Component<Props, State> {
                         defaultMessage="Denied fields"
                       />
                     }
-                    fullWidth={true}
+                    fullWidth
                     className="indexPrivilegeForm__deniedFieldsRow"
                   >
                     <EuiComboBox
@@ -273,6 +339,11 @@ export class IndexPrivilegeForm extends Component<Props, State> {
                       isDisabled={isRoleReadOnly}
                       async={true}
                       isLoading={this.state.isFieldListLoading}
+                      placeholder={i18n.translate(
+                        'xpack.security.management.editRole.indexPrivilegeForm.deniedFieldPlaceholder',
+                        { defaultMessage: 'Add a field pattern…' }
+                      )}
+                      fullWidth
                     />
                   </EuiFormRow>
                 </EuiFlexItem>
@@ -280,7 +351,6 @@ export class IndexPrivilegeForm extends Component<Props, State> {
             </EuiFlexItem>
           )}
         </EuiFlexGroup>
-        {allowDocumentLevelSecurity && <EuiSpacer />}
       </>
     );
   };
@@ -292,64 +362,71 @@ export class IndexPrivilegeForm extends Component<Props, State> {
       return null;
     }
 
+    if (this.props.isRoleReadOnly && !this.state.queryExpanded) {
+      return null;
+    }
+
     return (
-      <EuiFlexGroup direction="column">
-        {!this.props.isRoleReadOnly && (
-          <EuiFlexItem>
-            <EuiSwitch
-              data-test-subj={`restrictDocumentsQuery${this.props.formIndex}`}
-              label={
-                <FormattedMessage
-                  id="xpack.security.management.editRole.indexPrivilegeForm.grantReadPrivilegesLabel"
-                  defaultMessage="Grant read privileges to specific documents"
-                />
-              }
-              compressed={true}
-              checked={this.state.queryExpanded}
-              onChange={this.toggleDocumentQuery}
-              disabled={isRoleReadOnly}
-            />
-          </EuiFlexItem>
-        )}
-        {this.state.queryExpanded && (
-          <EuiFlexItem>
-            <EuiFormRow
-              label={
-                <FormattedMessage
-                  id="xpack.security.management.editRole.indexPrivilegeForm.grantedDocumentsQueryFormRowLabel"
-                  defaultMessage="Granted documents query"
-                />
-              }
-              fullWidth={true}
-              data-test-subj={`queryInput${this.props.formIndex}`}
-            >
-              <CodeEditorField
-                languageId="xjson"
-                width="100%"
-                fullWidth={true}
-                height={this.state.documentQueryEditorHeight}
-                aria-label={i18n.translate(
-                  'xpack.security.management.editRole.indexPrivilegeForm.grantedDocumentsQueryEditorAriaLabel',
-                  {
-                    defaultMessage: 'Granted documents query editor',
-                  }
-                )}
-                value={indexPrivilege.query ?? ''}
-                onChange={this.onQueryChange}
-                options={{
-                  readOnly: this.props.isRoleReadOnly,
-                  minimap: {
-                    enabled: false,
-                  },
-                  // Prevent an empty form from showing an error
-                  renderValidationDecorations: indexPrivilege.query ? 'editable' : 'off',
-                }}
-                editorDidMount={this.editorDidMount}
+      <>
+        <EuiSpacer />
+        <EuiFlexGroup direction="column">
+          {!this.props.isRoleReadOnly && (
+            <EuiFlexItem>
+              <EuiSwitch
+                data-test-subj={`restrictDocumentsQuery${this.props.formIndex}`}
+                label={
+                  <FormattedMessage
+                    id="xpack.security.management.editRole.indexPrivilegeForm.grantReadPrivilegesLabel"
+                    defaultMessage="Grant read privileges to specific documents"
+                  />
+                }
+                compressed={true}
+                checked={this.state.queryExpanded}
+                onChange={this.toggleDocumentQuery}
+                disabled={isRoleReadOnly}
               />
-            </EuiFormRow>
-          </EuiFlexItem>
-        )}
-      </EuiFlexGroup>
+            </EuiFlexItem>
+          )}
+          {this.state.queryExpanded && (
+            <EuiFlexItem>
+              <EuiFormRow
+                label={
+                  <FormattedMessage
+                    id="xpack.security.management.editRole.indexPrivilegeForm.grantedDocumentsQueryFormRowLabel"
+                    defaultMessage="Granted documents query"
+                  />
+                }
+                fullWidth
+                data-test-subj={`queryInput${this.props.formIndex}`}
+              >
+                <CodeEditorField
+                  languageId="xjson"
+                  width="100%"
+                  fullWidth
+                  height={this.state.documentQueryEditorHeight}
+                  aria-label={i18n.translate(
+                    'xpack.security.management.editRole.indexPrivilegeForm.grantedDocumentsQueryEditorAriaLabel',
+                    {
+                      defaultMessage: 'Granted documents query editor',
+                    }
+                  )}
+                  value={indexPrivilege.query ?? ''}
+                  onChange={this.onQueryChange}
+                  options={{
+                    readOnly: this.props.isRoleReadOnly,
+                    minimap: {
+                      enabled: false,
+                    },
+                    // Prevent an empty form from showing an error
+                    renderValidationDecorations: indexPrivilege.query ? 'editable' : 'off',
+                  }}
+                  editorDidMount={this.editorDidMount}
+                />
+              </EuiFormRow>
+            </EuiFlexItem>
+          )}
+        </EuiFlexGroup>
+      </>
     );
   };
 
@@ -444,6 +521,27 @@ export class IndexPrivilegeForm extends Component<Props, State> {
     }
   };
 
+  private onCreateClusterOption = (option: any) => {
+    const nextClusters = (
+      'clusters' in this.props.indexPrivilege && this.props.indexPrivilege.clusters
+        ? this.props.indexPrivilege.clusters
+        : []
+    ).concat([option]);
+
+    this.props.onChange({
+      ...this.props.indexPrivilege,
+      clusters: nextClusters,
+    });
+  };
+
+  private onClustersChange = (nextOptions: EuiComboBoxOptionOption[]) => {
+    const clusters = nextOptions.map(fromOption);
+    this.props.onChange({
+      ...this.props.indexPrivilege,
+      clusters,
+    });
+  };
+
   private onCreateIndexPatternOption = (option: any) => {
     const newIndexPatterns = this.props.indexPrivilege.names.concat([option]);
 
@@ -548,12 +646,14 @@ export class IndexPrivilegeForm extends Component<Props, State> {
     });
   };
 
-  private getFieldSecurity = (indexPrivilege: RoleIndexPrivilege) => {
+  private getFieldSecurity = (indexPrivilege: RoleIndexPrivilege | RoleRemoteIndexPrivilege) => {
     const { grant = [], except = [] } = indexPrivilege.field_security || {};
     return { grant, except };
   };
 
-  private isFieldSecurityConfigured = (indexPrivilege: RoleIndexPrivilege) => {
+  private isFieldSecurityConfigured = (
+    indexPrivilege: RoleIndexPrivilege | RoleRemoteIndexPrivilege
+  ) => {
     const { grant, except } = this.getFieldSecurity(indexPrivilege);
     return except.length > 0 || (grant.length > 0 && !_.isEqual(grant, ['*']));
   };
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privileges.test.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privileges.test.tsx
index 91f761d1157fa..5247b56d52a91 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privileges.test.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privileges.test.tsx
@@ -28,34 +28,34 @@ test('it renders without crashing', async () => {
     allowRoleDocumentLevelSecurity: true,
   } as any);
 
-  const props = {
-    role: {
-      name: '',
-      kibana: [],
-      elasticsearch: {
-        cluster: [],
-        indices: [],
-        run_as: [],
-      },
-    },
-    onChange: jest.fn(),
-    indexPatterns: [],
-    editable: true,
-    validator: new RoleValidator(),
-    availableIndexPrivileges: ['all', 'read', 'write', 'index'],
-    indicesAPIClient: indicesAPIClientMock.create(),
-    license,
-  };
   const wrapper = shallowWithIntl(
     <KibanaContextProvider services={coreMock.createStart()}>
-      <IndexPrivileges {...props} />
+      <IndexPrivileges
+        indexType="indices"
+        role={{
+          name: '',
+          kibana: [],
+          elasticsearch: {
+            cluster: [],
+            indices: [],
+            run_as: [],
+          },
+        }}
+        onChange={jest.fn()}
+        indexPatterns={[]}
+        editable
+        validator={new RoleValidator()}
+        availableIndexPrivileges={['all', 'read', 'write', 'index']}
+        indicesAPIClient={indicesAPIClientMock.create()}
+        license={license}
+      />
     </KibanaContextProvider>
   );
   await flushPromises();
   expect(wrapper.children()).toMatchSnapshot();
 });
 
-test('it renders a IndexPrivilegeForm for each privilege on the role', async () => {
+test('it renders an IndexPrivilegeForm for each index privilege on the role', async () => {
   const license = licenseMock.create();
   license.getFeatures.mockReturnValue({
     allowRoleFieldLevelSecurity: true,
@@ -65,40 +65,105 @@ test('it renders a IndexPrivilegeForm for each privilege on the role', async ()
   const indicesAPIClient = indicesAPIClientMock.create();
   indicesAPIClient.getFields.mockResolvedValue(['foo']);
 
-  const props = {
-    role: {
-      name: '',
-      kibana: [],
-      elasticsearch: {
-        cluster: [],
-        indices: [
-          {
-            names: ['foo*'],
-            privileges: ['all'],
-            query: '*',
-            field_security: {
-              grant: ['some_field'],
-            },
+  const wrapper = mountWithIntl(
+    <KibanaContextProvider services={coreMock.createStart()}>
+      <IndexPrivileges
+        indexType="indices"
+        role={{
+          name: '',
+          kibana: [],
+          elasticsearch: {
+            cluster: [],
+            indices: [
+              {
+                names: ['foo*'],
+                privileges: ['all'],
+                query: '*',
+                field_security: {
+                  grant: ['some_field'],
+                },
+              },
+              {
+                names: ['bar*'],
+                privileges: ['all'],
+                query: '*',
+                field_security: {
+                  grant: ['another_field'],
+                },
+              },
+            ],
+            run_as: [],
           },
-        ],
-        run_as: [],
-      },
-    },
-    onChange: jest.fn(),
-    indexPatterns: [],
-    editable: true,
-    validator: new RoleValidator(),
-    availableIndexPrivileges: ['all', 'read', 'write', 'index'],
-    indicesAPIClient,
-    license,
-  };
+        }}
+        onChange={jest.fn()}
+        indexPatterns={[]}
+        editable
+        validator={new RoleValidator()}
+        availableIndexPrivileges={['all', 'read', 'write', 'index']}
+        indicesAPIClient={indicesAPIClient}
+        license={license}
+      />
+    </KibanaContextProvider>
+  );
+  await flushPromises();
+  expect(wrapper.find(IndexPrivilegeForm)).toHaveLength(2);
+});
+
+test('it renders an IndexPrivilegeForm for each remote index privilege on the role', async () => {
+  const license = licenseMock.create();
+  license.getFeatures.mockReturnValue({
+    allowRoleFieldLevelSecurity: true,
+    allowRoleDocumentLevelSecurity: true,
+  } as any);
+
+  const indicesAPIClient = indicesAPIClientMock.create();
+  indicesAPIClient.getFields.mockResolvedValue(['foo']);
+
   const wrapper = mountWithIntl(
     <KibanaContextProvider services={coreMock.createStart()}>
-      <IndexPrivileges {...props} />
+      <IndexPrivileges
+        indexType="remote_indices"
+        role={{
+          name: '',
+          kibana: [],
+          elasticsearch: {
+            cluster: [],
+            indices: [],
+            remote_indices: [
+              {
+                clusters: ['foo*'],
+                names: ['bar*'],
+                privileges: ['all'],
+                query: '*',
+                field_security: {
+                  grant: ['some_field'],
+                },
+              },
+              {
+                clusters: ['bar*'],
+                names: ['foo*'],
+                privileges: ['all'],
+                query: '*',
+                field_security: {
+                  grant: ['another_field'],
+                },
+              },
+            ],
+            run_as: [],
+          },
+        }}
+        onChange={jest.fn()}
+        indexPatterns={[]}
+        editable
+        validator={new RoleValidator()}
+        availableIndexPrivileges={['all', 'read', 'write', 'index']}
+        indicesAPIClient={indicesAPIClient}
+        license={license}
+      />
     </KibanaContextProvider>
   );
   await flushPromises();
-  expect(wrapper.find(IndexPrivilegeForm)).toHaveLength(1);
+  expect(wrapper.find(IndexPrivilegeForm)).toHaveLength(2);
 });
 
 test('it renders fields as disabled when not editable', async () => {
@@ -144,5 +209,7 @@ test('it renders fields as disabled when not editable', async () => {
     </KibanaContextProvider>
   );
   await flushPromises();
-  expect(wrapper.find('IndexPrivilegeForm').prop('isRoleReadOnly')).toBe(true);
+  expect(
+    wrapper.find('IndexPrivilegeForm').everyWhere((component) => component.prop('isRoleReadOnly'))
+  ).toBe(true);
 });
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privileges.tsx b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privileges.tsx
index 8c8eafa6d6a2b..b47cff5b21669 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privileges.tsx
+++ b/x-pack/plugins/security/public/management/roles/edit_role/privileges/es/index_privileges.tsx
@@ -5,8 +5,10 @@
  * 2.0.
  */
 
+import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiIconTip, EuiSpacer } from '@elastic/eui';
 import React, { Component, Fragment } from 'react';
 
+import { FormattedMessage } from '@kbn/i18n-react';
 import type { PublicMethodsOf } from '@kbn/utility-types';
 
 import type { SecurityLicense } from '../../../../../../common/licensing';
@@ -17,8 +19,9 @@ import type { RoleValidator } from '../../validate_role';
 import { IndexPrivilegeForm } from './index_privilege_form';
 
 interface Props {
+  indexType: 'indices' | 'remote_indices';
+  indexPatterns?: string[];
   role: Role;
-  indexPatterns: string[];
   availableIndexPrivileges: string[];
   indicesAPIClient: PublicMethodsOf<IndicesAPIClient>;
   license: SecurityLicense;
@@ -46,12 +49,20 @@ export class IndexPrivileges extends Component<Props, State> {
   }
 
   public render() {
-    const { indices = [] } = this.props.role.elasticsearch;
+    const indices = this.props.role.elasticsearch[this.props.indexType] ?? [];
 
-    const { indexPatterns, license, availableIndexPrivileges, indicesAPIClient } = this.props;
-    const { allowRoleDocumentLevelSecurity, allowRoleFieldLevelSecurity } = license.getFeatures();
+    const { indexPatterns = [], license, availableIndexPrivileges, indicesAPIClient } = this.props;
+    const {
+      allowRoleDocumentLevelSecurity,
+      allowRoleFieldLevelSecurity,
+      allowRoleRemoteIndexPrivileges,
+    } = license.getFeatures();
+
+    const remoteIndexPrivilegesDisabled =
+      this.props.indexType === 'remote_indices' && !allowRoleRemoteIndexPrivileges;
 
     const props = {
+      indexType: this.props.indexType,
       indexPatterns,
       indicesAPIClient,
       // If editing an existing role while that has been disabled, always show the FLS/DLS fields because currently
@@ -59,30 +70,73 @@ export class IndexPrivileges extends Component<Props, State> {
       // doesn't permit FLS/DLS).
       allowDocumentLevelSecurity: allowRoleDocumentLevelSecurity || !isRoleEnabled(this.props.role),
       allowFieldLevelSecurity: allowRoleFieldLevelSecurity || !isRoleEnabled(this.props.role),
-      isRoleReadOnly: !this.props.editable || isRoleReadOnly(this.props.role),
+      isRoleReadOnly:
+        !this.props.editable || isRoleReadOnly(this.props.role) || remoteIndexPrivilegesDisabled,
     };
 
-    const forms = indices.map((indexPrivilege: RoleIndexPrivilege, idx) => (
-      <IndexPrivilegeForm
-        key={idx}
-        {...props}
-        formIndex={idx}
-        validator={this.props.validator}
-        availableIndexPrivileges={availableIndexPrivileges}
-        indexPrivilege={indexPrivilege}
-        onChange={this.onIndexPrivilegeChange(idx)}
-        onDelete={this.onIndexPrivilegeDelete(idx)}
-      />
-    ));
-
-    return <Fragment>{forms}</Fragment>;
+    return (
+      <Fragment>
+        {indices.map((indexPrivilege, i) => (
+          <IndexPrivilegeForm
+            key={i}
+            {...props}
+            formIndex={i}
+            validator={this.props.validator}
+            availableIndexPrivileges={availableIndexPrivileges}
+            indexPrivilege={indexPrivilege}
+            onChange={this.onIndexPrivilegeChange(i)}
+            onDelete={this.onIndexPrivilegeDelete(i)}
+          />
+        ))}
+        {this.props.editable && (
+          <>
+            <EuiSpacer size="m" />
+            <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false}>
+              <EuiFlexItem grow={false}>
+                <EuiButton
+                  iconType="plusInCircle"
+                  onClick={this.addIndexPrivilege}
+                  disabled={remoteIndexPrivilegesDisabled}
+                >
+                  {this.props.indexType === 'remote_indices' ? (
+                    <FormattedMessage
+                      id="xpack.security.management.editRole.elasticSearchPrivileges.addRemoteIndexPrivilegesButtonLabel"
+                      defaultMessage="Add remote index privilege"
+                    />
+                  ) : (
+                    <FormattedMessage
+                      id="xpack.security.management.editRole.elasticSearchPrivileges.addIndexPrivilegesButtonLabel"
+                      defaultMessage="Add index privilege"
+                    />
+                  )}
+                </EuiButton>
+              </EuiFlexItem>
+              {remoteIndexPrivilegesDisabled && (
+                <EuiFlexItem grow={false}>
+                  <EuiIconTip
+                    content={
+                      <FormattedMessage
+                        id="xpack.security.management.editRole.elasticSearchPrivileges.remoteIndexPrivilegesLicenseMissing"
+                        defaultMessage="Your license does not allow configuring remote index privileges"
+                      />
+                    }
+                    position="right"
+                  />
+                </EuiFlexItem>
+              )}
+            </EuiFlexGroup>
+          </>
+        )}
+      </Fragment>
+    );
   }
 
   public addIndexPrivilege = () => {
-    const { role } = this.props;
+    const { role, indexType } = this.props;
+    const indices = role.elasticsearch[indexType] ?? [];
 
     const newIndices = [
-      ...role.elasticsearch.indices,
+      ...indices,
       {
         names: [],
         privileges: [],
@@ -96,15 +150,15 @@ export class IndexPrivileges extends Component<Props, State> {
       ...this.props.role,
       elasticsearch: {
         ...this.props.role.elasticsearch,
-        indices: newIndices,
+        [indexType]: newIndices,
       },
     });
   };
 
   public onIndexPrivilegeChange = (privilegeIndex: number) => {
     return (updatedPrivilege: RoleIndexPrivilege) => {
-      const { role } = this.props;
-      const { indices } = role.elasticsearch;
+      const { role, indexType } = this.props;
+      const indices = role.elasticsearch[indexType] ?? [];
 
       const newIndices = [...indices];
       newIndices[privilegeIndex] = updatedPrivilege;
@@ -113,7 +167,7 @@ export class IndexPrivileges extends Component<Props, State> {
         ...this.props.role,
         elasticsearch: {
           ...this.props.role.elasticsearch,
-          indices: newIndices,
+          [indexType]: newIndices,
         },
       });
     };
@@ -121,16 +175,17 @@ export class IndexPrivileges extends Component<Props, State> {
 
   public onIndexPrivilegeDelete = (privilegeIndex: number) => {
     return () => {
-      const { role } = this.props;
+      const { role, indexType } = this.props;
 
-      const newIndices = [...role.elasticsearch.indices];
+      const indices = role.elasticsearch[indexType] ?? [];
+      const newIndices = [...indices];
       newIndices.splice(privilegeIndex, 1);
 
       this.props.onChange({
         ...this.props.role,
         elasticsearch: {
           ...this.props.role.elasticsearch,
-          indices: newIndices,
+          [indexType]: newIndices,
         },
       });
     };
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/validate_role.test.ts b/x-pack/plugins/security/public/management/roles/edit_role/validate_role.test.ts
index f508e444dc714..61c0902b4ef90 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/validate_role.test.ts
+++ b/x-pack/plugins/security/public/management/roles/edit_role/validate_role.test.ts
@@ -103,7 +103,7 @@ describe('validateIndexPrivileges', () => {
     validator = new RoleValidator({ shouldValidate: true });
   });
 
-  test('it ignores privilegs with no indices defined', () => {
+  test('it ignores privileges with no indices defined', () => {
     const role = {
       name: '',
       elasticsearch: {
@@ -124,7 +124,7 @@ describe('validateIndexPrivileges', () => {
     });
   });
 
-  test('it requires privilges when an index is defined', () => {
+  test('it requires privileges when an index is defined', () => {
     const role = {
       name: '',
       elasticsearch: {
@@ -161,6 +161,97 @@ describe('validateIndexPrivileges', () => {
   });
 });
 
+describe('validateRemoteIndexPrivileges', () => {
+  beforeEach(() => {
+    validator = new RoleValidator({ shouldValidate: true });
+  });
+
+  test('it ignores empty remote privileges', () => {
+    const role = {
+      name: '',
+      elasticsearch: {
+        indices: [],
+        remote_indices: [
+          {
+            clusters: [],
+            names: [],
+            privileges: [],
+          },
+        ],
+        cluster: [],
+        run_as: [],
+      },
+      kibana: [],
+    };
+
+    expect(validator.validateRemoteIndexPrivileges(role)).toEqual({
+      isInvalid: false,
+    });
+  });
+
+  test('it requires privileges when an index is defined', () => {
+    const role = {
+      name: '',
+      elasticsearch: {
+        cluster: [],
+        indices: [],
+        remote_indices: [
+          {
+            clusters: ['cluster'],
+            names: ['index-*'],
+            privileges: [],
+          },
+        ],
+        run_as: [],
+      },
+      kibana: [],
+    };
+
+    expect(validator.validateRemoteIndexPrivileges(role)).toEqual({
+      isInvalid: true,
+    });
+  });
+
+  test('it requires indices and privileges when clusters is defined', () => {
+    const role = {
+      name: '',
+      elasticsearch: {
+        cluster: [],
+        indices: [],
+        remote_indices: [
+          {
+            clusters: ['cluster'],
+            names: [],
+            privileges: [],
+          },
+        ],
+        run_as: [],
+      },
+      kibana: [],
+    };
+
+    expect(validator.validateRemoteIndexPrivileges(role)).toEqual({
+      isInvalid: true,
+    });
+  });
+
+  test('it throws when indices is not an array', () => {
+    const role = {
+      name: '',
+      elasticsearch: {
+        cluster: [],
+        indices: [],
+        remote_indices: 'asdf',
+        run_as: [],
+      },
+      kibana: [],
+    };
+
+    // @ts-ignore
+    expect(() => validator.validateRemoteIndexPrivileges(role)).toThrowErrorMatchingSnapshot();
+  });
+});
+
 describe('validateSpacePrivileges', () => {
   beforeEach(() => {
     validator = new RoleValidator({ shouldValidate: true });
diff --git a/x-pack/plugins/security/public/management/roles/edit_role/validate_role.ts b/x-pack/plugins/security/public/management/roles/edit_role/validate_role.ts
index ac509dba353d2..ee3e85959e312 100644
--- a/x-pack/plugins/security/public/management/roles/edit_role/validate_role.ts
+++ b/x-pack/plugins/security/public/management/roles/edit_role/validate_role.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 
 import { MAX_NAME_LENGTH, NAME_REGEX } from '../../../../common/constants';
-import type { Role, RoleIndexPrivilege } from '../../../../common/model';
+import type { Role, RoleIndexPrivilege, RoleRemoteIndexPrivilege } from '../../../../common/model';
 
 interface RoleValidatorOptions {
   shouldValidate?: boolean;
@@ -97,32 +97,145 @@ export class RoleValidator {
       );
     }
 
-    const areIndicesValid =
-      role.elasticsearch.indices
-        .map((indexPriv) => this.validateIndexPrivilege(indexPriv))
-        .find((result: RoleValidationResult) => result.isInvalid) == null;
+    const areIndicesInvalid = role.elasticsearch.indices.reduce((isInvalid, indexPriv) => {
+      if (
+        this.validateIndexPrivilegeNamesField(indexPriv).isInvalid ||
+        this.validateIndexPrivilegePrivilegesField(indexPriv).isInvalid
+      ) {
+        return true;
+      }
+      return isInvalid;
+    }, false);
 
-    if (areIndicesValid) {
+    if (areIndicesInvalid) {
+      return invalid();
+    }
+
+    return valid();
+  }
+
+  public validateRemoteIndexPrivileges(role: Role): RoleValidationResult {
+    if (!this.shouldValidate) {
       return valid();
     }
-    return invalid();
+
+    if (!role.elasticsearch.remote_indices) {
+      return valid();
+    }
+
+    if (!Array.isArray(role.elasticsearch.remote_indices)) {
+      throw new TypeError(
+        i18n.translate('xpack.security.management.editRole.validateRole.indicesTypeErrorMessage', {
+          defaultMessage: 'Expected {elasticIndices} to be an array',
+          values: {
+            elasticIndices: '"role.elasticsearch.remote_indices"',
+          },
+        })
+      );
+    }
+
+    const areRemoteIndicesInvalid = role.elasticsearch.remote_indices.reduce(
+      (isInvalid, indexPriv) => {
+        if (
+          this.validateRemoteIndexPrivilegeClustersField(indexPriv).isInvalid ||
+          this.validateIndexPrivilegeNamesField(indexPriv).isInvalid ||
+          this.validateIndexPrivilegePrivilegesField(indexPriv).isInvalid
+        ) {
+          return true;
+        }
+        return isInvalid;
+      },
+      false
+    );
+
+    if (areRemoteIndicesInvalid) {
+      return invalid();
+    }
+
+    return valid();
   }
 
-  public validateIndexPrivilege(indexPrivilege: RoleIndexPrivilege): RoleValidationResult {
+  public validateRemoteIndexPrivilegeClustersField(
+    indexPrivilege: RoleRemoteIndexPrivilege
+  ): RoleValidationResult {
     if (!this.shouldValidate) {
       return valid();
     }
 
-    if (indexPrivilege.names.length && !indexPrivilege.privileges.length) {
+    // Ignore if all other fields are empty
+    if (!indexPrivilege.names.length && !indexPrivilege.privileges.length) {
+      return valid();
+    }
+
+    if (!indexPrivilege.clusters || !indexPrivilege.clusters.length) {
+      return invalid(
+        i18n.translate(
+          'xpack.security.management.editRole.validateRole.oneRemoteClusterRequiredWarningMessage',
+          {
+            defaultMessage: 'Enter or select at least one remote cluster',
+          }
+        )
+      );
+    }
+
+    return valid();
+  }
+
+  public validateIndexPrivilegeNamesField(
+    indexPrivilege: RoleIndexPrivilege | RoleRemoteIndexPrivilege
+  ): RoleValidationResult {
+    if (!this.shouldValidate) {
+      return valid();
+    }
+
+    // Ignore if all other fields are empty
+    if (
+      (!('clusters' in indexPrivilege) || !indexPrivilege.clusters.length) &&
+      !indexPrivilege.privileges.length
+    ) {
+      return valid();
+    }
+
+    if (!indexPrivilege.names.length) {
+      return invalid(
+        i18n.translate(
+          'xpack.security.management.editRole.validateRole.oneIndexRequiredWarningMessage',
+          {
+            defaultMessage: 'Enter or select at least one index pattern',
+          }
+        )
+      );
+    }
+
+    return valid();
+  }
+
+  public validateIndexPrivilegePrivilegesField(
+    indexPrivilege: RoleIndexPrivilege | RoleRemoteIndexPrivilege
+  ): RoleValidationResult {
+    if (!this.shouldValidate) {
+      return valid();
+    }
+
+    // Ignore if all other fields are empty
+    if (
+      (!('clusters' in indexPrivilege) || !indexPrivilege.clusters.length) &&
+      !indexPrivilege.names.length
+    ) {
+      return valid();
+    }
+
+    if (!indexPrivilege.privileges.length) {
       return invalid(
         i18n.translate(
           'xpack.security.management.editRole.validateRole.onePrivilegeRequiredWarningMessage',
           {
-            defaultMessage: 'At least one privilege is required',
+            defaultMessage: 'Enter or select at least one action',
           }
         )
       );
     }
+
     return valid();
   }
 
@@ -198,9 +311,15 @@ export class RoleValidator {
   public validateForSave(role: Role): RoleValidationResult {
     const { isInvalid: isNameInvalid } = this.validateRoleName(role);
     const { isInvalid: areIndicesInvalid } = this.validateIndexPrivileges(role);
+    const { isInvalid: areRemoteIndicesInvalid } = this.validateRemoteIndexPrivileges(role);
     const { isInvalid: areSpacePrivilegesInvalid } = this.validateSpacePrivileges(role);
 
-    if (isNameInvalid || areIndicesInvalid || areSpacePrivilegesInvalid) {
+    if (
+      isNameInvalid ||
+      areIndicesInvalid ||
+      areRemoteIndicesInvalid ||
+      areSpacePrivilegesInvalid
+    ) {
       return invalid();
     }
 
diff --git a/x-pack/plugins/security/public/management/roles/roles_api_client.test.ts b/x-pack/plugins/security/public/management/roles/roles_api_client.test.ts
index 917843666378e..ce7af35dccf22 100644
--- a/x-pack/plugins/security/public/management/roles/roles_api_client.test.ts
+++ b/x-pack/plugins/security/public/management/roles/roles_api_client.test.ts
@@ -27,6 +27,7 @@ describe('RolesAPIClient', () => {
       elasticsearch: {
         cluster: [],
         indices: [{ names: [], privileges: [] }],
+        remote_indices: [{ clusters: [], names: [], privileges: [] }],
         run_as: [],
       },
       kibana: [],
@@ -38,6 +39,7 @@ describe('RolesAPIClient', () => {
       elasticsearch: {
         cluster: [],
         indices: [],
+        remote_indices: [],
         run_as: [],
       },
       kibana: [],
@@ -107,6 +109,9 @@ describe('RolesAPIClient', () => {
       elasticsearch: {
         cluster: [],
         indices: [{ names: ['.kibana*'], privileges: ['all'], query: 'something' }],
+        remote_indices: [
+          { clusters: ['cluster'], names: ['.kibana*'], privileges: ['all'], query: 'something' },
+        ],
         run_as: [],
       },
       kibana: [],
@@ -118,6 +123,9 @@ describe('RolesAPIClient', () => {
       elasticsearch: {
         cluster: [],
         indices: [{ names: ['.kibana*'], privileges: ['all'], query: 'something' }],
+        remote_indices: [
+          { clusters: ['cluster'], names: ['.kibana*'], privileges: ['all'], query: 'something' },
+        ],
         run_as: [],
       },
       kibana: [],
diff --git a/x-pack/plugins/security/public/management/roles/roles_api_client.ts b/x-pack/plugins/security/public/management/roles/roles_api_client.ts
index e57e003ab3f7d..6d59976a82ada 100644
--- a/x-pack/plugins/security/public/management/roles/roles_api_client.ts
+++ b/x-pack/plugins/security/public/management/roles/roles_api_client.ts
@@ -7,7 +7,7 @@
 
 import type { HttpStart } from '@kbn/core/public';
 
-import type { Role, RoleIndexPrivilege } from '../../../common/model';
+import type { Role, RoleIndexPrivilege, RoleRemoteIndexPrivilege } from '../../../common/model';
 import { copyRole } from '../../../common/model';
 
 export class RolesAPIClient {
@@ -34,14 +34,28 @@ export class RolesAPIClient {
 
   private transformRoleForSave(role: Role) {
     // Remove any placeholder index privileges
-    const isPlaceholderPrivilege = (indexPrivilege: RoleIndexPrivilege) =>
-      indexPrivilege.names.length === 0;
+    const isPlaceholderPrivilege = (
+      indexPrivilege: RoleIndexPrivilege | RoleRemoteIndexPrivilege
+    ) => {
+      if (
+        'clusters' in indexPrivilege &&
+        indexPrivilege.clusters &&
+        indexPrivilege.clusters.length > 0
+      ) {
+        return false;
+      }
+      return indexPrivilege.names.length === 0 && indexPrivilege.privileges.length === 0;
+    };
     role.elasticsearch.indices = role.elasticsearch.indices.filter(
       (indexPrivilege) => !isPlaceholderPrivilege(indexPrivilege)
     );
+    role.elasticsearch.remote_indices = role.elasticsearch.remote_indices?.filter(
+      (indexPrivilege) => !isPlaceholderPrivilege(indexPrivilege)
+    );
 
     // Remove any placeholder query entries
     role.elasticsearch.indices.forEach((index) => index.query || delete index.query);
+    role.elasticsearch.remote_indices?.forEach((index) => index.query || delete index.query);
 
     role.kibana.forEach((kibanaPrivilege) => {
       // If a base privilege is defined, then do not persist feature privileges
diff --git a/x-pack/plugins/security/server/authorization/roles/elasticsearch_role.ts b/x-pack/plugins/security/server/authorization/roles/elasticsearch_role.ts
index a491594c4256f..fe13d0a7960b0 100644
--- a/x-pack/plugins/security/server/authorization/roles/elasticsearch_role.ts
+++ b/x-pack/plugins/security/server/authorization/roles/elasticsearch_role.ts
@@ -25,6 +25,7 @@ export type ElasticsearchRole = Pick<Role, 'name' | 'metadata' | 'transient_meta
   }>;
   cluster: Role['elasticsearch']['cluster'];
   indices: Role['elasticsearch']['indices'];
+  remote_indices?: Role['elasticsearch']['remote_indices'];
   run_as: Role['elasticsearch']['run_as'];
 };
 
@@ -48,6 +49,7 @@ export function transformElasticsearchRoleToRole(
     elasticsearch: {
       cluster: elasticsearchRole.cluster,
       indices: elasticsearchRole.indices,
+      remote_indices: elasticsearchRole.remote_indices,
       run_as: elasticsearchRole.run_as,
     },
     kibana: kibanaTransformResult.success ? (kibanaTransformResult.value as Role['kibana']) : [],
diff --git a/x-pack/plugins/security/server/deprecations/privilege_deprecations.test.ts b/x-pack/plugins/security/server/deprecations/privilege_deprecations.test.ts
index a3836c4773595..2ab306ce82108 100644
--- a/x-pack/plugins/security/server/deprecations/privilege_deprecations.test.ts
+++ b/x-pack/plugins/security/server/deprecations/privilege_deprecations.test.ts
@@ -66,6 +66,7 @@ describe('#getPrivilegeDeprecationsService', () => {
               "elasticsearch": Object {
                 "cluster": Array [],
                 "indices": Array [],
+                "remote_indices": undefined,
                 "run_as": Array [],
               },
               "kibana": Array [
@@ -138,6 +139,7 @@ describe('#getPrivilegeDeprecationsService', () => {
               "elasticsearch": Object {
                 "cluster": Array [],
                 "indices": Array [],
+                "remote_indices": undefined,
                 "run_as": Array [],
               },
               "kibana": Array [
diff --git a/x-pack/plugins/security/server/lib/role_schema.ts b/x-pack/plugins/security/server/lib/role_schema.ts
index 135a24cf04085..fe59a1f740b41 100644
--- a/x-pack/plugins/security/server/lib/role_schema.ts
+++ b/x-pack/plugins/security/server/lib/role_schema.ts
@@ -66,6 +66,55 @@ export const elasticsearchRoleSchema = schema.object({
     )
   ),
 
+  /**
+   * An optional list of remote indices permissions entries.
+   */
+  remote_indices: schema.maybe(
+    schema.arrayOf(
+      schema.object({
+        /**
+         * Required list of remote clusters to which the permissions in this entry apply.
+         */
+        clusters: schema.arrayOf(schema.string(), { minSize: 1 }),
+
+        /**
+         * Required list of remote indices (or index name patterns) to which the permissions in this
+         * entry apply.
+         */
+        names: schema.arrayOf(schema.string(), { minSize: 1 }),
+
+        /**
+         * An optional set of the document fields that the owners of the role have read access to.
+         */
+        field_security: schema.maybe(
+          schema.recordOf(
+            schema.oneOf([schema.literal('grant'), schema.literal('except')]),
+            schema.arrayOf(schema.string())
+          )
+        ),
+
+        /**
+         * Required list of the index level privileges that the owners of the role have on the
+         * specified indices.
+         */
+        privileges: schema.arrayOf(schema.string(), { minSize: 1 }),
+
+        /**
+         * An optional search query that defines the documents the owners of the role have read access
+         * to. A document within the specified indices must match this query in order for it to be
+         * accessible by the owners of the role.
+         */
+        query: schema.maybe(schema.string()),
+
+        /**
+         * An optional flag used to indicate if index pattern wildcards or regexps should cover
+         * restricted indices.
+         */
+        allow_restricted_indices: schema.maybe(schema.boolean()),
+      })
+    )
+  ),
+
   /**
    * An optional list of users that the owners of this role can impersonate.
    */
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 ed1648c069d4a..597396a5837ff 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
@@ -257,6 +257,20 @@ describe('Put payload schema', () => {
               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: [
@@ -305,6 +319,33 @@ describe('Put payload schema', () => {
               "query": "{ \\"match\\": { \\"title\\": \\"foo\\" } }",
             },
           ],
+          "remote_indices": Array [
+            Object {
+              "clusters": Array [
+                "test-cluster-name-1",
+                "test-cluster-name-2",
+              ],
+              "field_security": Object {
+                "except": Array [
+                  "test-field-security-except-1",
+                  "test-field-security-except-2",
+                ],
+                "grant": Array [
+                  "test-field-security-grant-1",
+                  "test-field-security-grant-2",
+                ],
+              },
+              "names": Array [
+                "test-index-name-1",
+                "test-index-name-2",
+              ],
+              "privileges": Array [
+                "test-index-privilege-1",
+                "test-index-privilege-2",
+              ],
+              "query": "{ \\"match\\": { \\"title\\": \\"foo\\" } }",
+            },
+          ],
           "run_as": Array [
             "test-run-as-1",
             "test-run-as-2",
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 19ce403b77d86..a52399d4a04ec 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
@@ -21,7 +21,12 @@ export const transformPutPayloadToElasticsearchRole = (
   allExistingApplications: ElasticsearchRole['applications'] = []
 ) => {
   const {
-    elasticsearch = { cluster: undefined, indices: undefined, run_as: undefined },
+    elasticsearch = {
+      cluster: undefined,
+      indices: undefined,
+      remote_indices: undefined,
+      run_as: undefined,
+    },
     kibana = [],
   } = rolePayload;
   const otherApplications = allExistingApplications.filter(
@@ -32,6 +37,7 @@ export const transformPutPayloadToElasticsearchRole = (
     metadata: rolePayload.metadata,
     cluster: elasticsearch.cluster || [],
     indices: elasticsearch.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 f719b9c5e94ad..1e59f7a5d6a0f 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,6 +325,7 @@ describe('PUT role', () => {
               body: {
                 cluster: [],
                 indices: [],
+                remote_indices: [],
                 run_as: [],
                 applications: [],
               },
@@ -358,6 +359,7 @@ describe('PUT role', () => {
               body: {
                 cluster: [],
                 indices: [],
+                remote_indices: [],
                 run_as: [],
                 applications: [
                   {
@@ -400,6 +402,7 @@ describe('PUT role', () => {
               body: {
                 cluster: [],
                 indices: [],
+                remote_indices: [],
                 run_as: [],
                 applications: [
                   {
@@ -440,6 +443,7 @@ describe('PUT role', () => {
               body: {
                 cluster: [],
                 indices: [],
+                remote_indices: [],
                 run_as: [],
                 applications: [
                   {
@@ -535,6 +539,7 @@ describe('PUT role', () => {
                     query: `{ "match": { "title": "foo" } }`,
                   },
                 ],
+                remote_indices: [],
                 metadata: { foo: 'test-metadata' },
                 run_as: ['test-run-as-1', 'test-run-as-2'],
               },
@@ -656,6 +661,7 @@ describe('PUT role', () => {
                     query: `{ "match": { "title": "foo" } }`,
                   },
                 ],
+                remote_indices: [],
                 metadata: { foo: 'test-metadata' },
                 run_as: ['test-run-as-1', 'test-run-as-2'],
               },
@@ -759,6 +765,7 @@ describe('PUT role', () => {
                     privileges: ['test-index-privilege-1', 'test-index-privilege-2'],
                   },
                 ],
+                remote_indices: [],
                 metadata: { foo: 'test-metadata' },
                 run_as: ['test-run-as-1', 'test-run-as-2'],
               },
@@ -796,6 +803,7 @@ describe('PUT role', () => {
               body: {
                 cluster: [],
                 indices: [],
+                remote_indices: [],
                 run_as: [],
                 applications: [
                   {
@@ -840,6 +848,7 @@ describe('PUT role', () => {
               body: {
                 cluster: [],
                 indices: [],
+                remote_indices: [],
                 run_as: [],
                 applications: [
                   {
@@ -884,6 +893,7 @@ describe('PUT role', () => {
               body: {
                 cluster: [],
                 indices: [],
+                remote_indices: [],
                 run_as: [],
                 applications: [
                   {
diff --git a/x-pack/plugins/security/server/routes/views/login.test.ts b/x-pack/plugins/security/server/routes/views/login.test.ts
index 0e07c2460f9ee..7575aafead6e0 100644
--- a/x-pack/plugins/security/server/routes/views/login.test.ts
+++ b/x-pack/plugins/security/server/routes/views/login.test.ts
@@ -166,6 +166,7 @@ describe('Login view routes', () => {
         allowRbac: false,
         allowRoleDocumentLevelSecurity: true,
         allowRoleFieldLevelSecurity: false,
+        allowRoleRemoteIndexPrivileges: false,
         layout: 'error-es-unavailable',
         showLinks: false,
         showRoleMappingsManagement: true,
diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
index 3e37a243f85b4..18dc82ce2bcd2 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -27426,7 +27426,6 @@
     "xpack.security.management.editRole.featureTable.featureVisibilityTitle": "Personnaliser les privilèges des fonctionnalités",
     "xpack.security.management.editRole.featureTable.managementCategoryHelpText": "L'accès à Stack Management est déterminé à la fois par les privilèges Elasticsearch et les privilèges Kibana, et il ne peut pas être explicitement désactivé.",
     "xpack.security.management.editRole.featureTable.privilegeCustomizationTooltip": "La fonctionnalité possède des privilèges de sous-fonctionnalités personnalisés. Développez cette ligne pour en savoir plus.",
-    "xpack.security.management.editRole.indexPrivilegeForm.deleteSpacePrivilegeAriaLabel": "Supprimer un privilège d'index",
     "xpack.security.management.editRole.indexPrivilegeForm.grantedDocumentsQueryEditorAriaLabel": "Éditeur de requêtes des documents accordés",
     "xpack.security.management.editRole.indexPrivilegeForm.grantedDocumentsQueryFormRowLabel": "Requête des documents accordés",
     "xpack.security.management.editRole.indexPrivilegeForm.grantReadPrivilegesLabel": "Accorder des privilèges de lecture à des documents spécifiques",
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 99d0120204cc0..a4efde2e55050 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -27406,7 +27406,6 @@
     "xpack.security.management.editRole.featureTable.featureVisibilityTitle": "機能権限をカスタマイズ",
     "xpack.security.management.editRole.featureTable.managementCategoryHelpText": "スタック管理へのアクセスは、ElasticsearchとKibanaの両方の権限によって決まり、明示的に無効にすることはできません。",
     "xpack.security.management.editRole.featureTable.privilegeCustomizationTooltip": "機能でサブ機能の権限がカスタマイズされています。この行を展開すると詳細が表示されます。",
-    "xpack.security.management.editRole.indexPrivilegeForm.deleteSpacePrivilegeAriaLabel": "インデックスの権限を削除",
     "xpack.security.management.editRole.indexPrivilegeForm.grantedDocumentsQueryEditorAriaLabel": "提供されたドキュメントのクエリエディター",
     "xpack.security.management.editRole.indexPrivilegeForm.grantedDocumentsQueryFormRowLabel": "提供されたドキュメントのクエリ",
     "xpack.security.management.editRole.indexPrivilegeForm.grantReadPrivilegesLabel": "特定のドキュメントの読み込み権限を提供",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 79f4533163a39..d67deac8d9f9a 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -27421,7 +27421,6 @@
     "xpack.security.management.editRole.featureTable.featureVisibilityTitle": "定制功能权限",
     "xpack.security.management.editRole.featureTable.managementCategoryHelpText": "对堆栈管理的访问由 Elasticsearch 和 Kibana 权限共同决定，并且不能显式禁用。",
     "xpack.security.management.editRole.featureTable.privilegeCustomizationTooltip": "功能已定制子功能权限。展开此行以了解更多信息。",
-    "xpack.security.management.editRole.indexPrivilegeForm.deleteSpacePrivilegeAriaLabel": "删除索引权限",
     "xpack.security.management.editRole.indexPrivilegeForm.grantedDocumentsQueryEditorAriaLabel": "已授权文档查询编辑器",
     "xpack.security.management.editRole.indexPrivilegeForm.grantedDocumentsQueryFormRowLabel": "已授权文档查询",
     "xpack.security.management.editRole.indexPrivilegeForm.grantReadPrivilegesLabel": "授予特定文档的读取权限",

From befd429f4f70eb332b52e0a331b8e167ba0369f4 Mon Sep 17 00:00:00 2001
From: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Date: Wed, 19 Apr 2023 15:02:51 -0400
Subject: [PATCH 091/100] [Fleet] Fix logs useless rerender (#155305)

---
 .../components/agent_logs/agent_logs.tsx                 | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/agent_logs.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/agent_logs.tsx
index 809b87b614148..4af6b30c99fb4 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/agent_logs.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/agent_logs.tsx
@@ -30,7 +30,7 @@ import semverCoerce from 'semver/functions/coerce';
 import { createStateContainerReactHelpers } from '@kbn/kibana-utils-plugin/public';
 import { RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
 import type { TimeRange } from '@kbn/es-query';
-import { LogStream } from '@kbn/infra-plugin/public';
+import { LogStream, type LogStreamProps } from '@kbn/infra-plugin/public';
 
 import type { Agent, AgentPolicy } from '../../../../../types';
 import { useLink, useStartServices } from '../../../../../hooks';
@@ -50,6 +50,11 @@ const DatePickerFlexItem = styled(EuiFlexItem)`
   max-width: 312px;
 `;
 
+const LOG_VIEW_SETTINGS: LogStreamProps['logView'] = {
+  type: 'log-view-reference',
+  logViewId: 'default',
+};
+
 export interface AgentLogsProps {
   agent: Agent;
   agentPolicy?: AgentPolicy;
@@ -350,7 +355,7 @@ export const AgentLogsUI: React.FunctionComponent<AgentLogsProps> = memo(
         <EuiFlexItem>
           <EuiPanel paddingSize="none" panelRef={logsPanelRef} grow={false}>
             <LogStream
-              logView={{ type: 'log-view-reference', logViewId: 'default' }}
+              logView={LOG_VIEW_SETTINGS}
               height={logPanelHeight}
               startTimestamp={dateRangeTimestamps.start}
               endTimestamp={dateRangeTimestamps.end}

From ffc349225eb4f59d0736cd60faa0d5e254476900 Mon Sep 17 00:00:00 2001
From: Devon Thomson <devon.thomson@elastic.co>
Date: Wed, 19 Apr 2023 15:34:39 -0400
Subject: [PATCH 092/100] [Analyst Experience Components] Dashboard & Control
 Group APIs (#150121)

Aligns the Portable Dashboard renderer and the Control Group renderer to a new API structure using `useImperativeHandle` rather than the overcomplicated and mostly unused wrapper provider system.
---
 .../public/add_button_example.tsx             |   5 +-
 .../public/basic_redux_example.tsx            |  46 +--
 .../controls_example/public/edit_example.tsx  |  30 +-
 .../public/search_example.tsx                 |  17 +-
 examples/controls_example/tsconfig.json       |   3 +-
 .../portable_dashboards_example/kibana.jsonc  |   3 +-
 .../dashboard_with_controls_example.tsx       |  51 +--
 .../public/dual_redux_example.tsx             |  65 +---
 .../public/dynamically_add_panels_example.tsx |  67 ++--
 .../public/static_by_reference_example.tsx    |  15 +-
 .../public/static_by_value_example.tsx        |  10 +-
 .../portable_dashboards_example/tsconfig.json |   2 -
 .../controls/common/options_list/mocks.tsx    |  38 +-
 .../actions/delete_control_action.test.tsx    |  14 +-
 .../actions/edit_control_action.test.tsx      |  19 +-
 .../actions/edit_control_action.tsx           |   7 +-
 .../actions/edit_control_flyout.tsx           |  17 +-
 .../component/control_frame_component.tsx     |  27 +-
 .../component/control_group_component.tsx     |  37 +-
 .../component/control_group_sortable_item.tsx |  21 +-
 .../control_group/control_group_renderer.tsx  | 128 ------
 .../control_group/editor/control_editor.tsx   |  11 +-
 .../editor/open_add_data_control_flyout.tsx   | 101 ++---
 .../editor/open_edit_control_group_flyout.tsx |  11 +-
 .../control_group_chaining_system.ts          |   2 +-
 .../embeddable/control_group_container.tsx    | 177 +++++----
 .../control_group_container_factory.ts        |   4 +-
 .../external_api/control_group_api.ts         |  16 +
 .../control_group_input_builder.ts            |  26 +-
 .../control_group_renderer.test.tsx           | 129 +++++++
 .../external_api/control_group_renderer.tsx   | 130 +++++++
 .../controls/public/control_group/index.ts    |  12 +-
 .../state/control_group_reducers.ts           |   6 +
 src/plugins/controls/public/index.ts          |  12 +-
 .../components/options_list_control.test.tsx  |   9 +-
 .../components/options_list_control.tsx       |  56 ++-
 .../components/options_list_popover.test.tsx  |  17 +-
 .../components/options_list_popover.tsx       |  26 +-
 .../options_list_popover_action_bar.tsx       |  30 +-
 .../options_list_popover_footer.tsx           |  26 +-
 ...ptions_list_popover_invalid_selections.tsx |  19 +-
 .../options_list_popover_sorting_button.tsx   |  23 +-
 .../options_list_popover_suggestions.tsx      |  49 +--
 .../components/options_list_popover_title.tsx |  17 +-
 .../embeddable/options_list_embeddable.tsx    | 167 ++++----
 .../options_list_embeddable_factory.tsx       |   4 +-
 .../components/range_slider_control.tsx       |  45 +--
 .../components/range_slider_popover.tsx       |  34 +-
 .../embeddable/range_slider_embeddable.tsx    | 116 +++---
 .../range_slider_embeddable_factory.tsx       |   8 +-
 .../time_slider/components/time_slider.tsx    |  32 +-
 .../time_slider_popover_content.tsx           |  20 +-
 .../components/time_slider_prepend.tsx        |  20 +-
 .../embeddable/time_slider_embeddable.tsx     | 139 ++++---
 .../time_slider_embeddable_factory.tsx        |   4 +-
 .../common/dashboard_container/type_guards.ts |  25 --
 .../common/dashboard_container/types.ts       |   8 +-
 src/plugins/dashboard/common/index.ts         |   1 -
 src/plugins/dashboard/common/types.ts         |   4 +-
 .../add_to_library_action.test.tsx            |   5 +-
 .../clone_panel_action.test.tsx               |  16 +-
 .../expand_panel_action.test.tsx              |   7 +-
 .../export_csv_action.test.tsx                |   6 +-
 .../filters_notification_action.test.tsx      |   6 +-
 .../filters_notification_popover.test.tsx     |   5 +-
 .../library_notification_action.test.tsx      |   5 +-
 .../library_notification_popover.test.tsx     |   5 +-
 .../replace_panel_action.test.tsx             |  12 +-
 .../unlink_from_library_action.test.tsx       |   5 +-
 .../public/dashboard_app/dashboard_app.tsx    |  52 +--
 .../load_dashboard_history_location_state.ts  |   4 +-
 .../public/dashboard_app/locator/locator.ts   |   4 +-
 .../top_nav/dashboard_editing_toolbar.tsx     |  41 +-
 .../top_nav/dashboard_top_nav.tsx             |  46 +--
 .../top_nav/share/show_share_modal.test.tsx   |   8 +-
 .../top_nav/use_dashboard_menu_items.tsx      |  55 ++-
 .../url/search_sessions_integration.ts        |   2 +-
 .../url/sync_dashboard_url_state.ts           |  14 +-
 .../dashboard/public/dashboard_constants.ts   |   4 +-
 .../component/grid/dashboard_grid.test.tsx    |  72 +---
 .../component/grid/dashboard_grid.tsx         |  25 +-
 .../component/grid/dashboard_grid_item.tsx    |   8 +-
 .../grid/use_dashboard_grid_settings.tsx      |   8 +-
 .../use_dashboard_performance_tracker.tsx     |   8 +-
 .../component/settings/settings_flyout.tsx    |  40 +-
 .../component/viewport/dashboard_viewport.tsx |  34 +-
 .../dashboard_container_context.tsx           |  19 -
 .../dashboard_container_renderer.tsx          | 123 ------
 .../embeddable/api/run_save_functions.tsx     |  33 +-
 .../embeddable/api/show_settings.tsx          |  20 +-
 ...ashboard_control_group_integration.test.ts |   4 +-
 .../dashboard_control_group_integration.ts    | 112 ++----
 .../create/create_dashboard.test.ts           | 255 ++++++++++++
 .../embeddable/create/create_dashboard.ts     | 289 ++++++++++++++
 .../data_views/sync_dashboard_data_views.ts   |   0
 ...rt_dashboard_search_session_integration.ts |  91 +++++
 .../sync_dashboard_unified_search_state.ts    |  19 +-
 .../embeddable/dashboard_container.test.tsx   |  30 +-
 .../embeddable/dashboard_container.tsx        | 365 ++++--------------
 .../dashboard_container_factory.tsx           |  30 +-
 .../embeddable/integrations/index.ts          |  26 --
 ...rt_dashboard_search_session_integration.ts | 122 ------
 ...rt_dashboard_unified_search_integration.ts |  90 -----
 .../external_api/dashboard_api.ts             |  15 +
 .../external_api/dashboard_renderer.test.tsx  | 102 +++++
 .../external_api/dashboard_renderer.tsx       | 140 +++++++
 .../public/dashboard_container/index.ts       |  10 +-
 .../state/dashboard_container_reducers.ts     |  36 +-
 .../diffing}/dashboard_diffing_functions.ts   |  19 +-
 .../dashboard_diffing_integration.test.ts     |  32 +-
 .../diffing}/dashboard_diffing_integration.ts | 157 ++++----
 .../diffing}/dashboard_diffing_utils.ts       |   2 +-
 .../public/dashboard_container/types.ts       |  10 +-
 src/plugins/dashboard/public/index.ts         |   6 +-
 src/plugins/dashboard/public/mocks.tsx        |  35 +-
 .../load_dashboard_state_from_saved_object.ts |   4 +-
 .../save_dashboard_state_to_saved_object.ts   |   6 +-
 .../dashboard_session_storage_service.ts      |  11 +-
 .../dashboard_session_storage/types.ts        |   6 +-
 .../public/lib/containers/container.ts        |  10 +-
 .../public/lib/containers/i_container.ts      |   8 +-
 .../embeddables/hello_world_container.tsx     |   4 +-
 .../embeddable/public/tests/container.test.ts |   2 +-
 src/plugins/presentation_util/README.mdx      |  70 +---
 .../floating_actions/floating_actions.tsx     |  13 +-
 src/plugins/presentation_util/public/index.ts |   8 +-
 src/plugins/presentation_util/public/mocks.ts |  12 +-
 .../public/redux_embeddables/index.ts         |  21 -
 .../public/redux_embeddables/types.ts         | 115 ------
 .../use_redux_embeddable_context.ts           |  48 ---
 .../public/redux_tools/create_redux_tools.ts  |  83 ++++
 .../public/redux_tools/index.ts               |  24 ++
 .../clean_redux_embeddable_state.ts           |   3 +-
 .../create_redux_embeddable_tools.ts}         |  86 ++---
 .../sync_redux_embeddable.ts                  |  17 +-
 .../redux_tools/redux_embeddables/types.ts    |  56 +++
 .../public/redux_tools/types.ts               |  65 ++++
 .../hosts/components/controls_content.tsx     |  14 +-
 .../components/lazy_controls_renderer.tsx     |  20 -
 .../timeslider/timeslider.tsx                 |  17 +-
 .../job_from_map/visualization_extractor.ts   |   5 +-
 .../dashboards/dashboard_renderer.test.tsx    |   4 +-
 .../dashboards/dashboard_renderer.tsx         |  16 +-
 .../common/components/filter_group/index.tsx  |  14 +-
 .../public/dashboards/pages/details/index.tsx |   6 +-
 .../plugins/security_solution/tsconfig.json   |   3 +-
 146 files changed, 2768 insertions(+), 2850 deletions(-)
 delete mode 100644 src/plugins/controls/public/control_group/control_group_renderer.tsx
 create mode 100644 src/plugins/controls/public/control_group/external_api/control_group_api.ts
 rename src/plugins/controls/public/control_group/{ => external_api}/control_group_input_builder.ts (89%)
 create mode 100644 src/plugins/controls/public/control_group/external_api/control_group_renderer.test.tsx
 create mode 100644 src/plugins/controls/public/control_group/external_api/control_group_renderer.tsx
 delete mode 100644 src/plugins/dashboard/common/dashboard_container/type_guards.ts
 delete mode 100644 src/plugins/dashboard/public/dashboard_container/dashboard_container_context.tsx
 delete mode 100644 src/plugins/dashboard/public/dashboard_container/dashboard_container_renderer.tsx
 rename src/plugins/dashboard/public/dashboard_container/embeddable/{integrations => create}/controls/dashboard_control_group_integration.test.ts (95%)
 rename src/plugins/dashboard/public/dashboard_container/embeddable/{integrations => create}/controls/dashboard_control_group_integration.ts (61%)
 create mode 100644 src/plugins/dashboard/public/dashboard_container/embeddable/create/create_dashboard.test.ts
 create mode 100644 src/plugins/dashboard/public/dashboard_container/embeddable/create/create_dashboard.ts
 rename src/plugins/dashboard/public/dashboard_container/embeddable/{integrations => create}/data_views/sync_dashboard_data_views.ts (100%)
 create mode 100644 src/plugins/dashboard/public/dashboard_container/embeddable/create/search_sessions/start_dashboard_search_session_integration.ts
 rename src/plugins/dashboard/public/dashboard_container/embeddable/{integrations => create}/unified_search/sync_dashboard_unified_search_state.ts (86%)
 delete mode 100644 src/plugins/dashboard/public/dashboard_container/embeddable/integrations/index.ts
 delete mode 100644 src/plugins/dashboard/public/dashboard_container/embeddable/integrations/search_sessions/start_dashboard_search_session_integration.ts
 delete mode 100644 src/plugins/dashboard/public/dashboard_container/embeddable/integrations/unified_search/start_dashboard_unified_search_integration.ts
 create mode 100644 src/plugins/dashboard/public/dashboard_container/external_api/dashboard_api.ts
 create mode 100644 src/plugins/dashboard/public/dashboard_container/external_api/dashboard_renderer.test.tsx
 create mode 100644 src/plugins/dashboard/public/dashboard_container/external_api/dashboard_renderer.tsx
 rename src/plugins/dashboard/public/dashboard_container/{embeddable/integrations/diff_state => state/diffing}/dashboard_diffing_functions.ts (90%)
 rename src/plugins/dashboard/public/dashboard_container/{embeddable/integrations/diff_state => state/diffing}/dashboard_diffing_integration.test.ts (81%)
 rename src/plugins/dashboard/public/dashboard_container/{embeddable/integrations/diff_state => state/diffing}/dashboard_diffing_integration.ts (65%)
 rename src/plugins/dashboard/public/dashboard_container/{embeddable/integrations/diff_state => state/diffing}/dashboard_diffing_utils.ts (97%)
 delete mode 100644 src/plugins/presentation_util/public/redux_embeddables/index.ts
 delete mode 100644 src/plugins/presentation_util/public/redux_embeddables/types.ts
 delete mode 100644 src/plugins/presentation_util/public/redux_embeddables/use_redux_embeddable_context.ts
 create mode 100644 src/plugins/presentation_util/public/redux_tools/create_redux_tools.ts
 create mode 100644 src/plugins/presentation_util/public/redux_tools/index.ts
 rename src/plugins/presentation_util/public/{ => redux_tools}/redux_embeddables/clean_redux_embeddable_state.ts (94%)
 rename src/plugins/presentation_util/public/{redux_embeddables/create_redux_embeddable_tools.tsx => redux_tools/redux_embeddables/create_redux_embeddable_tools.ts} (50%)
 rename src/plugins/presentation_util/public/{ => redux_tools}/redux_embeddables/sync_redux_embeddable.ts (89%)
 create mode 100644 src/plugins/presentation_util/public/redux_tools/redux_embeddables/types.ts
 create mode 100644 src/plugins/presentation_util/public/redux_tools/types.ts
 delete mode 100644 x-pack/plugins/infra/public/pages/metrics/hosts/components/lazy_controls_renderer.tsx

diff --git a/examples/controls_example/public/add_button_example.tsx b/examples/controls_example/public/add_button_example.tsx
index a1603bf66606e..e9931c9b6e8ad 100644
--- a/examples/controls_example/public/add_button_example.tsx
+++ b/examples/controls_example/public/add_button_example.tsx
@@ -9,11 +9,8 @@
 import React from 'react';
 
 import { ViewMode } from '@kbn/embeddable-plugin/public';
-import { withSuspense } from '@kbn/presentation-util-plugin/public';
 import { EuiPanel, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
-import { LazyControlGroupRenderer } from '@kbn/controls-plugin/public';
-
-const ControlGroupRenderer = withSuspense(LazyControlGroupRenderer);
+import { ControlGroupRenderer } from '@kbn/controls-plugin/public';
 
 export const AddButtonExample = ({ dataViewId }: { dataViewId: string }) => {
   return (
diff --git a/examples/controls_example/public/basic_redux_example.tsx b/examples/controls_example/public/basic_redux_example.tsx
index 4500aa9aaf4bf..ede251d7ae3f1 100644
--- a/examples/controls_example/public/basic_redux_example.tsx
+++ b/examples/controls_example/public/basic_redux_example.tsx
@@ -6,36 +6,18 @@
  * Side Public License, v 1.
  */
 
-import React, { useMemo, useState } from 'react';
+import React, { useState } from 'react';
 
-import {
-  LazyControlGroupRenderer,
-  ControlGroupContainer,
-  useControlGroupContainerContext,
-  ControlStyle,
-} from '@kbn/controls-plugin/public';
-import { withSuspense } from '@kbn/presentation-util-plugin/public';
-import { EuiButtonGroup, EuiPanel, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
 import { ViewMode } from '@kbn/embeddable-plugin/public';
-
-const ControlGroupRenderer = withSuspense(LazyControlGroupRenderer);
+import { EuiButtonGroup, EuiPanel, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
+import { ControlGroupRenderer, ControlStyle, ControlGroupAPI } from '@kbn/controls-plugin/public';
+import { AwaitingControlGroupAPI } from '@kbn/controls-plugin/public/control_group';
 
 export const BasicReduxExample = ({ dataViewId }: { dataViewId: string }) => {
-  const [controlGroup, setControlGroup] = useState<ControlGroupContainer>();
-
-  const ControlGroupReduxWrapper = useMemo(() => {
-    if (controlGroup) return controlGroup.getReduxEmbeddableTools().Wrapper;
-  }, [controlGroup]);
-
-  const ButtonControls = () => {
-    const {
-      useEmbeddableDispatch,
-      useEmbeddableSelector: select,
-      actions: { setControlStyle },
-    } = useControlGroupContainerContext();
-    const dispatch = useEmbeddableDispatch();
-    const controlStyle = select((state) => state.explicitInput.controlStyle);
+  const [controlGroupAPI, setControlGroupApi] = useState<AwaitingControlGroupAPI>(null);
 
+  const Buttons = ({ api }: { api: ControlGroupAPI }) => {
+    const controlStyle = api.select((state) => state.explicitInput.controlStyle);
     return (
       <EuiButtonGroup
         legend="Text style"
@@ -52,9 +34,7 @@ export const BasicReduxExample = ({ dataViewId }: { dataViewId: string }) => {
           },
         ]}
         idSelected={controlStyle}
-        onChange={(id, value) => {
-          dispatch(setControlStyle(value));
-        }}
+        onChange={(id, value) => api.dispatch.setControlStyle(value)}
         type="single"
       />
     );
@@ -70,16 +50,10 @@ export const BasicReduxExample = ({ dataViewId }: { dataViewId: string }) => {
       </EuiText>
       <EuiSpacer size="m" />
       <EuiPanel hasBorder={true}>
-        {ControlGroupReduxWrapper && (
-          <ControlGroupReduxWrapper>
-            <ButtonControls />
-          </ControlGroupReduxWrapper>
-        )}
+        {controlGroupAPI && <Buttons api={controlGroupAPI} />}
 
         <ControlGroupRenderer
-          onLoadComplete={async (newControlGroup) => {
-            setControlGroup(newControlGroup);
-          }}
+          ref={setControlGroupApi}
           getCreationOptions={async (initialInput, builder) => {
             await builder.addDataControlFromField(initialInput, {
               dataViewId,
diff --git a/examples/controls_example/public/edit_example.tsx b/examples/controls_example/public/edit_example.tsx
index 21689eb13ab09..f6297befa615c 100644
--- a/examples/controls_example/public/edit_example.tsx
+++ b/examples/controls_example/public/edit_example.tsx
@@ -23,17 +23,14 @@ import {
 import { ViewMode } from '@kbn/embeddable-plugin/public';
 import { OPTIONS_LIST_CONTROL, RANGE_SLIDER_CONTROL } from '@kbn/controls-plugin/common';
 import {
-  LazyControlGroupRenderer,
-  ControlGroupContainer,
-  ControlGroupInput,
+  type ControlGroupInput,
+  ControlGroupRenderer,
+  AwaitingControlGroupAPI,
   ACTION_EDIT_CONTROL,
   ACTION_DELETE_CONTROL,
 } from '@kbn/controls-plugin/public';
-import { withSuspense } from '@kbn/presentation-util-plugin/public';
 import { ControlInputTransform } from '@kbn/controls-plugin/common/types';
 
-const ControlGroupRenderer = withSuspense(LazyControlGroupRenderer);
-
 const INPUT_KEY = 'kbnControls:saveExample:input';
 
 const WITH_CUSTOM_PLACEHOLDER = 'Custom Placeholder';
@@ -41,7 +38,7 @@ const WITH_CUSTOM_PLACEHOLDER = 'Custom Placeholder';
 export const EditExample = () => {
   const [isSaving, setIsSaving] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
-  const [controlGroup, setControlGroup] = useState<ControlGroupContainer>();
+  const [controlGroupAPI, setControlGroupAPI] = useState<AwaitingControlGroupAPI>(null);
   const [toggleIconIdToSelectedMapIcon, setToggleIconIdToSelectedMapIcon] = useState<{
     [id: string]: boolean;
   }>({});
@@ -54,20 +51,21 @@ export const EditExample = () => {
       },
     };
 
-    if (controlGroup) {
+    if (controlGroupAPI) {
       const disabledActions: string[] = Object.keys(
         pickBy(newToggleIconIdToSelectedMapIcon, (value) => value)
       );
-      controlGroup.updateInput({ disabledActions });
+      controlGroupAPI.updateInput({ disabledActions });
     }
 
     setToggleIconIdToSelectedMapIcon(newToggleIconIdToSelectedMapIcon);
   }
 
   async function onSave() {
-    setIsSaving(true);
+    if (!controlGroupAPI) return;
 
-    localStorage.setItem(INPUT_KEY, JSON.stringify(controlGroup!.getInput()));
+    setIsSaving(true);
+    localStorage.setItem(INPUT_KEY, JSON.stringify(controlGroupAPI.getInput()));
 
     // simulated async save await
     await new Promise((resolve) => setTimeout(resolve, 1000));
@@ -133,9 +131,9 @@ export const EditExample = () => {
             <EuiButtonEmpty
               color="primary"
               iconType="plusInCircle"
-              isDisabled={controlGroup === undefined}
+              isDisabled={controlGroupAPI === undefined}
               onClick={() => {
-                controlGroup!.openAddDataControlFlyout(controlInputTransform);
+                controlGroupAPI!.openAddDataControlFlyout(controlInputTransform);
               }}
             >
               Add control
@@ -171,7 +169,7 @@ export const EditExample = () => {
             <EuiButton
               fill
               color="primary"
-              isDisabled={controlGroup === undefined || isSaving}
+              isDisabled={controlGroupAPI === undefined || isSaving}
               onClick={onSave}
               isLoading={isSaving}
             >
@@ -186,6 +184,7 @@ export const EditExample = () => {
           </>
         ) : null}
         <ControlGroupRenderer
+          ref={setControlGroupAPI}
           getCreationOptions={async (initialInput, builder) => {
             const persistedInput = await onLoad();
             return {
@@ -196,9 +195,6 @@ export const EditExample = () => {
               },
             };
           }}
-          onLoadComplete={async (newControlGroup) => {
-            setControlGroup(newControlGroup);
-          }}
         />
       </EuiPanel>
     </>
diff --git a/examples/controls_example/public/search_example.tsx b/examples/controls_example/public/search_example.tsx
index f9ca9d8e24eca..85c37a1e21628 100644
--- a/examples/controls_example/public/search_example.tsx
+++ b/examples/controls_example/public/search_example.tsx
@@ -22,12 +22,9 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import { LazyControlGroupRenderer, ControlGroupContainer } from '@kbn/controls-plugin/public';
-import { withSuspense } from '@kbn/presentation-util-plugin/public';
+import { AwaitingControlGroupAPI, ControlGroupRenderer } from '@kbn/controls-plugin/public';
 import { PLUGIN_ID } from './constants';
 
-const ControlGroupRenderer = withSuspense(LazyControlGroupRenderer);
-
 interface Props {
   data: DataPublicPluginStart;
   dataView: DataView;
@@ -36,7 +33,7 @@ interface Props {
 
 export const SearchExample = ({ data, dataView, navigation }: Props) => {
   const [controlFilters, setControlFilters] = useState<Filter[]>([]);
-  const [controlGroup, setControlGroup] = useState<ControlGroupContainer>();
+  const [controlGroupAPI, setControlGroupAPI] = useState<AwaitingControlGroupAPI>();
   const [hits, setHits] = useState(0);
   const [filters, setFilters] = useState<Filter[]>([]);
   const [isSearching, setIsSearching] = useState(false);
@@ -47,16 +44,16 @@ export const SearchExample = ({ data, dataView, navigation }: Props) => {
   const [timeRange, setTimeRange] = useState<TimeRange>({ from: 'now-7d', to: 'now' });
 
   useEffect(() => {
-    if (!controlGroup) {
+    if (!controlGroupAPI) {
       return;
     }
-    const subscription = controlGroup.onFiltersPublished$.subscribe((newFilters) => {
+    const subscription = controlGroupAPI.onFiltersPublished$.subscribe((newFilters) => {
       setControlFilters([...newFilters]);
     });
     return () => {
       subscription.unsubscribe();
     };
-  }, [controlGroup]);
+  }, [controlGroupAPI]);
 
   useEffect(() => {
     const abortController = new AbortController();
@@ -155,10 +152,8 @@ export const SearchExample = ({ data, dataView, navigation }: Props) => {
               },
             };
           }}
-          onLoadComplete={async (newControlGroup) => {
-            setControlGroup(newControlGroup);
-          }}
           query={query}
+          ref={setControlGroupAPI}
           timeRange={timeRange}
         />
         <EuiCallOut title="Search results">
diff --git a/examples/controls_example/tsconfig.json b/examples/controls_example/tsconfig.json
index ae0426cf8b3f5..508a61e7020e0 100644
--- a/examples/controls_example/tsconfig.json
+++ b/examples/controls_example/tsconfig.json
@@ -18,10 +18,9 @@
     "@kbn/data-plugin",
     "@kbn/controls-plugin",
     "@kbn/navigation-plugin",
-    "@kbn/presentation-util-plugin",
     "@kbn/shared-ux-page-kibana-template",
     "@kbn/embeddable-plugin",
     "@kbn/data-views-plugin",
-    "@kbn/es-query"
+    "@kbn/es-query",
   ]
 }
diff --git a/examples/portable_dashboards_example/kibana.jsonc b/examples/portable_dashboards_example/kibana.jsonc
index 22699c136a96e..e4016f2b1c01e 100644
--- a/examples/portable_dashboards_example/kibana.jsonc
+++ b/examples/portable_dashboards_example/kibana.jsonc
@@ -20,7 +20,6 @@
       "unifiedSearch",
       "developerExamples",
       "embeddableExamples"
-    ],
-    "requiredBundles": ["presentationUtil"]
+    ]
   }
 }
diff --git a/examples/portable_dashboards_example/public/dashboard_with_controls_example.tsx b/examples/portable_dashboards_example/public/dashboard_with_controls_example.tsx
index 562d5392e8270..b0ad160b0829c 100644
--- a/examples/portable_dashboards_example/public/dashboard_with_controls_example.tsx
+++ b/examples/portable_dashboards_example/public/dashboard_with_controls_example.tsx
@@ -6,19 +6,37 @@
  * Side Public License, v 1.
  */
 
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 
-import { withSuspense } from '@kbn/shared-ux-utility';
 import { ViewMode } from '@kbn/embeddable-plugin/public';
 import type { DataView } from '@kbn/data-views-plugin/public';
-import { controlGroupInputBuilder } from '@kbn/controls-plugin/public';
 import { EuiPanel, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
+import { controlGroupInputBuilder } from '@kbn/controls-plugin/public';
+import { getDefaultControlGroupInput } from '@kbn/controls-plugin/common';
 import { FILTER_DEBUGGER_EMBEDDABLE } from '@kbn/embeddable-examples-plugin/public';
-import { LazyDashboardContainerRenderer } from '@kbn/dashboard-plugin/public';
-
-const DashboardContainerRenderer = withSuspense(LazyDashboardContainerRenderer);
+import { AwaitingDashboardAPI, DashboardRenderer } from '@kbn/dashboard-plugin/public';
 
 export const DashboardWithControlsExample = ({ dataView }: { dataView: DataView }) => {
+  const [dashboard, setDashboard] = useState<AwaitingDashboardAPI>();
+
+  // add a filter debugger panel as soon as the dashboard becomes available
+  useEffect(() => {
+    if (!dashboard) return;
+    (async () => {
+      const embeddable = await dashboard.addNewEmbeddable(FILTER_DEBUGGER_EMBEDDABLE, {});
+      const prevPanelState = dashboard.getExplicitInput().panels[embeddable.id];
+      // resize the new panel so that it fills up the entire width of the dashboard
+      dashboard.updateInput({
+        panels: {
+          [embeddable.id]: {
+            ...prevPanelState,
+            gridData: { i: embeddable.id, x: 0, y: 0, w: 48, h: 12 },
+          },
+        },
+      });
+    })();
+  }, [dashboard]);
+
   return (
     <>
       <EuiTitle>
@@ -29,10 +47,10 @@ export const DashboardWithControlsExample = ({ dataView }: { dataView: DataView
       </EuiText>
       <EuiSpacer size="m" />
       <EuiPanel hasBorder={true}>
-        <DashboardContainerRenderer
+        <DashboardRenderer
           getCreationOptions={async () => {
             const builder = controlGroupInputBuilder;
-            const controlGroupInput = {};
+            const controlGroupInput = getDefaultControlGroupInput();
             await builder.addDataControlFromField(controlGroupInput, {
               dataViewId: dataView.id ?? '',
               title: 'Destintion country',
@@ -57,22 +75,7 @@ export const DashboardWithControlsExample = ({ dataView }: { dataView: DataView
               },
             };
           }}
-          onDashboardContainerLoaded={(container) => {
-            const addFilterEmbeddable = async () => {
-              const embeddable = await container.addNewEmbeddable(FILTER_DEBUGGER_EMBEDDABLE, {});
-              const prevPanelState = container.getExplicitInput().panels[embeddable.id];
-              // resize the new panel so that it fills up the entire width of the dashboard
-              container.updateInput({
-                panels: {
-                  [embeddable.id]: {
-                    ...prevPanelState,
-                    gridData: { i: embeddable.id, x: 0, y: 0, w: 48, h: 12 },
-                  },
-                },
-              });
-            };
-            addFilterEmbeddable();
-          }}
+          ref={setDashboard}
         />
       </EuiPanel>
     </>
diff --git a/examples/portable_dashboards_example/public/dual_redux_example.tsx b/examples/portable_dashboards_example/public/dual_redux_example.tsx
index 0154ca2f2272e..0385cc0c8eb4b 100644
--- a/examples/portable_dashboards_example/public/dual_redux_example.tsx
+++ b/examples/portable_dashboards_example/public/dual_redux_example.tsx
@@ -6,9 +6,8 @@
  * Side Public License, v 1.
  */
 
-import React, { useMemo, useState } from 'react';
+import React, { useState } from 'react';
 
-import { DashboardContainer, LazyDashboardContainerRenderer } from '@kbn/dashboard-plugin/public';
 import {
   EuiButtonGroup,
   EuiFlexGroup,
@@ -18,35 +17,19 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
+import {
+  AwaitingDashboardAPI,
+  DashboardAPI,
+  DashboardRenderer,
+} from '@kbn/dashboard-plugin/public';
 import { ViewMode } from '@kbn/embeddable-plugin/public';
-import { withSuspense } from '@kbn/presentation-util-plugin/public';
-import { useDashboardContainerContext } from '@kbn/dashboard-plugin/public';
-
-const DashboardContainerRenderer = withSuspense(LazyDashboardContainerRenderer);
 
 export const DualReduxExample = () => {
-  const [firstDashboardContainer, setFirstDashboardContainer] = useState<
-    DashboardContainer | undefined
-  >();
-  const [secondDashboardContainer, setSecondDashboardContainer] = useState<
-    DashboardContainer | undefined
-  >();
-
-  const FirstDashboardReduxWrapper = useMemo(() => {
-    if (firstDashboardContainer) return firstDashboardContainer.getReduxEmbeddableTools().Wrapper;
-  }, [firstDashboardContainer]);
-  const SecondDashboardReduxWrapper = useMemo(() => {
-    if (secondDashboardContainer) return secondDashboardContainer.getReduxEmbeddableTools().Wrapper;
-  }, [secondDashboardContainer]);
+  const [firstDashboardContainer, setFirstDashboardContainer] = useState<AwaitingDashboardAPI>();
+  const [secondDashboardContainer, setSecondDashboardContainer] = useState<AwaitingDashboardAPI>();
 
-  const ButtonControls = () => {
-    const {
-      useEmbeddableDispatch,
-      useEmbeddableSelector: select,
-      actions: { setViewMode },
-    } = useDashboardContainerContext();
-    const dispatch = useEmbeddableDispatch();
-    const viewMode = select((state) => state.explicitInput.viewMode);
+  const ButtonControls = ({ dashboard }: { dashboard: DashboardAPI }) => {
+    const viewMode = dashboard.select((state) => state.explicitInput.viewMode);
 
     return (
       <EuiButtonGroup
@@ -64,9 +47,7 @@ export const DualReduxExample = () => {
           },
         ]}
         idSelected={viewMode}
-        onChange={(id, value) => {
-          dispatch(setViewMode(value));
-        }}
+        onChange={(id, value) => dashboard.dispatch.setViewMode(value)}
         type="single"
       />
     );
@@ -91,34 +72,18 @@ export const DualReduxExample = () => {
               <h3>Dashboard #1</h3>
             </EuiTitle>
             <EuiSpacer size="m" />
-            {FirstDashboardReduxWrapper && (
-              <FirstDashboardReduxWrapper>
-                <ButtonControls />
-              </FirstDashboardReduxWrapper>
-            )}
+            {firstDashboardContainer && <ButtonControls dashboard={firstDashboardContainer} />}
             <EuiSpacer size="m" />
-            <DashboardContainerRenderer
-              onDashboardContainerLoaded={(container) => {
-                setFirstDashboardContainer(container);
-              }}
-            />
+            <DashboardRenderer ref={setFirstDashboardContainer} />
           </EuiFlexItem>
           <EuiFlexItem>
             <EuiTitle size="xs">
               <h3>Dashboard #2</h3>
             </EuiTitle>
             <EuiSpacer size="m" />
-            {SecondDashboardReduxWrapper && (
-              <SecondDashboardReduxWrapper>
-                <ButtonControls />
-              </SecondDashboardReduxWrapper>
-            )}
+            {secondDashboardContainer && <ButtonControls dashboard={secondDashboardContainer} />}
             <EuiSpacer size="m" />
-            <DashboardContainerRenderer
-              onDashboardContainerLoaded={(container) => {
-                setSecondDashboardContainer(container);
-              }}
-            />
+            <DashboardRenderer ref={setSecondDashboardContainer} />
           </EuiFlexItem>
         </EuiFlexGroup>
       </EuiPanel>
diff --git a/examples/portable_dashboards_example/public/dynamically_add_panels_example.tsx b/examples/portable_dashboards_example/public/dynamically_add_panels_example.tsx
index 20fa99b631134..c1c4f7b850f21 100644
--- a/examples/portable_dashboards_example/public/dynamically_add_panels_example.tsx
+++ b/examples/portable_dashboards_example/public/dynamically_add_panels_example.tsx
@@ -8,7 +8,7 @@
 
 import React, { useMemo, useState } from 'react';
 
-import { DashboardContainer, LazyDashboardContainerRenderer } from '@kbn/dashboard-plugin/public';
+import { AwaitingDashboardAPI, DashboardRenderer } from '@kbn/dashboard-plugin/public';
 import {
   EuiButton,
   EuiFlexGroup,
@@ -23,19 +23,17 @@ import {
   VisualizeInput,
   VisualizeOutput,
 } from '@kbn/visualizations-plugin/public/embeddable/visualize_embeddable';
-import { withSuspense } from '@kbn/presentation-util-plugin/public';
 
 const INPUT_KEY = 'portableDashboard:saveExample:input';
 
-const DashboardContainerRenderer = withSuspense(LazyDashboardContainerRenderer); // make this so we don't have two loading states - loading in the dashboard plugin instead
-
 export const DynamicByReferenceExample = () => {
   const [isSaving, setIsSaving] = useState(false);
-  const [dashboardContainer, setDashboardContainer] = useState<DashboardContainer | undefined>();
+  const [dashboard, setdashboard] = useState<AwaitingDashboardAPI>();
 
   const onSave = async () => {
+    if (!dashboard) return;
     setIsSaving(true);
-    localStorage.setItem(INPUT_KEY, JSON.stringify(dashboardContainer!.getInput()));
+    localStorage.setItem(INPUT_KEY, JSON.stringify(dashboard.getInput()));
     // simulated async save await
     await new Promise((resolve) => setTimeout(resolve, 1000));
     setIsSaving(false);
@@ -56,44 +54,37 @@ export const DynamicByReferenceExample = () => {
 
   const resetPersistableInput = () => {
     localStorage.removeItem(INPUT_KEY);
-    if (dashboardContainer) {
-      const children = dashboardContainer.getChildIds();
+    if (dashboard) {
+      const children = dashboard.getChildIds();
       children.map((childId) => {
-        dashboardContainer.removeEmbeddable(childId);
+        dashboard.removeEmbeddable(childId);
       });
     }
   };
 
-  const addByReference = () => {
-    if (dashboardContainer) {
-      dashboardContainer.addFromLibrary();
-    }
-  };
-
   const addByValue = async () => {
-    if (dashboardContainer) {
-      dashboardContainer.addNewEmbeddable<VisualizeInput, VisualizeOutput, VisualizeEmbeddable>(
-        'visualization',
-        {
-          title: 'Sample Markdown Vis',
-          savedVis: {
-            type: 'markdown',
-            title: '',
-            data: { aggs: [], searchSource: {} },
-            params: {
-              fontSize: 12,
-              openLinksInNewTab: false,
-              markdown: '### By Value Visualization\nThis is a sample by value panel.',
-            },
+    if (!dashboard) return;
+    dashboard.addNewEmbeddable<VisualizeInput, VisualizeOutput, VisualizeEmbeddable>(
+      'visualization',
+      {
+        title: 'Sample Markdown Vis',
+        savedVis: {
+          type: 'markdown',
+          title: '',
+          data: { aggs: [], searchSource: {} },
+          params: {
+            fontSize: 12,
+            openLinksInNewTab: false,
+            markdown: '### By Value Visualization\nThis is a sample by value panel.',
           },
-        }
-      );
-    }
+        },
+      }
+    );
   };
 
   const disableButtons = useMemo(() => {
-    return dashboardContainer === undefined || isSaving;
-  }, [dashboardContainer, isSaving]);
+    return !dashboard || isSaving;
+  }, [dashboard, isSaving]);
 
   return (
     <>
@@ -114,7 +105,7 @@ export const DynamicByReferenceExample = () => {
                 </EuiButton>
               </EuiFlexItem>
               <EuiFlexItem>
-                <EuiButton onClick={addByReference} isDisabled={disableButtons}>
+                <EuiButton onClick={() => dashboard?.addFromLibrary()} isDisabled={disableButtons}>
                   Add visualization from library
                 </EuiButton>
               </EuiFlexItem>
@@ -141,7 +132,7 @@ export const DynamicByReferenceExample = () => {
         </EuiFlexGroup>
         <EuiSpacer size="m" />
 
-        <DashboardContainerRenderer
+        <DashboardRenderer
           getCreationOptions={async () => {
             const persistedInput = getPersistableInput();
             return {
@@ -151,9 +142,7 @@ export const DynamicByReferenceExample = () => {
               },
             };
           }}
-          onDashboardContainerLoaded={(container) => {
-            setDashboardContainer(container);
-          }}
+          ref={setdashboard}
         />
       </EuiPanel>
     </>
diff --git a/examples/portable_dashboards_example/public/static_by_reference_example.tsx b/examples/portable_dashboards_example/public/static_by_reference_example.tsx
index 8df1bb09c4590..3cd5bcb073a75 100644
--- a/examples/portable_dashboards_example/public/static_by_reference_example.tsx
+++ b/examples/portable_dashboards_example/public/static_by_reference_example.tsx
@@ -11,15 +11,9 @@ import { css } from '@emotion/react';
 
 import { buildPhraseFilter, Filter } from '@kbn/es-query';
 import type { DataView } from '@kbn/data-views-plugin/public';
-import {
-  LazyDashboardContainerRenderer,
-  DashboardCreationOptions,
-} from '@kbn/dashboard-plugin/public';
+import { DashboardRenderer, DashboardCreationOptions } from '@kbn/dashboard-plugin/public';
 import { EuiCode, EuiPanel, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
 import { ViewMode } from '@kbn/embeddable-plugin/public';
-import { withSuspense } from '@kbn/presentation-util-plugin/public';
-
-const DashboardContainerRenderer = withSuspense(LazyDashboardContainerRenderer);
 
 export const StaticByReferenceExample = ({
   dashboardId,
@@ -50,7 +44,7 @@ export const StaticByReferenceExample = ({
           overflow-y: auto;
         `}
       >
-        <DashboardContainerRenderer
+        <DashboardRenderer
           savedObjectId={dashboardId}
           getCreationOptions={async () => {
             const field = dataView.getFieldByName('machine.os.keyword');
@@ -61,13 +55,10 @@ export const StaticByReferenceExample = ({
             if (field) {
               filter = buildPhraseFilter(field, 'win xp', dataView);
               filter.meta.negate = true;
-              creationOptions = { ...creationOptions, overrideInput: { filters: [filter] } };
+              creationOptions = { ...creationOptions, initialInput: { filters: [filter] } };
             }
             return creationOptions; // if can't find the field, then just return no special creation options
           }}
-          onDashboardContainerLoaded={(container) => {
-            return; // this example is static, so don't need to do anything with the dashboard container
-          }}
         />
       </EuiPanel>
     </>
diff --git a/examples/portable_dashboards_example/public/static_by_value_example.tsx b/examples/portable_dashboards_example/public/static_by_value_example.tsx
index b686c701ced0d..3fbf416fbfbfa 100644
--- a/examples/portable_dashboards_example/public/static_by_value_example.tsx
+++ b/examples/portable_dashboards_example/public/static_by_value_example.tsx
@@ -11,13 +11,10 @@ import React from 'react';
 import { ViewMode } from '@kbn/embeddable-plugin/public';
 import { EuiPanel, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
 import type { DashboardPanelMap } from '@kbn/dashboard-plugin/common';
-import { LazyDashboardContainerRenderer } from '@kbn/dashboard-plugin/public';
-import { withSuspense } from '@kbn/presentation-util-plugin/public';
+import { DashboardRenderer } from '@kbn/dashboard-plugin/public';
 
 import panelsJson from './static_by_value_example_panels.json';
 
-const DashboardContainerRenderer = withSuspense(LazyDashboardContainerRenderer);
-
 export const StaticByValueExample = () => {
   return (
     <>
@@ -29,7 +26,7 @@ export const StaticByValueExample = () => {
       </EuiText>
       <EuiSpacer size="m" />
       <EuiPanel hasBorder={true}>
-        <DashboardContainerRenderer
+        <DashboardRenderer
           getCreationOptions={async () => {
             return {
               initialInput: {
@@ -39,9 +36,6 @@ export const StaticByValueExample = () => {
               },
             };
           }}
-          onDashboardContainerLoaded={(container) => {
-            return; // this example is static, so don't need to do anything with the dashboard container
-          }}
         />
       </EuiPanel>
     </>
diff --git a/examples/portable_dashboards_example/tsconfig.json b/examples/portable_dashboards_example/tsconfig.json
index 338fd93863aa5..fa93233be3f2a 100644
--- a/examples/portable_dashboards_example/tsconfig.json
+++ b/examples/portable_dashboards_example/tsconfig.json
@@ -20,11 +20,9 @@
     "@kbn/embeddable-plugin",
     "@kbn/data-views-plugin",
     "@kbn/visualizations-plugin",
-    "@kbn/presentation-util-plugin",
     "@kbn/developer-examples-plugin",
     "@kbn/embeddable-examples-plugin",
     "@kbn/shared-ux-page-kibana-template",
-    "@kbn/shared-ux-utility",
     "@kbn/controls-plugin",
     "@kbn/shared-ux-router"
   ]
diff --git a/src/plugins/controls/common/options_list/mocks.tsx b/src/plugins/controls/common/options_list/mocks.tsx
index 943e78c370fc6..936a620ec288c 100644
--- a/src/plugins/controls/common/options_list/mocks.tsx
+++ b/src/plugins/controls/common/options_list/mocks.tsx
@@ -6,19 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { createReduxEmbeddableTools } from '@kbn/presentation-util-plugin/public/redux_embeddables/create_redux_embeddable_tools';
-
 import { OptionsListEmbeddable, OptionsListEmbeddableFactory } from '../../public';
 import { OptionsListComponentState, OptionsListReduxState } from '../../public/options_list/types';
-import {
-  getDefaultComponentState,
-  optionsListReducers,
-} from '../../public/options_list/options_list_reducers';
 import { ControlFactory, ControlOutput } from '../../public/types';
 import { OptionsListEmbeddableInput } from './types';
 
+import * as optionsListStateModule from '../../public/options_list/options_list_reducers';
+
 const mockOptionsListComponentState = {
-  ...getDefaultComponentState(),
+  searchString: { value: '', valid: true },
   field: undefined,
   totalCardinality: 0,
   availableOptions: {
@@ -29,6 +25,8 @@ const mockOptionsListComponentState = {
     moo: { doc_count: 5 },
   },
   invalidSelections: [],
+  allowExpensiveQueries: true,
+  popoverOpen: false,
   validSelections: [],
 } as OptionsListComponentState;
 
@@ -46,26 +44,24 @@ const mockOptionsListOutput = {
   loading: false,
 } as ControlOutput;
 
-export const mockOptionsListReduxEmbeddableTools = async (
-  partialState?: Partial<OptionsListReduxState>
-) => {
+export const mockOptionsListEmbeddable = async (partialState?: Partial<OptionsListReduxState>) => {
   const optionsListFactoryStub = new OptionsListEmbeddableFactory();
   const optionsListControlFactory = optionsListFactoryStub as unknown as ControlFactory;
   optionsListControlFactory.getDefaultInput = () => ({});
+
+  // initial component state can be provided by overriding the defaults.
+  const initialComponentState = {
+    ...mockOptionsListComponentState,
+    ...partialState?.componentState,
+  };
+  jest
+    .spyOn(optionsListStateModule, 'getDefaultComponentState')
+    .mockImplementation(() => initialComponentState);
+
   const mockEmbeddable = (await optionsListControlFactory.create({
     ...mockOptionsListEmbeddableInput,
     ...partialState?.explicitInput,
   })) as OptionsListEmbeddable;
   mockEmbeddable.getOutput = jest.fn().mockReturnValue(mockOptionsListOutput);
-
-  const mockReduxEmbeddableTools = createReduxEmbeddableTools<OptionsListReduxState>({
-    embeddable: mockEmbeddable,
-    reducers: optionsListReducers,
-    initialComponentState: {
-      ...mockOptionsListComponentState,
-      ...partialState?.componentState,
-    },
-  });
-
-  return mockReduxEmbeddableTools;
+  return mockEmbeddable;
 };
diff --git a/src/plugins/controls/public/control_group/actions/delete_control_action.test.tsx b/src/plugins/controls/public/control_group/actions/delete_control_action.test.tsx
index 19d036ae5a6b3..0f64334b94787 100644
--- a/src/plugins/controls/public/control_group/actions/delete_control_action.test.tsx
+++ b/src/plugins/controls/public/control_group/actions/delete_control_action.test.tsx
@@ -6,10 +6,6 @@
  * Side Public License, v 1.
  */
 
-import {
-  lazyLoadReduxEmbeddablePackage,
-  ReduxEmbeddablePackage,
-} from '@kbn/presentation-util-plugin/public';
 import { ErrorEmbeddable } from '@kbn/embeddable-plugin/public';
 
 import { ControlOutput } from '../../types';
@@ -17,17 +13,15 @@ import { ControlGroupInput } from '../types';
 import { pluginServices } from '../../services';
 import { DeleteControlAction } from './delete_control_action';
 import { OptionsListEmbeddableInput } from '../../options_list';
-import { controlGroupInputBuilder } from '../control_group_input_builder';
+import { controlGroupInputBuilder } from '../external_api/control_group_input_builder';
 import { ControlGroupContainer } from '../embeddable/control_group_container';
 import { OptionsListEmbeddable } from '../../options_list/embeddable/options_list_embeddable';
+import { mockedReduxEmbeddablePackage } from '@kbn/presentation-util-plugin/public/mocks';
 
 let container: ControlGroupContainer;
 let embeddable: OptionsListEmbeddable;
-let reduxEmbeddablePackage: ReduxEmbeddablePackage;
 
 beforeAll(async () => {
-  reduxEmbeddablePackage = await lazyLoadReduxEmbeddablePackage();
-
   const controlGroupInput = { chainingSystem: 'NONE', panels: {} } as ControlGroupInput;
   controlGroupInputBuilder.addOptionsListControl(controlGroupInput, {
     dataViewId: 'test-data-view',
@@ -36,7 +30,7 @@ beforeAll(async () => {
     width: 'medium',
     grow: false,
   });
-  container = new ControlGroupContainer(reduxEmbeddablePackage, controlGroupInput);
+  container = new ControlGroupContainer(mockedReduxEmbeddablePackage, controlGroupInput);
   await container.untilInitialized();
 
   embeddable = container.getChild(container.getChildIds()[0]);
@@ -53,7 +47,7 @@ test('Action is incompatible with Error Embeddables', async () => {
 test('Execute throws an error when called with an embeddable not in a parent', async () => {
   const deleteControlAction = new DeleteControlAction();
   const optionsListEmbeddable = new OptionsListEmbeddable(
-    reduxEmbeddablePackage,
+    mockedReduxEmbeddablePackage,
     {} as OptionsListEmbeddableInput,
     {} as ControlOutput
   );
diff --git a/src/plugins/controls/public/control_group/actions/edit_control_action.test.tsx b/src/plugins/controls/public/control_group/actions/edit_control_action.test.tsx
index 7c4f15f091b9c..d8a1bdb30832f 100644
--- a/src/plugins/controls/public/control_group/actions/edit_control_action.test.tsx
+++ b/src/plugins/controls/public/control_group/actions/edit_control_action.test.tsx
@@ -6,10 +6,6 @@
  * Side Public License, v 1.
  */
 
-import {
-  lazyLoadReduxEmbeddablePackage,
-  ReduxEmbeddablePackage,
-} from '@kbn/presentation-util-plugin/public';
 import { ErrorEmbeddable } from '@kbn/embeddable-plugin/public';
 
 import { ControlOutput } from '../../types';
@@ -21,16 +17,11 @@ import { TimeSliderEmbeddableFactory } from '../../time_slider';
 import { OptionsListEmbeddableFactory, OptionsListEmbeddableInput } from '../../options_list';
 import { ControlGroupContainer } from '../embeddable/control_group_container';
 import { OptionsListEmbeddable } from '../../options_list/embeddable/options_list_embeddable';
-
-let reduxEmbeddablePackage: ReduxEmbeddablePackage;
+import { mockedReduxEmbeddablePackage } from '@kbn/presentation-util-plugin/public/mocks';
 
 const controlGroupInput = { chainingSystem: 'NONE', panels: {} } as ControlGroupInput;
 const deleteControlAction = new DeleteControlAction();
 
-beforeAll(async () => {
-  reduxEmbeddablePackage = await lazyLoadReduxEmbeddablePackage();
-});
-
 test('Action is incompatible with Error Embeddables', async () => {
   const editControlAction = new EditControlAction(deleteControlAction);
   const errorEmbeddable = new ErrorEmbeddable('Wow what an awful error', { id: ' 404' });
@@ -44,7 +35,7 @@ test('Action is incompatible with embeddables that are not editable', async () =
   pluginServices.getServices().embeddable.getEmbeddableFactory = mockGetFactory;
 
   const editControlAction = new EditControlAction(deleteControlAction);
-  const emptyContainer = new ControlGroupContainer(reduxEmbeddablePackage, controlGroupInput);
+  const emptyContainer = new ControlGroupContainer(mockedReduxEmbeddablePackage, controlGroupInput);
   await emptyContainer.untilInitialized();
   await emptyContainer.addTimeSliderControl();
 
@@ -62,7 +53,7 @@ test('Action is compatible with embeddables that are editable', async () => {
   pluginServices.getServices().embeddable.getEmbeddableFactory = mockGetFactory;
 
   const editControlAction = new EditControlAction(deleteControlAction);
-  const emptyContainer = new ControlGroupContainer(reduxEmbeddablePackage, controlGroupInput);
+  const emptyContainer = new ControlGroupContainer(mockedReduxEmbeddablePackage, controlGroupInput);
   await emptyContainer.untilInitialized();
   await emptyContainer.addOptionsListControl({
     dataViewId: 'test-data-view',
@@ -82,7 +73,7 @@ test('Action is compatible with embeddables that are editable', async () => {
 test('Execute throws an error when called with an embeddable not in a parent', async () => {
   const editControlAction = new EditControlAction(deleteControlAction);
   const optionsListEmbeddable = new OptionsListEmbeddable(
-    reduxEmbeddablePackage,
+    mockedReduxEmbeddablePackage,
     {} as OptionsListEmbeddableInput,
     {} as ControlOutput
   );
@@ -95,7 +86,7 @@ test('Execute should open a flyout', async () => {
   const spyOn = jest.fn().mockResolvedValue(undefined);
   pluginServices.getServices().overlays.openFlyout = spyOn;
 
-  const emptyContainer = new ControlGroupContainer(reduxEmbeddablePackage, controlGroupInput);
+  const emptyContainer = new ControlGroupContainer(mockedReduxEmbeddablePackage, controlGroupInput);
   await emptyContainer.untilInitialized();
   await emptyContainer.addOptionsListControl({
     dataViewId: 'test-data-view',
diff --git a/src/plugins/controls/public/control_group/actions/edit_control_action.tsx b/src/plugins/controls/public/control_group/actions/edit_control_action.tsx
index 9500640332446..fef0b7cd2a5bb 100644
--- a/src/plugins/controls/public/control_group/actions/edit_control_action.tsx
+++ b/src/plugins/controls/public/control_group/actions/edit_control_action.tsx
@@ -19,7 +19,7 @@ import { DeleteControlAction } from './delete_control_action';
 import { ControlGroupStrings } from '../control_group_strings';
 import { ACTION_EDIT_CONTROL, ControlGroupContainer } from '..';
 import { ControlEmbeddable, DataControlInput } from '../../types';
-import { setFlyoutRef } from '../embeddable/control_group_container';
+import { ControlGroupContainerContext, setFlyoutRef } from '../embeddable/control_group_container';
 import { isControlGroup } from '../embeddable/control_group_helpers';
 
 export interface EditControlActionContext {
@@ -91,11 +91,10 @@ export class EditControlAction implements Action<EditControlActionContext> {
       throw new IncompatibleActionError();
     }
     const controlGroup = embeddable.parent as ControlGroupContainer;
-    const ReduxWrapper = controlGroup.getReduxEmbeddableTools().Wrapper;
 
     const flyoutInstance = this.openFlyout(
       toMountPoint(
-        <ReduxWrapper>
+        <ControlGroupContainerContext.Provider value={controlGroup}>
           <EditControlFlyout
             embeddable={embeddable}
             removeControl={() => this.deleteControlAction.execute({ embeddable })}
@@ -104,7 +103,7 @@ export class EditControlAction implements Action<EditControlActionContext> {
               flyoutInstance.close();
             }}
           />
-        </ReduxWrapper>,
+        </ControlGroupContainerContext.Provider>,
 
         { theme$: this.theme$ }
       ),
diff --git a/src/plugins/controls/public/control_group/actions/edit_control_flyout.tsx b/src/plugins/controls/public/control_group/actions/edit_control_flyout.tsx
index c5f3dda8f5f8c..c182a61ff1567 100644
--- a/src/plugins/controls/public/control_group/actions/edit_control_flyout.tsx
+++ b/src/plugins/controls/public/control_group/actions/edit_control_flyout.tsx
@@ -14,7 +14,7 @@ import { EmbeddableFactoryNotFoundError } from '@kbn/embeddable-plugin/public';
 import { DataControlInput, ControlEmbeddable, IEditableControlFactory } from '../../types';
 import { pluginServices } from '../../services';
 import { ControlGroupStrings } from '../control_group_strings';
-import { useControlGroupContainerContext } from '../control_group_renderer';
+import { useControlGroupContainer } from '../embeddable/control_group_container';
 import { ControlEditor } from '../editor/control_editor';
 
 export const EditControlFlyout = ({
@@ -32,17 +32,10 @@ export const EditControlFlyout = ({
     controls: { getControlFactory },
   } = pluginServices.getServices();
   // Redux embeddable container Context
-  const reduxContext = useControlGroupContainerContext();
-  const {
-    embeddableInstance: controlGroup,
-    actions: { setControlWidth, setControlGrow },
-    useEmbeddableSelector,
-    useEmbeddableDispatch,
-  } = reduxContext;
-  const dispatch = useEmbeddableDispatch();
+  const controlGroup = useControlGroupContainer();
 
   // current state
-  const panels = useEmbeddableSelector((state) => state.explicitInput.panels);
+  const panels = controlGroup.select((state) => state.explicitInput.panels);
   const panel = panels[embeddable.id];
 
   const [currentGrow, setCurrentGrow] = useState(panel.grow);
@@ -86,9 +79,9 @@ export const EditControlFlyout = ({
     }
 
     if (currentWidth !== panel.width)
-      dispatch(setControlWidth({ width: currentWidth, embeddableId: embeddable.id }));
+      controlGroup.dispatch.setControlWidth({ width: currentWidth, embeddableId: embeddable.id });
     if (currentGrow !== panel.grow)
-      dispatch(setControlGrow({ grow: currentGrow, embeddableId: embeddable.id }));
+      controlGroup.dispatch.setControlGrow({ grow: currentGrow, embeddableId: embeddable.id });
 
     closeFlyout();
     await controlGroup.replaceEmbeddable(embeddable.id, inputToReturn, type);
diff --git a/src/plugins/controls/public/control_group/component/control_frame_component.tsx b/src/plugins/controls/public/control_group/component/control_frame_component.tsx
index 2697e941ab234..49282b05d76f9 100644
--- a/src/plugins/controls/public/control_group/component/control_frame_component.tsx
+++ b/src/plugins/controls/public/control_group/component/control_frame_component.tsx
@@ -6,8 +6,9 @@
  * Side Public License, v 1.
  */
 
-import React, { useEffect, useMemo, useState } from 'react';
 import classNames from 'classnames';
+import React, { useEffect, useMemo, useState } from 'react';
+
 import {
   EuiButtonEmpty,
   EuiFormControlLayout,
@@ -17,15 +18,16 @@ import {
   EuiPopover,
   EuiToolTip,
 } from '@elastic/eui';
-
 import { FormattedMessage } from '@kbn/i18n-react';
 import { Markdown } from '@kbn/kibana-react-plugin/public';
-import { useReduxEmbeddableContext, FloatingActions } from '@kbn/presentation-util-plugin/public';
-import { ControlGroupReduxState } from '../types';
+import { FloatingActions } from '@kbn/presentation-util-plugin/public';
+
+import {
+  controlGroupSelector,
+  useControlGroupContainer,
+} from '../embeddable/control_group_container';
 import { ControlGroupStrings } from '../control_group_strings';
 import { useChildEmbeddable } from '../../hooks/use_child_embeddable';
-import { controlGroupReducers } from '../state/control_group_reducers';
-import { ControlGroupContainer } from '..';
 
 interface ControlFrameErrorProps {
   error: Error;
@@ -82,16 +84,11 @@ export const ControlFrame = ({
   const embeddableRoot: React.RefObject<HTMLDivElement> = useMemo(() => React.createRef(), []);
   const [fatalError, setFatalError] = useState<Error>();
 
-  const { useEmbeddableSelector: select, embeddableInstance: controlGroup } =
-    useReduxEmbeddableContext<
-      ControlGroupReduxState,
-      typeof controlGroupReducers,
-      ControlGroupContainer
-    >();
+  const controlGroup = useControlGroupContainer();
 
-  const viewMode = select((state) => state.explicitInput.viewMode);
-  const controlStyle = select((state) => state.explicitInput.controlStyle);
-  const disabledActions = select((state) => state.explicitInput.disabledActions);
+  const controlStyle = controlGroupSelector((state) => state.explicitInput.controlStyle);
+  const viewMode = controlGroupSelector((state) => state.explicitInput.viewMode);
+  const disabledActions = controlGroupSelector((state) => state.explicitInput.disabledActions);
 
   const embeddable = useChildEmbeddable({
     untilEmbeddableLoaded: controlGroup.untilEmbeddableLoaded.bind(controlGroup),
diff --git a/src/plugins/controls/public/control_group/component/control_group_component.tsx b/src/plugins/controls/public/control_group/component/control_group_component.tsx
index a92ee31e83053..875cb48b5a8f4 100644
--- a/src/plugins/controls/public/control_group/component/control_group_component.tsx
+++ b/src/plugins/controls/public/control_group/component/control_group_component.tsx
@@ -8,9 +8,6 @@
 
 import '../control_group.scss';
 
-import { EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiPanel } from '@elastic/eui';
-import React, { useMemo, useState } from 'react';
-import classNames from 'classnames';
 import {
   arrayMove,
   SortableContext,
@@ -28,28 +25,28 @@ import {
   useSensors,
   LayoutMeasuringStrategy,
 } from '@dnd-kit/core';
+import classNames from 'classnames';
+import React, { useMemo, useState } from 'react';
+import { TypedUseSelectorHook, useSelector } from 'react-redux';
+import { EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiPanel } from '@elastic/eui';
 
 import { ViewMode } from '@kbn/embeddable-plugin/public';
-import { ControlClone, SortableControl } from './control_group_sortable_item';
-import { useControlGroupContainerContext } from '../control_group_renderer';
+
+import { ControlGroupReduxState } from '../types';
 import { ControlGroupStrings } from '../control_group_strings';
+import { ControlClone, SortableControl } from './control_group_sortable_item';
+import { useControlGroupContainer } from '../embeddable/control_group_container';
+
+const contextSelect = useSelector as TypedUseSelectorHook<ControlGroupReduxState>;
 
 export const ControlGroup = () => {
-  // Redux embeddable container Context
-  const reduxContext = useControlGroupContainerContext();
-  const {
-    embeddableInstance: controlGroup,
-    actions: { setControlOrders },
-    useEmbeddableSelector: select,
-    useEmbeddableDispatch,
-  } = reduxContext;
-  const dispatch = useEmbeddableDispatch();
+  const controlGroup = useControlGroupContainer();
 
   // current state
-  const panels = select((state) => state.explicitInput.panels);
-  const viewMode = select((state) => state.explicitInput.viewMode);
-  const controlStyle = select((state) => state.explicitInput.controlStyle);
-  const showAddButton = select((state) => state.componentState.showAddButton);
+  const panels = contextSelect((state) => state.explicitInput.panels);
+  const viewMode = contextSelect((state) => state.explicitInput.viewMode);
+  const controlStyle = contextSelect((state) => state.explicitInput.controlStyle);
+  const showAddButton = contextSelect((state) => state.componentState.showAddButton);
 
   const isEditable = viewMode === ViewMode.EDIT;
 
@@ -80,7 +77,9 @@ export const ControlGroup = () => {
       const overIndex = idsInOrder.indexOf(over.id);
       if (draggingIndex !== overIndex) {
         const newIndex = overIndex;
-        dispatch(setControlOrders({ ids: arrayMove([...idsInOrder], draggingIndex, newIndex) }));
+        controlGroup.dispatch.setControlOrders({
+          ids: arrayMove([...idsInOrder], draggingIndex, newIndex),
+        });
       }
     }
     setDraggingId(null);
diff --git a/src/plugins/controls/public/control_group/component/control_group_sortable_item.tsx b/src/plugins/controls/public/control_group/component/control_group_sortable_item.tsx
index 9ef7f9ef4a47d..414565851afce 100644
--- a/src/plugins/controls/public/control_group/component/control_group_sortable_item.tsx
+++ b/src/plugins/controls/public/control_group/component/control_group_sortable_item.tsx
@@ -6,16 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { EuiFlexItem, EuiFormLabel, EuiIcon, EuiFlexGroup } from '@elastic/eui';
-import React, { forwardRef, HTMLAttributes } from 'react';
-import { useSortable } from '@dnd-kit/sortable';
-import { CSS } from '@dnd-kit/utilities';
 import classNames from 'classnames';
+import { CSS } from '@dnd-kit/utilities';
+import { useSortable } from '@dnd-kit/sortable';
+import React, { forwardRef, HTMLAttributes } from 'react';
+import { EuiFlexItem, EuiFormLabel, EuiIcon, EuiFlexGroup } from '@elastic/eui';
 
-import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
-import { ControlFrame, ControlFrameProps } from './control_frame_component';
-import { ControlGroupReduxState } from '../types';
 import { ControlGroupStrings } from '../control_group_strings';
+import { ControlFrame, ControlFrameProps } from './control_frame_component';
+import { controlGroupSelector } from '../embeddable/control_group_container';
 
 interface DragInfo {
   isOver?: boolean;
@@ -70,8 +69,7 @@ const SortableControlInner = forwardRef<
     dragHandleRef
   ) => {
     const { isOver, isDragging, draggingIndex, index } = dragInfo;
-    const { useEmbeddableSelector } = useReduxEmbeddableContext<ControlGroupReduxState>();
-    const panels = useEmbeddableSelector((state) => state.explicitInput.panels);
+    const panels = controlGroupSelector((state) => state.explicitInput.panels);
 
     const grow = panels[embeddableId].grow;
     const width = panels[embeddableId].width;
@@ -122,9 +120,8 @@ const SortableControlInner = forwardRef<
  * can be quite cumbersome.
  */
 export const ControlClone = ({ draggingId }: { draggingId: string }) => {
-  const { useEmbeddableSelector: select } = useReduxEmbeddableContext<ControlGroupReduxState>();
-  const panels = select((state) => state.explicitInput.panels);
-  const controlStyle = select((state) => state.explicitInput.controlStyle);
+  const panels = controlGroupSelector((state) => state.explicitInput.panels);
+  const controlStyle = controlGroupSelector((state) => state.explicitInput.controlStyle);
 
   const width = panels[draggingId].width;
   const title = panels[draggingId].explicitInput.title;
diff --git a/src/plugins/controls/public/control_group/control_group_renderer.tsx b/src/plugins/controls/public/control_group/control_group_renderer.tsx
deleted file mode 100644
index 88b270349c42b..0000000000000
--- a/src/plugins/controls/public/control_group/control_group_renderer.tsx
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * 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 { v4 as uuidv4 } from 'uuid';
-import { isEqual } from 'lodash';
-import useLifecycles from 'react-use/lib/useLifecycles';
-import React, { useEffect, useMemo, useRef, useState } from 'react';
-
-import { compareFilters } from '@kbn/es-query';
-import type { Filter, TimeRange, Query } from '@kbn/es-query';
-import { EmbeddableFactory } from '@kbn/embeddable-plugin/public';
-import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
-
-import {
-  ControlGroupCreationOptions,
-  ControlGroupInput,
-  ControlGroupOutput,
-  ControlGroupReduxState,
-  CONTROL_GROUP_TYPE,
-} from './types';
-import { pluginServices } from '../services';
-import { getDefaultControlGroupInput } from '../../common';
-import { controlGroupReducers } from './state/control_group_reducers';
-import { controlGroupInputBuilder } from './control_group_input_builder';
-import { ControlGroupContainer } from './embeddable/control_group_container';
-import { ControlGroupContainerFactory } from './embeddable/control_group_container_factory';
-
-export interface ControlGroupRendererProps {
-  filters?: Filter[];
-  getCreationOptions: (
-    initialInput: Partial<ControlGroupInput>,
-    builder: typeof controlGroupInputBuilder
-  ) => Promise<ControlGroupCreationOptions>;
-  onLoadComplete?: (controlGroup: ControlGroupContainer) => void;
-  timeRange?: TimeRange;
-  query?: Query;
-}
-
-export const ControlGroupRenderer = ({
-  onLoadComplete,
-  getCreationOptions,
-  filters,
-  timeRange,
-  query,
-}: ControlGroupRendererProps) => {
-  const controlGroupRef = useRef(null);
-  const [controlGroup, setControlGroup] = useState<ControlGroupContainer>();
-  const id = useMemo(() => uuidv4(), []);
-  /**
-   * Use Lifecycles to load initial control group container
-   */
-  useLifecycles(
-    // onMount
-    () => {
-      const { embeddable } = pluginServices.getServices();
-      (async () => {
-        const factory = embeddable.getEmbeddableFactory(CONTROL_GROUP_TYPE) as EmbeddableFactory<
-          ControlGroupInput,
-          ControlGroupOutput,
-          ControlGroupContainer
-        > & {
-          create: ControlGroupContainerFactory['create'];
-        };
-        const { initialInput, settings } = await getCreationOptions(
-          getDefaultControlGroupInput(),
-          controlGroupInputBuilder
-        );
-        const newControlGroup = (await factory?.create(
-          {
-            id,
-            ...getDefaultControlGroupInput(),
-            ...initialInput,
-          },
-          undefined,
-          settings
-        )) as ControlGroupContainer;
-
-        if (controlGroupRef.current) {
-          newControlGroup.render(controlGroupRef.current);
-        }
-        setControlGroup(newControlGroup);
-        if (onLoadComplete) {
-          onLoadComplete(newControlGroup);
-        }
-      })();
-    },
-    // onUnmount
-    () => {
-      controlGroup?.destroy();
-    }
-  );
-
-  useEffect(() => {
-    if (!controlGroup) {
-      return;
-    }
-
-    if (
-      (timeRange && !isEqual(controlGroup.getInput().timeRange, timeRange)) ||
-      !compareFilters(controlGroup.getInput().filters ?? [], filters ?? []) ||
-      !isEqual(controlGroup.getInput().query, query)
-    ) {
-      controlGroup.updateInput({
-        timeRange,
-        query,
-        filters,
-      });
-    }
-  }, [query, filters, controlGroup, timeRange]);
-
-  return <div ref={controlGroupRef} />;
-};
-
-export const useControlGroupContainerContext = () =>
-  useReduxEmbeddableContext<
-    ControlGroupReduxState,
-    typeof controlGroupReducers,
-    ControlGroupContainer
-  >();
-
-// required for dynamic import using React.lazy()
-// eslint-disable-next-line import/no-default-export
-export default ControlGroupRenderer;
diff --git a/src/plugins/controls/public/control_group/editor/control_editor.tsx b/src/plugins/controls/public/control_group/editor/control_editor.tsx
index 90285c7cca005..8bf021b8c4b8a 100644
--- a/src/plugins/controls/public/control_group/editor/control_editor.tsx
+++ b/src/plugins/controls/public/control_group/editor/control_editor.tsx
@@ -53,7 +53,8 @@ import {
 import { CONTROL_WIDTH_OPTIONS } from './editor_constants';
 import { pluginServices } from '../../services';
 import { getDataControlFieldRegistry } from './data_control_editor_tools';
-import { useControlGroupContainerContext } from '../control_group_renderer';
+import { useControlGroupContainer } from '../embeddable/control_group_container';
+
 interface EditControlProps {
   embeddable?: ControlEmbeddable<DataControlInput>;
   isCreate: boolean;
@@ -95,9 +96,11 @@ export const ControlEditor = ({
     controls: { getControlFactory },
   } = pluginServices.getServices();
 
-  const { useEmbeddableSelector: select } = useControlGroupContainerContext();
-  const editorConfig = select((state) => state.componentState.editorConfig);
-  const customFilterPredicate = select((state) => state.componentState.fieldFilterPredicate);
+  const controlGroup = useControlGroupContainer();
+  const editorConfig = controlGroup.select((state) => state.componentState.editorConfig);
+  const customFilterPredicate = controlGroup.select(
+    (state) => state.componentState.fieldFilterPredicate
+  );
 
   const [defaultTitle, setDefaultTitle] = useState<string>();
   const [currentTitle, setCurrentTitle] = useState(title ?? '');
diff --git a/src/plugins/controls/public/control_group/editor/open_add_data_control_flyout.tsx b/src/plugins/controls/public/control_group/editor/open_add_data_control_flyout.tsx
index e9e89d3828729..bf60193432488 100644
--- a/src/plugins/controls/public/control_group/editor/open_add_data_control_flyout.tsx
+++ b/src/plugins/controls/public/control_group/editor/open_add_data_control_flyout.tsx
@@ -8,22 +8,27 @@
 
 import React from 'react';
 import { toMountPoint } from '@kbn/kibana-react-plugin/public';
-import { ControlInputTransform } from '../../../common/types';
+
+import {
+  ControlGroupContainer,
+  ControlGroupContainerContext,
+  setFlyoutRef,
+} from '../embeddable/control_group_container';
 import type {
   AddDataControlProps,
   AddOptionsListControlProps,
   AddRangeSliderControlProps,
-} from '../control_group_input_builder';
-import { ControlGroupStrings } from '../control_group_strings';
-import { ControlGroupContainer, setFlyoutRef } from '../embeddable/control_group_container';
-import { pluginServices } from '../../services';
-import { ControlEditor } from './control_editor';
-import { DataControlInput, OPTIONS_LIST_CONTROL, RANGE_SLIDER_CONTROL } from '../..';
-import { IEditableControlFactory } from '../../types';
+} from '../external_api/control_group_input_builder';
 import {
   DEFAULT_CONTROL_GROW,
   DEFAULT_CONTROL_WIDTH,
 } from '../../../common/control_group/control_group_constants';
+import { pluginServices } from '../../services';
+import { ControlEditor } from './control_editor';
+import { IEditableControlFactory } from '../../types';
+import { ControlInputTransform } from '../../../common/types';
+import { ControlGroupStrings } from '../control_group_strings';
+import { DataControlInput, OPTIONS_LIST_CONTROL, RANGE_SLIDER_CONTROL } from '../..';
 
 export function openAddDataControlFlyout(
   this: ControlGroupContainer,
@@ -34,8 +39,6 @@ export function openAddDataControlFlyout(
     controls: { getControlFactory },
     theme: { theme$ },
   } = pluginServices.getServices();
-  const ControlsServicesProvider = pluginServices.getContextProvider();
-  const ReduxWrapper = this.getReduxEmbeddableTools().Wrapper;
 
   let controlInput: Partial<DataControlInput> = {};
   const onCancel = () => {
@@ -58,51 +61,49 @@ export function openAddDataControlFlyout(
 
   const flyoutInstance = openFlyout(
     toMountPoint(
-      <ControlsServicesProvider>
-        <ReduxWrapper>
-          <ControlEditor
-            setLastUsedDataViewId={(newId) => this.setLastUsedDataViewId(newId)}
-            getRelevantDataViewId={this.getMostRelevantDataViewId}
-            isCreate={true}
-            width={this.getInput().defaultControlWidth ?? DEFAULT_CONTROL_WIDTH}
-            grow={this.getInput().defaultControlGrow ?? DEFAULT_CONTROL_GROW}
-            updateTitle={(newTitle) => (controlInput.title = newTitle)}
-            updateWidth={(defaultControlWidth) => this.updateInput({ defaultControlWidth })}
-            updateGrow={(defaultControlGrow: boolean) => this.updateInput({ defaultControlGrow })}
-            onSave={(type) => {
-              this.closeAllFlyouts();
-              if (!type) {
-                return;
-              }
-
-              const factory = getControlFactory(type) as IEditableControlFactory;
-              if (factory.presaveTransformFunction) {
-                controlInput = factory.presaveTransformFunction(controlInput);
-              }
+      <ControlGroupContainerContext.Provider value={this}>
+        <ControlEditor
+          setLastUsedDataViewId={(newId) => this.setLastUsedDataViewId(newId)}
+          getRelevantDataViewId={this.getMostRelevantDataViewId}
+          isCreate={true}
+          width={this.getInput().defaultControlWidth ?? DEFAULT_CONTROL_WIDTH}
+          grow={this.getInput().defaultControlGrow ?? DEFAULT_CONTROL_GROW}
+          updateTitle={(newTitle) => (controlInput.title = newTitle)}
+          updateWidth={(defaultControlWidth) => this.updateInput({ defaultControlWidth })}
+          updateGrow={(defaultControlGrow: boolean) => this.updateInput({ defaultControlGrow })}
+          onSave={(type) => {
+            this.closeAllFlyouts();
+            if (!type) {
+              return;
+            }
 
-              if (controlInputTransform) {
-                controlInput = controlInputTransform({ ...controlInput }, type);
-              }
+            const factory = getControlFactory(type) as IEditableControlFactory;
+            if (factory.presaveTransformFunction) {
+              controlInput = factory.presaveTransformFunction(controlInput);
+            }
 
-              if (type === OPTIONS_LIST_CONTROL) {
-                this.addOptionsListControl(controlInput as AddOptionsListControlProps);
-                return;
-              }
+            if (controlInputTransform) {
+              controlInput = controlInputTransform({ ...controlInput }, type);
+            }
 
-              if (type === RANGE_SLIDER_CONTROL) {
-                this.addRangeSliderControl(controlInput as AddRangeSliderControlProps);
-                return;
-              }
+            if (type === OPTIONS_LIST_CONTROL) {
+              this.addOptionsListControl(controlInput as AddOptionsListControlProps);
+              return;
+            }
 
-              this.addDataControlFromField(controlInput as AddDataControlProps);
-            }}
-            onCancel={onCancel}
-            onTypeEditorChange={(partialInput) =>
-              (controlInput = { ...controlInput, ...partialInput })
+            if (type === RANGE_SLIDER_CONTROL) {
+              this.addRangeSliderControl(controlInput as AddRangeSliderControlProps);
+              return;
             }
-          />
-        </ReduxWrapper>
-      </ControlsServicesProvider>,
+
+            this.addDataControlFromField(controlInput as AddDataControlProps);
+          }}
+          onCancel={onCancel}
+          onTypeEditorChange={(partialInput) =>
+            (controlInput = { ...controlInput, ...partialInput })
+          }
+        />
+      </ControlGroupContainerContext.Provider>,
       { theme$ }
     ),
     {
diff --git a/src/plugins/controls/public/control_group/editor/open_edit_control_group_flyout.tsx b/src/plugins/controls/public/control_group/editor/open_edit_control_group_flyout.tsx
index 156ab377792dd..8708830d532e9 100644
--- a/src/plugins/controls/public/control_group/editor/open_edit_control_group_flyout.tsx
+++ b/src/plugins/controls/public/control_group/editor/open_edit_control_group_flyout.tsx
@@ -13,14 +13,17 @@ import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { pluginServices } from '../../services';
 import { ControlGroupEditor } from './control_group_editor';
 import { ControlGroupStrings } from '../control_group_strings';
-import { ControlGroupContainer, setFlyoutRef } from '../embeddable/control_group_container';
+import {
+  ControlGroupContainer,
+  ControlGroupContainerContext,
+  setFlyoutRef,
+} from '../embeddable/control_group_container';
 
 export function openEditControlGroupFlyout(this: ControlGroupContainer) {
   const {
     overlays: { openFlyout, openConfirm },
     theme: { theme$ },
   } = pluginServices.getServices();
-  const ReduxWrapper = this.getReduxEmbeddableTools().Wrapper;
 
   const onDeleteAll = (ref: OverlayRef) => {
     openConfirm(ControlGroupStrings.management.deleteControls.getSubtitle(), {
@@ -37,7 +40,7 @@ export function openEditControlGroupFlyout(this: ControlGroupContainer) {
 
   const flyoutInstance = openFlyout(
     toMountPoint(
-      <ReduxWrapper>
+      <ControlGroupContainerContext.Provider value={this}>
         <ControlGroupEditor
           initialInput={this.getInput()}
           updateInput={(changes) => this.updateInput(changes)}
@@ -45,7 +48,7 @@ export function openEditControlGroupFlyout(this: ControlGroupContainer) {
           onDeleteAll={() => onDeleteAll(flyoutInstance)}
           onClose={() => flyoutInstance.close()}
         />
-      </ReduxWrapper>,
+      </ControlGroupContainerContext.Provider>,
       { theme$ }
     ),
     {
diff --git a/src/plugins/controls/public/control_group/embeddable/control_group_chaining_system.ts b/src/plugins/controls/public/control_group/embeddable/control_group_chaining_system.ts
index b5e703afefd19..1857bd8a8df07 100644
--- a/src/plugins/controls/public/control_group/embeddable/control_group_chaining_system.ts
+++ b/src/plugins/controls/public/control_group/embeddable/control_group_chaining_system.ts
@@ -35,7 +35,7 @@ interface OnChildChangedProps {
 interface ChainingSystem {
   getContainerSettings: (
     initialInput: ControlGroupInput
-  ) => EmbeddableContainerSettings<ControlGroupInput> | undefined;
+  ) => EmbeddableContainerSettings | undefined;
   getPrecedingFilters: (
     props: GetPrecedingFiltersProps
   ) => { filters: Filter[]; timeslice?: [number, number] } | undefined;
diff --git a/src/plugins/controls/public/control_group/embeddable/control_group_container.tsx b/src/plugins/controls/public/control_group/embeddable/control_group_container.tsx
index 533f8ffa443fe..220967b8ef23e 100644
--- a/src/plugins/controls/public/control_group/embeddable/control_group_container.tsx
+++ b/src/plugins/controls/public/control_group/embeddable/control_group_container.tsx
@@ -5,18 +5,19 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-
-import { skip, debounceTime, distinctUntilChanged } from 'rxjs/operators';
-import React from 'react';
+import { isEqual } from 'lodash';
 import ReactDOM from 'react-dom';
-import { compareFilters, COMPARE_ALL_OPTIONS, Filter, uniqFilters } from '@kbn/es-query';
+import { Provider, TypedUseSelectorHook, useSelector } from 'react-redux';
+import React, { createContext, useContext } from 'react';
 import { BehaviorSubject, merge, Subject, Subscription } from 'rxjs';
-import _ from 'lodash';
+import { skip, debounceTime, distinctUntilChanged } from 'rxjs/operators';
+import { compareFilters, COMPARE_ALL_OPTIONS, Filter, uniqFilters } from '@kbn/es-query';
 
-import { ReduxEmbeddablePackage, ReduxEmbeddableTools } from '@kbn/presentation-util-plugin/public';
 import { OverlayRef } from '@kbn/core/public';
 import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { Container, EmbeddableFactory } from '@kbn/embeddable-plugin/public';
+import { ReduxToolsPackage, ReduxEmbeddableTools } from '@kbn/presentation-util-plugin/public';
+
 import {
   ControlGroupInput,
   ControlGroupOutput,
@@ -31,23 +32,21 @@ import {
   ControlGroupChainingSystems,
   controlOrdersAreEqual,
 } from './control_group_chaining_system';
-import { pluginServices } from '../../services';
-import { openAddDataControlFlyout } from '../editor/open_add_data_control_flyout';
-import { ControlGroup } from '../component/control_group_component';
-import { controlGroupReducers } from '../state/control_group_reducers';
-import { ControlEmbeddable, ControlInput, ControlOutput } from '../../types';
-import { getNextPanelOrder } from './control_group_helpers';
-import type {
-  AddDataControlProps,
-  AddOptionsListControlProps,
-  AddRangeSliderControlProps,
-} from '../control_group_input_builder';
 import {
+  type AddDataControlProps,
+  type AddOptionsListControlProps,
+  type AddRangeSliderControlProps,
   getDataControlPanelState,
   getOptionsListPanelState,
   getRangeSliderPanelState,
   getTimeSliderPanelState,
-} from '../control_group_input_builder';
+} from '../external_api/control_group_input_builder';
+import { pluginServices } from '../../services';
+import { getNextPanelOrder } from './control_group_helpers';
+import { ControlGroup } from '../component/control_group_component';
+import { controlGroupReducers } from '../state/control_group_reducers';
+import { ControlEmbeddable, ControlInput, ControlOutput } from '../../types';
+import { openAddDataControlFlyout } from '../editor/open_add_data_control_flyout';
 import { openEditControlGroupFlyout } from '../editor/open_edit_control_group_flyout';
 
 let flyoutRef: OverlayRef | undefined;
@@ -55,6 +54,21 @@ export const setFlyoutRef = (newRef: OverlayRef | undefined) => {
   flyoutRef = newRef;
 };
 
+export const ControlGroupContainerContext = createContext<ControlGroupContainer | null>(null);
+export const controlGroupSelector = useSelector as TypedUseSelectorHook<ControlGroupReduxState>;
+export const useControlGroupContainer = (): ControlGroupContainer => {
+  const controlGroup = useContext<ControlGroupContainer | null>(ControlGroupContainerContext);
+  if (controlGroup == null) {
+    throw new Error('useControlGroupContainer must be used inside ControlGroupContainerContext.');
+  }
+  return controlGroup!;
+};
+
+type ControlGroupReduxEmbeddableTools = ReduxEmbeddableTools<
+  ControlGroupReduxState,
+  typeof controlGroupReducers
+>;
+
 export class ControlGroupContainer extends Container<
   ControlInput,
   ControlGroupInput,
@@ -71,63 +85,21 @@ export class ControlGroupContainer extends Container<
   private relevantDataViewId?: string;
   private lastUsedDataViewId?: string;
 
-  private reduxEmbeddableTools: ReduxEmbeddableTools<
-    ControlGroupReduxState,
-    typeof controlGroupReducers
-  >;
+  // state management
+  public select: ControlGroupReduxEmbeddableTools['select'];
+  public getState: ControlGroupReduxEmbeddableTools['getState'];
+  public dispatch: ControlGroupReduxEmbeddableTools['dispatch'];
+  public onStateChange: ControlGroupReduxEmbeddableTools['onStateChange'];
 
-  public onFiltersPublished$: Subject<Filter[]>;
-  public onControlRemoved$: Subject<string>;
+  private store: ControlGroupReduxEmbeddableTools['store'];
 
-  public setLastUsedDataViewId = (lastUsedDataViewId: string) => {
-    this.lastUsedDataViewId = lastUsedDataViewId;
-  };
+  private cleanupStateTools: () => void;
 
-  public setRelevantDataViewId = (newRelevantDataViewId: string) => {
-    this.relevantDataViewId = newRelevantDataViewId;
-  };
-
-  public getMostRelevantDataViewId = () => {
-    const staticDataViewId =
-      this.getReduxEmbeddableTools().getState().componentState.staticDataViewId;
-    return staticDataViewId ?? this.lastUsedDataViewId ?? this.relevantDataViewId;
-  };
-
-  public getReduxEmbeddableTools = () => {
-    return this.reduxEmbeddableTools;
-  };
-
-  public closeAllFlyouts() {
-    flyoutRef?.close();
-    flyoutRef = undefined;
-  }
-
-  public async addDataControlFromField(controlProps: AddDataControlProps) {
-    const panelState = await getDataControlPanelState(this.getInput(), controlProps);
-    return this.createAndSaveEmbeddable(panelState.type, panelState);
-  }
-
-  public addOptionsListControl(controlProps: AddOptionsListControlProps) {
-    const panelState = getOptionsListPanelState(this.getInput(), controlProps);
-    return this.createAndSaveEmbeddable(panelState.type, panelState);
-  }
-
-  public addRangeSliderControl(controlProps: AddRangeSliderControlProps) {
-    const panelState = getRangeSliderPanelState(this.getInput(), controlProps);
-    return this.createAndSaveEmbeddable(panelState.type, panelState);
-  }
-
-  public addTimeSliderControl() {
-    const panelState = getTimeSliderPanelState(this.getInput());
-    return this.createAndSaveEmbeddable(panelState.type, panelState);
-  }
-
-  public openAddDataControlFlyout = openAddDataControlFlyout;
-
-  public openEditControlGroupFlyout = openEditControlGroupFlyout;
+  public onFiltersPublished$: Subject<Filter[]>;
+  public onControlRemoved$: Subject<string>;
 
   constructor(
-    reduxEmbeddablePackage: ReduxEmbeddablePackage,
+    reduxToolsPackage: ReduxToolsPackage,
     initialInput: ControlGroupInput,
     parent?: Container,
     settings?: ControlGroupSettings
@@ -145,7 +117,7 @@ export class ControlGroupContainer extends Container<
     this.onControlRemoved$ = new Subject<string>();
 
     // build redux embeddable tools
-    this.reduxEmbeddableTools = reduxEmbeddablePackage.createTools<
+    const reduxEmbeddableTools = reduxToolsPackage.createReduxEmbeddableTools<
       ControlGroupReduxState,
       typeof controlGroupReducers
     >({
@@ -154,6 +126,14 @@ export class ControlGroupContainer extends Container<
       initialComponentState: settings,
     });
 
+    this.select = reduxEmbeddableTools.select;
+    this.getState = reduxEmbeddableTools.getState;
+    this.dispatch = reduxEmbeddableTools.dispatch;
+    this.cleanupStateTools = reduxEmbeddableTools.cleanup;
+    this.onStateChange = reduxEmbeddableTools.onStateChange;
+
+    this.store = reduxEmbeddableTools.store;
+
     // when all children are ready setup subscriptions
     this.untilAllChildrenReady().then(() => {
       this.recalculateDataViews();
@@ -204,6 +184,47 @@ export class ControlGroupContainer extends Container<
     );
   };
 
+  public setLastUsedDataViewId = (lastUsedDataViewId: string) => {
+    this.lastUsedDataViewId = lastUsedDataViewId;
+  };
+
+  public setRelevantDataViewId = (newRelevantDataViewId: string) => {
+    this.relevantDataViewId = newRelevantDataViewId;
+  };
+
+  public getMostRelevantDataViewId = () => {
+    return this.lastUsedDataViewId ?? this.relevantDataViewId;
+  };
+
+  public closeAllFlyouts() {
+    flyoutRef?.close();
+    flyoutRef = undefined;
+  }
+
+  public async addDataControlFromField(controlProps: AddDataControlProps) {
+    const panelState = await getDataControlPanelState(this.getInput(), controlProps);
+    return this.createAndSaveEmbeddable(panelState.type, panelState);
+  }
+
+  public addOptionsListControl(controlProps: AddOptionsListControlProps) {
+    const panelState = getOptionsListPanelState(this.getInput(), controlProps);
+    return this.createAndSaveEmbeddable(panelState.type, panelState);
+  }
+
+  public addRangeSliderControl(controlProps: AddRangeSliderControlProps) {
+    const panelState = getRangeSliderPanelState(this.getInput(), controlProps);
+    return this.createAndSaveEmbeddable(panelState.type, panelState);
+  }
+
+  public addTimeSliderControl() {
+    const panelState = getTimeSliderPanelState(this.getInput());
+    return this.createAndSaveEmbeddable(panelState.type, panelState);
+  }
+
+  public openAddDataControlFlyout = openAddDataControlFlyout;
+
+  public openEditControlGroupFlyout = openEditControlGroupFlyout;
+
   public getPanelCount = () => {
     return Object.keys(this.getInput().panels).length;
   };
@@ -225,7 +246,7 @@ export class ControlGroupContainer extends Container<
     // if filters are different, publish them
     if (
       !compareFilters(this.output.filters ?? [], allFilters ?? [], COMPARE_ALL_OPTIONS) ||
-      !_.isEqual(this.output.timeslice, timeslice)
+      !isEqual(this.output.timeslice, timeslice)
     ) {
       this.updateOutput({ filters: uniqFilters(allFilters), timeslice });
       this.onFiltersPublished$.next(allFilters);
@@ -337,15 +358,13 @@ export class ControlGroupContainer extends Container<
       ReactDOM.unmountComponentAtNode(this.domNode);
     }
     this.domNode = dom;
-    const ControlsServicesProvider = pluginServices.getContextProvider();
-    const { Wrapper: ControlGroupReduxWrapper } = this.reduxEmbeddableTools;
     ReactDOM.render(
       <KibanaThemeProvider theme$={pluginServices.getServices().theme.theme$}>
-        <ControlsServicesProvider>
-          <ControlGroupReduxWrapper>
+        <Provider store={this.store}>
+          <ControlGroupContainerContext.Provider value={this}>
             <ControlGroup />
-          </ControlGroupReduxWrapper>
-        </ControlsServicesProvider>
+          </ControlGroupContainerContext.Provider>
+        </Provider>
       </KibanaThemeProvider>,
       dom
     );
@@ -355,7 +374,7 @@ export class ControlGroupContainer extends Container<
     super.destroy();
     this.closeAllFlyouts();
     this.subscriptions.unsubscribe();
-    this.reduxEmbeddableTools.cleanup();
+    this.cleanupStateTools();
     if (this.domNode) ReactDOM.unmountComponentAtNode(this.domNode);
   }
 }
diff --git a/src/plugins/controls/public/control_group/embeddable/control_group_container_factory.ts b/src/plugins/controls/public/control_group/embeddable/control_group_container_factory.ts
index b4fe9285d3bb1..d14ceb3679a0b 100644
--- a/src/plugins/controls/public/control_group/embeddable/control_group_container_factory.ts
+++ b/src/plugins/controls/public/control_group/embeddable/control_group_container_factory.ts
@@ -16,7 +16,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { Container, EmbeddableFactoryDefinition } from '@kbn/embeddable-plugin/public';
-import { lazyLoadReduxEmbeddablePackage } from '@kbn/presentation-util-plugin/public';
+import { lazyLoadReduxToolsPackage } from '@kbn/presentation-util-plugin/public';
 import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common';
 
 import { ControlGroupInput, ControlGroupSettings, CONTROL_GROUP_TYPE } from '../types';
@@ -54,7 +54,7 @@ export class ControlGroupContainerFactory implements EmbeddableFactoryDefinition
     parent?: Container,
     settings?: ControlGroupSettings
   ) => {
-    const reduxEmbeddablePackage = await lazyLoadReduxEmbeddablePackage();
+    const reduxEmbeddablePackage = await lazyLoadReduxToolsPackage();
     const { ControlGroupContainer } = await import('./control_group_container');
     return new ControlGroupContainer(reduxEmbeddablePackage, initialInput, parent, settings);
   };
diff --git a/src/plugins/controls/public/control_group/external_api/control_group_api.ts b/src/plugins/controls/public/control_group/external_api/control_group_api.ts
new file mode 100644
index 0000000000000..d269eb61c0fab
--- /dev/null
+++ b/src/plugins/controls/public/control_group/external_api/control_group_api.ts
@@ -0,0 +1,16 @@
+/*
+ * 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 { ControlGroupContainer } from '..';
+
+// TODO lock down ControlGroupAPI
+export type ControlGroupAPI = ControlGroupContainer;
+export type AwaitingControlGroupAPI = ControlGroupAPI | null;
+
+export const buildApiFromControlGroupContainer = (container?: ControlGroupContainer) =>
+  container ?? null;
diff --git a/src/plugins/controls/public/control_group/control_group_input_builder.ts b/src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts
similarity index 89%
rename from src/plugins/controls/public/control_group/control_group_input_builder.ts
rename to src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts
index e340294cb2b15..fafbd33da893e 100644
--- a/src/plugins/controls/public/control_group/control_group_input_builder.ts
+++ b/src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts
@@ -8,22 +8,22 @@
 
 import { i18n } from '@kbn/i18n';
 import { v4 as uuidv4 } from 'uuid';
-import { ControlPanelState, OptionsListEmbeddableInput } from '../../common';
-import {
-  DEFAULT_CONTROL_GROW,
-  DEFAULT_CONTROL_WIDTH,
-} from '../../common/control_group/control_group_constants';
-import { RangeValue } from '../../common/range_slider/types';
+
 import {
-  ControlInput,
+  ControlPanelState,
   ControlWidth,
-  DataControlInput,
+  OptionsListEmbeddableInput,
   OPTIONS_LIST_CONTROL,
-  RANGE_SLIDER_CONTROL,
   TIME_SLIDER_CONTROL,
-} from '..';
-import { ControlGroupInput } from './types';
-import { getCompatibleControlType, getNextPanelOrder } from './embeddable/control_group_helpers';
+} from '../../../common';
+import {
+  DEFAULT_CONTROL_GROW,
+  DEFAULT_CONTROL_WIDTH,
+} from '../../../common/control_group/control_group_constants';
+import { ControlGroupInput } from '../types';
+import { ControlInput, DataControlInput } from '../../types';
+import { RangeValue, RANGE_SLIDER_CONTROL } from '../../../common/range_slider/types';
+import { getCompatibleControlType, getNextPanelOrder } from '../embeddable/control_group_helpers';
 
 export interface AddDataControlProps {
   controlId?: string;
@@ -40,6 +40,8 @@ export type AddRangeSliderControlProps = AddDataControlProps & {
   value?: RangeValue;
 };
 
+export type ControlGroupInputBuilder = typeof controlGroupInputBuilder;
+
 export const controlGroupInputBuilder = {
   addDataControlFromField: async (
     initialInput: Partial<ControlGroupInput>,
diff --git a/src/plugins/controls/public/control_group/external_api/control_group_renderer.test.tsx b/src/plugins/controls/public/control_group/external_api/control_group_renderer.test.tsx
new file mode 100644
index 0000000000000..7349cff7594f8
--- /dev/null
+++ b/src/plugins/controls/public/control_group/external_api/control_group_renderer.test.tsx
@@ -0,0 +1,129 @@
+/*
+ * 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 { act } from 'react-dom/test-utils';
+import { mountWithIntl } from '@kbn/test-jest-helpers';
+
+import {
+  ControlGroupContainer,
+  ControlGroupContainerFactory,
+  ControlGroupRenderer,
+  CONTROL_GROUP_TYPE,
+} from '..';
+import { pluginServices } from '../../services/plugin_services';
+import { ReactWrapper } from 'enzyme';
+import { Filter } from '@kbn/es-query';
+
+describe('control group renderer', () => {
+  let mockControlGroupFactory: ControlGroupContainerFactory;
+  let mockControlGroupContainer: ControlGroupContainer;
+
+  beforeEach(() => {
+    mockControlGroupContainer = {
+      destroy: jest.fn(),
+      render: jest.fn(),
+      updateInput: jest.fn(),
+      getInput: jest.fn().mockReturnValue({}),
+    } as unknown as ControlGroupContainer;
+    mockControlGroupFactory = {
+      create: jest.fn().mockReturnValue(mockControlGroupContainer),
+    } as unknown as ControlGroupContainerFactory;
+    pluginServices.getServices().embeddable.getEmbeddableFactory = jest
+      .fn()
+      .mockReturnValue(mockControlGroupFactory);
+  });
+
+  test('calls create method on the Control Group embeddable factory with returned initial input', async () => {
+    await act(async () => {
+      mountWithIntl(
+        <ControlGroupRenderer
+          getCreationOptions={() => Promise.resolve({ initialInput: { controlStyle: 'twoLine' } })}
+        />
+      );
+    });
+    expect(pluginServices.getServices().embeddable.getEmbeddableFactory).toHaveBeenCalledWith(
+      CONTROL_GROUP_TYPE
+    );
+    expect(mockControlGroupFactory.create).toHaveBeenCalledWith(
+      expect.objectContaining({ controlStyle: 'twoLine' }),
+      undefined,
+      undefined
+    );
+  });
+
+  test('destroys control group container on unmount', async () => {
+    let wrapper: ReactWrapper;
+    await act(async () => {
+      wrapper = await mountWithIntl(<ControlGroupRenderer />);
+    });
+    wrapper!.unmount();
+    expect(mockControlGroupContainer.destroy).toHaveBeenCalledTimes(1);
+  });
+
+  test('filter changes are dispatched to control group if they are different', async () => {
+    const initialFilters: Filter[] = [
+      { meta: { alias: 'test', disabled: false, negate: false, index: 'test' } },
+    ];
+    const updatedFilters: Filter[] = [
+      { meta: { alias: 'test', disabled: false, negate: true, index: 'test' } },
+    ];
+    let wrapper: ReactWrapper;
+    await act(async () => {
+      wrapper = mountWithIntl(
+        <ControlGroupRenderer
+          getCreationOptions={() => Promise.resolve({ initialInput: { filters: initialFilters } })}
+        />
+      );
+    });
+    await act(async () => {
+      await wrapper.setProps({ filters: updatedFilters });
+    });
+    expect(mockControlGroupContainer.updateInput).toHaveBeenCalledWith(
+      expect.objectContaining({ filters: updatedFilters })
+    );
+  });
+
+  test('query changes are dispatched to control group if they are different', async () => {
+    const initialQuery = { language: 'kql', query: 'query' };
+    const updatedQuery = { language: 'kql', query: 'super query' };
+    let wrapper: ReactWrapper;
+    await act(async () => {
+      wrapper = mountWithIntl(
+        <ControlGroupRenderer
+          getCreationOptions={() => Promise.resolve({ initialInput: { query: initialQuery } })}
+        />
+      );
+    });
+    await act(async () => {
+      await wrapper.setProps({ query: updatedQuery });
+    });
+    expect(mockControlGroupContainer.updateInput).toHaveBeenCalledWith(
+      expect.objectContaining({ query: updatedQuery })
+    );
+  });
+
+  test('time range changes are dispatched to control group if they are different', async () => {
+    const initialTime = { from: new Date().toISOString(), to: new Date().toISOString() };
+    const updatedTime = { from: new Date().toISOString() + 10, to: new Date().toISOString() + 20 };
+    let wrapper: ReactWrapper;
+    await act(async () => {
+      wrapper = mountWithIntl(
+        <ControlGroupRenderer
+          getCreationOptions={() => Promise.resolve({ initialInput: { timeRange: initialTime } })}
+        />
+      );
+    });
+    await act(async () => {
+      await wrapper.setProps({ timeRange: updatedTime });
+    });
+    expect(mockControlGroupContainer.updateInput).toHaveBeenCalledWith(
+      expect.objectContaining({ timeRange: updatedTime })
+    );
+  });
+});
diff --git a/src/plugins/controls/public/control_group/external_api/control_group_renderer.tsx b/src/plugins/controls/public/control_group/external_api/control_group_renderer.tsx
new file mode 100644
index 0000000000000..e8968ab5b4a7e
--- /dev/null
+++ b/src/plugins/controls/public/control_group/external_api/control_group_renderer.tsx
@@ -0,0 +1,130 @@
+/*
+ * 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, {
+  forwardRef,
+  useEffect,
+  useImperativeHandle,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
+import { isEqual } from 'lodash';
+import { v4 as uuidv4 } from 'uuid';
+
+import { compareFilters } from '@kbn/es-query';
+import type { Filter, TimeRange, Query } from '@kbn/es-query';
+import { EmbeddableFactory } from '@kbn/embeddable-plugin/public';
+
+import {
+  ControlGroupInput,
+  CONTROL_GROUP_TYPE,
+  ControlGroupOutput,
+  ControlGroupCreationOptions,
+} from '../types';
+import {
+  ControlGroupAPI,
+  AwaitingControlGroupAPI,
+  buildApiFromControlGroupContainer,
+} from './control_group_api';
+import { getDefaultControlGroupInput } from '../../../common';
+import { controlGroupInputBuilder, ControlGroupInputBuilder } from './control_group_input_builder';
+import { ControlGroupContainer } from '../embeddable/control_group_container';
+import { ControlGroupContainerFactory } from '../embeddable/control_group_container_factory';
+
+export interface ControlGroupRendererProps {
+  filters?: Filter[];
+  getCreationOptions?: (
+    initialInput: Partial<ControlGroupInput>,
+    builder: ControlGroupInputBuilder
+  ) => Promise<ControlGroupCreationOptions>;
+  timeRange?: TimeRange;
+  query?: Query;
+}
+
+export const ControlGroupRenderer = forwardRef<AwaitingControlGroupAPI, ControlGroupRendererProps>(
+  ({ getCreationOptions, filters, timeRange, query }, ref) => {
+    const [controlGroup, setControlGroup] = useState<ControlGroupContainer>();
+
+    useImperativeHandle(
+      ref,
+      () => buildApiFromControlGroupContainer(controlGroup) as ControlGroupAPI,
+      [controlGroup]
+    );
+
+    const controlGroupDomRef = useRef(null);
+    const id = useMemo(() => uuidv4(), []);
+
+    // onMount
+    useEffect(() => {
+      let canceled = false;
+      let destroyControlGroup: () => void;
+
+      (async () => {
+        // Lazy loading all services is required in this component because it is exported and contributes to the bundle size.
+        const { pluginServices } = await import('../../services/plugin_services');
+        const { embeddable } = pluginServices.getServices();
+
+        const factory = embeddable.getEmbeddableFactory(CONTROL_GROUP_TYPE) as EmbeddableFactory<
+          ControlGroupInput,
+          ControlGroupOutput,
+          ControlGroupContainer
+        > & {
+          create: ControlGroupContainerFactory['create'];
+        };
+        const { initialInput, settings } =
+          (await getCreationOptions?.(getDefaultControlGroupInput(), controlGroupInputBuilder)) ??
+          {};
+        const newControlGroup = (await factory?.create(
+          {
+            id,
+            ...getDefaultControlGroupInput(),
+            ...initialInput,
+          },
+          undefined,
+          settings
+        )) as ControlGroupContainer;
+
+        if (canceled) {
+          newControlGroup.destroy();
+          controlGroup?.destroy();
+          return;
+        }
+
+        if (controlGroupDomRef.current) {
+          newControlGroup.render(controlGroupDomRef.current);
+        }
+        setControlGroup(newControlGroup);
+        destroyControlGroup = () => newControlGroup.destroy();
+      })();
+      return () => {
+        canceled = true;
+        destroyControlGroup?.();
+      };
+      // exhaustive deps disabled because we want the control group to be created only on first render.
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+
+    useEffect(() => {
+      if (!controlGroup) return;
+      if (
+        (timeRange && !isEqual(controlGroup.getInput().timeRange, timeRange)) ||
+        !compareFilters(controlGroup.getInput().filters ?? [], filters ?? []) ||
+        !isEqual(controlGroup.getInput().query, query)
+      ) {
+        controlGroup.updateInput({
+          timeRange,
+          query,
+          filters,
+        });
+      }
+    }, [query, filters, controlGroup, timeRange]);
+
+    return <div ref={controlGroupDomRef} />;
+  }
+);
diff --git a/src/plugins/controls/public/control_group/index.ts b/src/plugins/controls/public/control_group/index.ts
index d56fc619885c2..812733a71077a 100644
--- a/src/plugins/controls/public/control_group/index.ts
+++ b/src/plugins/controls/public/control_group/index.ts
@@ -6,8 +6,6 @@
  * Side Public License, v 1.
  */
 
-import React from 'react';
-
 export type { ControlGroupContainer } from './embeddable/control_group_container';
 export type { ControlGroupInput, ControlGroupOutput } from './types';
 
@@ -19,12 +17,14 @@ export { ACTION_EDIT_CONTROL, ACTION_DELETE_CONTROL } from './actions';
 export {
   type AddDataControlProps,
   type AddOptionsListControlProps,
+  type ControlGroupInputBuilder,
   type AddRangeSliderControlProps,
   controlGroupInputBuilder,
-} from './control_group_input_builder';
+} from './external_api/control_group_input_builder';
+
+export type { ControlGroupAPI, AwaitingControlGroupAPI } from './external_api/control_group_api';
 
 export {
   type ControlGroupRendererProps,
-  useControlGroupContainerContext,
-} from './control_group_renderer';
-export const LazyControlGroupRenderer = React.lazy(() => import('./control_group_renderer'));
+  ControlGroupRenderer,
+} from './external_api/control_group_renderer';
diff --git a/src/plugins/controls/public/control_group/state/control_group_reducers.ts b/src/plugins/controls/public/control_group/state/control_group_reducers.ts
index ff1b2e501dabe..a81784351a631 100644
--- a/src/plugins/controls/public/control_group/state/control_group_reducers.ts
+++ b/src/plugins/controls/public/control_group/state/control_group_reducers.ts
@@ -19,6 +19,12 @@ export const controlGroupReducers = {
   ) => {
     state.explicitInput.controlStyle = action.payload;
   },
+  setChainingSystem: (
+    state: WritableDraft<ControlGroupReduxState>,
+    action: PayloadAction<ControlGroupInput['chainingSystem']>
+  ) => {
+    state.explicitInput.chainingSystem = action.payload;
+  },
   setDefaultControlWidth: (
     state: WritableDraft<ControlGroupReduxState>,
     action: PayloadAction<ControlGroupInput['defaultControlWidth']>
diff --git a/src/plugins/controls/public/index.ts b/src/plugins/controls/public/index.ts
index 62378f5abbf26..555b9d4284e89 100644
--- a/src/plugins/controls/public/index.ts
+++ b/src/plugins/controls/public/index.ts
@@ -39,8 +39,11 @@ export {
   type ControlGroupContainer,
   ControlGroupContainerFactory,
   type ControlGroupInput,
-  controlGroupInputBuilder,
+  type ControlGroupInputBuilder,
+  type ControlGroupAPI,
+  type AwaitingControlGroupAPI,
   type ControlGroupOutput,
+  controlGroupInputBuilder,
 } from './control_group';
 
 export {
@@ -56,11 +59,10 @@ export {
 } from './range_slider';
 
 export {
-  LazyControlGroupRenderer,
-  useControlGroupContainerContext,
-  type ControlGroupRendererProps,
-  ACTION_DELETE_CONTROL,
   ACTION_EDIT_CONTROL,
+  ACTION_DELETE_CONTROL,
+  ControlGroupRenderer,
+  type ControlGroupRendererProps,
 } from './control_group';
 
 export function plugin() {
diff --git a/src/plugins/controls/public/options_list/components/options_list_control.test.tsx b/src/plugins/controls/public/options_list/components/options_list_control.test.tsx
index 7fe1cd2f7aa78..5bfe3edd16c57 100644
--- a/src/plugins/controls/public/options_list/components/options_list_control.test.tsx
+++ b/src/plugins/controls/public/options_list/components/options_list_control.test.tsx
@@ -11,9 +11,10 @@ import React from 'react';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 
+import { OptionsListEmbeddableContext } from '../embeddable/options_list_embeddable';
 import { OptionsListComponentState, OptionsListReduxState } from '../types';
 import { ControlOutput, OptionsListEmbeddableInput } from '../..';
-import { mockOptionsListReduxEmbeddableTools } from '../../../common/mocks';
+import { mockOptionsListEmbeddable } from '../../../common/mocks';
 import { OptionsListControl } from './options_list_control';
 import { BehaviorSubject } from 'rxjs';
 
@@ -30,16 +31,16 @@ describe('Options list control', () => {
   }
 
   async function mountComponent(options?: Partial<MountOptions>) {
-    const mockReduxEmbeddableTools = await mockOptionsListReduxEmbeddableTools({
+    const optionsListEmbeddable = await mockOptionsListEmbeddable({
       componentState: options?.componentState ?? {},
       explicitInput: options?.explicitInput ?? {},
       output: options?.output ?? {},
     } as Partial<OptionsListReduxState>);
 
     return mountWithIntl(
-      <mockReduxEmbeddableTools.Wrapper>
+      <OptionsListEmbeddableContext.Provider value={optionsListEmbeddable}>
         <OptionsListControl {...defaultProps} />
-      </mockReduxEmbeddableTools.Wrapper>
+      </OptionsListEmbeddableContext.Provider>
     );
   }
 
diff --git a/src/plugins/controls/public/options_list/components/options_list_control.tsx b/src/plugins/controls/public/options_list/components/options_list_control.tsx
index 6d1e18c32b3e2..7d899f8a90e31 100644
--- a/src/plugins/controls/public/options_list/components/options_list_control.tsx
+++ b/src/plugins/controls/public/options_list/components/options_list_control.tsx
@@ -12,12 +12,11 @@ import { debounce, isEmpty } from 'lodash';
 import React, { useCallback, useEffect, useMemo, useState, useRef } from 'react';
 
 import { EuiFilterButton, EuiFilterGroup, EuiPopover, useResizeObserver } from '@elastic/eui';
-import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
 
+import { MAX_OPTIONS_LIST_REQUEST_SIZE } from '../types';
 import { OptionsListStrings } from './options_list_strings';
 import { OptionsListPopover } from './options_list_popover';
-import { optionsListReducers } from '../options_list_reducers';
-import { MAX_OPTIONS_LIST_REQUEST_SIZE, OptionsListReduxState } from '../types';
+import { useOptionsList } from '../embeddable/options_list_embeddable';
 
 import './options_list.scss';
 
@@ -29,38 +28,29 @@ export const OptionsListControl = ({
   loadMoreSubject: Subject<number>;
 }) => {
   const resizeRef = useRef(null);
+  const optionsList = useOptionsList();
   const dimensions = useResizeObserver(resizeRef.current);
 
-  // Redux embeddable Context
-  const {
-    useEmbeddableDispatch,
-    actions: { replaceSelection, setSearchString, setPopoverOpen },
-    useEmbeddableSelector: select,
-  } = useReduxEmbeddableContext<OptionsListReduxState, typeof optionsListReducers>();
-  const dispatch = useEmbeddableDispatch();
+  const isPopoverOpen = optionsList.select((state) => state.componentState.popoverOpen);
+  const validSelections = optionsList.select((state) => state.componentState.validSelections);
+  const invalidSelections = optionsList.select((state) => state.componentState.invalidSelections);
 
-  // Select current state from Redux using multiple selectors to avoid rerenders.
-  const invalidSelections = select((state) => state.componentState.invalidSelections);
-  const validSelections = select((state) => state.componentState.validSelections);
-  const isPopoverOpen = select((state) => state.componentState.popoverOpen);
+  const id = optionsList.select((state) => state.explicitInput.id);
+  const exclude = optionsList.select((state) => state.explicitInput.exclude);
+  const fieldName = optionsList.select((state) => state.explicitInput.fieldName);
+  const placeholder = optionsList.select((state) => state.explicitInput.placeholder);
+  const controlStyle = optionsList.select((state) => state.explicitInput.controlStyle);
+  const singleSelect = optionsList.select((state) => state.explicitInput.singleSelect);
+  const existsSelected = optionsList.select((state) => state.explicitInput.existsSelected);
+  const selectedOptions = optionsList.select((state) => state.explicitInput.selectedOptions);
 
-  const selectedOptions = select((state) => state.explicitInput.selectedOptions);
-  const existsSelected = select((state) => state.explicitInput.existsSelected);
-  const controlStyle = select((state) => state.explicitInput.controlStyle);
-  const singleSelect = select((state) => state.explicitInput.singleSelect);
-  const fieldName = select((state) => state.explicitInput.fieldName);
-  const exclude = select((state) => state.explicitInput.exclude);
-  const id = select((state) => state.explicitInput.id);
-
-  const placeholder = select((state) => state.explicitInput.placeholder);
-
-  const loading = select((state) => state.output.loading);
+  const loading = optionsList.select((state) => state.output.loading);
 
   useEffect(() => {
     return () => {
-      dispatch(setPopoverOpen(false)); // on unmount, close the popover
+      optionsList.dispatch.setPopoverOpen(false); // on unmount, close the popover
     };
-  }, [dispatch, setPopoverOpen]);
+  }, [optionsList]);
 
   // debounce loading state so loading doesn't flash when user types
   const [debouncedLoading, setDebouncedLoading] = useState(true);
@@ -76,16 +66,16 @@ export const OptionsListControl = ({
   // remove all other selections if this control is single select
   useEffect(() => {
     if (singleSelect && selectedOptions && selectedOptions?.length > 1) {
-      dispatch(replaceSelection(selectedOptions[0]));
+      optionsList.dispatch.replaceSelection(selectedOptions[0]);
     }
-  }, [selectedOptions, singleSelect, dispatch, replaceSelection]);
+  }, [selectedOptions, singleSelect, optionsList.dispatch]);
 
   const updateSearchString = useCallback(
     (newSearchString: string) => {
       typeaheadSubject.next(newSearchString);
-      dispatch(setSearchString(newSearchString));
+      optionsList.dispatch.setSearchString(newSearchString);
     },
-    [typeaheadSubject, dispatch, setSearchString]
+    [typeaheadSubject, optionsList.dispatch]
   );
 
   const loadMoreSuggestions = useCallback(
@@ -141,7 +131,7 @@ export const OptionsListControl = ({
           'optionsList--filterBtnPlaceholder': !hasSelections,
         })}
         data-test-subj={`optionsList-control-${id}`}
-        onClick={() => dispatch(setPopoverOpen(!isPopoverOpen))}
+        onClick={() => optionsList.dispatch.setPopoverOpen(!isPopoverOpen)}
         isSelected={isPopoverOpen}
         numActiveFilters={validSelectionsCount}
         hasActiveFilters={Boolean(validSelectionsCount)}
@@ -168,7 +158,7 @@ export const OptionsListControl = ({
         anchorPosition="downCenter"
         initialFocus={'[data-test-subj=optionsList-control-search-input]'}
         className="optionsList__popoverOverride"
-        closePopover={() => dispatch(setPopoverOpen(false))}
+        closePopover={() => optionsList.dispatch.setPopoverOpen(false)}
         anchorClassName="optionsList__anchorOverride"
         aria-label={OptionsListStrings.popover.getAriaLabel(fieldName)}
       >
diff --git a/src/plugins/controls/public/options_list/components/options_list_popover.test.tsx b/src/plugins/controls/public/options_list/components/options_list_popover.test.tsx
index 4b40414974b67..ffdb1045cad88 100644
--- a/src/plugins/controls/public/options_list/components/options_list_popover.test.tsx
+++ b/src/plugins/controls/public/options_list/components/options_list_popover.test.tsx
@@ -13,10 +13,12 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { FieldSpec } from '@kbn/data-views-plugin/common';
 
-import { OptionsListPopover, OptionsListPopoverProps } from './options_list_popover';
-import { OptionsListComponentState, OptionsListReduxState } from '../types';
-import { mockOptionsListReduxEmbeddableTools } from '../../../common/mocks';
+import { mockOptionsListEmbeddable } from '../../../common/mocks';
 import { ControlOutput, OptionsListEmbeddableInput } from '../..';
+import { OptionsListComponentState, OptionsListReduxState } from '../types';
+import { OptionsListEmbeddableContext } from '../embeddable/options_list_embeddable';
+import { OptionsListPopover, OptionsListPopoverProps } from './options_list_popover';
+import { pluginServices } from '../../services';
 
 describe('Options list popover', () => {
   const defaultProps = {
@@ -35,16 +37,16 @@ describe('Options list popover', () => {
 
   async function mountComponent(options?: Partial<MountOptions>) {
     const compProps = { ...defaultProps, ...(options?.popoverProps ?? {}) };
-    const mockReduxEmbeddableTools = await mockOptionsListReduxEmbeddableTools({
+    const optionsListEmbeddable = await mockOptionsListEmbeddable({
       componentState: options?.componentState ?? {},
       explicitInput: options?.explicitInput ?? {},
       output: options?.output ?? {},
     } as Partial<OptionsListReduxState>);
 
     return mountWithIntl(
-      <mockReduxEmbeddableTools.Wrapper>
+      <OptionsListEmbeddableContext.Provider value={optionsListEmbeddable}>
         <OptionsListPopover {...compProps} />
-      </mockReduxEmbeddableTools.Wrapper>
+      </OptionsListEmbeddableContext.Provider>
     );
   }
 
@@ -290,6 +292,9 @@ describe('Options list popover', () => {
   });
 
   test('ensure warning icon shows up when testAllowExpensiveQueries = false', async () => {
+    pluginServices.getServices().optionsList.getAllowExpensiveQueries = jest.fn(() =>
+      Promise.resolve(false)
+    );
     const popover = await mountComponent({
       componentState: {
         field: { name: 'Test keyword field', type: 'keyword' } as FieldSpec,
diff --git a/src/plugins/controls/public/options_list/components/options_list_popover.tsx b/src/plugins/controls/public/options_list/components/options_list_popover.tsx
index df5f3d00730d0..79e20925ed369 100644
--- a/src/plugins/controls/public/options_list/components/options_list_popover.tsx
+++ b/src/plugins/controls/public/options_list/components/options_list_popover.tsx
@@ -9,16 +9,13 @@
 import React, { useState } from 'react';
 import { isEmpty } from 'lodash';
 
-import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
-
-import { OptionsListReduxState } from '../types';
 import { OptionsListStrings } from './options_list_strings';
-import { optionsListReducers } from '../options_list_reducers';
 import { OptionsListPopoverTitle } from './options_list_popover_title';
 import { OptionsListPopoverFooter } from './options_list_popover_footer';
 import { OptionsListPopoverActionBar } from './options_list_popover_action_bar';
 import { OptionsListPopoverSuggestions } from './options_list_popover_suggestions';
 import { OptionsListPopoverInvalidSelections } from './options_list_popover_invalid_selections';
+import { useOptionsList } from '../embeddable/options_list_embeddable';
 
 export interface OptionsListPopoverProps {
   width: number;
@@ -33,21 +30,16 @@ export const OptionsListPopover = ({
   updateSearchString,
   loadMoreSuggestions,
 }: OptionsListPopoverProps) => {
-  // Redux embeddable container Context
-  const { useEmbeddableSelector: select } = useReduxEmbeddableContext<
-    OptionsListReduxState,
-    typeof optionsListReducers
-  >();
+  const optionsList = useOptionsList();
 
-  // Select current state from Redux using multiple selectors to avoid rerenders.
-  const invalidSelections = select((state) => state.componentState.invalidSelections);
-  const availableOptions = select((state) => state.componentState.availableOptions);
-  const field = select((state) => state.componentState.field);
+  const field = optionsList.select((state) => state.componentState.field);
+  const availableOptions = optionsList.select((state) => state.componentState.availableOptions);
+  const invalidSelections = optionsList.select((state) => state.componentState.invalidSelections);
 
-  const hideActionBar = select((state) => state.explicitInput.hideActionBar);
-  const hideExclude = select((state) => state.explicitInput.hideExclude);
-  const fieldName = select((state) => state.explicitInput.fieldName);
-  const id = select((state) => state.explicitInput.id);
+  const id = optionsList.select((state) => state.explicitInput.id);
+  const fieldName = optionsList.select((state) => state.explicitInput.fieldName);
+  const hideExclude = optionsList.select((state) => state.explicitInput.hideExclude);
+  const hideActionBar = optionsList.select((state) => state.explicitInput.hideActionBar);
 
   const [showOnlySelected, setShowOnlySelected] = useState(false);
 
diff --git a/src/plugins/controls/public/options_list/components/options_list_popover_action_bar.tsx b/src/plugins/controls/public/options_list/components/options_list_popover_action_bar.tsx
index d0354525c51a2..ecf70a5b38d6e 100644
--- a/src/plugins/controls/public/options_list/components/options_list_popover_action_bar.tsx
+++ b/src/plugins/controls/public/options_list/components/options_list_popover_action_bar.tsx
@@ -17,11 +17,9 @@ import {
   EuiToolTip,
   EuiText,
 } from '@elastic/eui';
-import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
 
-import { OptionsListReduxState } from '../types';
 import { OptionsListStrings } from './options_list_strings';
-import { optionsListReducers } from '../options_list_reducers';
+import { useOptionsList } from '../embeddable/options_list_embeddable';
 import { OptionsListPopoverSortingButton } from './options_list_popover_sorting_button';
 
 interface OptionsListPopoverProps {
@@ -35,20 +33,18 @@ export const OptionsListPopoverActionBar = ({
   updateSearchString,
   setShowOnlySelected,
 }: OptionsListPopoverProps) => {
-  // Redux embeddable container Context
-  const {
-    useEmbeddableDispatch,
-    useEmbeddableSelector: select,
-    actions: { clearSelections },
-  } = useReduxEmbeddableContext<OptionsListReduxState, typeof optionsListReducers>();
-  const dispatch = useEmbeddableDispatch();
+  const optionsList = useOptionsList();
 
-  // Select current state from Redux using multiple selectors to avoid rerenders.
-  const allowExpensiveQueries = select((state) => state.componentState.allowExpensiveQueries);
-  const invalidSelections = select((state) => state.componentState.invalidSelections);
-  const totalCardinality = select((state) => state.componentState.totalCardinality) ?? 0;
-  const searchString = select((state) => state.componentState.searchString);
-  const hideSort = select((state) => state.explicitInput.hideSort);
+  const totalCardinality =
+    optionsList.select((state) => state.componentState.totalCardinality) ?? 0;
+  const searchString = optionsList.select((state) => state.componentState.searchString);
+  const invalidSelections = optionsList.select((state) => state.componentState.invalidSelections);
+
+  const allowExpensiveQueries = optionsList.select(
+    (state) => state.componentState.allowExpensiveQueries
+  );
+
+  const hideSort = optionsList.select((state) => state.explicitInput.hideSort);
 
   return (
     <div className="optionsList__actions">
@@ -142,7 +138,7 @@ export const OptionsListPopoverActionBar = ({
                     size="xs"
                     color="danger"
                     iconType="eraser"
-                    onClick={() => dispatch(clearSelections({}))}
+                    onClick={() => optionsList.dispatch.clearSelections({})}
                     data-test-subj="optionsList-control-clear-all-selections"
                     aria-label={OptionsListStrings.popover.getClearAllSelectionsButtonTitle()}
                   />
diff --git a/src/plugins/controls/public/options_list/components/options_list_popover_footer.tsx b/src/plugins/controls/public/options_list/components/options_list_popover_footer.tsx
index 966cc56d98044..bd71ad3a9f7d2 100644
--- a/src/plugins/controls/public/options_list/components/options_list_popover_footer.tsx
+++ b/src/plugins/controls/public/options_list/components/options_list_popover_footer.tsx
@@ -7,19 +7,18 @@
  */
 
 import React from 'react';
+
 import {
-  useEuiBackgroundColor,
-  useEuiPaddingSize,
-  EuiPopoverFooter,
-  EuiButtonGroup,
   EuiProgress,
+  EuiButtonGroup,
+  EuiPopoverFooter,
+  useEuiPaddingSize,
+  useEuiBackgroundColor,
 } from '@elastic/eui';
 import { css } from '@emotion/react';
-import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
 
-import { OptionsListReduxState } from '../types';
 import { OptionsListStrings } from './options_list_strings';
-import { optionsListReducers } from '../options_list_reducers';
+import { useOptionsList } from '../embeddable/options_list_embeddable';
 
 const aggregationToggleButtons = [
   {
@@ -33,16 +32,9 @@ const aggregationToggleButtons = [
 ];
 
 export const OptionsListPopoverFooter = ({ isLoading }: { isLoading: boolean }) => {
-  // Redux embeddable container Context
-  const {
-    useEmbeddableDispatch,
-    useEmbeddableSelector: select,
-    actions: { setExclude },
-  } = useReduxEmbeddableContext<OptionsListReduxState, typeof optionsListReducers>();
-  const dispatch = useEmbeddableDispatch();
+  const optionsList = useOptionsList();
 
-  // Select current state from Redux using multiple selectors to avoid rerenders.
-  const exclude = select((state) => state.explicitInput.exclude);
+  const exclude = optionsList.select((state) => state.explicitInput.exclude);
 
   return (
     <>
@@ -71,7 +63,7 @@ export const OptionsListPopoverFooter = ({ isLoading }: { isLoading: boolean })
             options={aggregationToggleButtons}
             idSelected={exclude ? 'optionsList__excludeResults' : 'optionsList__includeResults'}
             onChange={(optionId) =>
-              dispatch(setExclude(optionId === 'optionsList__excludeResults'))
+              optionsList.dispatch.setExclude(optionId === 'optionsList__excludeResults')
             }
             buttonSize="compressed"
             data-test-subj="optionsList__includeExcludeButtonGroup"
diff --git a/src/plugins/controls/public/options_list/components/options_list_popover_invalid_selections.tsx b/src/plugins/controls/public/options_list/components/options_list_popover_invalid_selections.tsx
index 424ae37da4bcb..980f861e00b26 100644
--- a/src/plugins/controls/public/options_list/components/options_list_popover_invalid_selections.tsx
+++ b/src/plugins/controls/public/options_list/components/options_list_popover_invalid_selections.tsx
@@ -15,24 +15,15 @@ import {
   EuiTitle,
   EuiScreenReaderOnly,
 } from '@elastic/eui';
-import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
 
-import { OptionsListReduxState } from '../types';
 import { OptionsListStrings } from './options_list_strings';
-import { optionsListReducers } from '../options_list_reducers';
+import { useOptionsList } from '../embeddable/options_list_embeddable';
 
 export const OptionsListPopoverInvalidSelections = () => {
-  // Redux embeddable container Context
-  const {
-    useEmbeddableDispatch,
-    useEmbeddableSelector: select,
-    actions: { deselectOption },
-  } = useReduxEmbeddableContext<OptionsListReduxState, typeof optionsListReducers>();
-  const dispatch = useEmbeddableDispatch();
+  const optionsList = useOptionsList();
 
-  // Select current state from Redux using multiple selectors to avoid rerenders.
-  const invalidSelections = select((state) => state.componentState.invalidSelections);
-  const fieldName = select((state) => state.explicitInput.fieldName);
+  const invalidSelections = optionsList.select((state) => state.componentState.invalidSelections);
+  const fieldName = optionsList.select((state) => state.explicitInput.fieldName);
 
   const [selectableOptions, setSelectableOptions] = useState<EuiSelectableOption[]>([]); // will be set in following useEffect
   useEffect(() => {
@@ -80,7 +71,7 @@ export const OptionsListPopoverInvalidSelections = () => {
         listProps={{ onFocusBadge: false, isVirtualized: false }}
         onChange={(newSuggestions, _, changedOption) => {
           setSelectableOptions(newSuggestions);
-          dispatch(deselectOption(changedOption.label));
+          optionsList.dispatch.deselectOption(changedOption.label);
         }}
       >
         {(list) => list}
diff --git a/src/plugins/controls/public/options_list/components/options_list_popover_sorting_button.tsx b/src/plugins/controls/public/options_list/components/options_list_popover_sorting_button.tsx
index 9132fee3dc5dc..3867ce4a569cc 100644
--- a/src/plugins/controls/public/options_list/components/options_list_popover_sorting_button.tsx
+++ b/src/plugins/controls/public/options_list/components/options_list_popover_sorting_button.tsx
@@ -21,16 +21,14 @@ import {
   Direction,
   EuiToolTip,
 } from '@elastic/eui';
-import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
 
 import {
   getCompatibleSortingTypes,
   OPTIONS_LIST_DEFAULT_SORT,
   OptionsListSortBy,
 } from '../../../common/options_list/suggestions_sorting';
-import { OptionsListReduxState } from '../types';
 import { OptionsListStrings } from './options_list_strings';
-import { optionsListReducers } from '../options_list_reducers';
+import { useOptionsList } from '../embeddable/options_list_embeddable';
 
 interface OptionsListSortingPopoverProps {
   showOnlySelected: boolean;
@@ -42,17 +40,10 @@ type SortByItem = EuiSelectableOption & {
 export const OptionsListPopoverSortingButton = ({
   showOnlySelected,
 }: OptionsListSortingPopoverProps) => {
-  // Redux embeddable container Context
-  const {
-    useEmbeddableDispatch,
-    useEmbeddableSelector: select,
-    actions: { setSort },
-  } = useReduxEmbeddableContext<OptionsListReduxState, typeof optionsListReducers>();
-  const dispatch = useEmbeddableDispatch();
+  const optionsList = useOptionsList();
 
-  // Select current state from Redux using multiple selectors to avoid rerenders.
-  const field = select((state) => state.componentState.field);
-  const sort = select((state) => state.explicitInput.sort ?? OPTIONS_LIST_DEFAULT_SORT);
+  const field = optionsList.select((state) => state.componentState.field);
+  const sort = optionsList.select((state) => state.explicitInput.sort ?? OPTIONS_LIST_DEFAULT_SORT);
 
   const [isSortingPopoverOpen, setIsSortingPopoverOpen] = useState(false);
 
@@ -87,7 +78,7 @@ export const OptionsListPopoverSortingButton = ({
     setSortByOptions(updatedOptions);
     const selectedOption = updatedOptions.find(({ checked }) => checked === 'on');
     if (selectedOption) {
-      dispatch(setSort({ by: selectedOption.data.sortBy }));
+      optionsList.dispatch.setSort({ by: selectedOption.data.sortBy });
     }
   };
 
@@ -135,7 +126,9 @@ export const OptionsListPopoverSortingButton = ({
                 options={sortOrderOptions}
                 idSelected={sort.direction}
                 legend={OptionsListStrings.editorAndPopover.getSortDirectionLegend()}
-                onChange={(value) => dispatch(setSort({ direction: value as Direction }))}
+                onChange={(value) =>
+                  optionsList.dispatch.setSort({ direction: value as Direction })
+                }
               />
             </EuiFlexItem>
           </EuiFlexGroup>
diff --git a/src/plugins/controls/public/options_list/components/options_list_popover_suggestions.tsx b/src/plugins/controls/public/options_list/components/options_list_popover_suggestions.tsx
index fd0e7668c82fa..8d727bed55e20 100644
--- a/src/plugins/controls/public/options_list/components/options_list_popover_suggestions.tsx
+++ b/src/plugins/controls/public/options_list/components/options_list_popover_suggestions.tsx
@@ -10,12 +10,11 @@ import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 
 import { euiThemeVars } from '@kbn/ui-theme';
 import { EuiSelectable } from '@elastic/eui';
-import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
 import { EuiSelectableOption } from '@elastic/eui/src/components/selectable/selectable_option';
 
+import { MAX_OPTIONS_LIST_REQUEST_SIZE } from '../types';
 import { OptionsListStrings } from './options_list_strings';
-import { optionsListReducers } from '../options_list_reducers';
-import { MAX_OPTIONS_LIST_REQUEST_SIZE, OptionsListReduxState } from '../types';
+import { useOptionsList } from '../embeddable/options_list_embeddable';
 import { OptionsListPopoverEmptyMessage } from './options_list_popover_empty_message';
 import { OptionsListPopoverSuggestionBadge } from './options_list_popover_suggestion_badge';
 
@@ -28,27 +27,21 @@ export const OptionsListPopoverSuggestions = ({
   showOnlySelected,
   loadMoreSuggestions,
 }: OptionsListPopoverSuggestionsProps) => {
-  // Redux embeddable container Context
-  const {
-    useEmbeddableDispatch,
-    useEmbeddableSelector: select,
-    actions: { replaceSelection, deselectOption, selectOption, selectExists },
-  } = useReduxEmbeddableContext<OptionsListReduxState, typeof optionsListReducers>();
-  const dispatch = useEmbeddableDispatch();
-
-  // Select current state from Redux using multiple selectors to avoid rerenders.
-  const invalidSelections = select((state) => state.componentState.invalidSelections);
-  const availableOptions = select((state) => state.componentState.availableOptions);
-  const totalCardinality = select((state) => state.componentState.totalCardinality);
-  const searchString = select((state) => state.componentState.searchString);
-
-  const selectedOptions = select((state) => state.explicitInput.selectedOptions);
-  const existsSelected = select((state) => state.explicitInput.existsSelected);
-  const singleSelect = select((state) => state.explicitInput.singleSelect);
-  const hideExists = select((state) => state.explicitInput.hideExists);
-  const isLoading = select((state) => state.output.loading) ?? false;
-  const fieldName = select((state) => state.explicitInput.fieldName);
-  const sort = select((state) => state.explicitInput.sort);
+  const optionsList = useOptionsList();
+
+  const searchString = optionsList.select((state) => state.componentState.searchString);
+  const availableOptions = optionsList.select((state) => state.componentState.availableOptions);
+  const totalCardinality = optionsList.select((state) => state.componentState.totalCardinality);
+  const invalidSelections = optionsList.select((state) => state.componentState.invalidSelections);
+
+  const sort = optionsList.select((state) => state.explicitInput.sort);
+  const fieldName = optionsList.select((state) => state.explicitInput.fieldName);
+  const hideExists = optionsList.select((state) => state.explicitInput.hideExists);
+  const singleSelect = optionsList.select((state) => state.explicitInput.singleSelect);
+  const existsSelected = optionsList.select((state) => state.explicitInput.existsSelected);
+  const selectedOptions = optionsList.select((state) => state.explicitInput.selectedOptions);
+
+  const isLoading = optionsList.select((state) => state.output.loading) ?? false;
 
   const listRef = useRef<HTMLDivElement>(null);
 
@@ -173,13 +166,13 @@ export const OptionsListPopoverSuggestions = ({
             setSelectableOptions(newSuggestions);
             // the order of these checks matters, so be careful if rearranging them
             if (key === 'exists-option') {
-              dispatch(selectExists(!Boolean(existsSelected)));
+              optionsList.dispatch.selectExists(!Boolean(existsSelected));
             } else if (showOnlySelected || selectedOptionsSet.has(key)) {
-              dispatch(deselectOption(key));
+              optionsList.dispatch.deselectOption(key);
             } else if (singleSelect) {
-              dispatch(replaceSelection(key));
+              optionsList.dispatch.replaceSelection(key);
             } else {
-              dispatch(selectOption(key));
+              optionsList.dispatch.selectOption(key);
             }
           }}
         >
diff --git a/src/plugins/controls/public/options_list/components/options_list_popover_title.tsx b/src/plugins/controls/public/options_list/components/options_list_popover_title.tsx
index 08aee48f61e28..9801a7bf2474c 100644
--- a/src/plugins/controls/public/options_list/components/options_list_popover_title.tsx
+++ b/src/plugins/controls/public/options_list/components/options_list_popover_title.tsx
@@ -9,22 +9,17 @@
 import React from 'react';
 
 import { EuiFlexGroup, EuiFlexItem, EuiPopoverTitle, EuiIconTip } from '@elastic/eui';
-import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
 
-import { OptionsListReduxState } from '../types';
 import { OptionsListStrings } from './options_list_strings';
-import { optionsListReducers } from '../options_list_reducers';
+import { useOptionsList } from '../embeddable/options_list_embeddable';
 
 export const OptionsListPopoverTitle = () => {
-  // Redux embeddable container Context
-  const { useEmbeddableSelector: select } = useReduxEmbeddableContext<
-    OptionsListReduxState,
-    typeof optionsListReducers
-  >();
+  const optionsList = useOptionsList();
 
-  // Select current state from Redux using multiple selectors to avoid rerenders.
-  const allowExpensiveQueries = select((state) => state.componentState.allowExpensiveQueries);
-  const title = select((state) => state.explicitInput.title);
+  const allowExpensiveQueries = optionsList.select(
+    (state) => state.componentState.allowExpensiveQueries
+  );
+  const title = optionsList.select((state) => state.explicitInput.title);
 
   return (
     <EuiPopoverTitle paddingSize="s">
diff --git a/src/plugins/controls/public/options_list/embeddable/options_list_embeddable.tsx b/src/plugins/controls/public/options_list/embeddable/options_list_embeddable.tsx
index 2a7f7e116c40f..e2503b4e530e8 100644
--- a/src/plugins/controls/public/options_list/embeddable/options_list_embeddable.tsx
+++ b/src/plugins/controls/public/options_list/embeddable/options_list_embeddable.tsx
@@ -6,15 +6,14 @@
  * Side Public License, v 1.
  */
 
-import React from 'react';
 import ReactDOM from 'react-dom';
 import { batch } from 'react-redux';
 import deepEqual from 'fast-deep-equal';
 import { isEmpty, isEqual } from 'lodash';
 import { merge, Subject, Subscription } from 'rxjs';
+import React, { createContext, useContext } from 'react';
 import { debounceTime, map, distinctUntilChanged, skip } from 'rxjs/operators';
 
-import { i18n } from '@kbn/i18n';
 import {
   Filter,
   compareFilters,
@@ -23,23 +22,24 @@ import {
   COMPARE_ALL_OPTIONS,
   buildExistsFilter,
 } from '@kbn/es-query';
-import { ReduxEmbeddableTools, ReduxEmbeddablePackage } from '@kbn/presentation-util-plugin/public';
+import { i18n } from '@kbn/i18n';
 import { DataView, FieldSpec } from '@kbn/data-views-plugin/public';
 import { Embeddable, IContainer } from '@kbn/embeddable-plugin/public';
 import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
+import { ReduxEmbeddableTools, ReduxToolsPackage } from '@kbn/presentation-util-plugin/public';
 
-import { MIN_OPTIONS_LIST_REQUEST_SIZE, OptionsListReduxState } from '../types';
-import { pluginServices } from '../../services';
 import {
   ControlInput,
   ControlOutput,
-  OptionsListEmbeddableInput,
   OPTIONS_LIST_CONTROL,
+  OptionsListEmbeddableInput,
 } from '../..';
-import { getDefaultComponentState, optionsListReducers } from '../options_list_reducers';
+import { pluginServices } from '../../services';
+import { MIN_OPTIONS_LIST_REQUEST_SIZE, OptionsListReduxState } from '../types';
 import { OptionsListControl } from '../components/options_list_control';
 import { ControlsDataViewsService } from '../../services/data_views/types';
 import { ControlsOptionsListService } from '../../services/options_list/types';
+import { getDefaultComponentState, optionsListReducers } from '../options_list_reducers';
 
 const diffDataFetchProps = (
   last?: OptionsListDataFetchProps,
@@ -62,6 +62,20 @@ interface OptionsListDataFetchProps {
   filters?: ControlInput['filters'];
 }
 
+export const OptionsListEmbeddableContext = createContext<OptionsListEmbeddable | null>(null);
+export const useOptionsList = (): OptionsListEmbeddable => {
+  const optionsList = useContext<OptionsListEmbeddable | null>(OptionsListEmbeddableContext);
+  if (optionsList == null) {
+    throw new Error('useOptionsList must be used inside OptionsListEmbeddableContext.');
+  }
+  return optionsList!;
+};
+
+type OptionsListReduxEmbeddableTools = ReduxEmbeddableTools<
+  OptionsListReduxState,
+  typeof optionsListReducers
+>;
+
 export class OptionsListEmbeddable extends Embeddable<OptionsListEmbeddableInput, ControlOutput> {
   public readonly type = OPTIONS_LIST_CONTROL;
   public deferEmbeddableLoad = true;
@@ -80,13 +94,16 @@ export class OptionsListEmbeddable extends Embeddable<OptionsListEmbeddableInput
   private dataView?: DataView;
   private field?: FieldSpec;
 
-  private reduxEmbeddableTools: ReduxEmbeddableTools<
-    OptionsListReduxState,
-    typeof optionsListReducers
-  >;
+  // state management
+  public select: OptionsListReduxEmbeddableTools['select'];
+  public getState: OptionsListReduxEmbeddableTools['getState'];
+  public dispatch: OptionsListReduxEmbeddableTools['dispatch'];
+  public onStateChange: OptionsListReduxEmbeddableTools['onStateChange'];
+
+  private cleanupStateTools: () => void;
 
   constructor(
-    reduxEmbeddablePackage: ReduxEmbeddablePackage,
+    reduxToolsPackage: ReduxToolsPackage,
     input: OptionsListEmbeddableInput,
     output: ControlOutput,
     parent?: IContainer
@@ -101,7 +118,7 @@ export class OptionsListEmbeddable extends Embeddable<OptionsListEmbeddableInput
     this.loadMoreSubject = new Subject<number>();
 
     // build redux embeddable tools
-    this.reduxEmbeddableTools = reduxEmbeddablePackage.createTools<
+    const reduxEmbeddableTools = reduxToolsPackage.createReduxEmbeddableTools<
       OptionsListReduxState,
       typeof optionsListReducers
     >({
@@ -110,6 +127,12 @@ export class OptionsListEmbeddable extends Embeddable<OptionsListEmbeddableInput
       initialComponentState: getDefaultComponentState(),
     });
 
+    this.select = reduxEmbeddableTools.select;
+    this.getState = reduxEmbeddableTools.getState;
+    this.dispatch = reduxEmbeddableTools.dispatch;
+    this.cleanupStateTools = reduxEmbeddableTools.cleanup;
+    this.onStateChange = reduxEmbeddableTools.onStateChange;
+
     this.initialize();
   }
 
@@ -117,11 +140,9 @@ export class OptionsListEmbeddable extends Embeddable<OptionsListEmbeddableInput
     const { selectedOptions: initialSelectedOptions } = this.getInput();
     if (!initialSelectedOptions) this.setInitializationFinished();
 
-    const {
-      actions: { setAllowExpensiveQueries },
-      dispatch,
-    } = this.reduxEmbeddableTools;
-    dispatch(setAllowExpensiveQueries(await this.optionsListService.getAllowExpensiveQueries()));
+    this.dispatch.setAllowExpensiveQueries(
+      await this.optionsListService.getAllowExpensiveQueries()
+    );
 
     this.runOptionsListQuery().then(async () => {
       if (initialSelectedOptions) {
@@ -183,19 +204,10 @@ export class OptionsListEmbeddable extends Embeddable<OptionsListEmbeddableInput
           )
         )
         .subscribe(async ({ selectedOptions: newSelectedOptions }) => {
-          const {
-            actions: {
-              clearValidAndInvalidSelections,
-              setValidAndInvalidSelections,
-              publishFilters,
-            },
-            dispatch,
-          } = this.reduxEmbeddableTools;
-
           if (!newSelectedOptions || isEmpty(newSelectedOptions)) {
-            dispatch(clearValidAndInvalidSelections({}));
+            this.dispatch.clearValidAndInvalidSelections({});
           } else {
-            const { invalidSelections } = this.reduxEmbeddableTools.getState().componentState ?? {};
+            const { invalidSelections } = this.getState().componentState ?? {};
             const newValidSelections: string[] = [];
             const newInvalidSelections: string[] = [];
             for (const selectedOption of newSelectedOptions) {
@@ -205,15 +217,13 @@ export class OptionsListEmbeddable extends Embeddable<OptionsListEmbeddableInput
               }
               newValidSelections.push(selectedOption);
             }
-            dispatch(
-              setValidAndInvalidSelections({
-                validSelections: newValidSelections,
-                invalidSelections: newInvalidSelections,
-              })
-            );
+            this.dispatch.setValidAndInvalidSelections({
+              validSelections: newValidSelections,
+              invalidSelections: newInvalidSelections,
+            });
           }
           const newFilters = await this.buildFilter();
-          dispatch(publishFilters(newFilters));
+          this.dispatch.publishFilters(newFilters);
         })
     );
   };
@@ -222,15 +232,9 @@ export class OptionsListEmbeddable extends Embeddable<OptionsListEmbeddableInput
     dataView?: DataView;
     field?: FieldSpec;
   }> => {
-    const {
-      dispatch,
-      getState,
-      actions: { setField, setDataViewId },
-    } = this.reduxEmbeddableTools;
-
     const {
       explicitInput: { dataViewId, fieldName },
-    } = getState();
+    } = this.getState();
 
     if (!this.dataView || this.dataView.id !== dataViewId) {
       try {
@@ -246,7 +250,7 @@ export class OptionsListEmbeddable extends Embeddable<OptionsListEmbeddableInput
         this.onFatalError(e);
       }
 
-      dispatch(setDataViewId(this.dataView?.id));
+      this.dispatch.setDataViewId(this.dataView?.id);
     }
 
     if (this.dataView && (!this.field || this.field.name !== fieldName)) {
@@ -265,31 +269,26 @@ export class OptionsListEmbeddable extends Embeddable<OptionsListEmbeddableInput
       } catch (e) {
         this.onFatalError(e);
       }
-      dispatch(setField(this.field));
+      this.dispatch.setField(this.field);
     }
 
     return { dataView: this.dataView, field: this.field! };
   };
 
   private runOptionsListQuery = async (size: number = MIN_OPTIONS_LIST_REQUEST_SIZE) => {
-    const {
-      dispatch,
-      getState,
-      actions: { setLoading, publishFilters, setSearchString, updateQueryResults },
-    } = this.reduxEmbeddableTools;
     const previousFieldName = this.field?.name;
     const { dataView, field } = await this.getCurrentDataViewAndField();
     if (!dataView || !field) return;
 
     if (previousFieldName && field.name !== previousFieldName) {
-      dispatch(setSearchString(''));
+      this.dispatch.setSearchString('');
     }
 
     const {
       componentState: { searchString, allowExpensiveQueries },
       explicitInput: { selectedOptions, runPastTimeout, existsSelected, sort },
-    } = getState();
-    dispatch(setLoading(true));
+    } = this.getState();
+    this.dispatch.setLoading(true);
     if (searchString.valid) {
       // need to get filters, query, ignoreParentSettings, and timeRange from input for inheritance
       const {
@@ -342,14 +341,12 @@ export class OptionsListEmbeddable extends Embeddable<OptionsListEmbeddableInput
         isEmpty(invalidSelections) ||
         ignoreParentSettings?.ignoreValidations
       ) {
-        dispatch(
-          updateQueryResults({
-            availableOptions: suggestions,
-            invalidSelections: undefined,
-            validSelections: selectedOptions,
-            totalCardinality,
-          })
-        );
+        this.dispatch.updateQueryResults({
+          availableOptions: suggestions,
+          invalidSelections: undefined,
+          validSelections: selectedOptions,
+          totalCardinality,
+        });
       } else {
         const valid: string[] = [];
         const invalid: string[] = [];
@@ -357,38 +354,33 @@ export class OptionsListEmbeddable extends Embeddable<OptionsListEmbeddableInput
           if (invalidSelections?.includes(selectedOption)) invalid.push(selectedOption);
           else valid.push(selectedOption);
         }
-        dispatch(
-          updateQueryResults({
-            availableOptions: suggestions,
-            invalidSelections: invalid,
-            validSelections: valid,
-            totalCardinality,
-          })
-        );
+        this.dispatch.updateQueryResults({
+          availableOptions: suggestions,
+          invalidSelections: invalid,
+          validSelections: valid,
+          totalCardinality,
+        });
       }
 
       // publish filter
       const newFilters = await this.buildFilter();
       batch(() => {
-        dispatch(setLoading(false));
-        dispatch(publishFilters(newFilters));
+        this.dispatch.setLoading(false);
+        this.dispatch.publishFilters(newFilters);
       });
     } else {
       batch(() => {
-        dispatch(
-          updateQueryResults({
-            availableOptions: {},
-          })
-        );
-        dispatch(setLoading(false));
+        this.dispatch.updateQueryResults({
+          availableOptions: {},
+        });
+        this.dispatch.setLoading(false);
       });
     }
   };
 
   private buildFilter = async () => {
-    const { getState } = this.reduxEmbeddableTools;
-    const { validSelections } = getState().componentState ?? {};
-    const { existsSelected } = getState().explicitInput ?? {};
+    const { validSelections } = this.getState().componentState ?? {};
+    const { existsSelected } = this.getState().explicitInput ?? {};
     const { exclude } = this.getInput();
 
     if ((!validSelections || isEmpty(validSelections)) && !existsSelected) {
@@ -421,22 +413,18 @@ export class OptionsListEmbeddable extends Embeddable<OptionsListEmbeddableInput
   };
 
   public onFatalError = (e: Error) => {
-    const {
-      dispatch,
-      actions: { setPopoverOpen, setLoading },
-    } = this.reduxEmbeddableTools;
     batch(() => {
-      dispatch(setLoading(false));
-      dispatch(setPopoverOpen(false));
+      this.dispatch.setLoading(false);
+      this.dispatch.setPopoverOpen(false);
     });
     super.onFatalError(e);
   };
 
   public destroy = () => {
     super.destroy();
+    this.cleanupStateTools();
     this.abortController?.abort();
     this.subscriptions.unsubscribe();
-    this.reduxEmbeddableTools.cleanup();
     if (this.node) ReactDOM.unmountComponentAtNode(this.node);
   };
 
@@ -444,16 +432,15 @@ export class OptionsListEmbeddable extends Embeddable<OptionsListEmbeddableInput
     if (this.node) {
       ReactDOM.unmountComponentAtNode(this.node);
     }
-    const { Wrapper: OptionsListReduxWrapper } = this.reduxEmbeddableTools;
     this.node = node;
     ReactDOM.render(
       <KibanaThemeProvider theme$={pluginServices.getServices().theme.theme$}>
-        <OptionsListReduxWrapper>
+        <OptionsListEmbeddableContext.Provider value={this}>
           <OptionsListControl
             typeaheadSubject={this.typeaheadSubject}
             loadMoreSubject={this.loadMoreSubject}
           />
-        </OptionsListReduxWrapper>
+        </OptionsListEmbeddableContext.Provider>
       </KibanaThemeProvider>,
       node
     );
diff --git a/src/plugins/controls/public/options_list/embeddable/options_list_embeddable_factory.tsx b/src/plugins/controls/public/options_list/embeddable/options_list_embeddable_factory.tsx
index d970c309bb6a8..cb2b1b4a82de3 100644
--- a/src/plugins/controls/public/options_list/embeddable/options_list_embeddable_factory.tsx
+++ b/src/plugins/controls/public/options_list/embeddable/options_list_embeddable_factory.tsx
@@ -10,7 +10,7 @@ import deepEqual from 'fast-deep-equal';
 
 import { i18n } from '@kbn/i18n';
 import { DataViewField } from '@kbn/data-views-plugin/common';
-import { lazyLoadReduxEmbeddablePackage } from '@kbn/presentation-util-plugin/public';
+import { lazyLoadReduxToolsPackage } from '@kbn/presentation-util-plugin/public';
 import { EmbeddableFactoryDefinition, IContainer } from '@kbn/embeddable-plugin/public';
 
 import {
@@ -33,7 +33,7 @@ export class OptionsListEmbeddableFactory
   constructor() {}
 
   public async create(initialInput: OptionsListEmbeddableInput, parent?: IContainer) {
-    const reduxEmbeddablePackage = await lazyLoadReduxEmbeddablePackage();
+    const reduxEmbeddablePackage = await lazyLoadReduxToolsPackage();
     const { OptionsListEmbeddable } = await import('./options_list_embeddable');
     return Promise.resolve(
       new OptionsListEmbeddable(reduxEmbeddablePackage, initialInput, {}, parent)
diff --git a/src/plugins/controls/public/range_slider/components/range_slider_control.tsx b/src/plugins/controls/public/range_slider/components/range_slider_control.tsx
index 5e5bd512ab355..c96637b55f1d7 100644
--- a/src/plugins/controls/public/range_slider/components/range_slider_control.tsx
+++ b/src/plugins/controls/public/range_slider/components/range_slider_control.tsx
@@ -16,10 +16,8 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
 } from '@elastic/eui';
-import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
 
-import { rangeSliderReducers } from '../range_slider_reducers';
-import { RangeSliderReduxState } from '../types';
+import { useRangeSlider } from '../embeddable/range_slider_embeddable';
 import { RangeSliderPopover, EuiDualRangeRef } from './range_slider_popover';
 
 import './range_slider.scss';
@@ -30,21 +28,14 @@ export const RangeSliderControl: FC = () => {
   const rangeRef = useRef<EuiDualRangeRef>(null);
   const [isPopoverOpen, setIsPopoverOpen] = useState<boolean>(false);
 
-  // Controls Services Context
-  const {
-    useEmbeddableDispatch,
-    useEmbeddableSelector: select,
-    actions: { setSelectedRange },
-  } = useReduxEmbeddableContext<RangeSliderReduxState, typeof rangeSliderReducers>();
-  const dispatch = useEmbeddableDispatch();
+  const rangeSlider = useRangeSlider();
 
-  // Select current state from Redux using multiple selectors to avoid rerenders.
-  const min = select((state) => state.componentState.min);
-  const max = select((state) => state.componentState.max);
-  const isInvalid = select((state) => state.componentState.isInvalid);
-  const id = select((state) => state.explicitInput.id);
-  const value = select((state) => state.explicitInput.value) ?? ['', ''];
-  const isLoading = select((state) => state.output.loading);
+  const min = rangeSlider.select((state) => state.componentState.min);
+  const max = rangeSlider.select((state) => state.componentState.max);
+  const isInvalid = rangeSlider.select((state) => state.componentState.isInvalid);
+  const id = rangeSlider.select((state) => state.explicitInput.id);
+  const value = rangeSlider.select((state) => state.explicitInput.value) ?? ['', ''];
+  const isLoading = rangeSlider.select((state) => state.output.loading);
 
   const hasAvailableRange = min !== '' && max !== '';
 
@@ -76,12 +67,10 @@ export const RangeSliderControl: FC = () => {
             }`}
             value={hasLowerBoundSelection ? lowerBoundValue : ''}
             onChange={(event) => {
-              dispatch(
-                setSelectedRange([
-                  event.target.value,
-                  isNaN(upperBoundValue) ? '' : String(upperBoundValue),
-                ])
-              );
+              rangeSlider.dispatch.setSelectedRange([
+                event.target.value,
+                isNaN(upperBoundValue) ? '' : String(upperBoundValue),
+              ]);
             }}
             disabled={isLoading}
             placeholder={`${hasAvailableRange ? roundedMin : ''}`}
@@ -103,12 +92,10 @@ export const RangeSliderControl: FC = () => {
             }`}
             value={hasUpperBoundSelection ? upperBoundValue : ''}
             onChange={(event) => {
-              dispatch(
-                setSelectedRange([
-                  isNaN(lowerBoundValue) ? '' : String(lowerBoundValue),
-                  event.target.value,
-                ])
-              );
+              rangeSlider.dispatch.setSelectedRange([
+                isNaN(lowerBoundValue) ? '' : String(lowerBoundValue),
+                event.target.value,
+              ]);
             }}
             disabled={isLoading}
             placeholder={`${hasAvailableRange ? roundedMax : ''}`}
diff --git a/src/plugins/controls/public/range_slider/components/range_slider_popover.tsx b/src/plugins/controls/public/range_slider/components/range_slider_popover.tsx
index bd2fee564e9cb..c3b2ccbe676f4 100644
--- a/src/plugins/controls/public/range_slider/components/range_slider_popover.tsx
+++ b/src/plugins/controls/public/range_slider/components/range_slider_popover.tsx
@@ -19,13 +19,11 @@ import {
   EuiButtonIcon,
 } from '@elastic/eui';
 import type { EuiDualRangeClass } from '@elastic/eui/src/components/form/range/dual_range';
-import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
 
-import { RangeValue } from '../../../common/range_slider/types';
 import { pluginServices } from '../../services';
-import { rangeSliderReducers } from '../range_slider_reducers';
-import { RangeSliderReduxState } from '../types';
 import { RangeSliderStrings } from './range_slider_strings';
+import { RangeValue } from '../../../common/range_slider/types';
+import { useRangeSlider } from '../embeddable/range_slider_embeddable';
 
 // Unfortunately, wrapping EuiDualRange in `withEuiTheme` has created this annoying/verbose typing
 export type EuiDualRangeRef = EuiDualRangeClass & ComponentProps<typeof EuiDualRange>;
@@ -37,23 +35,17 @@ export const RangeSliderPopover: FC<{ rangeRef?: Ref<EuiDualRangeRef> }> = ({ ra
   const {
     dataViews: { get: getDataViewById },
   } = pluginServices.getServices();
-  const {
-    useEmbeddableDispatch,
-    useEmbeddableSelector: select,
-    actions: { setSelectedRange },
-  } = useReduxEmbeddableContext<RangeSliderReduxState, typeof rangeSliderReducers>();
-
-  const dispatch = useEmbeddableDispatch();
+  const rangeSlider = useRangeSlider();
 
   // Select current state from Redux using multiple selectors to avoid rerenders.
-  const dataViewId = select((state) => state.output.dataViewId);
-  const fieldSpec = select((state) => state.componentState.field);
-  const id = select((state) => state.explicitInput.id);
-  const isInvalid = select((state) => state.componentState.isInvalid);
-  const max = select((state) => state.componentState.max);
-  const min = select((state) => state.componentState.min);
-  const title = select((state) => state.explicitInput.title);
-  const value = select((state) => state.explicitInput.value) ?? ['', ''];
+  const dataViewId = rangeSlider.select((state) => state.output.dataViewId);
+  const fieldSpec = rangeSlider.select((state) => state.componentState.field);
+  const id = rangeSlider.select((state) => state.explicitInput.id);
+  const isInvalid = rangeSlider.select((state) => state.componentState.isInvalid);
+  const max = rangeSlider.select((state) => state.componentState.max);
+  const min = rangeSlider.select((state) => state.componentState.min);
+  const title = rangeSlider.select((state) => state.explicitInput.title);
+  const value = rangeSlider.select((state) => state.explicitInput.value) ?? ['', ''];
 
   const hasAvailableRange = min !== '' && max !== '';
   const hasLowerBoundSelection = value[0] !== '';
@@ -154,7 +146,7 @@ export const RangeSliderPopover: FC<{ rangeRef?: Ref<EuiDualRangeRef> }> = ({ ra
               const updatedUpperBound =
                 typeof newUpperBound === 'number' ? String(newUpperBound) : value[1];
 
-              dispatch(setSelectedRange([updatedLowerBound, updatedUpperBound]));
+              rangeSlider.dispatch.setSelectedRange([updatedLowerBound, updatedUpperBound]);
             }}
             value={displayedValue}
             ticks={hasAvailableRange ? ticks : undefined}
@@ -179,7 +171,7 @@ export const RangeSliderPopover: FC<{ rangeRef?: Ref<EuiDualRangeRef> }> = ({ ra
               iconType="eraser"
               color="danger"
               onClick={() => {
-                dispatch(setSelectedRange(['', '']));
+                rangeSlider.dispatch.setSelectedRange(['', '']);
               }}
               aria-label={RangeSliderStrings.popover.getClearRangeButtonTitle()}
               data-test-subj="rangeSlider__clearRangeButton"
diff --git a/src/plugins/controls/public/range_slider/embeddable/range_slider_embeddable.tsx b/src/plugins/controls/public/range_slider/embeddable/range_slider_embeddable.tsx
index 3ae81b267e9ea..62809be8cc39c 100644
--- a/src/plugins/controls/public/range_slider/embeddable/range_slider_embeddable.tsx
+++ b/src/plugins/controls/public/range_slider/embeddable/range_slider_embeddable.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import React from 'react';
+import React, { createContext, useContext } from 'react';
 import ReactDOM from 'react-dom';
 import { isEmpty } from 'lodash';
 import { batch } from 'react-redux';
@@ -15,8 +15,6 @@ import deepEqual from 'fast-deep-equal';
 import { Subscription, lastValueFrom } from 'rxjs';
 import { debounceTime, distinctUntilChanged, skip, map } from 'rxjs/operators';
 
-import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
-import { Embeddable, IContainer } from '@kbn/embeddable-plugin/public';
 import {
   compareFilters,
   buildRangeFilter,
@@ -27,7 +25,9 @@ import {
 } from '@kbn/es-query';
 import { i18n } from '@kbn/i18n';
 import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
-import { ReduxEmbeddableTools, ReduxEmbeddablePackage } from '@kbn/presentation-util-plugin/public';
+import { Embeddable, IContainer } from '@kbn/embeddable-plugin/public';
+import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
+import { ReduxEmbeddableTools, ReduxToolsPackage } from '@kbn/presentation-util-plugin/public';
 
 import {
   ControlInput,
@@ -36,11 +36,11 @@ import {
   RANGE_SLIDER_CONTROL,
 } from '../..';
 import { pluginServices } from '../../services';
-import { RangeSliderControl } from '../components/range_slider_control';
-import { getDefaultComponentState, rangeSliderReducers } from '../range_slider_reducers';
 import { RangeSliderReduxState } from '../types';
 import { ControlsDataService } from '../../services/data/types';
+import { RangeSliderControl } from '../components/range_slider_control';
 import { ControlsDataViewsService } from '../../services/data_views/types';
+import { getDefaultComponentState, rangeSliderReducers } from '../range_slider_reducers';
 
 const diffDataFetchProps = (
   current?: RangeSliderDataFetchProps,
@@ -65,6 +65,20 @@ interface RangeSliderDataFetchProps {
 const fieldMissingError = (fieldName: string) =>
   new Error(`field ${fieldName} not found in index pattern`);
 
+export const RangeSliderControlContext = createContext<RangeSliderEmbeddable | null>(null);
+export const useRangeSlider = (): RangeSliderEmbeddable => {
+  const rangeSlider = useContext<RangeSliderEmbeddable | null>(RangeSliderControlContext);
+  if (rangeSlider == null) {
+    throw new Error('useRangeSlider must be used inside RangeSliderControlContext.');
+  }
+  return rangeSlider!;
+};
+
+type RangeSliderReduxEmbeddableTools = ReduxEmbeddableTools<
+  RangeSliderReduxState,
+  typeof rangeSliderReducers
+>;
+
 export class RangeSliderEmbeddable extends Embeddable<RangeSliderEmbeddableInput, ControlOutput> {
   public readonly type = RANGE_SLIDER_CONTROL;
   public deferEmbeddableLoad = true;
@@ -80,13 +94,16 @@ export class RangeSliderEmbeddable extends Embeddable<RangeSliderEmbeddableInput
   private dataView?: DataView;
   private field?: DataViewField;
 
-  private reduxEmbeddableTools: ReduxEmbeddableTools<
-    RangeSliderReduxState,
-    typeof rangeSliderReducers
-  >;
+  // state management
+  public select: RangeSliderReduxEmbeddableTools['select'];
+  public getState: RangeSliderReduxEmbeddableTools['getState'];
+  public dispatch: RangeSliderReduxEmbeddableTools['dispatch'];
+  public onStateChange: RangeSliderReduxEmbeddableTools['onStateChange'];
+
+  private cleanupStateTools: () => void;
 
   constructor(
-    reduxEmbeddablePackage: ReduxEmbeddablePackage,
+    reduxToolsPackage: ReduxToolsPackage,
     input: RangeSliderEmbeddableInput,
     output: ControlOutput,
     parent?: IContainer
@@ -96,7 +113,7 @@ export class RangeSliderEmbeddable extends Embeddable<RangeSliderEmbeddableInput
     // Destructure controls services
     ({ data: this.dataService, dataViews: this.dataViewsService } = pluginServices.getServices());
 
-    this.reduxEmbeddableTools = reduxEmbeddablePackage.createTools<
+    const reduxEmbeddableTools = reduxToolsPackage.createReduxEmbeddableTools<
       RangeSliderReduxState,
       typeof rangeSliderReducers
     >({
@@ -104,6 +121,11 @@ export class RangeSliderEmbeddable extends Embeddable<RangeSliderEmbeddableInput
       reducers: rangeSliderReducers,
       initialComponentState: getDefaultComponentState(),
     });
+    this.select = reduxEmbeddableTools.select;
+    this.getState = reduxEmbeddableTools.getState;
+    this.dispatch = reduxEmbeddableTools.dispatch;
+    this.onStateChange = reduxEmbeddableTools.onStateChange;
+    this.cleanupStateTools = reduxEmbeddableTools.cleanup;
 
     this.initialize();
   }
@@ -157,14 +179,9 @@ export class RangeSliderEmbeddable extends Embeddable<RangeSliderEmbeddableInput
     dataView?: DataView;
     field?: DataViewField;
   }> => {
-    const {
-      getState,
-      dispatch,
-      actions: { setField, setDataViewId },
-    } = this.reduxEmbeddableTools;
     const {
       explicitInput: { dataViewId, fieldName },
-    } = getState();
+    } = this.getState();
 
     if (!this.dataView || this.dataView.id !== dataViewId) {
       try {
@@ -179,7 +196,7 @@ export class RangeSliderEmbeddable extends Embeddable<RangeSliderEmbeddableInput
           );
         }
 
-        dispatch(setDataViewId(this.dataView.id));
+        this.dispatch.setDataViewId(this.dataView.id);
       } catch (e) {
         this.onFatalError(e);
       }
@@ -198,19 +215,14 @@ export class RangeSliderEmbeddable extends Embeddable<RangeSliderEmbeddableInput
         );
       }
 
-      dispatch(setField(this.field?.toSpec()));
+      this.dispatch.setField(this.field?.toSpec());
     }
 
     return { dataView: this.dataView, field: this.field! };
   };
 
   private runRangeSliderQuery = async () => {
-    const {
-      dispatch,
-      actions: { setLoading, publishFilters, setMinMax },
-    } = this.reduxEmbeddableTools;
-
-    dispatch(setLoading(true));
+    this.dispatch.setLoading(true);
     const { dataView, field } = await this.getCurrentDataViewAndField();
     if (!dataView || !field) return;
 
@@ -226,8 +238,8 @@ export class RangeSliderEmbeddable extends Embeddable<RangeSliderEmbeddableInput
 
     if (!field) {
       batch(() => {
-        dispatch(setLoading(false));
-        dispatch(publishFilters([]));
+        this.dispatch.setLoading(false);
+        this.dispatch.publishFilters([]);
       });
       throw fieldMissingError(fieldName);
     }
@@ -258,12 +270,10 @@ export class RangeSliderEmbeddable extends Embeddable<RangeSliderEmbeddableInput
       query,
     });
 
-    dispatch(
-      setMinMax({
-        min: `${min ?? ''}`,
-        max: `${max ?? ''}`,
-      })
-    );
+    this.dispatch.setMinMax({
+      min: `${min ?? ''}`,
+      max: `${max ?? ''}`,
+    });
 
     // build filter with new min/max
     await this.buildFilter();
@@ -323,11 +333,6 @@ export class RangeSliderEmbeddable extends Embeddable<RangeSliderEmbeddableInput
   };
 
   private buildFilter = async () => {
-    const {
-      dispatch,
-      getState,
-      actions: { setLoading, setIsInvalid, setDataViewId, publishFilters },
-    } = this.reduxEmbeddableTools;
     const {
       componentState: { min: availableMin, max: availableMax },
       explicitInput: {
@@ -337,7 +342,7 @@ export class RangeSliderEmbeddable extends Embeddable<RangeSliderEmbeddableInput
         ignoreParentSettings,
         value: [selectedMin, selectedMax] = ['', ''],
       },
-    } = getState();
+    } = this.getState();
 
     const hasData = !isEmpty(availableMin) && !isEmpty(availableMax);
     const hasLowerSelection = !isEmpty(selectedMin);
@@ -349,10 +354,10 @@ export class RangeSliderEmbeddable extends Embeddable<RangeSliderEmbeddableInput
 
     if (!hasData || !hasEitherSelection) {
       batch(() => {
-        dispatch(setLoading(false));
-        dispatch(setIsInvalid(!ignoreParentSettings?.ignoreValidations && hasEitherSelection));
-        dispatch(setDataViewId(dataView.id));
-        dispatch(publishFilters([]));
+        this.dispatch.setLoading(false);
+        this.dispatch.setIsInvalid(!ignoreParentSettings?.ignoreValidations && hasEitherSelection);
+        this.dispatch.setDataViewId(dataView.id);
+        this.dispatch.publishFilters([]);
       });
       return;
     }
@@ -404,20 +409,20 @@ export class RangeSliderEmbeddable extends Embeddable<RangeSliderEmbeddableInput
 
       if (!docCount) {
         batch(() => {
-          dispatch(setLoading(false));
-          dispatch(setIsInvalid(true));
-          dispatch(setDataViewId(dataView.id));
-          dispatch(publishFilters([]));
+          this.dispatch.setLoading(false);
+          this.dispatch.setIsInvalid(true);
+          this.dispatch.setDataViewId(dataView.id);
+          this.dispatch.publishFilters([]);
         });
         return;
       }
     }
 
     batch(() => {
-      dispatch(setLoading(false));
-      dispatch(setIsInvalid(false));
-      dispatch(setDataViewId(dataView.id));
-      dispatch(publishFilters([rangeFilter]));
+      this.dispatch.setLoading(false);
+      this.dispatch.setIsInvalid(false);
+      this.dispatch.setDataViewId(dataView.id);
+      this.dispatch.publishFilters([rangeFilter]);
     });
   };
 
@@ -427,23 +432,22 @@ export class RangeSliderEmbeddable extends Embeddable<RangeSliderEmbeddableInput
 
   public destroy = () => {
     super.destroy();
+    this.cleanupStateTools();
     this.subscriptions.unsubscribe();
-    this.reduxEmbeddableTools.cleanup();
   };
 
   public render = (node: HTMLElement) => {
     if (this.node) {
       ReactDOM.unmountComponentAtNode(this.node);
     }
-    const { Wrapper: RangeSliderReduxWrapper } = this.reduxEmbeddableTools;
     this.node = node;
     const ControlsServicesProvider = pluginServices.getContextProvider();
     ReactDOM.render(
       <KibanaThemeProvider theme$={pluginServices.getServices().theme.theme$}>
         <ControlsServicesProvider>
-          <RangeSliderReduxWrapper>
+          <RangeSliderControlContext.Provider value={this}>
             <RangeSliderControl />
-          </RangeSliderReduxWrapper>
+          </RangeSliderControlContext.Provider>
         </ControlsServicesProvider>
       </KibanaThemeProvider>,
       node
diff --git a/src/plugins/controls/public/range_slider/embeddable/range_slider_embeddable_factory.tsx b/src/plugins/controls/public/range_slider/embeddable/range_slider_embeddable_factory.tsx
index b8cd0d9536b1e..4103be5ff59b3 100644
--- a/src/plugins/controls/public/range_slider/embeddable/range_slider_embeddable_factory.tsx
+++ b/src/plugins/controls/public/range_slider/embeddable/range_slider_embeddable_factory.tsx
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
+import { i18n } from '@kbn/i18n';
 import deepEqual from 'fast-deep-equal';
 
-import { EmbeddableFactoryDefinition, IContainer } from '@kbn/embeddable-plugin/public';
-import { lazyLoadReduxEmbeddablePackage } from '@kbn/presentation-util-plugin/public';
 import { DataViewField } from '@kbn/data-views-plugin/common';
-import { i18n } from '@kbn/i18n';
+import { lazyLoadReduxToolsPackage } from '@kbn/presentation-util-plugin/public';
+import { EmbeddableFactoryDefinition, IContainer } from '@kbn/embeddable-plugin/public';
 
 import {
   createRangeSliderExtract,
@@ -45,7 +45,7 @@ export class RangeSliderEmbeddableFactory
   public isEditable = () => Promise.resolve(true);
 
   public async create(initialInput: RangeSliderEmbeddableInput, parent?: IContainer) {
-    const reduxEmbeddablePackage = await lazyLoadReduxEmbeddablePackage();
+    const reduxEmbeddablePackage = await lazyLoadReduxToolsPackage();
     const { RangeSliderEmbeddable } = await import('./range_slider_embeddable');
 
     return Promise.resolve(
diff --git a/src/plugins/controls/public/time_slider/components/time_slider.tsx b/src/plugins/controls/public/time_slider/components/time_slider.tsx
index f8ae06677cd16..5c0fb97f21304 100644
--- a/src/plugins/controls/public/time_slider/components/time_slider.tsx
+++ b/src/plugins/controls/public/time_slider/components/time_slider.tsx
@@ -8,14 +8,12 @@
 
 import React, { FC, useRef } from 'react';
 import { EuiInputPopover } from '@elastic/eui';
-import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
-import { timeSliderReducers } from '../time_slider_reducers';
-import { TimeSliderReduxState } from '../types';
-import { TimeSliderPopoverButton } from './time_slider_popover_button';
-import { TimeSliderPopoverContent } from './time_slider_popover_content';
-import { EuiDualRangeRef } from './time_slider_sliding_window_range';
 import { FROM_INDEX, TO_INDEX } from '../time_utils';
+import { EuiDualRangeRef } from './time_slider_sliding_window_range';
 import { getRoundedTimeRangeBounds } from '../time_slider_selectors';
+import { useTimeSlider } from '../embeddable/time_slider_embeddable';
+import { TimeSliderPopoverButton } from './time_slider_popover_button';
+import { TimeSliderPopoverContent } from './time_slider_popover_content';
 
 import './index.scss';
 
@@ -25,25 +23,21 @@ interface Props {
 }
 
 export const TimeSlider: FC<Props> = (props: Props) => {
-  const {
-    useEmbeddableDispatch,
-    useEmbeddableSelector: select,
-    actions,
-  } = useReduxEmbeddableContext<TimeSliderReduxState, typeof timeSliderReducers>();
-  const dispatch = useEmbeddableDispatch();
-  const stepSize = select((state) => {
+  const timeSlider = useTimeSlider();
+
+  const stepSize = timeSlider.select((state) => {
     return state.componentState.stepSize;
   });
-  const ticks = select((state) => {
+  const ticks = timeSlider.select((state) => {
     return state.componentState.ticks;
   });
-  const timeRangeBounds = select(getRoundedTimeRangeBounds);
+  const timeRangeBounds = timeSlider.select(getRoundedTimeRangeBounds);
   const timeRangeMin = timeRangeBounds[FROM_INDEX];
   const timeRangeMax = timeRangeBounds[TO_INDEX];
-  const value = select((state) => {
+  const value = timeSlider.select((state) => {
     return state.componentState.value;
   });
-  const isOpen = select((state) => {
+  const isOpen = timeSlider.select((state) => {
     return state.componentState.isOpen;
   });
 
@@ -64,7 +58,7 @@ export const TimeSlider: FC<Props> = (props: Props) => {
       input={
         <TimeSliderPopoverButton
           onClick={() => {
-            dispatch(actions.setIsOpen({ isOpen: !isOpen }));
+            timeSlider.dispatch.setIsOpen({ isOpen: !isOpen });
           }}
           formatDate={props.formatDate}
           from={from}
@@ -72,7 +66,7 @@ export const TimeSlider: FC<Props> = (props: Props) => {
         />
       }
       isOpen={isOpen}
-      closePopover={() => dispatch(actions.setIsOpen({ isOpen: false }))}
+      closePopover={() => timeSlider.dispatch.setIsOpen({ isOpen: false })}
       panelPaddingSize="s"
       anchorPosition="downCenter"
       disableFocusTrap
diff --git a/src/plugins/controls/public/time_slider/components/time_slider_popover_content.tsx b/src/plugins/controls/public/time_slider/components/time_slider_popover_content.tsx
index 68201aa4debe6..400b93efbbbfe 100644
--- a/src/plugins/controls/public/time_slider/components/time_slider_popover_content.tsx
+++ b/src/plugins/controls/public/time_slider/components/time_slider_popover_content.tsx
@@ -8,13 +8,12 @@
 
 import React, { Ref } from 'react';
 import { EuiButtonIcon, EuiRangeTick, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
-import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
-import { TimeSliderAnchoredRange } from './time_slider_anchored_range';
-import { EuiDualRangeRef, TimeSliderSlidingWindowRange } from './time_slider_sliding_window_range';
-import { timeSliderReducers } from '../time_slider_reducers';
-import { TimeSliderReduxState } from '../types';
+
 import { getIsAnchored } from '../time_slider_selectors';
 import { TimeSliderStrings } from './time_slider_strings';
+import { useTimeSlider } from '../embeddable/time_slider_embeddable';
+import { TimeSliderAnchoredRange } from './time_slider_anchored_range';
+import { EuiDualRangeRef, TimeSliderSlidingWindowRange } from './time_slider_sliding_window_range';
 
 interface Props {
   value: [number, number];
@@ -41,13 +40,8 @@ export function TimeSliderPopoverContent(props: Props) {
           };
         });
 
-  const {
-    useEmbeddableDispatch,
-    useEmbeddableSelector: select,
-    actions: { setIsAnchored },
-  } = useReduxEmbeddableContext<TimeSliderReduxState, typeof timeSliderReducers>();
-  const dispatch = useEmbeddableDispatch();
-  const isAnchored = select(getIsAnchored);
+  const timeSlider = useTimeSlider();
+  const isAnchored = timeSlider.select(getIsAnchored);
   const rangeInput = isAnchored ? (
     <TimeSliderAnchoredRange
       value={props.value}
@@ -88,7 +82,7 @@ export function TimeSliderPopoverContent(props: Props) {
               if (nextIsAnchored) {
                 props.onChange([props.timeRangeMin, props.value[1]]);
               }
-              dispatch(setIsAnchored({ isAnchored: nextIsAnchored }));
+              timeSlider.dispatch.setIsAnchored({ isAnchored: nextIsAnchored });
             }}
             aria-label={anchorStartToggleButtonLabel}
             data-test-subj="timeSlider__anchorStartToggleButton"
diff --git a/src/plugins/controls/public/time_slider/components/time_slider_prepend.tsx b/src/plugins/controls/public/time_slider/components/time_slider_prepend.tsx
index 3f569fe6b60be..bf27042190acf 100644
--- a/src/plugins/controls/public/time_slider/components/time_slider_prepend.tsx
+++ b/src/plugins/controls/public/time_slider/components/time_slider_prepend.tsx
@@ -6,14 +6,12 @@
  * Side Public License, v 1.
  */
 
-import React, { FC, useState } from 'react';
-import { Observable, Subscription } from 'rxjs';
-import { first } from 'rxjs/operators';
 import { i18n } from '@kbn/i18n';
+import { first } from 'rxjs/operators';
+import React, { FC, useState } from 'react';
 import { EuiButtonIcon } from '@elastic/eui';
-import { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
-import { timeSliderReducers } from '../time_slider_reducers';
-import { TimeSliderReduxState } from '../types';
+import { Observable, Subscription } from 'rxjs';
+import { useTimeSlider } from '../embeddable/time_slider_embeddable';
 
 interface Props {
   onNext: () => void;
@@ -22,11 +20,7 @@ interface Props {
 }
 
 export const TimeSliderPrepend: FC<Props> = (props: Props) => {
-  const { useEmbeddableDispatch, actions } = useReduxEmbeddableContext<
-    TimeSliderReduxState,
-    typeof timeSliderReducers
-  >();
-  const dispatch = useEmbeddableDispatch();
+  const timeSlider = useTimeSlider();
 
   const [isPaused, setIsPaused] = useState(true);
   const [timeoutId, setTimeoutId] = useState<number | undefined>(undefined);
@@ -51,13 +45,13 @@ export const TimeSliderPrepend: FC<Props> = (props: Props) => {
   };
 
   const onPlay = () => {
-    dispatch(actions.setIsOpen({ isOpen: true }));
+    timeSlider.dispatch.setIsOpen({ isOpen: true });
     setIsPaused(false);
     playNextFrame();
   };
 
   const onPause = () => {
-    dispatch(actions.setIsOpen({ isOpen: true }));
+    timeSlider.dispatch.setIsOpen({ isOpen: true });
     setIsPaused(true);
     if (subscription) {
       subscription.unsubscribe();
diff --git a/src/plugins/controls/public/time_slider/embeddable/time_slider_embeddable.tsx b/src/plugins/controls/public/time_slider/embeddable/time_slider_embeddable.tsx
index 424d2d953c965..b9baa4084fb55 100644
--- a/src/plugins/controls/public/time_slider/embeddable/time_slider_embeddable.tsx
+++ b/src/plugins/controls/public/time_slider/embeddable/time_slider_embeddable.tsx
@@ -10,10 +10,10 @@ import _ from 'lodash';
 import { debounceTime, first, map } from 'rxjs/operators';
 import moment from 'moment-timezone';
 import { Embeddable, IContainer } from '@kbn/embeddable-plugin/public';
-import { ReduxEmbeddableTools, ReduxEmbeddablePackage } from '@kbn/presentation-util-plugin/public';
+import { ReduxEmbeddableTools, ReduxToolsPackage } from '@kbn/presentation-util-plugin/public';
 import type { TimeRange } from '@kbn/es-query';
 import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
-import React from 'react';
+import React, { createContext, useContext } from 'react';
 import ReactDOM from 'react-dom';
 import { Subscription } from 'rxjs';
 import { TIME_SLIDER_CONTROL } from '../..';
@@ -37,6 +37,20 @@ import {
 } from '../time_utils';
 import { getIsAnchored, getRoundedTimeRangeBounds } from '../time_slider_selectors';
 
+export const TimeSliderControlContext = createContext<TimeSliderControlEmbeddable | null>(null);
+export const useTimeSlider = (): TimeSliderControlEmbeddable => {
+  const timeSlider = useContext<TimeSliderControlEmbeddable | null>(TimeSliderControlContext);
+  if (timeSlider == null) {
+    throw new Error('useTimeSlider must be used inside TimeSliderControlContext.');
+  }
+  return timeSlider!;
+};
+
+type TimeSliderReduxEmbeddableTools = ReduxEmbeddableTools<
+  TimeSliderReduxState,
+  typeof timeSliderReducers
+>;
+
 export class TimeSliderControlEmbeddable extends Embeddable<
   TimeSliderControlEmbeddableInput,
   ControlOutput
@@ -47,6 +61,14 @@ export class TimeSliderControlEmbeddable extends Embeddable<
   private inputSubscription: Subscription;
   private node?: HTMLElement;
 
+  // state management
+  public select: TimeSliderReduxEmbeddableTools['select'];
+  public getState: TimeSliderReduxEmbeddableTools['getState'];
+  public dispatch: TimeSliderReduxEmbeddableTools['dispatch'];
+  public onStateChange: TimeSliderReduxEmbeddableTools['onStateChange'];
+
+  private cleanupStateTools: () => void;
+
   private getTimezone: ControlsSettingsService['getTimezone'];
   private timefilter: ControlsDataService['timefilter'];
   private prevTimeRange: TimeRange | undefined;
@@ -56,13 +78,8 @@ export class TimeSliderControlEmbeddable extends Embeddable<
   };
   private readonly waitForControlOutputConsumersToLoad$;
 
-  private reduxEmbeddableTools: ReduxEmbeddableTools<
-    TimeSliderReduxState,
-    typeof timeSliderReducers
-  >;
-
   constructor(
-    reduxEmbeddablePackage: ReduxEmbeddablePackage,
+    reduxToolsPackage: ReduxToolsPackage,
     input: TimeSliderControlEmbeddableInput,
     output: ControlOutput,
     parent?: IContainer
@@ -85,7 +102,7 @@ export class TimeSliderControlEmbeddable extends Embeddable<
       timeRangeBounds[TO_INDEX],
       this.getTimezone()
     );
-    this.reduxEmbeddableTools = reduxEmbeddablePackage.createTools<
+    const reduxEmbeddableTools = reduxToolsPackage.createReduxEmbeddableTools<
       TimeSliderReduxState,
       typeof timeSliderReducers
     >({
@@ -99,6 +116,12 @@ export class TimeSliderControlEmbeddable extends Embeddable<
       },
     });
 
+    this.select = reduxEmbeddableTools.select;
+    this.getState = reduxEmbeddableTools.getState;
+    this.dispatch = reduxEmbeddableTools.dispatch;
+    this.onStateChange = reduxEmbeddableTools.onStateChange;
+    this.cleanupStateTools = reduxEmbeddableTools.cleanup;
+
     this.inputSubscription = this.getInput$().subscribe(() => this.onInputChange());
 
     this.waitForControlOutputConsumersToLoad$ =
@@ -125,7 +148,7 @@ export class TimeSliderControlEmbeddable extends Embeddable<
 
   public destroy = () => {
     super.destroy();
-    this.reduxEmbeddableTools.cleanup();
+    this.cleanupStateTools();
     if (this.inputSubscription) {
       this.inputSubscription.unsubscribe();
     }
@@ -136,7 +159,6 @@ export class TimeSliderControlEmbeddable extends Embeddable<
     const { timesliceStartAsPercentageOfTimeRange, timesliceEndAsPercentageOfTimeRange } =
       this.prevTimesliceAsPercentage ?? {};
 
-    const { actions, dispatch } = this.reduxEmbeddableTools;
     if (
       timesliceStartAsPercentageOfTimeRange !== input.timesliceStartAsPercentageOfTimeRange ||
       timesliceEndAsPercentageOfTimeRange !== input.timesliceEndAsPercentageOfTimeRange
@@ -149,8 +171,8 @@ export class TimeSliderControlEmbeddable extends Embeddable<
       ) {
         // If no selections have been saved into the timeslider, then both `timesliceStartAsPercentageOfTimeRange`
         // and `timesliceEndAsPercentageOfTimeRange` will be undefined - so, need to reset component state to match
-        dispatch(actions.publishValue({ value: undefined }));
-        dispatch(actions.setValue({ value: undefined }));
+        this.dispatch.publishValue({ value: undefined });
+        this.dispatch.setValue({ value: undefined });
       } else {
         // Otherwise, need to call `syncWithTimeRange` so that the component state value can be calculated and set
         this.syncWithTimeRange();
@@ -158,31 +180,26 @@ export class TimeSliderControlEmbeddable extends Embeddable<
     } else if (input.timeRange && !_.isEqual(input.timeRange, this.prevTimeRange)) {
       const nextBounds = this.timeRangeToBounds(input.timeRange);
       const ticks = getTicks(nextBounds[FROM_INDEX], nextBounds[TO_INDEX], this.getTimezone());
-      dispatch(
-        actions.setTimeRangeBounds({
-          ...getStepSize(ticks),
-          ticks,
-          timeRangeBounds: nextBounds,
-        })
-      );
+      this.dispatch.setTimeRangeBounds({
+        ...getStepSize(ticks),
+        ticks,
+        timeRangeBounds: nextBounds,
+      });
       this.syncWithTimeRange();
     }
   }
 
   private syncWithTimeRange() {
     this.prevTimeRange = this.getInput().timeRange;
-    const { actions, dispatch, getState } = this.reduxEmbeddableTools;
-    const stepSize = getState().componentState.stepSize;
-    const timesliceStartAsPercentageOfTimeRange =
-      getState().explicitInput.timesliceStartAsPercentageOfTimeRange;
-    const timesliceEndAsPercentageOfTimeRange =
-      getState().explicitInput.timesliceEndAsPercentageOfTimeRange;
+    const stepSize = this.getState().componentState.stepSize;
+    const { timesliceStartAsPercentageOfTimeRange, timesliceEndAsPercentageOfTimeRange } =
+      this.getState().explicitInput;
 
     if (
       timesliceStartAsPercentageOfTimeRange !== undefined &&
       timesliceEndAsPercentageOfTimeRange !== undefined
     ) {
-      const timeRangeBounds = getState().componentState.timeRangeBounds;
+      const timeRangeBounds = this.getState().componentState.timeRangeBounds;
       const timeRange = timeRangeBounds[TO_INDEX] - timeRangeBounds[FROM_INDEX];
       const from = timeRangeBounds[FROM_INDEX] + timesliceStartAsPercentageOfTimeRange * timeRange;
       const to = timeRangeBounds[FROM_INDEX] + timesliceEndAsPercentageOfTimeRange * timeRange;
@@ -190,8 +207,8 @@ export class TimeSliderControlEmbeddable extends Embeddable<
         roundDownToNextStepSizeFactor(from, stepSize),
         roundUpToNextStepSizeFactor(to, stepSize),
       ] as [number, number];
-      dispatch(actions.publishValue({ value }));
-      dispatch(actions.setValue({ value }));
+      this.dispatch.publishValue({ value });
+      this.dispatch.setValue({ value });
       this.onRangeChange(value[TO_INDEX] - value[FROM_INDEX]);
     }
   }
@@ -208,16 +225,14 @@ export class TimeSliderControlEmbeddable extends Embeddable<
   }
 
   private debouncedPublishChange = _.debounce((value?: [number, number]) => {
-    const { actions, dispatch } = this.reduxEmbeddableTools;
-    dispatch(actions.publishValue({ value }));
+    this.dispatch.publishValue({ value });
   }, 500);
 
   private getTimeSliceAsPercentageOfTimeRange(value?: [number, number]) {
-    const { getState } = this.reduxEmbeddableTools;
     let timesliceStartAsPercentageOfTimeRange: number | undefined;
     let timesliceEndAsPercentageOfTimeRange: number | undefined;
     if (value) {
-      const timeRangeBounds = getState().componentState.timeRangeBounds;
+      const timeRangeBounds = this.getState().componentState.timeRangeBounds;
       const timeRange = timeRangeBounds[TO_INDEX] - timeRangeBounds[FROM_INDEX];
       timesliceStartAsPercentageOfTimeRange =
         (value[FROM_INDEX] - timeRangeBounds[FROM_INDEX]) / timeRange;
@@ -232,39 +247,29 @@ export class TimeSliderControlEmbeddable extends Embeddable<
   }
 
   private onTimesliceChange = (value?: [number, number]) => {
-    const { actions, dispatch } = this.reduxEmbeddableTools;
-
     const { timesliceStartAsPercentageOfTimeRange, timesliceEndAsPercentageOfTimeRange } =
       this.getTimeSliceAsPercentageOfTimeRange(value);
-    dispatch(
-      actions.setValueAsPercentageOfTimeRange({
-        timesliceStartAsPercentageOfTimeRange,
-        timesliceEndAsPercentageOfTimeRange,
-      })
-    );
-    dispatch(actions.setValue({ value }));
+    this.dispatch.setValueAsPercentageOfTimeRange({
+      timesliceStartAsPercentageOfTimeRange,
+      timesliceEndAsPercentageOfTimeRange,
+    });
+    this.dispatch.setValue({ value });
     this.debouncedPublishChange(value);
   };
 
   private onRangeChange = (range?: number) => {
-    const { actions, dispatch, getState } = this.reduxEmbeddableTools;
-    const timeRangeBounds = getState().componentState.timeRangeBounds;
+    const timeRangeBounds = this.getState().componentState.timeRangeBounds;
     const timeRange = timeRangeBounds[TO_INDEX] - timeRangeBounds[FROM_INDEX];
-    dispatch(
-      actions.setRange({
-        range: range !== undefined && range < timeRange ? range : undefined,
-      })
-    );
+    this.dispatch.setRange({
+      range: range !== undefined && range < timeRange ? range : undefined,
+    });
   };
 
   private onNext = () => {
-    const { getState } = this.reduxEmbeddableTools;
-    const value = getState().componentState.value;
-    const range = getState().componentState.range;
-    const ticks = getState().componentState.ticks;
-    const isAnchored = getIsAnchored(getState());
+    const { value, range, ticks } = this.getState().componentState;
+    const isAnchored = getIsAnchored(this.getState());
     const tickRange = ticks[1].value - ticks[0].value;
-    const timeRangeBounds = getRoundedTimeRangeBounds(getState());
+    const timeRangeBounds = getRoundedTimeRangeBounds(this.getState());
 
     if (isAnchored) {
       if (value === undefined || value[TO_INDEX] >= timeRangeBounds[TO_INDEX]) {
@@ -304,13 +309,10 @@ export class TimeSliderControlEmbeddable extends Embeddable<
   };
 
   private onPrevious = () => {
-    const { getState } = this.reduxEmbeddableTools;
-    const value = getState().componentState.value;
-    const range = getState().componentState.range;
-    const ticks = getState().componentState.ticks;
-    const isAnchored = getIsAnchored(getState());
+    const { value, range, ticks } = this.getState().componentState;
+    const isAnchored = getIsAnchored(this.getState());
     const tickRange = ticks[1].value - ticks[0].value;
-    const timeRangeBounds = getRoundedTimeRangeBounds(getState());
+    const timeRangeBounds = getRoundedTimeRangeBounds(this.getState());
 
     if (isAnchored) {
       const prevTick = value
@@ -347,10 +349,9 @@ export class TimeSliderControlEmbeddable extends Embeddable<
   };
 
   private formatDate = (epoch: number) => {
-    const { getState } = this.reduxEmbeddableTools;
     return moment
       .tz(epoch, getMomentTimezone(this.getTimezone()))
-      .format(getState().componentState.format);
+      .format(this.getState().componentState.format);
   };
 
   public render = (node: HTMLElement) => {
@@ -358,12 +359,9 @@ export class TimeSliderControlEmbeddable extends Embeddable<
       ReactDOM.unmountComponentAtNode(this.node);
     }
     this.node = node;
-
-    const { Wrapper: TimeSliderControlReduxWrapper } = this.reduxEmbeddableTools;
-
     ReactDOM.render(
       <KibanaThemeProvider theme$={pluginServices.getServices().theme.theme$}>
-        <TimeSliderControlReduxWrapper>
+        <TimeSliderControlContext.Provider value={this}>
           <TimeSlider
             formatDate={this.formatDate}
             onChange={(value?: [number, number]) => {
@@ -372,22 +370,21 @@ export class TimeSliderControlEmbeddable extends Embeddable<
               this.onRangeChange(range);
             }}
           />
-        </TimeSliderControlReduxWrapper>
+        </TimeSliderControlContext.Provider>
       </KibanaThemeProvider>,
       node
     );
   };
 
   public renderPrepend() {
-    const { Wrapper: TimeSliderControlReduxWrapper } = this.reduxEmbeddableTools;
     return (
-      <TimeSliderControlReduxWrapper>
+      <TimeSliderControlContext.Provider value={this}>
         <TimeSliderPrepend
           onNext={this.onNext}
           onPrevious={this.onPrevious}
           waitForControlOutputConsumersToLoad$={this.waitForControlOutputConsumersToLoad$}
         />
-      </TimeSliderControlReduxWrapper>
+      </TimeSliderControlContext.Provider>
     );
   }
 
diff --git a/src/plugins/controls/public/time_slider/embeddable/time_slider_embeddable_factory.tsx b/src/plugins/controls/public/time_slider/embeddable/time_slider_embeddable_factory.tsx
index d3f3418104328..51aa173bef2bf 100644
--- a/src/plugins/controls/public/time_slider/embeddable/time_slider_embeddable_factory.tsx
+++ b/src/plugins/controls/public/time_slider/embeddable/time_slider_embeddable_factory.tsx
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { EmbeddableFactoryDefinition, IContainer } from '@kbn/embeddable-plugin/public';
-import { lazyLoadReduxEmbeddablePackage } from '@kbn/presentation-util-plugin/public';
+import { lazyLoadReduxToolsPackage } from '@kbn/presentation-util-plugin/public';
 import {
   createTimeSliderExtract,
   createTimeSliderInject,
@@ -24,7 +24,7 @@ export class TimeSliderEmbeddableFactory
   constructor() {}
 
   public async create(initialInput: any, parent?: IContainer) {
-    const reduxEmbeddablePackage = await lazyLoadReduxEmbeddablePackage();
+    const reduxEmbeddablePackage = await lazyLoadReduxToolsPackage();
     const { TimeSliderControlEmbeddable } = await import('./time_slider_embeddable');
 
     return Promise.resolve(
diff --git a/src/plugins/dashboard/common/dashboard_container/type_guards.ts b/src/plugins/dashboard/common/dashboard_container/type_guards.ts
deleted file mode 100644
index 1c5468609c3af..0000000000000
--- a/src/plugins/dashboard/common/dashboard_container/type_guards.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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 {
-  DashboardContainerByReferenceInput,
-  DashboardContainerByValueInput,
-  DashboardContainerInput,
-} from './types';
-
-export const dashboardContainerInputIsByValue = (
-  containerInput: DashboardContainerInput
-): containerInput is DashboardContainerByValueInput => {
-  if (
-    (containerInput as DashboardContainerByValueInput).panels &&
-    !(containerInput as DashboardContainerByReferenceInput).savedObjectId
-  ) {
-    return true;
-  }
-  return false;
-};
diff --git a/src/plugins/dashboard/common/dashboard_container/types.ts b/src/plugins/dashboard/common/dashboard_container/types.ts
index df71eb4565442..2af75ccbf7fc4 100644
--- a/src/plugins/dashboard/common/dashboard_container/types.ts
+++ b/src/plugins/dashboard/common/dashboard_container/types.ts
@@ -30,13 +30,9 @@ export interface DashboardPanelState<
   panelRefName?: string;
 }
 
-export type DashboardContainerInput =
-  | DashboardContainerByReferenceInput
-  | DashboardContainerByValueInput;
+export type DashboardContainerByReferenceInput = SavedObjectEmbeddableInput;
 
-export type DashboardContainerByReferenceInput = SavedObjectEmbeddableInput & { panels: never };
-
-export interface DashboardContainerByValueInput extends EmbeddableInput {
+export interface DashboardContainerInput extends EmbeddableInput {
   // filter context to be passed to children
   query: Query;
   filters: Filter[];
diff --git a/src/plugins/dashboard/common/index.ts b/src/plugins/dashboard/common/index.ts
index b997db4d7696c..612314da5245d 100644
--- a/src/plugins/dashboard/common/index.ts
+++ b/src/plugins/dashboard/common/index.ts
@@ -17,7 +17,6 @@ export type {
   DashboardPanelMap,
   DashboardPanelState,
   DashboardContainerInput,
-  DashboardContainerByValueInput,
   DashboardContainerByReferenceInput,
 } from './dashboard_container/types';
 
diff --git a/src/plugins/dashboard/common/types.ts b/src/plugins/dashboard/common/types.ts
index 4a1abbd49b2db..bf7cedbadec45 100644
--- a/src/plugins/dashboard/common/types.ts
+++ b/src/plugins/dashboard/common/types.ts
@@ -10,7 +10,7 @@ import { EmbeddableInput, EmbeddableStateWithType } from '@kbn/embeddable-plugin
 import { PersistableControlGroupInput } from '@kbn/controls-plugin/common';
 
 import { SavedDashboardPanel } from './dashboard_saved_object/types';
-import { DashboardContainerByValueInput, DashboardPanelState } from './dashboard_container/types';
+import { DashboardContainerInput, DashboardPanelState } from './dashboard_container/types';
 
 export interface DashboardOptions {
   hidePanelTitles: boolean;
@@ -32,7 +32,7 @@ export interface DashboardCapabilities {
  * For BWC reasons, dashboard state is stored with panels as an array instead of a map
  */
 export type SharedDashboardState = Partial<
-  Omit<DashboardContainerByValueInput, 'panels'> & { panels: SavedDashboardPanel[] }
+  Omit<DashboardContainerInput, 'panels'> & { panels: SavedDashboardPanel[] }
 >;
 
 /**
diff --git a/src/plugins/dashboard/public/dashboard_actions/add_to_library_action.test.tsx b/src/plugins/dashboard/public/dashboard_actions/add_to_library_action.test.tsx
index 1e9f0e7f02b97..f7c1c2a30f68c 100644
--- a/src/plugins/dashboard/public/dashboard_actions/add_to_library_action.test.tsx
+++ b/src/plugins/dashboard/public/dashboard_actions/add_to_library_action.test.tsx
@@ -22,7 +22,7 @@ import {
 } from '@kbn/embeddable-plugin/public/lib/test_samples/embeddables';
 import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 
-import { getSampleDashboardInput } from '../mocks';
+import { buildMockDashboard } from '../mocks';
 import { pluginServices } from '../services/plugin_services';
 import { AddToLibraryAction } from './add_to_library_action';
 import { DashboardContainer } from '../dashboard_container/embeddable/dashboard_container';
@@ -48,8 +48,7 @@ Object.defineProperty(pluginServices.getServices().application, 'capabilities',
 beforeEach(async () => {
   pluginServices.getServices().application.capabilities = defaultCapabilities;
 
-  container = new DashboardContainer(getSampleDashboardInput());
-  await container.untilInitialized();
+  container = buildMockDashboard();
 
   const contactCardEmbeddable = await container.addNewEmbeddable<
     ContactCardEmbeddableInput,
diff --git a/src/plugins/dashboard/public/dashboard_actions/clone_panel_action.test.tsx b/src/plugins/dashboard/public/dashboard_actions/clone_panel_action.test.tsx
index d59c2047eeb28..6c1e8bc6d680e 100644
--- a/src/plugins/dashboard/public/dashboard_actions/clone_panel_action.test.tsx
+++ b/src/plugins/dashboard/public/dashboard_actions/clone_panel_action.test.tsx
@@ -21,7 +21,7 @@ import { ErrorEmbeddable, IContainer, isErrorEmbeddable } from '@kbn/embeddable-
 import { DashboardPanelState } from '../../common';
 import { ClonePanelAction } from './clone_panel_action';
 import { pluginServices } from '../services/plugin_services';
-import { getSampleDashboardInput, getSampleDashboardPanel } from '../mocks';
+import { buildMockDashboard, getSampleDashboardPanel } from '../mocks';
 import { DashboardContainer } from '../dashboard_container/embeddable/dashboard_container';
 
 let container: DashboardContainer;
@@ -37,7 +37,12 @@ beforeEach(async () => {
     create: jest.fn().mockImplementation(() => ({ id: 'brandNewSavedObject' })),
   };
 
-  const input = getSampleDashboardInput({
+  const mockEmbeddableFactory = new ContactCardEmbeddableFactory((() => null) as any, {} as any);
+
+  pluginServices.getServices().embeddable.getEmbeddableFactory = jest
+    .fn()
+    .mockReturnValue(mockEmbeddableFactory);
+  container = buildMockDashboard({
     panels: {
       '123': getSampleDashboardPanel<ContactCardEmbeddableInput>({
         explicitInput: { firstName: 'Kibanana', id: '123' },
@@ -45,13 +50,6 @@ beforeEach(async () => {
       }),
     },
   });
-  const mockEmbeddableFactory = new ContactCardEmbeddableFactory((() => null) as any, {} as any);
-
-  pluginServices.getServices().embeddable.getEmbeddableFactory = jest
-    .fn()
-    .mockReturnValue(mockEmbeddableFactory);
-  container = new DashboardContainer(input);
-  await container.untilInitialized();
 
   const refOrValContactCardEmbeddable = await container.addNewEmbeddable<
     ContactCardEmbeddableInput,
diff --git a/src/plugins/dashboard/public/dashboard_actions/expand_panel_action.test.tsx b/src/plugins/dashboard/public/dashboard_actions/expand_panel_action.test.tsx
index 44a1b2d4828df..877488c6d8041 100644
--- a/src/plugins/dashboard/public/dashboard_actions/expand_panel_action.test.tsx
+++ b/src/plugins/dashboard/public/dashboard_actions/expand_panel_action.test.tsx
@@ -7,7 +7,7 @@
  */
 
 import { ExpandPanelAction } from './expand_panel_action';
-import { getSampleDashboardInput, getSampleDashboardPanel } from '../mocks';
+import { buildMockDashboard, getSampleDashboardPanel } from '../mocks';
 import { DashboardContainer } from '../dashboard_container/embeddable/dashboard_container';
 
 import { isErrorEmbeddable } from '@kbn/embeddable-plugin/public';
@@ -30,7 +30,7 @@ pluginServices.getServices().embeddable.getEmbeddableFactory = jest
   .mockReturnValue(mockEmbeddableFactory);
 
 beforeEach(async () => {
-  const input = getSampleDashboardInput({
+  container = buildMockDashboard({
     panels: {
       '123': getSampleDashboardPanel<ContactCardEmbeddableInput>({
         explicitInput: { firstName: 'Sam', id: '123' },
@@ -39,9 +39,6 @@ beforeEach(async () => {
     },
   });
 
-  container = new DashboardContainer(input);
-  await container.untilInitialized();
-
   const contactCardEmbeddable = await container.addNewEmbeddable<
     ContactCardEmbeddableInput,
     ContactCardEmbeddableOutput,
diff --git a/src/plugins/dashboard/public/dashboard_actions/export_csv_action.test.tsx b/src/plugins/dashboard/public/dashboard_actions/export_csv_action.test.tsx
index 265d34992689c..350db8fad40b1 100644
--- a/src/plugins/dashboard/public/dashboard_actions/export_csv_action.test.tsx
+++ b/src/plugins/dashboard/public/dashboard_actions/export_csv_action.test.tsx
@@ -20,7 +20,7 @@ import { isErrorEmbeddable, IContainer, ErrorEmbeddable } from '@kbn/embeddable-
 
 import { ExportCSVAction } from './export_csv_action';
 import { pluginServices } from '../services/plugin_services';
-import { getSampleDashboardInput, getSampleDashboardPanel } from '../mocks';
+import { buildMockDashboard, getSampleDashboardPanel } from '../mocks';
 import { DashboardContainer } from '../dashboard_container/embeddable/dashboard_container';
 
 describe('Export CSV action', () => {
@@ -45,7 +45,7 @@ describe('Export CSV action', () => {
       create: jest.fn().mockImplementation(() => ({ id: 'brandNewSavedObject' })),
     };
 
-    const input = getSampleDashboardInput({
+    container = buildMockDashboard({
       panels: {
         '123': getSampleDashboardPanel<ContactCardEmbeddableInput>({
           explicitInput: { firstName: 'Kibanana', id: '123' },
@@ -53,8 +53,6 @@ describe('Export CSV action', () => {
         }),
       },
     });
-    container = new DashboardContainer(input);
-    await container.untilInitialized();
 
     const contactCardEmbeddable = await container.addNewEmbeddable<
       ContactCardEmbeddableInput,
diff --git a/src/plugins/dashboard/public/dashboard_actions/filters_notification_action.test.tsx b/src/plugins/dashboard/public/dashboard_actions/filters_notification_action.test.tsx
index e864e35d5ad3a..3bec1276fb4c7 100644
--- a/src/plugins/dashboard/public/dashboard_actions/filters_notification_action.test.tsx
+++ b/src/plugins/dashboard/public/dashboard_actions/filters_notification_action.test.tsx
@@ -17,9 +17,8 @@ import {
 import { type Query, type AggregateQuery, Filter } from '@kbn/es-query';
 import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 
-import { getSampleDashboardInput } from '../mocks';
+import { buildMockDashboard } from '../mocks';
 import { pluginServices } from '../services/plugin_services';
-import { DashboardContainer } from '../dashboard_container/embeddable/dashboard_container';
 import { FiltersNotificationAction } from './filters_notification_action';
 
 const mockEmbeddableFactory = new ContactCardEmbeddableFactory((() => null) as any, {} as any);
@@ -51,8 +50,7 @@ const getMockPhraseFilter = (key: string, value: string) => {
 };
 
 const buildEmbeddable = async (input?: Partial<ContactCardEmbeddableInput>) => {
-  const container = new DashboardContainer(getSampleDashboardInput());
-  await container.untilInitialized();
+  const container = buildMockDashboard();
   const contactCardEmbeddable = await container.addNewEmbeddable<
     ContactCardEmbeddableInput,
     ContactCardEmbeddableOutput,
diff --git a/src/plugins/dashboard/public/dashboard_actions/filters_notification_popover.test.tsx b/src/plugins/dashboard/public/dashboard_actions/filters_notification_popover.test.tsx
index 7a3b98633fa67..eb7aa344a8311 100644
--- a/src/plugins/dashboard/public/dashboard_actions/filters_notification_popover.test.tsx
+++ b/src/plugins/dashboard/public/dashboard_actions/filters_notification_popover.test.tsx
@@ -13,7 +13,7 @@ import { FilterableEmbeddable, isErrorEmbeddable, ViewMode } from '@kbn/embeddab
 
 import { DashboardContainer } from '../dashboard_container/embeddable/dashboard_container';
 import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
-import { getSampleDashboardInput } from '../mocks';
+import { buildMockDashboard } from '../mocks';
 import { EuiPopover } from '@elastic/eui';
 import {
   FiltersNotificationPopover,
@@ -40,8 +40,7 @@ describe('filters notification popover', () => {
   let defaultProps: FiltersNotificationProps;
 
   beforeEach(async () => {
-    container = new DashboardContainer(getSampleDashboardInput());
-    await container.untilInitialized();
+    container = buildMockDashboard();
     const contactCardEmbeddable = await container.addNewEmbeddable<
       ContactCardEmbeddableInput,
       ContactCardEmbeddableOutput,
diff --git a/src/plugins/dashboard/public/dashboard_actions/library_notification_action.test.tsx b/src/plugins/dashboard/public/dashboard_actions/library_notification_action.test.tsx
index ed7f501f83296..9fc05d575cbc3 100644
--- a/src/plugins/dashboard/public/dashboard_actions/library_notification_action.test.tsx
+++ b/src/plugins/dashboard/public/dashboard_actions/library_notification_action.test.tsx
@@ -22,11 +22,11 @@ import {
 } from '@kbn/embeddable-plugin/public/lib/test_samples/embeddables';
 import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 
-import { getSampleDashboardInput } from '../mocks';
 import { pluginServices } from '../services/plugin_services';
 import { UnlinkFromLibraryAction } from './unlink_from_library_action';
 import { LibraryNotificationAction } from './library_notification_action';
 import { DashboardContainer } from '../dashboard_container/embeddable/dashboard_container';
+import { buildMockDashboard } from '../mocks';
 
 const mockEmbeddableFactory = new ContactCardEmbeddableFactory((() => null) as any, {} as any);
 pluginServices.getServices().embeddable.getEmbeddableFactory = jest
@@ -43,8 +43,7 @@ beforeEach(async () => {
     execute: jest.fn(),
   } as unknown as UnlinkFromLibraryAction;
 
-  container = new DashboardContainer(getSampleDashboardInput());
-  await container.untilInitialized();
+  container = buildMockDashboard();
 
   const contactCardEmbeddable = await container.addNewEmbeddable<
     ContactCardEmbeddableInput,
diff --git a/src/plugins/dashboard/public/dashboard_actions/library_notification_popover.test.tsx b/src/plugins/dashboard/public/dashboard_actions/library_notification_popover.test.tsx
index eb390b37a88f3..7fd0385f5ef1b 100644
--- a/src/plugins/dashboard/public/dashboard_actions/library_notification_popover.test.tsx
+++ b/src/plugins/dashboard/public/dashboard_actions/library_notification_popover.test.tsx
@@ -24,7 +24,7 @@ import {
   LibraryNotificationPopover,
   LibraryNotificationProps,
 } from './library_notification_popover';
-import { getSampleDashboardInput } from '../mocks';
+import { buildMockDashboard } from '../mocks';
 import { pluginServices } from '../services/plugin_services';
 import { DashboardContainer } from '../dashboard_container/embeddable/dashboard_container';
 
@@ -38,8 +38,7 @@ describe('LibraryNotificationPopover', () => {
   let defaultProps: LibraryNotificationProps;
 
   beforeEach(async () => {
-    container = new DashboardContainer(getSampleDashboardInput());
-    await container.untilInitialized();
+    container = buildMockDashboard();
 
     const contactCardEmbeddable = await container.addNewEmbeddable<
       ContactCardEmbeddableInput,
diff --git a/src/plugins/dashboard/public/dashboard_actions/replace_panel_action.test.tsx b/src/plugins/dashboard/public/dashboard_actions/replace_panel_action.test.tsx
index c5695b55072d2..0829f89424ede 100644
--- a/src/plugins/dashboard/public/dashboard_actions/replace_panel_action.test.tsx
+++ b/src/plugins/dashboard/public/dashboard_actions/replace_panel_action.test.tsx
@@ -17,7 +17,7 @@ import { isErrorEmbeddable } from '@kbn/embeddable-plugin/public';
 
 import { ReplacePanelAction } from './replace_panel_action';
 import { pluginServices } from '../services/plugin_services';
-import { getSampleDashboardInput, getSampleDashboardPanel } from '../mocks';
+import { buildMockDashboard, getSampleDashboardPanel } from '../mocks';
 import { DashboardContainer } from '../dashboard_container/embeddable/dashboard_container';
 
 const mockEmbeddableFactory = new ContactCardEmbeddableFactory((() => null) as any, {} as any);
@@ -28,7 +28,7 @@ pluginServices.getServices().embeddable.getEmbeddableFactory = jest
 let container: DashboardContainer;
 let embeddable: ContactCardEmbeddable;
 beforeEach(async () => {
-  const input = getSampleDashboardInput({
+  container = buildMockDashboard({
     panels: {
       '123': getSampleDashboardPanel<ContactCardEmbeddableInput>({
         explicitInput: { firstName: 'Sam', id: '123' },
@@ -36,8 +36,6 @@ beforeEach(async () => {
       }),
     },
   });
-  container = new DashboardContainer(input);
-  await container.untilInitialized();
 
   const contactCardEmbeddable = await container.addNewEmbeddable<
     ContactCardEmbeddableInput,
@@ -54,7 +52,7 @@ beforeEach(async () => {
   }
 });
 
-test('Executes the replace panel action', async () => {
+test('Executes the replace panel action', () => {
   let SavedObjectFinder: any;
   const action = new ReplacePanelAction(SavedObjectFinder);
   action.execute({ embeddable });
@@ -82,13 +80,13 @@ test('Execute throws an error when called with an embeddable not in a parent', a
   await expect(check()).rejects.toThrow(Error);
 });
 
-test('Returns title', async () => {
+test('Returns title', () => {
   let SavedObjectFinder: any;
   const action = new ReplacePanelAction(SavedObjectFinder);
   expect(action.getDisplayName({ embeddable })).toBeDefined();
 });
 
-test('Returns an icon', async () => {
+test('Returns an icon', () => {
   let SavedObjectFinder: any;
   const action = new ReplacePanelAction(SavedObjectFinder);
   expect(action.getIconType({ embeddable })).toBeDefined();
diff --git a/src/plugins/dashboard/public/dashboard_actions/unlink_from_library_action.test.tsx b/src/plugins/dashboard/public/dashboard_actions/unlink_from_library_action.test.tsx
index a0e557ce107a0..1bcb273ea2511 100644
--- a/src/plugins/dashboard/public/dashboard_actions/unlink_from_library_action.test.tsx
+++ b/src/plugins/dashboard/public/dashboard_actions/unlink_from_library_action.test.tsx
@@ -23,7 +23,7 @@ import {
 } from '@kbn/embeddable-plugin/public/lib/test_samples/embeddables';
 import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
 
-import { getSampleDashboardInput } from '../mocks';
+import { buildMockDashboard } from '../mocks';
 import { DashboardPanelState } from '../../common';
 import { pluginServices } from '../services/plugin_services';
 import { UnlinkFromLibraryAction } from './unlink_from_library_action';
@@ -38,8 +38,7 @@ pluginServices.getServices().embeddable.getEmbeddableFactory = jest
   .mockReturnValue(mockEmbeddableFactory);
 
 beforeEach(async () => {
-  container = new DashboardContainer(getSampleDashboardInput());
-  await container.untilInitialized();
+  container = buildMockDashboard();
 
   const contactCardEmbeddable = await container.addNewEmbeddable<
     ContactCardEmbeddableInput,
diff --git a/src/plugins/dashboard/public/dashboard_app/dashboard_app.tsx b/src/plugins/dashboard/public/dashboard_app/dashboard_app.tsx
index b78ae7a4806f4..8fc546a41ea65 100644
--- a/src/plugins/dashboard/public/dashboard_app/dashboard_app.tsx
+++ b/src/plugins/dashboard/public/dashboard_app/dashboard_app.tsx
@@ -8,7 +8,8 @@
 
 import { History } from 'history';
 import useMount from 'react-use/lib/useMount';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import useObservable from 'react-use/lib/useObservable';
+import React, { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react';
 
 import { ViewMode } from '@kbn/embeddable-plugin/public';
 import { useExecutionContext } from '@kbn/kibana-react-plugin/public';
@@ -28,14 +29,14 @@ import {
   removeSearchSessionIdFromURL,
   createSessionRestorationDataProvider,
 } from './url/search_sessions_integration';
+import { DashboardAPI, DashboardRenderer } from '..';
 import { DASHBOARD_APP_ID } from '../dashboard_constants';
 import { pluginServices } from '../services/plugin_services';
 import { DashboardTopNav } from './top_nav/dashboard_top_nav';
-import type { DashboardContainer } from '../dashboard_container';
+import { AwaitingDashboardAPI } from '../dashboard_container';
 import { type DashboardEmbedSettings, DashboardRedirect } from './types';
 import { useDashboardMountContext } from './hooks/dashboard_mount_context';
 import { useDashboardOutcomeValidation } from './hooks/use_dashboard_outcome_validation';
-import DashboardContainerRenderer from '../dashboard_container/dashboard_container_renderer';
 import { loadDashboardHistoryLocationState } from './locator/load_dashboard_history_location_state';
 import type { DashboardCreationOptions } from '../dashboard_container/embeddable/dashboard_container_factory';
 
@@ -46,6 +47,16 @@ export interface DashboardAppProps {
   embedSettings?: DashboardEmbedSettings;
 }
 
+export const DashboardAPIContext = createContext<AwaitingDashboardAPI>(null);
+
+export const useDashboardAPI = (): DashboardAPI => {
+  const api = useContext<AwaitingDashboardAPI>(DashboardAPIContext);
+  if (api == null) {
+    throw new Error('useDashboardAPI must be used inside DashboardAPIContext');
+  }
+  return api!;
+};
+
 export function DashboardApp({
   savedDashboardId,
   embedSettings,
@@ -57,10 +68,7 @@ export function DashboardApp({
   useMount(() => {
     (async () => setShowNoDataPage(await isDashboardAppInNoDataState()))();
   });
-
-  const [dashboardContainer, setDashboardContainer] = useState<DashboardContainer | undefined>(
-    undefined
-  );
+  const [dashboardAPI, setDashboardAPI] = useState<AwaitingDashboardAPI>(null);
 
   /**
    * Unpack & set up dashboard services
@@ -72,7 +80,9 @@ export function DashboardApp({
     notifications: { toasts },
     settings: { uiSettings },
     data: { search },
+    customBranding,
   } = pluginServices.getServices();
+  const showPlainSpinner = useObservable(customBranding.hasCustomBranding$, false);
 
   const incomingEmbeddable = getStateTransfer().getIncomingEmbeddablePackage(
     DASHBOARD_APP_ID,
@@ -140,7 +150,7 @@ export function DashboardApp({
       },
 
       // Override all state with URL + Locator input
-      overrideInput: {
+      initialInput: {
         // State loaded from the dashboard app URL and from the locator overrides all other dashboard state.
         ...initialUrlState,
         ...stateFromLocator,
@@ -163,26 +173,17 @@ export function DashboardApp({
     getScreenshotContext,
   ]);
 
-  /**
-   * Get the redux wrapper from the dashboard container. This is used to wrap the top nav so it can interact with the
-   * dashboard's redux state.
-   */
-  const DashboardReduxWrapper = useMemo(
-    () => dashboardContainer?.getReduxEmbeddableTools().Wrapper,
-    [dashboardContainer]
-  );
-
   /**
    * When the dashboard container is created, or re-created, start syncing dashboard state with the URL
    */
   useEffect(() => {
-    if (!dashboardContainer) return;
+    if (!dashboardAPI) return;
     const { stopWatchingAppStateInUrl } = startSyncingDashboardUrlState({
       kbnUrlStateStorage,
-      dashboardContainer,
+      dashboardAPI,
     });
     return () => stopWatchingAppStateInUrl();
-  }, [dashboardContainer, kbnUrlStateStorage]);
+  }, [dashboardAPI, kbnUrlStateStorage]);
 
   return (
     <div className="dshAppWrapper">
@@ -191,18 +192,19 @@ export function DashboardApp({
       )}
       {!showNoDataPage && (
         <>
-          {DashboardReduxWrapper && (
-            <DashboardReduxWrapper>
+          {dashboardAPI && (
+            <DashboardAPIContext.Provider value={dashboardAPI}>
               <DashboardTopNav redirectTo={redirectTo} embedSettings={embedSettings} />
-            </DashboardReduxWrapper>
+            </DashboardAPIContext.Provider>
           )}
 
           {getLegacyConflictWarning?.()}
 
-          <DashboardContainerRenderer
+          <DashboardRenderer
+            ref={setDashboardAPI}
             savedObjectId={savedDashboardId}
+            showPlainSpinner={showPlainSpinner}
             getCreationOptions={getCreationOptions}
-            onDashboardContainerLoaded={(container) => setDashboardContainer(container)}
           />
         </>
       )}
diff --git a/src/plugins/dashboard/public/dashboard_app/locator/load_dashboard_history_location_state.ts b/src/plugins/dashboard/public/dashboard_app/locator/load_dashboard_history_location_state.ts
index c187ab4cdaeed..4234269ca7758 100644
--- a/src/plugins/dashboard/public/dashboard_app/locator/load_dashboard_history_location_state.ts
+++ b/src/plugins/dashboard/public/dashboard_app/locator/load_dashboard_history_location_state.ts
@@ -8,11 +8,11 @@
 import { ScopedHistory } from '@kbn/core-application-browser';
 
 import { ForwardedDashboardState } from './locator';
-import { convertSavedPanelsToPanelMap, DashboardContainerByValueInput } from '../../../common';
+import { convertSavedPanelsToPanelMap, DashboardContainerInput } from '../../../common';
 
 export const loadDashboardHistoryLocationState = (
   getScopedHistory: () => ScopedHistory
-): Partial<DashboardContainerByValueInput> => {
+): Partial<DashboardContainerInput> => {
   const state = getScopedHistory().location.state as undefined | ForwardedDashboardState;
 
   if (!state) {
diff --git a/src/plugins/dashboard/public/dashboard_app/locator/locator.ts b/src/plugins/dashboard/public/dashboard_app/locator/locator.ts
index 7d03bc1bc65c8..073105f38cddf 100644
--- a/src/plugins/dashboard/public/dashboard_app/locator/locator.ts
+++ b/src/plugins/dashboard/public/dashboard_app/locator/locator.ts
@@ -16,7 +16,7 @@ import type { LocatorDefinition, LocatorPublic } from '@kbn/share-plugin/public'
 import type { GlobalQueryStateFromUrl } from '@kbn/data-plugin/public';
 
 import { DASHBOARD_APP_ID, SEARCH_SESSION_ID } from '../../dashboard_constants';
-import type { DashboardContainerByValueInput, SavedDashboardPanel } from '../../../common';
+import type { DashboardContainerInput, SavedDashboardPanel } from '../../../common';
 
 /**
  * Useful for ensuring that we don't pass any non-serializable values to history.push (for example, functions).
@@ -36,7 +36,7 @@ export const DASHBOARD_APP_LOCATOR = 'DASHBOARD_APP_LOCATOR';
 
 export type DashboardAppLocatorParams = Partial<
   Omit<
-    DashboardContainerByValueInput,
+    DashboardContainerInput,
     'panels' | 'controlGroupInput' | 'executionContext' | 'isEmbeddedExternally'
   >
 > & {
diff --git a/src/plugins/dashboard/public/dashboard_app/top_nav/dashboard_editing_toolbar.tsx b/src/plugins/dashboard/public/dashboard_app/top_nav/dashboard_editing_toolbar.tsx
index f3b67afbac91d..03b609ae99736 100644
--- a/src/plugins/dashboard/public/dashboard_app/top_nav/dashboard_editing_toolbar.tsx
+++ b/src/plugins/dashboard/public/dashboard_app/top_nav/dashboard_editing_toolbar.tsx
@@ -6,25 +6,31 @@
  * Side Public License, v 1.
  */
 
+import { css } from '@emotion/react';
+import React, { useCallback } from 'react';
 import { METRIC_TYPE } from '@kbn/analytics';
+import { IconType, useEuiTheme } from '@elastic/eui';
+
+import {
+  AddFromLibraryButton,
+  IconButton,
+  IconButtonGroup,
+  Toolbar,
+  ToolbarButton,
+} from '@kbn/shared-ux-button-toolbar';
 import { EmbeddableFactory } from '@kbn/embeddable-plugin/public';
-import { AddFromLibraryButton, Toolbar, ToolbarButton } from '@kbn/shared-ux-button-toolbar';
-import { IconButton, IconButtonGroup } from '@kbn/shared-ux-button-toolbar';
 import { BaseVisType, VisTypeAlias } from '@kbn/visualizations-plugin/public';
-import React from 'react';
-import { useCallback } from 'react';
-import { IconType, useEuiTheme } from '@elastic/eui';
-import { css } from '@emotion/react';
-import { dashboardReplacePanelActionStrings } from '../../dashboard_actions/_dashboard_actions_strings';
-import { DASHBOARD_APP_ID, DASHBOARD_UI_METRIC_ID } from '../../dashboard_constants';
-import { useDashboardContainerContext } from '../../dashboard_container/dashboard_container_context';
-import { pluginServices } from '../../services/plugin_services';
+
 import {
   getCreateVisualizationButtonTitle,
   getQuickCreateButtonGroupLegend,
 } from '../_dashboard_app_strings';
 import { EditorMenu } from './editor_menu';
+import { useDashboardAPI } from '../dashboard_app';
+import { pluginServices } from '../../services/plugin_services';
 import { ControlsToolbarButton } from './controls_toolbar_button';
+import { DASHBOARD_APP_ID, DASHBOARD_UI_METRIC_ID } from '../../dashboard_constants';
+import { dashboardReplacePanelActionStrings } from '../../dashboard_actions/_dashboard_actions_strings';
 
 export function DashboardEditingToolbar() {
   const {
@@ -36,7 +42,7 @@ export function DashboardEditingToolbar() {
   } = pluginServices.getServices();
   const { euiTheme } = useEuiTheme();
 
-  const { embeddableInstance: dashboardContainer } = useDashboardContainerContext();
+  const dashboard = useDashboardAPI();
 
   const stateTransferService = getStateTransfer();
 
@@ -101,10 +107,7 @@ export function DashboardEditingToolbar() {
         return;
       }
 
-      const newEmbeddable = await dashboardContainer.addNewEmbeddable(
-        embeddableFactory.type,
-        explicitInput
-      );
+      const newEmbeddable = await dashboard.addNewEmbeddable(embeddableFactory.type, explicitInput);
 
       if (newEmbeddable) {
         toasts.addSuccess({
@@ -113,7 +116,7 @@ export function DashboardEditingToolbar() {
         });
       }
     },
-    [trackUiMetric, dashboardContainer, toasts]
+    [trackUiMetric, dashboard, toasts]
   );
 
   const getVisTypeQuickButton = (
@@ -170,12 +173,12 @@ export function DashboardEditingToolbar() {
   const extraButtons = [
     <EditorMenu createNewVisType={createNewVisType} createNewEmbeddable={createNewEmbeddable} />,
     <AddFromLibraryButton
-      onClick={() => dashboardContainer.addFromLibrary()}
+      onClick={() => dashboard.addFromLibrary()}
       data-test-subj="dashboardAddPanelButton"
     />,
   ];
-  if (dashboardContainer.controlGroup) {
-    extraButtons.push(<ControlsToolbarButton controlGroup={dashboardContainer.controlGroup} />);
+  if (dashboard.controlGroup) {
+    extraButtons.push(<ControlsToolbarButton controlGroup={dashboard.controlGroup} />);
   }
 
   return (
diff --git a/src/plugins/dashboard/public/dashboard_app/top_nav/dashboard_top_nav.tsx b/src/plugins/dashboard/public/dashboard_app/top_nav/dashboard_top_nav.tsx
index c2febc4750185..9ae7f5759e6cc 100644
--- a/src/plugins/dashboard/public/dashboard_app/top_nav/dashboard_top_nav.tsx
+++ b/src/plugins/dashboard/public/dashboard_app/top_nav/dashboard_top_nav.tsx
@@ -26,13 +26,13 @@ import {
   unsavedChangesBadgeStrings,
 } from '../_dashboard_app_strings';
 import { UI_SETTINGS } from '../../../common';
+import { useDashboardAPI } from '../dashboard_app';
 import { pluginServices } from '../../services/plugin_services';
 import { useDashboardMenuItems } from './use_dashboard_menu_items';
 import { DashboardEmbedSettings, DashboardRedirect } from '../types';
 import { DashboardEditingToolbar } from './dashboard_editing_toolbar';
 import { useDashboardMountContext } from '../hooks/dashboard_mount_context';
 import { getFullEditPath, LEGACY_DASHBOARD_APP_ID } from '../../dashboard_constants';
-import { useDashboardContainerContext } from '../../dashboard_container/dashboard_container_context';
 
 import './_dashboard_top_nav.scss';
 export interface DashboardTopNavProps {
@@ -69,36 +69,26 @@ export function DashboardTopNav({ embedSettings, redirectTo }: DashboardTopNavPr
   } = pluginServices.getServices();
   const isLabsEnabled = uiSettings.get(UI_SETTINGS.ENABLE_LABS_UI);
   const { setHeaderActionMenu, onAppLeave } = useDashboardMountContext();
-  /**
-   * Unpack dashboard state from redux
-   */
-  const {
-    useEmbeddableDispatch,
-    actions: { setSavedQueryId },
-    useEmbeddableSelector: select,
-    embeddableInstance: dashboardContainer,
-  } = useDashboardContainerContext();
-  const dispatch = useEmbeddableDispatch();
+
+  const dashboard = useDashboardAPI();
   const PresentationUtilContextProvider = getPresentationUtilContextProvider();
 
-  const hasUnsavedChanges = select((state) => state.componentState.hasUnsavedChanges);
-  const fullScreenMode = select((state) => state.componentState.fullScreenMode);
-  const savedQueryId = select((state) => state.componentState.savedQueryId);
-  const lastSavedId = select((state) => state.componentState.lastSavedId);
-  const viewMode = select((state) => state.explicitInput.viewMode);
-  const query = select((state) => state.explicitInput.query);
-  const title = select((state) => state.explicitInput.title);
+  const hasUnsavedChanges = dashboard.select((state) => state.componentState.hasUnsavedChanges);
+  const fullScreenMode = dashboard.select((state) => state.componentState.fullScreenMode);
+  const savedQueryId = dashboard.select((state) => state.componentState.savedQueryId);
+  const lastSavedId = dashboard.select((state) => state.componentState.lastSavedId);
+  const viewMode = dashboard.select((state) => state.explicitInput.viewMode);
+  const query = dashboard.select((state) => state.explicitInput.query);
+  const title = dashboard.select((state) => state.explicitInput.title);
 
   // store data views in state & subscribe to dashboard data view changes.
-  const [allDataViews, setAllDataViews] = useState<DataView[]>(
-    dashboardContainer.getAllDataViews()
-  );
+  const [allDataViews, setAllDataViews] = useState<DataView[]>(dashboard.getAllDataViews());
   useEffect(() => {
-    const subscription = dashboardContainer.onDataViewsUpdate$.subscribe((dataViews) =>
+    const subscription = dashboard.onDataViewsUpdate$.subscribe((dataViews) =>
       setAllDataViews(dataViews)
     );
     return () => subscription.unsubscribe();
-  }, [dashboardContainer]);
+  }, [dashboard]);
 
   const dashboardTitle = useMemo(() => {
     return getDashboardTitle(title, viewMode, !lastSavedId);
@@ -212,7 +202,7 @@ export function DashboardTopNav({ embedSettings, redirectTo }: DashboardTopNavPr
   }, [embedSettings, filterManager, fullScreenMode, isChromeVisible, viewMode]);
 
   UseUnmount(() => {
-    dashboardContainer.clearOverlays();
+    dashboard.clearOverlays();
   });
 
   return (
@@ -264,12 +254,12 @@ export function DashboardTopNav({ embedSettings, redirectTo }: DashboardTopNavPr
         }
         onQuerySubmit={(_payload, isUpdate) => {
           if (isUpdate === false) {
-            dashboardContainer.forceRefresh();
+            dashboard.forceRefresh();
           }
         }}
-        onSavedQueryIdChange={(newId: string | undefined) => {
-          dispatch(setSavedQueryId(newId));
-        }}
+        onSavedQueryIdChange={(newId: string | undefined) =>
+          dashboard.dispatch.setSavedQueryId(newId)
+        }
       />
       {viewMode !== ViewMode.PRINT && isLabsEnabled && isLabsShown ? (
         <PresentationUtilContextProvider>
diff --git a/src/plugins/dashboard/public/dashboard_app/top_nav/share/show_share_modal.test.tsx b/src/plugins/dashboard/public/dashboard_app/top_nav/share/show_share_modal.test.tsx
index f2603110ebaa1..8beba68e51da2 100644
--- a/src/plugins/dashboard/public/dashboard_app/top_nav/share/show_share_modal.test.tsx
+++ b/src/plugins/dashboard/public/dashboard_app/top_nav/share/show_share_modal.test.tsx
@@ -7,7 +7,7 @@
  */
 
 import { Capabilities } from '@kbn/core/public';
-import { convertPanelMapToSavedPanels, DashboardContainerByValueInput } from '../../../../common';
+import { convertPanelMapToSavedPanels, DashboardContainerInput } from '../../../../common';
 
 import { DashboardAppLocatorParams } from '../../..';
 import { pluginServices } from '../../../services/plugin_services';
@@ -68,7 +68,7 @@ describe('ShowShareModal', () => {
   });
 
   const getPropsAndShare = (
-    unsavedState?: Partial<DashboardContainerByValueInput>
+    unsavedState?: Partial<DashboardContainerInput>
   ): ShowShareModalProps => {
     pluginServices.getServices().dashboardSessionStorage.getState = jest
       .fn()
@@ -94,7 +94,7 @@ describe('ShowShareModal', () => {
   });
 
   it('locatorParams unsaved state is properly propagated to locator', () => {
-    const unsavedDashboardState: DashboardContainerByValueInput = {
+    const unsavedDashboardState: DashboardContainerInput = {
       panels: {
         panel_1: {
           type: 'panel_type',
@@ -121,7 +121,7 @@ describe('ShowShareModal', () => {
         },
       ],
       query: { query: 'bye', language: 'kuery' },
-    } as unknown as DashboardContainerByValueInput;
+    } as unknown as DashboardContainerInput;
     const showModalProps = getPropsAndShare(unsavedDashboardState);
     ShowShareModal(showModalProps);
     expect(toggleShareMenuSpy).toHaveBeenCalledTimes(1);
diff --git a/src/plugins/dashboard/public/dashboard_app/top_nav/use_dashboard_menu_items.tsx b/src/plugins/dashboard/public/dashboard_app/top_nav/use_dashboard_menu_items.tsx
index b548d2e39afc5..73996719966a1 100644
--- a/src/plugins/dashboard/public/dashboard_app/top_nav/use_dashboard_menu_items.tsx
+++ b/src/plugins/dashboard/public/dashboard_app/top_nav/use_dashboard_menu_items.tsx
@@ -14,13 +14,13 @@ import { TopNavMenuData } from '@kbn/navigation-plugin/public';
 
 import { DashboardRedirect } from '../types';
 import { UI_SETTINGS } from '../../../common';
+import { useDashboardAPI } from '../dashboard_app';
 import { topNavStrings } from '../_dashboard_app_strings';
 import { ShowShareModal } from './share/show_share_modal';
 import { pluginServices } from '../../services/plugin_services';
 import { CHANGE_CHECK_DEBOUNCE } from '../../dashboard_constants';
 import { SaveDashboardReturn } from '../../services/dashboard_saved_object/types';
 import { confirmDiscardUnsavedChanges } from '../../dashboard_listing/confirm_overlays';
-import { useDashboardContainerContext } from '../../dashboard_container/dashboard_container_context';
 
 export const useDashboardMenuItems = ({
   redirectTo,
@@ -46,18 +46,12 @@ export const useDashboardMenuItems = ({
   /**
    * Unpack dashboard state from redux
    */
-  const {
-    useEmbeddableDispatch,
-    useEmbeddableSelector: select,
-    embeddableInstance: dashboardContainer,
-    actions: { setViewMode, setFullScreenMode },
-  } = useDashboardContainerContext();
-  const dispatch = useEmbeddableDispatch();
+  const dashboard = useDashboardAPI();
 
-  const hasUnsavedChanges = select((state) => state.componentState.hasUnsavedChanges);
-  const hasOverlays = select((state) => state.componentState.hasOverlays);
-  const lastSavedId = select((state) => state.componentState.lastSavedId);
-  const dashboardTitle = select((state) => state.explicitInput.title);
+  const hasUnsavedChanges = dashboard.select((state) => state.componentState.hasUnsavedChanges);
+  const hasOverlays = dashboard.select((state) => state.componentState.hasOverlays);
+  const lastSavedId = dashboard.select((state) => state.componentState.lastSavedId);
+  const dashboardTitle = dashboard.select((state) => state.explicitInput.title);
 
   /**
    * Show the Dashboard app's share menu
@@ -95,41 +89,41 @@ export const useDashboardMenuItems = ({
    */
   const quickSaveDashboard = useCallback(() => {
     setIsSaveInProgress(true);
-    dashboardContainer
+    dashboard
       .runQuickSave()
       .then(() => setTimeout(() => setIsSaveInProgress(false), CHANGE_CHECK_DEBOUNCE));
-  }, [dashboardContainer]);
+  }, [dashboard]);
 
   /**
    * Show the dashboard's save modal
    */
   const saveDashboardAs = useCallback(() => {
-    dashboardContainer.runSaveAs().then((result) => maybeRedirect(result));
-  }, [maybeRedirect, dashboardContainer]);
+    dashboard.runSaveAs().then((result) => maybeRedirect(result));
+  }, [maybeRedirect, dashboard]);
 
   /**
    * Clone the dashboard
    */
   const clone = useCallback(() => {
-    dashboardContainer.runClone().then((result) => maybeRedirect(result));
-  }, [maybeRedirect, dashboardContainer]);
+    dashboard.runClone().then((result) => maybeRedirect(result));
+  }, [maybeRedirect, dashboard]);
 
   /**
    * Returns to view mode. If the dashboard has unsaved changes shows a warning and resets to last saved state.
    */
   const returnToViewMode = useCallback(() => {
-    dashboardContainer.clearOverlays();
+    dashboard.clearOverlays();
     if (hasUnsavedChanges) {
       confirmDiscardUnsavedChanges(() => {
         batch(() => {
-          dashboardContainer.resetToLastSavedState();
-          dispatch(setViewMode(ViewMode.VIEW));
+          dashboard.resetToLastSavedState();
+          dashboard.dispatch.setViewMode(ViewMode.VIEW);
         });
       });
       return;
     }
-    dispatch(setViewMode(ViewMode.VIEW));
-  }, [dashboardContainer, dispatch, hasUnsavedChanges, setViewMode]);
+    dashboard.dispatch.setViewMode(ViewMode.VIEW);
+  }, [dashboard, hasUnsavedChanges]);
 
   /**
    * Register all of the top nav configs that can be used by dashboard.
@@ -140,7 +134,7 @@ export const useDashboardMenuItems = ({
         ...topNavStrings.fullScreen,
         id: 'full-screen',
         testId: 'dashboardFullScreenMode',
-        run: () => dispatch(setFullScreenMode(true)),
+        run: () => dashboard.dispatch.setFullScreenMode(true),
       } as TopNavMenuData,
 
       labs: {
@@ -158,8 +152,8 @@ export const useDashboardMenuItems = ({
         testId: 'dashboardEditMode',
         className: 'eui-hideFor--s eui-hideFor--xs', // hide for small screens - editing doesn't work in mobile mode.
         run: () => {
-          dashboardContainer.clearOverlays();
-          dispatch(setViewMode(ViewMode.EDIT));
+          dashboard.dispatch.setViewMode(ViewMode.EDIT);
+          dashboard.clearOverlays();
         },
       } as TopNavMenuData,
 
@@ -206,7 +200,7 @@ export const useDashboardMenuItems = ({
         id: 'settings',
         testId: 'dashboardSettingsButton',
         disableButton: isSaveInProgress || hasOverlays,
-        run: () => dashboardContainer.showSettings(),
+        run: () => dashboard.showSettings(),
       } as TopNavMenuData,
 
       clone: {
@@ -219,19 +213,16 @@ export const useDashboardMenuItems = ({
     };
   }, [
     quickSaveDashboard,
-    dashboardContainer,
     hasUnsavedChanges,
-    hasOverlays,
-    setFullScreenMode,
     isSaveInProgress,
     returnToViewMode,
     saveDashboardAs,
     setIsLabsShown,
+    hasOverlays,
     lastSavedId,
-    setViewMode,
     isLabsShown,
     showShare,
-    dispatch,
+    dashboard,
     clone,
   ]);
 
diff --git a/src/plugins/dashboard/public/dashboard_app/url/search_sessions_integration.ts b/src/plugins/dashboard/public/dashboard_app/url/search_sessions_integration.ts
index 79e6742a793c1..2cf31c0ec0e03 100644
--- a/src/plugins/dashboard/public/dashboard_app/url/search_sessions_integration.ts
+++ b/src/plugins/dashboard/public/dashboard_app/url/search_sessions_integration.ts
@@ -83,7 +83,7 @@ function getLocatorParams({
   const {
     componentState: { lastSavedId },
     explicitInput: { panels, query, viewMode },
-  } = container.getReduxEmbeddableTools().getState();
+  } = container.getState();
 
   return {
     viewMode,
diff --git a/src/plugins/dashboard/public/dashboard_app/url/sync_dashboard_url_state.ts b/src/plugins/dashboard/public/dashboard_app/url/sync_dashboard_url_state.ts
index cbfc7271aef41..8be9b1a35f71c 100644
--- a/src/plugins/dashboard/public/dashboard_app/url/sync_dashboard_url_state.ts
+++ b/src/plugins/dashboard/public/dashboard_app/url/sync_dashboard_url_state.ts
@@ -18,9 +18,9 @@ import {
   SavedDashboardPanel,
   SharedDashboardState,
   convertSavedPanelsToPanelMap,
-  DashboardContainerByValueInput,
+  DashboardContainerInput,
 } from '../../../common';
-import { DashboardContainer } from '../../dashboard_container';
+import { DashboardAPI } from '../../dashboard_container';
 import { pluginServices } from '../../services/plugin_services';
 import { getPanelTooOldErrorString } from '../_dashboard_app_strings';
 import { DASHBOARD_STATE_STORAGE_KEY } from '../../dashboard_constants';
@@ -59,7 +59,7 @@ function getPanelsMap(appStateInUrl: SharedDashboardState): DashboardPanelMap |
  */
 export const loadAndRemoveDashboardState = (
   kbnUrlStateStorage: IKbnUrlStateStorage
-): Partial<DashboardContainerByValueInput> => {
+): Partial<DashboardContainerInput> => {
   const rawAppStateInUrl = kbnUrlStateStorage.get<SharedDashboardState>(
     DASHBOARD_STATE_STORAGE_KEY
   );
@@ -72,7 +72,7 @@ export const loadAndRemoveDashboardState = (
     return hashQuery;
   });
   kbnUrlStateStorage.kbnUrlControls.update(nextUrl, true);
-  const partialState: Partial<DashboardContainerByValueInput> = {
+  const partialState: Partial<DashboardContainerInput> = {
     ..._.omit(rawAppStateInUrl, ['panels', 'query']),
     ...(panelsMap ? { panels: panelsMap } : {}),
     ...(rawAppStateInUrl.query ? { query: migrateLegacyQuery(rawAppStateInUrl.query) } : {}),
@@ -83,10 +83,10 @@ export const loadAndRemoveDashboardState = (
 
 export const startSyncingDashboardUrlState = ({
   kbnUrlStateStorage,
-  dashboardContainer,
+  dashboardAPI,
 }: {
   kbnUrlStateStorage: IKbnUrlStateStorage;
-  dashboardContainer: DashboardContainer;
+  dashboardAPI: DashboardAPI;
 }) => {
   const appStateSubscription = kbnUrlStateStorage
     .change$(DASHBOARD_STATE_STORAGE_KEY)
@@ -94,7 +94,7 @@ export const startSyncingDashboardUrlState = ({
     .subscribe(() => {
       const stateFromUrl = loadAndRemoveDashboardState(kbnUrlStateStorage);
       if (Object.keys(stateFromUrl).length === 0) return;
-      dashboardContainer.updateInput(stateFromUrl);
+      dashboardAPI.updateInput(stateFromUrl);
     });
 
   const stopWatchingAppStateInUrl = () => appStateSubscription.unsubscribe();
diff --git a/src/plugins/dashboard/public/dashboard_constants.ts b/src/plugins/dashboard/public/dashboard_constants.ts
index 7a6f7bb68cc53..0d8c72395f300 100644
--- a/src/plugins/dashboard/public/dashboard_constants.ts
+++ b/src/plugins/dashboard/public/dashboard_constants.ts
@@ -7,7 +7,7 @@
  */
 
 import { ViewMode } from '@kbn/embeddable-plugin/common';
-import type { DashboardContainerByValueInput } from '../common';
+import type { DashboardContainerInput } from '../common';
 
 // ------------------------------------------------------------------
 // URL Constants
@@ -69,7 +69,7 @@ export const CHANGE_CHECK_DEBOUNCE = 100;
 // ------------------------------------------------------------------
 // Default State
 // ------------------------------------------------------------------
-export const DEFAULT_DASHBOARD_INPUT: Omit<DashboardContainerByValueInput, 'id'> = {
+export const DEFAULT_DASHBOARD_INPUT: Omit<DashboardContainerInput, 'id'> = {
   viewMode: ViewMode.EDIT, // new dashboards start in  edit mode.
   timeRestore: false,
   query: { query: '', language: 'kuery' },
diff --git a/src/plugins/dashboard/public/dashboard_container/component/grid/dashboard_grid.test.tsx b/src/plugins/dashboard/public/dashboard_container/component/grid/dashboard_grid.test.tsx
index c6b128efe5570..be21a9ba6645e 100644
--- a/src/plugins/dashboard/public/dashboard_container/component/grid/dashboard_grid.test.tsx
+++ b/src/plugins/dashboard/public/dashboard_container/component/grid/dashboard_grid.test.tsx
@@ -6,17 +6,15 @@
  * Side Public License, v 1.
  */
 
-// @ts-ignore
 import React from 'react';
 
-import { CONTACT_CARD_EMBEDDABLE } from '@kbn/embeddable-plugin/public/lib/test_samples/embeddables';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
+import { CONTACT_CARD_EMBEDDABLE } from '@kbn/embeddable-plugin/public/lib/test_samples/embeddables';
 
-import { pluginServices } from '../../../services/plugin_services';
 import { DashboardGrid } from './dashboard_grid';
-import { DashboardContainer } from '../../embeddable/dashboard_container';
-import { getSampleDashboardInput } from '../../../mocks';
+import { buildMockDashboard } from '../../../mocks';
 import type { Props as DashboardGridItemProps } from './dashboard_grid_item';
+import { DashboardContainerContext } from '../../embeddable/dashboard_container';
 
 jest.mock('./dashboard_grid_item', () => {
   return {
@@ -39,10 +37,8 @@ jest.mock('./dashboard_grid_item', () => {
   };
 });
 
-const DashboardServicesProvider = pluginServices.getContextProvider();
-
-async function getDashboardContainer() {
-  const initialInput = getSampleDashboardInput({
+const createAndMountDashboardGrid = () => {
+  const dashboardContainer = buildMockDashboard({
     panels: {
       '1': {
         gridData: { x: 0, y: 0, w: 6, h: 6, i: '1' },
@@ -56,55 +52,29 @@ async function getDashboardContainer() {
       },
     },
   });
-  const dashboardContainer = new DashboardContainer(initialInput);
-  await dashboardContainer.untilInitialized();
-  return dashboardContainer;
-}
-
-test('renders DashboardGrid', async () => {
-  const dashboardContainer = await getDashboardContainer();
-  const { Wrapper: DashboardReduxWrapper } = dashboardContainer.getReduxEmbeddableTools();
-
   const component = mountWithIntl(
-    <DashboardServicesProvider>
-      <DashboardReduxWrapper>
-        <DashboardGrid viewportWidth={1000} />
-      </DashboardReduxWrapper>
-    </DashboardServicesProvider>
+    <DashboardContainerContext.Provider value={dashboardContainer}>
+      <DashboardGrid viewportWidth={1000} />
+    </DashboardContainerContext.Provider>
   );
+  return { dashboardContainer, component };
+};
+
+test('renders DashboardGrid', async () => {
+  const { component } = createAndMountDashboardGrid();
   const panelElements = component.find('GridItem');
   expect(panelElements.length).toBe(2);
 });
 
 test('renders DashboardGrid with no visualizations', async () => {
-  const dashboardContainer = await getDashboardContainer();
-  const { Wrapper: DashboardReduxWrapper } = dashboardContainer.getReduxEmbeddableTools();
-
-  const component = mountWithIntl(
-    <DashboardServicesProvider>
-      <DashboardReduxWrapper>
-        <DashboardGrid viewportWidth={1000} />
-      </DashboardReduxWrapper>
-    </DashboardServicesProvider>
-  );
-
+  const { dashboardContainer, component } = createAndMountDashboardGrid();
   dashboardContainer.updateInput({ panels: {} });
   component.update();
   expect(component.find('GridItem').length).toBe(0);
 });
 
 test('DashboardGrid removes panel when removed from container', async () => {
-  const dashboardContainer = await getDashboardContainer();
-  const { Wrapper: DashboardReduxWrapper } = dashboardContainer.getReduxEmbeddableTools();
-
-  const component = mountWithIntl(
-    <DashboardServicesProvider>
-      <DashboardReduxWrapper>
-        <DashboardGrid viewportWidth={1000} />
-      </DashboardReduxWrapper>
-    </DashboardServicesProvider>
-  );
-
+  const { dashboardContainer, component } = createAndMountDashboardGrid();
   const originalPanels = dashboardContainer.getInput().panels;
   const filteredPanels = { ...originalPanels };
   delete filteredPanels['1'];
@@ -115,17 +85,7 @@ test('DashboardGrid removes panel when removed from container', async () => {
 });
 
 test('DashboardGrid renders expanded panel', async () => {
-  const dashboardContainer = await getDashboardContainer();
-  const { Wrapper: DashboardReduxWrapper } = dashboardContainer.getReduxEmbeddableTools();
-
-  const component = mountWithIntl(
-    <DashboardServicesProvider>
-      <DashboardReduxWrapper>
-        <DashboardGrid viewportWidth={1000} />
-      </DashboardReduxWrapper>
-    </DashboardServicesProvider>
-  );
-
+  const { dashboardContainer, component } = createAndMountDashboardGrid();
   dashboardContainer.setExpandedPanelId('1');
   component.update();
   // Both panels should still exist in the dom, so nothing needs to be re-fetched once minimized.
diff --git a/src/plugins/dashboard/public/dashboard_container/component/grid/dashboard_grid.tsx b/src/plugins/dashboard/public/dashboard_container/component/grid/dashboard_grid.tsx
index e888fb1dce4f2..b840fcd408977 100644
--- a/src/plugins/dashboard/public/dashboard_container/component/grid/dashboard_grid.tsx
+++ b/src/plugins/dashboard/public/dashboard_container/component/grid/dashboard_grid.tsx
@@ -19,23 +19,18 @@ import { ViewMode } from '@kbn/embeddable-plugin/public';
 
 import { DashboardPanelState } from '../../../../common';
 import { DashboardGridItem } from './dashboard_grid_item';
-import { DASHBOARD_GRID_HEIGHT, DASHBOARD_MARGIN_SIZE } from '../../../dashboard_constants';
 import { useDashboardGridSettings } from './use_dashboard_grid_settings';
-import { useDashboardContainerContext } from '../../dashboard_container_context';
+import { useDashboardContainer } from '../../embeddable/dashboard_container';
 import { useDashboardPerformanceTracker } from './use_dashboard_performance_tracker';
-import { getPanelLayoutsAreEqual } from '../../embeddable/integrations/diff_state/dashboard_diffing_utils';
+import { getPanelLayoutsAreEqual } from '../../state/diffing/dashboard_diffing_utils';
+import { DASHBOARD_GRID_HEIGHT, DASHBOARD_MARGIN_SIZE } from '../../../dashboard_constants';
 
 export const DashboardGrid = ({ viewportWidth }: { viewportWidth: number }) => {
-  const {
-    useEmbeddableSelector: select,
-    actions: { setPanels },
-    useEmbeddableDispatch,
-  } = useDashboardContainerContext();
-  const dispatch = useEmbeddableDispatch();
-  const panels = select((state) => state.explicitInput.panels);
-  const viewMode = select((state) => state.explicitInput.viewMode);
-  const useMargins = select((state) => state.explicitInput.useMargins);
-  const expandedPanelId = select((state) => state.componentState.expandedPanelId);
+  const dashboard = useDashboardContainer();
+  const panels = dashboard.select((state) => state.explicitInput.panels);
+  const viewMode = dashboard.select((state) => state.explicitInput.viewMode);
+  const useMargins = dashboard.select((state) => state.explicitInput.useMargins);
+  const expandedPanelId = dashboard.select((state) => state.componentState.expandedPanelId);
 
   // turn off panel transform animations for the first 500ms so that the dashboard doesn't animate on its first render.
   const [animatePanelTransforms, setAnimatePanelTransforms] = useState(false);
@@ -93,10 +88,10 @@ export const DashboardGrid = ({ viewportWidth }: { viewportWidth: number }) => {
         {} as { [key: string]: DashboardPanelState }
       );
       if (!getPanelLayoutsAreEqual(panels, updatedPanels)) {
-        dispatch(setPanels(updatedPanels));
+        dashboard.dispatch.setPanels(updatedPanels);
       }
     },
-    [dispatch, panels, setPanels]
+    [dashboard, panels]
   );
 
   const classes = classNames({
diff --git a/src/plugins/dashboard/public/dashboard_container/component/grid/dashboard_grid_item.tsx b/src/plugins/dashboard/public/dashboard_container/component/grid/dashboard_grid_item.tsx
index edea6b0e68dc1..45aa70fd50feb 100644
--- a/src/plugins/dashboard/public/dashboard_container/component/grid/dashboard_grid_item.tsx
+++ b/src/plugins/dashboard/public/dashboard_container/component/grid/dashboard_grid_item.tsx
@@ -18,7 +18,7 @@ import {
 
 import { DashboardPanelState } from '../../../../common';
 import { pluginServices } from '../../../services/plugin_services';
-import { useDashboardContainerContext } from '../../dashboard_container_context';
+import { useDashboardContainer } from '../../embeddable/dashboard_container';
 
 type DivProps = Pick<React.HTMLAttributes<HTMLDivElement>, 'className' | 'style' | 'children'>;
 
@@ -55,7 +55,7 @@ const Item = React.forwardRef<HTMLDivElement, Props>(
     const {
       embeddable: { EmbeddablePanel: PanelComponent },
     } = pluginServices.getServices();
-    const { embeddableInstance: container } = useDashboardContainerContext();
+    const container = useDashboardContainer();
 
     const expandPanel = expandedPanelId !== undefined && expandedPanelId === id;
     const hidePanel = expandedPanelId !== undefined && expandedPanelId !== id;
@@ -134,9 +134,9 @@ export const DashboardGridItem = React.forwardRef<HTMLDivElement, Props>((props,
     settings: { isProjectEnabledInLabs },
   } = pluginServices.getServices();
 
-  const { useEmbeddableSelector: select } = useDashboardContainerContext();
+  const dashboard = useDashboardContainer();
 
-  const isPrintMode = select((state) => state.explicitInput.viewMode) === ViewMode.PRINT;
+  const isPrintMode = dashboard.select((state) => state.explicitInput.viewMode) === ViewMode.PRINT;
   const isEnabled = !isPrintMode && isProjectEnabledInLabs('labs:dashboard:deferBelowFold');
 
   return isEnabled ? <ObservedItem ref={ref} {...props} /> : <Item ref={ref} {...props} />;
diff --git a/src/plugins/dashboard/public/dashboard_container/component/grid/use_dashboard_grid_settings.tsx b/src/plugins/dashboard/public/dashboard_container/component/grid/use_dashboard_grid_settings.tsx
index 1fb684b236b8a..58d0f45c6a312 100644
--- a/src/plugins/dashboard/public/dashboard_container/component/grid/use_dashboard_grid_settings.tsx
+++ b/src/plugins/dashboard/public/dashboard_container/component/grid/use_dashboard_grid_settings.tsx
@@ -12,14 +12,14 @@ import { useEuiTheme } from '@elastic/eui';
 import { ViewMode } from '@kbn/embeddable-plugin/public';
 
 import { DASHBOARD_GRID_COLUMN_COUNT } from '../../../dashboard_constants';
-import { useDashboardContainerContext } from '../../dashboard_container_context';
+import { useDashboardContainer } from '../../embeddable/dashboard_container';
 
 export const useDashboardGridSettings = (panelsInOrder: string[]) => {
-  const { useEmbeddableSelector: select } = useDashboardContainerContext();
+  const dashboard = useDashboardContainer();
   const { euiTheme } = useEuiTheme();
 
-  const panels = select((state) => state.explicitInput.panels);
-  const viewMode = select((state) => state.explicitInput.viewMode);
+  const panels = dashboard.select((state) => state.explicitInput.panels);
+  const viewMode = dashboard.select((state) => state.explicitInput.viewMode);
 
   const layouts = useMemo(() => {
     return {
diff --git a/src/plugins/dashboard/public/dashboard_container/component/grid/use_dashboard_performance_tracker.tsx b/src/plugins/dashboard/public/dashboard_container/component/grid/use_dashboard_performance_tracker.tsx
index af0312572d7c5..f8b04e70861e9 100644
--- a/src/plugins/dashboard/public/dashboard_container/component/grid/use_dashboard_performance_tracker.tsx
+++ b/src/plugins/dashboard/public/dashboard_container/component/grid/use_dashboard_performance_tracker.tsx
@@ -10,7 +10,7 @@ import { useCallback, useRef } from 'react';
 
 import { EmbeddablePhaseEvent } from '@kbn/embeddable-plugin/public';
 
-import { useDashboardContainerContext } from '../../dashboard_container_context';
+import { useDashboardContainer } from '../../embeddable/dashboard_container';
 import { DashboardLoadedEventStatus, DashboardRenderPerformanceStats } from '../../types';
 
 type DashboardRenderPerformanceTracker = DashboardRenderPerformanceStats & {
@@ -30,7 +30,7 @@ const getDefaultPerformanceTracker: () => DashboardRenderPerformanceTracker = ()
 });
 
 export const useDashboardPerformanceTracker = ({ panelCount }: { panelCount: number }) => {
-  const { embeddableInstance: dashboardContainer } = useDashboardContainerContext();
+  const dashboard = useDashboardContainer();
 
   // reset performance tracker on each render.
   const performanceRefs = useRef<DashboardRenderPerformanceTracker>(getDefaultPerformanceTracker());
@@ -52,11 +52,11 @@ export const useDashboardPerformanceTracker = ({ panelCount }: { panelCount: num
         performanceRefs.current.doneCount++;
         if (performanceRefs.current.doneCount === panelCount) {
           performanceRefs.current.panelsRenderDoneTime = performance.now();
-          dashboardContainer.reportPerformanceMetrics(performanceRefs.current);
+          dashboard.reportPerformanceMetrics(performanceRefs.current);
         }
       }
     },
-    [dashboardContainer, panelCount]
+    [dashboard, panelCount]
   );
 
   return { onPanelStatusChange };
diff --git a/src/plugins/dashboard/public/dashboard_container/component/settings/settings_flyout.tsx b/src/plugins/dashboard/public/dashboard_container/component/settings/settings_flyout.tsx
index d7cd61cdd7f7c..881f245ee7733 100644
--- a/src/plugins/dashboard/public/dashboard_container/component/settings/settings_flyout.tsx
+++ b/src/plugins/dashboard/public/dashboard_container/component/settings/settings_flyout.tsx
@@ -26,9 +26,9 @@ import {
   EuiSwitch,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { DashboardContainerByValueInput } from '../../../../common';
+import { DashboardContainerInput } from '../../../../common';
 import { pluginServices } from '../../../services/plugin_services';
-import { useDashboardContainerContext } from '../../dashboard_container_context';
+import { useDashboardContainer } from '../../embeddable/dashboard_container';
 
 interface DashboardSettingsProps {
   onClose: () => void;
@@ -42,23 +42,18 @@ export const DashboardSettings = ({ onClose }: DashboardSettingsProps) => {
     dashboardSavedObject: { checkForDuplicateDashboardTitle },
   } = pluginServices.getServices();
 
-  const {
-    useEmbeddableDispatch,
-    useEmbeddableSelector: select,
-    actions: { setStateFromSettingsFlyout },
-    embeddableInstance: dashboardContainer,
-  } = useDashboardContainerContext();
+  const dashboard = useDashboardContainer();
 
   const [dashboardSettingsState, setDashboardSettingsState] = useState({
-    ...dashboardContainer.getInputAsValueType(),
+    ...dashboard.getInput(),
   });
 
   const [isTitleDuplicate, setIsTitleDuplicate] = useState(false);
   const [isTitleDuplicateConfirmed, setIsTitleDuplicateConfirmed] = useState(false);
   const [isApplying, setIsApplying] = useState(false);
 
-  const lastSavedId = select((state) => state.componentState.lastSavedId);
-  const lastSavedTitle = select((state) => state.explicitInput.title);
+  const lastSavedId = dashboard.select((state) => state.componentState.lastSavedId);
+  const lastSavedTitle = dashboard.select((state) => state.explicitInput.title);
 
   const isMounted = useMountedState();
 
@@ -83,24 +78,19 @@ export const DashboardSettings = ({ onClose }: DashboardSettingsProps) => {
     setIsApplying(false);
 
     if (validTitle) {
-      dispatch(setStateFromSettingsFlyout({ lastSavedId, ...dashboardSettingsState }));
+      dashboard.dispatch.setStateFromSettingsFlyout({ lastSavedId, ...dashboardSettingsState });
       onClose();
     }
   };
 
-  const updateDashboardSetting = useCallback(
-    (newSettings: Partial<DashboardContainerByValueInput>) => {
-      setDashboardSettingsState((prevDashboardSettingsState) => {
-        return {
-          ...prevDashboardSettingsState,
-          ...newSettings,
-        };
-      });
-    },
-    []
-  );
-
-  const dispatch = useEmbeddableDispatch();
+  const updateDashboardSetting = useCallback((newSettings: Partial<DashboardContainerInput>) => {
+    setDashboardSettingsState((prevDashboardSettingsState) => {
+      return {
+        ...prevDashboardSettingsState,
+        ...newSettings,
+      };
+    });
+  }, []);
 
   const renderDuplicateTitleCallout = () => {
     if (!isTitleDuplicate) {
diff --git a/src/plugins/dashboard/public/dashboard_container/component/viewport/dashboard_viewport.tsx b/src/plugins/dashboard/public/dashboard_container/component/viewport/dashboard_viewport.tsx
index c5919462765d6..07bb9d111cd07 100644
--- a/src/plugins/dashboard/public/dashboard_container/component/viewport/dashboard_viewport.tsx
+++ b/src/plugins/dashboard/public/dashboard_container/component/viewport/dashboard_viewport.tsx
@@ -17,8 +17,8 @@ import { ExitFullScreenButton } from '@kbn/shared-ux-button-exit-full-screen';
 
 import { DashboardGrid } from '../grid';
 import { pluginServices } from '../../../services/plugin_services';
+import { useDashboardContainer } from '../../embeddable/dashboard_container';
 import { DashboardEmptyScreen } from '../empty_screen/dashboard_empty_screen';
-import { useDashboardContainerContext } from '../../dashboard_container_context';
 
 export const useDebouncedWidthObserver = (wait = 250) => {
   const [width, setWidth] = useState<number>(0);
@@ -38,26 +38,25 @@ export const DashboardViewportComponent = () => {
   } = pluginServices.getServices();
   const controlsRoot = useRef(null);
 
-  const { useEmbeddableSelector: select, embeddableInstance: dashboardContainer } =
-    useDashboardContainerContext();
+  const dashboard = useDashboardContainer();
 
   /**
    * Render Control group
    */
-  const controlGroup = dashboardContainer.controlGroup;
+  const controlGroup = dashboard.controlGroup;
   useEffect(() => {
     if (controlGroup && controlsRoot.current) controlGroup.render(controlsRoot.current);
   }, [controlGroup]);
 
-  const panelCount = Object.keys(select((state) => state.explicitInput.panels)).length;
+  const panelCount = Object.keys(dashboard.select((state) => state.explicitInput.panels)).length;
   const controlCount = Object.keys(
-    select((state) => state.explicitInput.controlGroupInput?.panels) ?? {}
+    dashboard.select((state) => state.explicitInput.controlGroupInput?.panels) ?? {}
   ).length;
 
-  const viewMode = select((state) => state.explicitInput.viewMode);
-  const dashboardTitle = select((state) => state.explicitInput.title);
-  const description = select((state) => state.explicitInput.description);
-  const expandedPanelId = select((state) => state.componentState.expandedPanelId);
+  const viewMode = dashboard.select((state) => state.explicitInput.viewMode);
+  const dashboardTitle = dashboard.select((state) => state.explicitInput.title);
+  const description = dashboard.select((state) => state.explicitInput.description);
+  const expandedPanelId = dashboard.select((state) => state.componentState.expandedPanelId);
   const controlsEnabled = isProjectEnabledInLabs('labs:dashboard:dashboardControls');
 
   const { ref: resizeRef, width: viewportWidth } = useDebouncedWidthObserver();
@@ -98,15 +97,12 @@ export const DashboardViewportComponent = () => {
 // because ExitFullScreenButton sets isFullscreenMode to false on unmount while rerendering.
 // This specifically fixed maximizing/minimizing panels without exiting fullscreen mode.
 const WithFullScreenButton = ({ children }: { children: JSX.Element }) => {
-  const {
-    useEmbeddableDispatch,
-    useEmbeddableSelector: select,
-    actions: { setFullScreenMode },
-  } = useDashboardContainerContext();
-  const dispatch = useEmbeddableDispatch();
+  const dashboard = useDashboardContainer();
 
-  const isFullScreenMode = select((state) => state.componentState.fullScreenMode);
-  const isEmbeddedExternally = select((state) => state.componentState.isEmbeddedExternally);
+  const isFullScreenMode = dashboard.select((state) => state.componentState.fullScreenMode);
+  const isEmbeddedExternally = dashboard.select(
+    (state) => state.componentState.isEmbeddedExternally
+  );
 
   return (
     <>
@@ -114,7 +110,7 @@ const WithFullScreenButton = ({ children }: { children: JSX.Element }) => {
       {isFullScreenMode && (
         <EuiPortal>
           <ExitFullScreenButton
-            onExit={() => dispatch(setFullScreenMode(false))}
+            onExit={() => dashboard.dispatch.setFullScreenMode(false)}
             toggleChrome={!isEmbeddedExternally}
           />
         </EuiPortal>
diff --git a/src/plugins/dashboard/public/dashboard_container/dashboard_container_context.tsx b/src/plugins/dashboard/public/dashboard_container/dashboard_container_context.tsx
deleted file mode 100644
index b3e498dba36ef..0000000000000
--- a/src/plugins/dashboard/public/dashboard_container/dashboard_container_context.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * 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 { useReduxEmbeddableContext } from '@kbn/presentation-util-plugin/public';
-import { dashboardContainerReducers } from './state/dashboard_container_reducers';
-import { DashboardReduxState } from './types';
-import { DashboardContainer } from '..';
-
-export const useDashboardContainerContext = () =>
-  useReduxEmbeddableContext<
-    DashboardReduxState,
-    typeof dashboardContainerReducers,
-    DashboardContainer
-  >();
diff --git a/src/plugins/dashboard/public/dashboard_container/dashboard_container_renderer.tsx b/src/plugins/dashboard/public/dashboard_container/dashboard_container_renderer.tsx
deleted file mode 100644
index 1c79a1e0977f4..0000000000000
--- a/src/plugins/dashboard/public/dashboard_container/dashboard_container_renderer.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * 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 './_dashboard_container.scss';
-
-import { v4 as uuidv4 } from 'uuid';
-import classNames from 'classnames';
-import React, { useEffect, useMemo, useRef, useState } from 'react';
-import useObservable from 'react-use/lib/useObservable';
-
-import { EuiLoadingElastic, EuiLoadingSpinner } from '@elastic/eui';
-
-import {
-  DashboardContainerFactory,
-  DashboardContainerFactoryDefinition,
-  DashboardCreationOptions,
-} from './embeddable/dashboard_container_factory';
-import { DASHBOARD_CONTAINER_TYPE } from '..';
-import { pluginServices } from '../services/plugin_services';
-import { DEFAULT_DASHBOARD_INPUT } from '../dashboard_constants';
-import { DashboardContainer } from './embeddable/dashboard_container';
-
-export interface DashboardContainerRendererProps {
-  savedObjectId?: string;
-  getCreationOptions?: () => Promise<DashboardCreationOptions>;
-  onDashboardContainerLoaded?: (dashboardContainer: DashboardContainer) => void;
-}
-
-export const DashboardContainerRenderer = ({
-  savedObjectId,
-  getCreationOptions,
-  onDashboardContainerLoaded,
-}: DashboardContainerRendererProps) => {
-  const {
-    embeddable,
-    screenshotMode: { isScreenshotMode },
-    customBranding,
-  } = pluginServices.getServices();
-
-  const dashboardRoot = useRef(null);
-  const [dashboardIdToBuild, setDashboardIdToBuild] = useState<string | undefined>(savedObjectId);
-  const [dashboardContainer, setDashboardContainer] = useState<DashboardContainer>();
-  const [loading, setLoading] = useState(true);
-  const showPlainSpinner = useObservable(customBranding.hasCustomBranding$, false);
-
-  useEffect(() => {
-    // check if dashboard container is expecting id change... if not, update dashboardIdToBuild to force it to rebuild the container.
-    if (!dashboardContainer) return;
-    if (!dashboardContainer.isExpectingIdChange()) setDashboardIdToBuild(savedObjectId);
-
-    // Disabling exhaustive deps because this useEffect should only be triggered when the savedObjectId changes.
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [savedObjectId]);
-
-  const id = useMemo(() => uuidv4(), []);
-
-  useEffect(() => {
-    let canceled = false;
-    let destroyContainer: () => void;
-
-    (async () => {
-      const creationOptions = await getCreationOptions?.();
-      const dashboardFactory = embeddable.getEmbeddableFactory(
-        DASHBOARD_CONTAINER_TYPE
-      ) as DashboardContainerFactory & { create: DashboardContainerFactoryDefinition['create'] };
-      const container = (await dashboardFactory?.create(
-        {
-          id,
-          ...DEFAULT_DASHBOARD_INPUT,
-          ...creationOptions?.initialInput,
-          savedObjectId: dashboardIdToBuild,
-        },
-        undefined,
-        creationOptions
-      )) as DashboardContainer;
-
-      await container.untilInitialized();
-      if (canceled) {
-        container.destroy();
-        return;
-      }
-
-      setLoading(false);
-      if (dashboardRoot.current) {
-        container.render(dashboardRoot.current);
-      }
-      onDashboardContainerLoaded?.(container);
-      setDashboardContainer(container);
-
-      destroyContainer = () => container.destroy();
-    })();
-    return () => {
-      canceled = true;
-      destroyContainer?.();
-    };
-    // Disabling exhaustive deps because embeddable should only be created when the dashboardIdToBuild changes.
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [dashboardIdToBuild]);
-
-  const viewportClasses = classNames(
-    'dashboardViewport',
-    { 'dashboardViewport--screenshotMode': isScreenshotMode() },
-    { 'dashboardViewport--loading': loading }
-  );
-
-  const loadingSpinner = showPlainSpinner ? (
-    <EuiLoadingSpinner size="xxl" />
-  ) : (
-    <EuiLoadingElastic size="xxl" />
-  );
-  return (
-    <div className={viewportClasses}>{loading ? loadingSpinner : <div ref={dashboardRoot} />}</div>
-  );
-};
-
-// required for dynamic import using React.lazy()
-// eslint-disable-next-line import/no-default-export
-export default DashboardContainerRenderer;
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/api/run_save_functions.tsx b/src/plugins/dashboard/public/dashboard_container/embeddable/api/run_save_functions.tsx
index 94f4c8fdfa58e..d3dea0d250036 100644
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/api/run_save_functions.tsx
+++ b/src/plugins/dashboard/public/dashboard_container/embeddable/api/run_save_functions.tsx
@@ -17,7 +17,7 @@ import { DashboardSaveModal } from './overlays/save_modal';
 import { DashboardContainer } from '../dashboard_container';
 import { showCloneModal } from './overlays/show_clone_modal';
 import { pluginServices } from '../../../services/plugin_services';
-import { DashboardContainerByValueInput } from '../../../../common';
+import { DashboardContainerInput } from '../../../../common';
 import { SaveDashboardReturn } from '../../../services/dashboard_saved_object/types';
 
 export function runSaveAs(this: DashboardContainer) {
@@ -31,15 +31,10 @@ export function runSaveAs(this: DashboardContainer) {
     dashboardSavedObject: { checkForDuplicateDashboardTitle, saveDashboardStateToSavedObject },
   } = pluginServices.getServices();
 
-  const {
-    getState,
-    dispatch,
-    actions: { setStateFromSaveModal, setLastSavedInput },
-  } = this.getReduxEmbeddableTools();
   const {
     explicitInput: currentState,
     componentState: { lastSavedId },
-  } = getState();
+  } = this.getState();
 
   return new Promise<SaveDashboardReturn | undefined>((resolve) => {
     const onSave = async ({
@@ -81,7 +76,7 @@ export function runSaveAs(this: DashboardContainer) {
         // do not save if title is duplicate and is unconfirmed
         return {};
       }
-      const stateToSave: DashboardContainerByValueInput = {
+      const stateToSave: DashboardContainerInput = {
         ...currentState,
         ...stateFromSaveModal,
       };
@@ -103,8 +98,8 @@ export function runSaveAs(this: DashboardContainer) {
       stateFromSaveModal.lastSavedId = saveResult.id;
       if (saveResult.id) {
         batch(() => {
-          dispatch(setStateFromSaveModal(stateFromSaveModal));
-          dispatch(setLastSavedInput(stateToSave));
+          this.dispatch.setStateFromSaveModal(stateFromSaveModal);
+          this.dispatch.setLastSavedInput(stateToSave);
         });
       }
       if (newCopyOnSave || !lastSavedId) this.expectIdChange();
@@ -136,22 +131,17 @@ export async function runQuickSave(this: DashboardContainer) {
     dashboardSavedObject: { saveDashboardStateToSavedObject },
   } = pluginServices.getServices();
 
-  const {
-    getState,
-    dispatch,
-    actions: { setLastSavedInput },
-  } = this.getReduxEmbeddableTools();
   const {
     explicitInput: currentState,
     componentState: { lastSavedId },
-  } = getState();
+  } = this.getState();
 
   const saveResult = await saveDashboardStateToSavedObject({
     lastSavedId,
     currentState,
     saveOptions: {},
   });
-  dispatch(setLastSavedInput(currentState));
+  this.dispatch.setLastSavedInput(currentState);
 
   return saveResult;
 }
@@ -161,12 +151,7 @@ export async function runClone(this: DashboardContainer) {
     dashboardSavedObject: { saveDashboardStateToSavedObject, checkForDuplicateDashboardTitle },
   } = pluginServices.getServices();
 
-  const {
-    getState,
-    dispatch,
-    actions: { setTitle },
-  } = this.getReduxEmbeddableTools();
-  const { explicitInput: currentState } = getState();
+  const { explicitInput: currentState } = this.getState();
 
   return new Promise<SaveDashboardReturn | undefined>((resolve) => {
     const onClone = async (
@@ -191,7 +176,7 @@ export async function runClone(this: DashboardContainer) {
         currentState: { ...currentState, title: newTitle },
       });
 
-      dispatch(setTitle(newTitle));
+      this.dispatch.setTitle(newTitle);
       resolve(saveResult);
       this.expectIdChange();
       return saveResult.id ? { id: saveResult.id } : { error: saveResult.error };
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/api/show_settings.tsx b/src/plugins/dashboard/public/dashboard_container/embeddable/api/show_settings.tsx
index 266c0a414b5b9..56798f5770dd1 100644
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/api/show_settings.tsx
+++ b/src/plugins/dashboard/public/dashboard_container/embeddable/api/show_settings.tsx
@@ -10,9 +10,9 @@ import React from 'react';
 
 import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 
-import { DashboardSettings } from '../../component/settings/settings_flyout';
-import { DashboardContainer } from '../dashboard_container';
 import { pluginServices } from '../../../services/plugin_services';
+import { DashboardSettings } from '../../component/settings/settings_flyout';
+import { DashboardContainer, DashboardContainerContext } from '../dashboard_container';
 
 export function showSettings(this: DashboardContainer) {
   const {
@@ -22,26 +22,20 @@ export function showSettings(this: DashboardContainer) {
     overlays,
   } = pluginServices.getServices();
 
-  const {
-    dispatch,
-    Wrapper: DashboardReduxWrapper,
-    actions: { setHasOverlays },
-  } = this.getReduxEmbeddableTools();
-
   // TODO Move this action into DashboardContainer.openOverlay
-  dispatch(setHasOverlays(true));
+  this.dispatch.setHasOverlays(true);
 
   this.openOverlay(
     overlays.openFlyout(
       toMountPoint(
-        <DashboardReduxWrapper>
+        <DashboardContainerContext.Provider value={this}>
           <DashboardSettings
             onClose={() => {
-              dispatch(setHasOverlays(false));
+              this.dispatch.setHasOverlays(false);
               this.clearOverlays();
             }}
           />
-        </DashboardReduxWrapper>,
+        </DashboardContainerContext.Provider>,
         { theme$ }
       ),
       {
@@ -49,7 +43,7 @@ export function showSettings(this: DashboardContainer) {
         'data-test-subj': 'dashboardSettingsFlyout',
         onClose: (flyout) => {
           this.clearOverlays();
-          dispatch(setHasOverlays(false));
+          this.dispatch.setHasOverlays(false);
           flyout.close();
         },
       }
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/integrations/controls/dashboard_control_group_integration.test.ts b/src/plugins/dashboard/public/dashboard_container/embeddable/create/controls/dashboard_control_group_integration.test.ts
similarity index 95%
rename from src/plugins/dashboard/public/dashboard_container/embeddable/integrations/controls/dashboard_control_group_integration.test.ts
rename to src/plugins/dashboard/public/dashboard_container/embeddable/create/controls/dashboard_control_group_integration.test.ts
index ae8102318e36c..148c409e8d702 100644
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/integrations/controls/dashboard_control_group_integration.test.ts
+++ b/src/plugins/dashboard/public/dashboard_container/embeddable/create/controls/dashboard_control_group_integration.test.ts
@@ -9,7 +9,7 @@
 import { mockControlGroupInput } from '@kbn/controls-plugin/common/mocks';
 import { ControlGroupContainer } from '@kbn/controls-plugin/public/control_group/embeddable/control_group_container';
 import { Filter } from '@kbn/es-query';
-import { ReduxEmbeddablePackage } from '@kbn/presentation-util-plugin/public';
+import { ReduxToolsPackage } from '@kbn/presentation-util-plugin/public';
 import { combineDashboardFiltersWithControlGroupFilters } from './dashboard_control_group_integration';
 
 jest.mock('@kbn/controls-plugin/public/control_group/embeddable/control_group_container');
@@ -52,7 +52,7 @@ const testFilter3: Filter = {
 };
 
 const mockControlGroupContainer = new ControlGroupContainer(
-  { getTools: () => {} } as unknown as ReduxEmbeddablePackage,
+  { getTools: () => {} } as unknown as ReduxToolsPackage,
   mockControlGroupInput()
 );
 
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/integrations/controls/dashboard_control_group_integration.ts b/src/plugins/dashboard/public/dashboard_container/embeddable/create/controls/dashboard_control_group_integration.ts
similarity index 61%
rename from src/plugins/dashboard/public/dashboard_container/embeddable/integrations/controls/dashboard_control_group_integration.ts
rename to src/plugins/dashboard/public/dashboard_container/embeddable/create/controls/dashboard_control_group_integration.ts
index 2f0f8626528b9..4201da0bf6996 100644
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/integrations/controls/dashboard_control_group_integration.ts
+++ b/src/plugins/dashboard/public/dashboard_container/embeddable/create/controls/dashboard_control_group_integration.ts
@@ -6,24 +6,21 @@
  * Side Public License, v 1.
  */
 
-import _, { identity, pickBy } from 'lodash';
-import { Observable, Subscription } from 'rxjs';
+import { isEqual } from 'lodash';
+import { Observable } from 'rxjs';
 import deepEqual from 'fast-deep-equal';
 import { compareFilters, COMPARE_ALL_OPTIONS, type Filter } from '@kbn/es-query';
 import { debounceTime, distinctUntilChanged, distinctUntilKeyChanged, skip } from 'rxjs/operators';
 
 import {
   ControlGroupInput,
-  CONTROL_GROUP_TYPE,
   getDefaultControlGroupInput,
   persistableControlGroupInputIsEqual,
 } from '@kbn/controls-plugin/common';
-import { isErrorEmbeddable } from '@kbn/embeddable-plugin/public';
-import { ControlGroupContainer, ControlGroupOutput } from '@kbn/controls-plugin/public';
+import { ControlGroupContainer } from '@kbn/controls-plugin/public';
 
 import { DashboardContainer } from '../../dashboard_container';
-import { pluginServices } from '../../../../services/plugin_services';
-import { DashboardContainerByValueInput } from '../../../../../common';
+import { DashboardContainerInput } from '../../../../../common';
 
 interface DiffChecks {
   [key: string]: (a?: unknown, b?: unknown) => boolean;
@@ -35,61 +32,16 @@ const distinctUntilDiffCheck = <T extends {}>(a: T, b: T, diffChecks: DiffChecks
     .includes(false);
 
 type DashboardControlGroupCommonKeys = keyof Pick<
-  DashboardContainerByValueInput | ControlGroupInput,
+  DashboardContainerInput | ControlGroupInput,
   'filters' | 'lastReloadRequestTime' | 'timeRange' | 'query'
 >;
 
-export async function startControlGroupIntegration(
-  this: DashboardContainer,
-  initialInput: DashboardContainerByValueInput
-): Promise<ControlGroupContainer | undefined> {
-  const {
-    embeddable: { getEmbeddableFactory },
-  } = pluginServices.getServices();
-  const controlsGroupFactory = getEmbeddableFactory<
-    ControlGroupInput,
-    ControlGroupOutput,
-    ControlGroupContainer
-  >(CONTROL_GROUP_TYPE);
-  const { filters, query, timeRange, viewMode, controlGroupInput, id } = initialInput;
-  const controlGroup = await controlsGroupFactory?.create({
-    id: `control_group_${id ?? 'new_dashboard'}`,
-    ...getDefaultControlGroupInput(),
-    ...pickBy(controlGroupInput, identity), // undefined keys in initialInput should not overwrite defaults
-    timeRange,
-    viewMode,
-    filters,
-    query,
-  });
-  if (!controlGroup || isErrorEmbeddable(controlGroup)) {
-    return;
-  }
-
-  this.untilInitialized().then(() => {
-    const stopSyncingControlGroup =
-      startSyncingDashboardControlGroup.bind(this)()?.stopSyncingWithControlGroup;
-    this.onDestroyControlGroup = () => {
-      stopSyncingControlGroup?.();
-      this.controlGroup?.destroy();
-    };
-  });
-  await controlGroup.untilInitialized();
-  return controlGroup;
-}
-
-function startSyncingDashboardControlGroup(this: DashboardContainer) {
+export function startSyncingDashboardControlGroup(this: DashboardContainer) {
   if (!this.controlGroup) return;
-  const subscriptions = new Subscription();
-
-  const {
-    actions: { setControlGroupState },
-    dispatch,
-  } = this.getReduxEmbeddableTools();
-
   const isControlGroupInputEqual = () =>
     persistableControlGroupInputIsEqual(
       this.controlGroup!.getInput(),
-      this.getInputAsValueType().controlGroupInput
+      this.getInput().controlGroupInput
     );
 
   // Because dashboard container stores control group state, certain control group changes need to be passed up dashboard container
@@ -99,7 +51,7 @@ function startSyncingDashboardControlGroup(this: DashboardContainer) {
     chainingSystem: deepEqual,
     ignoreParentSettings: deepEqual,
   };
-  subscriptions.add(
+  this.subscriptions.add(
     this.controlGroup
       .getInput$()
       .pipe(
@@ -111,9 +63,12 @@ function startSyncingDashboardControlGroup(this: DashboardContainer) {
         const { panels, controlStyle, chainingSystem, ignoreParentSettings } =
           this.controlGroup!.getInput();
         if (!isControlGroupInputEqual()) {
-          dispatch(
-            setControlGroupState({ panels, controlStyle, chainingSystem, ignoreParentSettings })
-          );
+          this.dispatch.setControlGroupState({
+            panels,
+            controlStyle,
+            chainingSystem,
+            ignoreParentSettings,
+          });
         }
       })
   );
@@ -129,23 +84,20 @@ function startSyncingDashboardControlGroup(this: DashboardContainer) {
   };
 
   // pass down any pieces of input needed to refetch or force refetch data for the controls
-  subscriptions.add(
-    (this.getInput$() as Readonly<Observable<DashboardContainerByValueInput>>)
+  this.subscriptions.add(
+    (this.getInput$() as Readonly<Observable<DashboardContainerInput>>)
       .pipe(
         distinctUntilChanged((a, b) =>
-          distinctUntilDiffCheck<DashboardContainerByValueInput>(a, b, dashboardRefetchDiff)
+          distinctUntilDiffCheck<DashboardContainerInput>(a, b, dashboardRefetchDiff)
         )
       )
       .subscribe(() => {
         const newInput: { [key: string]: unknown } = {};
         (Object.keys(dashboardRefetchDiff) as DashboardControlGroupCommonKeys[]).forEach((key) => {
           if (
-            !dashboardRefetchDiff[key]?.(
-              this.getInputAsValueType()[key],
-              this.controlGroup!.getInput()[key]
-            )
+            !dashboardRefetchDiff[key]?.(this.getInput()[key], this.controlGroup!.getInput()[key])
           ) {
-            newInput[key] = this.getInputAsValueType()[key];
+            newInput[key] = this.getInput()[key];
           }
         });
         if (Object.keys(newInput).length > 0) {
@@ -155,24 +107,24 @@ function startSyncingDashboardControlGroup(this: DashboardContainer) {
   );
 
   // dashboard may reset the control group input when discarding changes. Subscribe to these changes and update accordingly
-  subscriptions.add(
-    (this.getInput$() as Readonly<Observable<DashboardContainerByValueInput>>)
+  this.subscriptions.add(
+    (this.getInput$() as Readonly<Observable<DashboardContainerInput>>)
       .pipe(debounceTime(10), distinctUntilKeyChanged('controlGroupInput'))
       .subscribe(() => {
         if (!isControlGroupInputEqual()) {
-          if (!this.getInputAsValueType().controlGroupInput) {
+          if (!this.getInput().controlGroupInput) {
             this.controlGroup!.updateInput(getDefaultControlGroupInput());
             return;
           }
           this.controlGroup!.updateInput({
-            ...this.getInputAsValueType().controlGroupInput,
+            ...this.getInput().controlGroupInput,
           });
         }
       })
   );
 
   // when control group outputs filters, force a refresh!
-  subscriptions.add(
+  this.subscriptions.add(
     this.controlGroup
       .getOutput$()
       .pipe(
@@ -184,23 +136,23 @@ function startSyncingDashboardControlGroup(this: DashboardContainer) {
       .subscribe(() => this.forceRefresh(false)) // we should not reload the control group when the control group output changes - otherwise, performance is severely impacted
   );
 
-  subscriptions.add(
+  this.subscriptions.add(
     this.controlGroup
       .getOutput$()
       .pipe(
         distinctUntilChanged(({ timeslice: timesliceA }, { timeslice: timesliceB }) =>
-          _.isEqual(timesliceA, timesliceB)
+          isEqual(timesliceA, timesliceB)
         )
       )
       .subscribe(({ timeslice }) => {
-        if (!_.isEqual(timeslice, this.getInputAsValueType().timeslice)) {
-          this.updateInput({ timeslice });
+        if (!isEqual(timeslice, this.getInput().timeslice)) {
+          this.dispatch.setTimeslice(timeslice);
         }
       })
   );
 
   // the Control Group needs to know when any dashboard children are loading in order to know when to move on to the next time slice when playing.
-  subscriptions.add(
+  this.subscriptions.add(
     this.getAnyChildOutputChange$().subscribe(() => {
       if (!this.controlGroup) {
         return;
@@ -216,12 +168,6 @@ function startSyncingDashboardControlGroup(this: DashboardContainer) {
       this.controlGroup.anyControlOutputConsumerLoading$.next(false);
     })
   );
-
-  return {
-    stopSyncingWithControlGroup: () => {
-      subscriptions.unsubscribe();
-    },
-  };
 }
 
 export const combineDashboardFiltersWithControlGroupFilters = (
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/create/create_dashboard.test.ts b/src/plugins/dashboard/public/dashboard_container/embeddable/create/create_dashboard.test.ts
new file mode 100644
index 0000000000000..6f9f40745322b
--- /dev/null
+++ b/src/plugins/dashboard/public/dashboard_container/embeddable/create/create_dashboard.test.ts
@@ -0,0 +1,255 @@
+/*
+ * 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 {
+  ContactCardEmbeddableInput,
+  CONTACT_CARD_EMBEDDABLE,
+} from '@kbn/embeddable-plugin/public/lib/test_samples';
+import {
+  ControlGroupInput,
+  ControlGroupContainer,
+  ControlGroupContainerFactory,
+} from '@kbn/controls-plugin/public';
+import { Filter } from '@kbn/es-query';
+import { EmbeddablePackageState } from '@kbn/embeddable-plugin/public';
+import { createKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public';
+
+import { createDashboard } from './create_dashboard';
+import { getSampleDashboardPanel } from '../../../mocks';
+import { pluginServices } from '../../../services/plugin_services';
+import { DashboardCreationOptions } from '../dashboard_container_factory';
+import { Observable } from 'rxjs';
+
+const embeddableId = 'create-dat-dashboard';
+
+test('throws error when no data views are available', async () => {
+  pluginServices.getServices().data.dataViews.getDefaultDataView = jest
+    .fn()
+    .mockReturnValue(undefined);
+  await expect(async () => {
+    await createDashboard(embeddableId);
+  }).rejects.toThrow('Dashboard requires at least one data view before it can be initialized.');
+
+  // reset get default data view
+  pluginServices.getServices().data.dataViews.getDefaultDataView = jest.fn().mockResolvedValue({});
+});
+
+test('throws error when provided validation function returns invalid', async () => {
+  const creationOptions: DashboardCreationOptions = {
+    validateLoadedSavedObject: jest.fn().mockImplementation(() => false),
+  };
+  await expect(async () => {
+    await createDashboard(embeddableId, creationOptions, 0, 'test-id');
+  }).rejects.toThrow('Dashboard failed saved object result validation');
+});
+
+test('pulls state from dashboard saved object when given a saved object id', async () => {
+  pluginServices.getServices().dashboardSavedObject.loadDashboardStateFromSavedObject = jest
+    .fn()
+    .mockResolvedValue({ dashboardInput: { description: 'wow would you look at that? Wow.' } });
+  const dashboard = await createDashboard(embeddableId, {}, 0, 'wow-such-id');
+  expect(
+    pluginServices.getServices().dashboardSavedObject.loadDashboardStateFromSavedObject
+  ).toHaveBeenCalledWith({ id: 'wow-such-id' });
+  expect(dashboard.getState().explicitInput.description).toBe('wow would you look at that? Wow.');
+});
+
+test('pulls state from session storage which overrides state from saved object', async () => {
+  pluginServices.getServices().dashboardSavedObject.loadDashboardStateFromSavedObject = jest
+    .fn()
+    .mockResolvedValue({ dashboardInput: { description: 'wow this description is okay' } });
+  pluginServices.getServices().dashboardSessionStorage.getState = jest
+    .fn()
+    .mockReturnValue({ description: 'wow this description marginally better' });
+  const dashboard = await createDashboard(
+    embeddableId,
+    { useSessionStorageIntegration: true },
+    0,
+    'wow-such-id'
+  );
+  expect(dashboard.getState().explicitInput.description).toBe(
+    'wow this description marginally better'
+  );
+});
+
+test('pulls state from creation options initial input which overrides all other state sources', async () => {
+  pluginServices.getServices().dashboardSavedObject.loadDashboardStateFromSavedObject = jest
+    .fn()
+    .mockResolvedValue({ dashboardInput: { description: 'wow this description is okay' } });
+  pluginServices.getServices().dashboardSessionStorage.getState = jest
+    .fn()
+    .mockReturnValue({ description: 'wow this description marginally better' });
+  const dashboard = await createDashboard(
+    embeddableId,
+    {
+      useSessionStorageIntegration: true,
+      initialInput: { description: 'wow this description is a masterpiece' },
+    },
+    0,
+    'wow-such-id'
+  );
+  expect(dashboard.getState().explicitInput.description).toBe(
+    'wow this description is a masterpiece'
+  );
+});
+
+test('applies filters and query from state to query service', async () => {
+  const filters: Filter[] = [
+    { meta: { alias: 'test', disabled: false, negate: false, index: 'test' } },
+  ];
+  const query = { language: 'kql', query: 'query' };
+  await createDashboard(embeddableId, {
+    useUnifiedSearchIntegration: true,
+    unifiedSearchSettings: {
+      kbnUrlStateStorage: createKbnUrlStateStorage(),
+    },
+    initialInput: { filters, query },
+  });
+  expect(pluginServices.getServices().data.query.queryString.setQuery).toHaveBeenCalledWith(query);
+  expect(pluginServices.getServices().data.query.filterManager.setAppFilters).toHaveBeenCalledWith(
+    filters
+  );
+});
+
+test('applies time range and refresh interval from initial input to query service if time restore is on', async () => {
+  const timeRange = { from: new Date().toISOString(), to: new Date().toISOString() };
+  const refreshInterval = { pause: false, value: 42 };
+  await createDashboard(embeddableId, {
+    useUnifiedSearchIntegration: true,
+    unifiedSearchSettings: {
+      kbnUrlStateStorage: createKbnUrlStateStorage(),
+    },
+    initialInput: { timeRange, refreshInterval, timeRestore: true },
+  });
+  expect(
+    pluginServices.getServices().data.query.timefilter.timefilter.setTime
+  ).toHaveBeenCalledWith(timeRange);
+  expect(
+    pluginServices.getServices().data.query.timefilter.timefilter.setRefreshInterval
+  ).toHaveBeenCalledWith(refreshInterval);
+});
+
+test('applied time range from query service to initial input if time restore is off', async () => {
+  const timeRange = { from: new Date().toISOString(), to: new Date().toISOString() };
+  pluginServices.getServices().data.query.timefilter.timefilter.getTime = jest
+    .fn()
+    .mockReturnValue(timeRange);
+  const dashboard = await createDashboard(embeddableId, {
+    useUnifiedSearchIntegration: true,
+    unifiedSearchSettings: {
+      kbnUrlStateStorage: createKbnUrlStateStorage(),
+    },
+  });
+  expect(dashboard.getState().explicitInput.timeRange).toEqual(timeRange);
+});
+
+test('replaces panel with incoming embeddable if id matches existing panel', async () => {
+  const incomingEmbeddable: EmbeddablePackageState = {
+    type: CONTACT_CARD_EMBEDDABLE,
+    input: {
+      id: 'i_match',
+      firstName: 'wow look at this replacement wow',
+    } as ContactCardEmbeddableInput,
+    embeddableId: 'i_match',
+  };
+  const dashboard = await createDashboard(embeddableId, {
+    incomingEmbeddable,
+    initialInput: {
+      panels: {
+        i_match: getSampleDashboardPanel<ContactCardEmbeddableInput>({
+          explicitInput: {
+            id: 'i_match',
+            firstName: 'oh no, I am about to get replaced',
+          },
+          type: CONTACT_CARD_EMBEDDABLE,
+        }),
+      },
+    },
+  });
+  expect(dashboard.getState().explicitInput.panels.i_match.explicitInput).toStrictEqual(
+    expect.objectContaining({
+      id: 'i_match',
+      firstName: 'wow look at this replacement wow',
+    })
+  );
+});
+
+test('creates new embeddable with incoming embeddable if id does not match existing panel', async () => {
+  const incomingEmbeddable: EmbeddablePackageState = {
+    type: CONTACT_CARD_EMBEDDABLE,
+    input: {
+      id: 'i_match',
+      firstName: 'wow look at this new panel wow',
+    } as ContactCardEmbeddableInput,
+    embeddableId: 'i_match',
+  };
+  const mockContactCardFactory = {
+    create: jest.fn().mockReturnValue({ destroy: jest.fn() }),
+    getDefaultInput: jest.fn().mockResolvedValue({}),
+  };
+  pluginServices.getServices().embeddable.getEmbeddableFactory = jest
+    .fn()
+    .mockReturnValue(mockContactCardFactory);
+
+  await createDashboard(embeddableId, {
+    incomingEmbeddable,
+    initialInput: {
+      panels: {
+        i_do_not_match: getSampleDashboardPanel<ContactCardEmbeddableInput>({
+          explicitInput: {
+            id: 'i_do_not_match',
+            firstName: 'phew... I will not be replaced',
+          },
+          type: CONTACT_CARD_EMBEDDABLE,
+        }),
+      },
+    },
+  });
+  // flush promises
+  await new Promise((r) => setTimeout(r, 1));
+  expect(mockContactCardFactory.create).toHaveBeenCalledWith(
+    expect.objectContaining({
+      id: 'i_match',
+      firstName: 'wow look at this new panel wow',
+    }),
+    expect.any(Object)
+  );
+});
+
+test('creates a control group from the control group factory and waits for it to be initialized', async () => {
+  const mockControlGroupContainer = {
+    destroy: jest.fn(),
+    render: jest.fn(),
+    updateInput: jest.fn(),
+    untilInitialized: jest.fn(),
+    getInput: jest.fn().mockReturnValue({}),
+    getInput$: jest.fn().mockReturnValue(new Observable()),
+    getOutput$: jest.fn().mockReturnValue(new Observable()),
+  } as unknown as ControlGroupContainer;
+  const mockControlGroupFactory = {
+    create: jest.fn().mockReturnValue(mockControlGroupContainer),
+  } as unknown as ControlGroupContainerFactory;
+  pluginServices.getServices().embeddable.getEmbeddableFactory = jest
+    .fn()
+    .mockReturnValue(mockControlGroupFactory);
+  await createDashboard(embeddableId, {
+    useControlGroupIntegration: true,
+    initialInput: {
+      controlGroupInput: { controlStyle: 'twoLine' } as unknown as ControlGroupInput,
+    },
+  });
+  // flush promises
+  await new Promise((r) => setTimeout(r, 1));
+  expect(pluginServices.getServices().embeddable.getEmbeddableFactory).toHaveBeenCalledWith(
+    'control_group'
+  );
+  expect(mockControlGroupFactory.create).toHaveBeenCalledWith(
+    expect.objectContaining({ controlStyle: 'twoLine' })
+  );
+  expect(mockControlGroupContainer.untilInitialized).toHaveBeenCalled();
+});
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/create/create_dashboard.ts b/src/plugins/dashboard/public/dashboard_container/embeddable/create/create_dashboard.ts
new file mode 100644
index 0000000000000..7609a4f3eb95f
--- /dev/null
+++ b/src/plugins/dashboard/public/dashboard_container/embeddable/create/create_dashboard.ts
@@ -0,0 +1,289 @@
+/*
+ * 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 { Subject } from 'rxjs';
+import { cloneDeep, identity, pickBy } from 'lodash';
+
+import {
+  ControlGroupInput,
+  CONTROL_GROUP_TYPE,
+  getDefaultControlGroupInput,
+} from '@kbn/controls-plugin/common';
+import { syncGlobalQueryStateWithUrl } from '@kbn/data-plugin/public';
+import { isErrorEmbeddable, ViewMode } from '@kbn/embeddable-plugin/public';
+import { lazyLoadReduxToolsPackage } from '@kbn/presentation-util-plugin/public';
+import { type ControlGroupContainer, ControlGroupOutput } from '@kbn/controls-plugin/public';
+
+import { DashboardContainerInput } from '../../../../common';
+import { DashboardContainer } from '../dashboard_container';
+import { pluginServices } from '../../../services/plugin_services';
+import { DEFAULT_DASHBOARD_INPUT } from '../../../dashboard_constants';
+import { DashboardCreationOptions } from '../dashboard_container_factory';
+import { startSyncingDashboardDataViews } from './data_views/sync_dashboard_data_views';
+import { syncUnifiedSearchState } from './unified_search/sync_dashboard_unified_search_state';
+import { startSyncingDashboardControlGroup } from './controls/dashboard_control_group_integration';
+import { startDashboardSearchSessionIntegration } from './search_sessions/start_dashboard_search_session_integration';
+
+/**
+ *
+ * @param creationOptions
+ */
+export const createDashboard = async (
+  embeddableId: string,
+  creationOptions?: DashboardCreationOptions,
+  dashboardCreationStartTime?: number,
+  savedObjectId?: string
+): Promise<DashboardContainer> => {
+  // --------------------------------------------------------------------------------------
+  // Unpack services & Options
+  // --------------------------------------------------------------------------------------
+  const {
+    dashboardSessionStorage,
+    embeddable: { getEmbeddableFactory },
+    data: {
+      dataViews,
+      query: queryService,
+      search: { session },
+    },
+    dashboardSavedObject: { loadDashboardStateFromSavedObject },
+  } = pluginServices.getServices();
+
+  const {
+    queryString,
+    filterManager,
+    timefilter: { timefilter: timefilterService },
+  } = queryService;
+
+  const {
+    searchSessionSettings,
+    unifiedSearchSettings,
+    validateLoadedSavedObject,
+    useControlGroupIntegration,
+    useUnifiedSearchIntegration,
+    initialInput: overrideInput,
+    useSessionStorageIntegration,
+  } = creationOptions ?? {};
+
+  // --------------------------------------------------------------------------------------
+  // Create method which allows work to be done on the dashboard container when it's ready.
+  // --------------------------------------------------------------------------------------
+  const dashboardContainerReady$ = new Subject<DashboardContainer>();
+  const untilDashboardReady = () =>
+    new Promise<DashboardContainer>((resolve) => {
+      const subscription = dashboardContainerReady$.subscribe((container) => {
+        subscription.unsubscribe();
+        resolve(container);
+      });
+    });
+
+  // --------------------------------------------------------------------------------------
+  // Lazy load required systems and Dashboard saved object.
+  // --------------------------------------------------------------------------------------
+
+  const reduxEmbeddablePackagePromise = lazyLoadReduxToolsPackage();
+  const defaultDataViewAssignmentPromise = dataViews.getDefaultDataView();
+  const dashboardSavedObjectPromise = savedObjectId
+    ? loadDashboardStateFromSavedObject({ id: savedObjectId })
+    : Promise.resolve(undefined);
+
+  const [reduxEmbeddablePackage, savedObjectResult, defaultDataView] = await Promise.all([
+    reduxEmbeddablePackagePromise,
+    dashboardSavedObjectPromise,
+    defaultDataViewAssignmentPromise,
+  ]);
+
+  // --------------------------------------------------------------------------------------
+  // Run validations.
+  // --------------------------------------------------------------------------------------
+  if (!defaultDataView) {
+    throw new Error('Dashboard requires at least one data view before it can be initialized.');
+  }
+
+  if (
+    savedObjectResult &&
+    validateLoadedSavedObject &&
+    !validateLoadedSavedObject(savedObjectResult)
+  ) {
+    throw new Error('Dashboard failed saved object result validation');
+  }
+
+  // --------------------------------------------------------------------------------------
+  // Gather input from session storage if integration is used.
+  // --------------------------------------------------------------------------------------
+  const sessionStorageInput = ((): Partial<DashboardContainerInput> | undefined => {
+    if (!useSessionStorageIntegration) return;
+    return dashboardSessionStorage.getState(savedObjectId);
+  })();
+
+  // --------------------------------------------------------------------------------------
+  // Combine input from saved object, session storage, & passed input to create initial input.
+  // --------------------------------------------------------------------------------------
+  const initialInput: DashboardContainerInput = cloneDeep({
+    ...DEFAULT_DASHBOARD_INPUT,
+    ...(savedObjectResult?.dashboardInput ?? {}),
+    ...sessionStorageInput,
+    ...overrideInput,
+    id: embeddableId,
+  });
+
+  initialInput.executionContext = {
+    type: 'dashboard',
+    description: initialInput.title,
+  };
+
+  // --------------------------------------------------------------------------------------
+  // Set up unified search integration.
+  // --------------------------------------------------------------------------------------
+  if (useUnifiedSearchIntegration && unifiedSearchSettings?.kbnUrlStateStorage) {
+    const { filters, query, timeRestore, timeRange, refreshInterval } = initialInput;
+    const { kbnUrlStateStorage } = unifiedSearchSettings;
+
+    // apply filters and query to the query service
+    filterManager.setAppFilters(cloneDeep(filters ?? []));
+    queryString.setQuery(query ?? queryString.getDefaultQuery());
+
+    /**
+     * If a global time range is not set explicitly and the time range was saved with the dashboard, apply
+     * time range and refresh interval to the query service. Otherwise, set the current dashboard time range
+     * from the query service. The order of the following lines is very important.
+     */
+    if (timeRestore) {
+      if (timeRange) timefilterService.setTime(timeRange);
+      if (refreshInterval) timefilterService.setRefreshInterval(refreshInterval);
+    }
+
+    const { stop: stopSyncingQueryServiceStateWithUrl } = syncGlobalQueryStateWithUrl(
+      queryService,
+      kbnUrlStateStorage
+    );
+
+    if (!timeRestore) {
+      initialInput.timeRange = timefilterService.getTime();
+    }
+
+    untilDashboardReady().then((dashboardContainer) => {
+      const stopSyncingUnifiedSearchState =
+        syncUnifiedSearchState.bind(dashboardContainer)(kbnUrlStateStorage);
+      dashboardContainer.stopSyncingWithUnifiedSearch = () => {
+        stopSyncingUnifiedSearchState();
+        stopSyncingQueryServiceStateWithUrl();
+      };
+    });
+  }
+
+  // --------------------------------------------------------------------------------------
+  // Place the incoming embeddable if there is one
+  // --------------------------------------------------------------------------------------
+  const incomingEmbeddable = creationOptions?.incomingEmbeddable;
+  if (incomingEmbeddable) {
+    initialInput.viewMode = ViewMode.EDIT; // view mode must always be edit to recieve an embeddable.
+    if (
+      incomingEmbeddable.embeddableId &&
+      Boolean(initialInput.panels[incomingEmbeddable.embeddableId])
+    ) {
+      // this embeddable already exists, we will update the explicit input.
+      const panelToUpdate = initialInput.panels[incomingEmbeddable.embeddableId];
+      const sameType = panelToUpdate.type === incomingEmbeddable.type;
+
+      panelToUpdate.type = incomingEmbeddable.type;
+      panelToUpdate.explicitInput = {
+        // if the incoming panel is the same type as what was there before we can safely spread the old panel's explicit input
+        ...(sameType ? panelToUpdate.explicitInput : {}),
+
+        ...incomingEmbeddable.input,
+        id: incomingEmbeddable.embeddableId,
+
+        // maintain hide panel titles setting.
+        hidePanelTitles: panelToUpdate.explicitInput.hidePanelTitles,
+      };
+    } else {
+      // otherwise this incoming embeddable is brand new and can be added via the default method after the dashboard container is created.
+      untilDashboardReady().then((container) =>
+        container.addNewEmbeddable(incomingEmbeddable.type, incomingEmbeddable.input)
+      );
+    }
+  }
+
+  // --------------------------------------------------------------------------------------
+  // Set up search sessions integration.
+  // --------------------------------------------------------------------------------------
+  if (searchSessionSettings) {
+    const { sessionIdToRestore } = searchSessionSettings;
+
+    // if this incoming embeddable has a session, continue it.
+    if (incomingEmbeddable?.searchSessionId) {
+      session.continue(incomingEmbeddable.searchSessionId);
+    }
+    if (sessionIdToRestore) {
+      session.restore(sessionIdToRestore);
+    }
+    const existingSession = session.getSessionId();
+
+    const initialSearchSessionId =
+      sessionIdToRestore ??
+      (existingSession && incomingEmbeddable ? existingSession : session.start());
+
+    untilDashboardReady().then((container) => {
+      startDashboardSearchSessionIntegration.bind(container)(
+        creationOptions?.searchSessionSettings
+      );
+    });
+    initialInput.searchSessionId = initialSearchSessionId;
+  }
+
+  // --------------------------------------------------------------------------------------
+  // Start the control group integration.
+  // --------------------------------------------------------------------------------------
+  if (useControlGroupIntegration) {
+    const controlsGroupFactory = getEmbeddableFactory<
+      ControlGroupInput,
+      ControlGroupOutput,
+      ControlGroupContainer
+    >(CONTROL_GROUP_TYPE);
+    const { filters, query, timeRange, viewMode, controlGroupInput, id } = initialInput;
+    const controlGroup = await controlsGroupFactory?.create({
+      id: `control_group_${id ?? 'new_dashboard'}`,
+      ...getDefaultControlGroupInput(),
+      ...pickBy(controlGroupInput, identity), // undefined keys in initialInput should not overwrite defaults
+      timeRange,
+      viewMode,
+      filters,
+      query,
+    });
+    if (!controlGroup || isErrorEmbeddable(controlGroup)) {
+      throw new Error('Error in control group startup');
+    }
+
+    untilDashboardReady().then((dashboardContainer) => {
+      dashboardContainer.controlGroup = controlGroup;
+      startSyncingDashboardControlGroup.bind(dashboardContainer)();
+    });
+    await controlGroup.untilInitialized();
+  }
+
+  // --------------------------------------------------------------------------------------
+  // Start the data views integration.
+  // --------------------------------------------------------------------------------------
+  untilDashboardReady().then((dashboardContainer) => {
+    dashboardContainer.subscriptions.add(startSyncingDashboardDataViews.bind(dashboardContainer)());
+  });
+
+  // --------------------------------------------------------------------------------------
+  // Build and return the dashboard container.
+  // --------------------------------------------------------------------------------------
+  const dashboardContainer = new DashboardContainer(
+    initialInput,
+    reduxEmbeddablePackage,
+    savedObjectResult?.dashboardInput,
+    dashboardCreationStartTime,
+    undefined,
+    creationOptions,
+    savedObjectId
+  );
+  dashboardContainerReady$.next(dashboardContainer);
+  return dashboardContainer;
+};
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/integrations/data_views/sync_dashboard_data_views.ts b/src/plugins/dashboard/public/dashboard_container/embeddable/create/data_views/sync_dashboard_data_views.ts
similarity index 100%
rename from src/plugins/dashboard/public/dashboard_container/embeddable/integrations/data_views/sync_dashboard_data_views.ts
rename to src/plugins/dashboard/public/dashboard_container/embeddable/create/data_views/sync_dashboard_data_views.ts
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/create/search_sessions/start_dashboard_search_session_integration.ts b/src/plugins/dashboard/public/dashboard_container/embeddable/create/search_sessions/start_dashboard_search_session_integration.ts
new file mode 100644
index 0000000000000..506083ab25386
--- /dev/null
+++ b/src/plugins/dashboard/public/dashboard_container/embeddable/create/search_sessions/start_dashboard_search_session_integration.ts
@@ -0,0 +1,91 @@
+/*
+ * 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 { debounceTime, pairwise, skip } from 'rxjs/operators';
+
+import { noSearchSessionStorageCapabilityMessage } from '@kbn/data-plugin/public';
+
+import { DashboardContainer } from '../../dashboard_container';
+import { DashboardContainerInput } from '../../../../../common';
+import { pluginServices } from '../../../../services/plugin_services';
+import { CHANGE_CHECK_DEBOUNCE } from '../../../../dashboard_constants';
+import { DashboardCreationOptions } from '../../dashboard_container_factory';
+import { getShouldRefresh } from '../../../state/diffing/dashboard_diffing_integration';
+
+/**
+ * Enables dashboard search sessions.
+ */
+export function startDashboardSearchSessionIntegration(
+  this: DashboardContainer,
+  searchSessionSettings: DashboardCreationOptions['searchSessionSettings']
+) {
+  if (!searchSessionSettings) return;
+
+  const {
+    data: {
+      search: { session },
+    },
+    dashboardCapabilities: { storeSearchSession: canStoreSearchSession },
+  } = pluginServices.getServices();
+
+  const {
+    sessionIdUrlChangeObservable,
+    getSearchSessionIdFromURL,
+    removeSessionIdFromUrl,
+    createSessionRestorationDataProvider,
+  } = searchSessionSettings;
+
+  session.enableStorage(createSessionRestorationDataProvider(this), {
+    isDisabled: () =>
+      canStoreSearchSession
+        ? { disabled: false }
+        : {
+            disabled: true,
+            reasonText: noSearchSessionStorageCapabilityMessage,
+          },
+  });
+
+  // force refresh when the session id in the URL changes. This will also fire off the "handle search session change" below.
+  const searchSessionIdChangeSubscription = sessionIdUrlChangeObservable
+    ?.pipe(skip(1))
+    .subscribe(() => this.forceRefresh());
+
+  // listen to and compare states to determine when to launch a new session.
+  this.getInput$()
+    .pipe(pairwise(), debounceTime(CHANGE_CHECK_DEBOUNCE))
+    .subscribe(async (states) => {
+      const [previous, current] = states as DashboardContainerInput[];
+      const shouldRefetch = await getShouldRefresh.bind(this)(previous, current);
+      if (!shouldRefetch) return;
+
+      const currentSearchSessionId = this.getState().explicitInput.searchSessionId;
+
+      const updatedSearchSessionId: string | undefined = (() => {
+        // do not update session id if this is irrelevant state change to prevent excessive searches
+        if (!shouldRefetch) return;
+
+        let searchSessionIdFromURL = getSearchSessionIdFromURL();
+        if (searchSessionIdFromURL) {
+          if (session.isRestore() && session.isCurrentSession(searchSessionIdFromURL)) {
+            // we had previously been in a restored session but have now changed state so remove the session id from the URL.
+            removeSessionIdFromUrl();
+            searchSessionIdFromURL = undefined;
+          } else {
+            session.restore(searchSessionIdFromURL);
+          }
+        }
+        return searchSessionIdFromURL ?? session.start();
+      })();
+
+      if (updatedSearchSessionId && updatedSearchSessionId !== currentSearchSessionId) {
+        this.dispatch.setSearchSessionId(updatedSearchSessionId);
+      }
+    });
+
+  this.subscriptions.add(searchSessionIdChangeSubscription);
+}
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/integrations/unified_search/sync_dashboard_unified_search_state.ts b/src/plugins/dashboard/public/dashboard_container/embeddable/create/unified_search/sync_dashboard_unified_search_state.ts
similarity index 86%
rename from src/plugins/dashboard/public/dashboard_container/embeddable/integrations/unified_search/sync_dashboard_unified_search_state.ts
rename to src/plugins/dashboard/public/dashboard_container/embeddable/create/unified_search/sync_dashboard_unified_search_state.ts
index c3dc5f616330a..02095015f75a8 100644
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/integrations/unified_search/sync_dashboard_unified_search_state.ts
+++ b/src/plugins/dashboard/public/dashboard_container/embeddable/create/unified_search/sync_dashboard_unified_search_state.ts
@@ -31,19 +31,12 @@ export function syncUnifiedSearchState(
   const { queryString, timefilter } = queryService;
   const { timefilter: timefilterService } = timefilter;
 
-  const {
-    getState,
-    dispatch,
-    onStateChange,
-    actions: { setFiltersAndQuery, setTimeRange, setRefreshInterval },
-  } = this.getReduxEmbeddableTools();
-
   // get Observable for when the dashboard's saved filters or query change.
   const OnFiltersChange$ = new Subject<{ filters: Filter[]; query: Query }>();
-  const unsubscribeFromSavedFilterChanges = onStateChange(() => {
+  const unsubscribeFromSavedFilterChanges = this.onStateChange(() => {
     const {
       explicitInput: { filters, query },
-    } = getState();
+    } = this.getState();
     OnFiltersChange$.next({
       filters: filters ?? [],
       query: query ?? queryString.getDefaultQuery(),
@@ -53,7 +46,7 @@ export function syncUnifiedSearchState(
   // starts syncing app filters between dashboard state and filterManager
   const {
     explicitInput: { filters, query },
-  } = getState();
+  } = this.getState();
   const intermediateFilterState: { filters: Filter[]; query: Query } = {
     query: query ?? queryString.getDefaultQuery(),
     filters: filters ?? [],
@@ -66,7 +59,7 @@ export function syncUnifiedSearchState(
       set: ({ filters: newFilters, query: newQuery }) => {
         intermediateFilterState.filters = cleanFiltersForSerialize(newFilters);
         intermediateFilterState.query = newQuery;
-        dispatch(setFiltersAndQuery(intermediateFilterState));
+        this.dispatch.setFiltersAndQuery(intermediateFilterState);
       },
       state$: OnFiltersChange$.pipe(distinctUntilChanged()),
     },
@@ -78,11 +71,11 @@ export function syncUnifiedSearchState(
 
   const timeUpdateSubscription = timefilterService
     .getTimeUpdate$()
-    .subscribe(() => dispatch(setTimeRange(timefilterService.getTime())));
+    .subscribe(() => this.dispatch.setTimeRange(timefilterService.getTime()));
 
   const refreshIntervalSubscription = timefilterService
     .getRefreshIntervalUpdate$()
-    .subscribe(() => dispatch(setRefreshInterval(timefilterService.getRefreshInterval())));
+    .subscribe(() => this.dispatch.setRefreshInterval(timefilterService.getRefreshInterval()));
 
   const autoRefreshSubscription = timefilterService
     .getAutoRefreshFetch$()
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.test.tsx b/src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.test.tsx
index a6ac4bc970a00..bdce2754ba0dd 100644
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.test.tsx
+++ b/src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.test.tsx
@@ -29,8 +29,7 @@ import { applicationServiceMock, coreMock } from '@kbn/core/public/mocks';
 import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
 import { createEditModeActionDefinition } from '@kbn/embeddable-plugin/public/lib/test_samples';
 
-import { DashboardContainer } from './dashboard_container';
-import { getSampleDashboardInput, getSampleDashboardPanel } from '../../mocks';
+import { buildMockDashboard, getSampleDashboardPanel } from '../../mocks';
 import { pluginServices } from '../../services/plugin_services';
 import { ApplicationStart } from '@kbn/core-application-browser';
 
@@ -47,7 +46,7 @@ beforeEach(() => {
 });
 
 test('DashboardContainer initializes embeddables', (done) => {
-  const initialInput = getSampleDashboardInput({
+  const container = buildMockDashboard({
     panels: {
       '123': getSampleDashboardPanel<ContactCardEmbeddableInput>({
         explicitInput: { firstName: 'Sam', id: '123' },
@@ -55,7 +54,6 @@ test('DashboardContainer initializes embeddables', (done) => {
       }),
     },
   });
-  const container = new DashboardContainer(initialInput);
 
   const subscription = container.getOutput$().subscribe((output) => {
     if (container.getOutput().embeddableLoaded['123']) {
@@ -76,8 +74,7 @@ test('DashboardContainer initializes embeddables', (done) => {
 });
 
 test('DashboardContainer.addNewEmbeddable', async () => {
-  const container = new DashboardContainer(getSampleDashboardInput());
-  await container.untilInitialized();
+  const container = buildMockDashboard();
   const embeddable = await container.addNewEmbeddable<ContactCardEmbeddableInput>(
     CONTACT_CARD_EMBEDDABLE,
     {
@@ -99,7 +96,8 @@ test('DashboardContainer.addNewEmbeddable', async () => {
 
 test('DashboardContainer.replacePanel', (done) => {
   const ID = '123';
-  const initialInput = getSampleDashboardInput({
+
+  const container = buildMockDashboard({
     panels: {
       [ID]: getSampleDashboardPanel<ContactCardEmbeddableInput>({
         explicitInput: { firstName: 'Sam', id: ID },
@@ -107,8 +105,6 @@ test('DashboardContainer.replacePanel', (done) => {
       }),
     },
   });
-
-  const container = new DashboardContainer(initialInput);
   let counter = 0;
 
   const subscription = container.getInput$().subscribe(
@@ -141,7 +137,7 @@ test('DashboardContainer.replacePanel', (done) => {
 });
 
 test('Container view mode change propagates to existing children', async () => {
-  const initialInput = getSampleDashboardInput({
+  const container = buildMockDashboard({
     panels: {
       '123': getSampleDashboardPanel<ContactCardEmbeddableInput>({
         explicitInput: { firstName: 'Sam', id: '123' },
@@ -149,8 +145,6 @@ test('Container view mode change propagates to existing children', async () => {
       }),
     },
   });
-  const container = new DashboardContainer(initialInput);
-  await container.untilInitialized();
 
   const embeddable = await container.untilEmbeddableLoaded('123');
   expect(embeddable.getInput().viewMode).toBe(ViewMode.VIEW);
@@ -159,8 +153,7 @@ test('Container view mode change propagates to existing children', async () => {
 });
 
 test('Container view mode change propagates to new children', async () => {
-  const container = new DashboardContainer(getSampleDashboardInput());
-  await container.untilInitialized();
+  const container = buildMockDashboard();
   const embeddable = await container.addNewEmbeddable<
     ContactCardEmbeddableInput,
     ContactCardEmbeddableOutput,
@@ -178,10 +171,7 @@ test('Container view mode change propagates to new children', async () => {
 
 test('searchSessionId propagates to children', async () => {
   const searchSessionId1 = 'searchSessionId1';
-  const container = new DashboardContainer(
-    getSampleDashboardInput({ searchSessionId: searchSessionId1 })
-  );
-  await container.untilInitialized();
+  const container = buildMockDashboard({ searchSessionId: searchSessionId1 });
   const embeddable = await container.addNewEmbeddable<
     ContactCardEmbeddableInput,
     ContactCardEmbeddableOutput,
@@ -205,9 +195,7 @@ test('DashboardContainer in edit mode shows edit mode actions', async () => {
   uiActionsSetup.registerAction(editModeAction);
   uiActionsSetup.addTriggerAction(CONTEXT_MENU_TRIGGER, editModeAction);
 
-  const initialInput = getSampleDashboardInput({ viewMode: ViewMode.VIEW });
-  const container = new DashboardContainer(initialInput);
-  await container.untilInitialized();
+  const container = buildMockDashboard({ viewMode: ViewMode.VIEW });
 
   const embeddable = await container.addNewEmbeddable<
     ContactCardEmbeddableInput,
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx b/src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx
index 11e7de65f75ec..5b7a589afa950 100644
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx
+++ b/src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx
@@ -6,19 +6,14 @@
  * Side Public License, v 1.
  */
 
-import React from 'react';
+import React, { createContext, useContext } from 'react';
 import ReactDOM from 'react-dom';
-import { cloneDeep, omit } from 'lodash';
-import { BehaviorSubject, Subject, Subscription } from 'rxjs';
+import { Subject, Subscription } from 'rxjs';
 
-import {
-  lazyLoadReduxEmbeddablePackage,
-  ReduxEmbeddableTools,
-} from '@kbn/presentation-util-plugin/public';
+import { ReduxToolsPackage, ReduxEmbeddableTools } from '@kbn/presentation-util-plugin/public';
 import {
   ViewMode,
   Container,
-  type Embeddable,
   type IEmbeddable,
   type EmbeddableInput,
   type EmbeddableOutput,
@@ -44,36 +39,19 @@ import {
   showPlaceholderUntil,
   addOrUpdateEmbeddable,
 } from './api';
-import {
-  DashboardReduxState,
-  DashboardContainerOutput,
-  DashboardRenderPerformanceStats,
-} from '../types';
-import {
-  DashboardPanelState,
-  DashboardContainerInput,
-  DashboardContainerByValueInput,
-} from '../../../common';
-import {
-  startDiffingDashboardState,
-  startControlGroupIntegration,
-  startUnifiedSearchIntegration,
-  startSyncingDashboardDataViews,
-  startDashboardSearchSessionIntegration,
-  combineDashboardFiltersWithControlGroupFilters,
-  getUnsavedChanges,
-  keysNotConsideredUnsavedChanges,
-} from './integrations';
+
 import { DASHBOARD_CONTAINER_TYPE } from '../..';
 import { createPanelState } from '../component/panel';
 import { pluginServices } from '../../services/plugin_services';
-import { DASHBOARD_LOADED_EVENT } from '../../dashboard_constants';
 import { DashboardCreationOptions } from './dashboard_container_factory';
 import { DashboardAnalyticsService } from '../../services/analytics/types';
 import { DashboardViewport } from '../component/viewport/dashboard_viewport';
+import { DashboardPanelState, DashboardContainerInput } from '../../../common';
+import { DashboardReduxState, DashboardRenderPerformanceStats } from '../types';
 import { dashboardContainerReducers } from '../state/dashboard_container_reducers';
-import { DashboardSavedObjectService } from '../../services/dashboard_saved_object/types';
-import { dashboardContainerInputIsByValue } from '../../../common/dashboard_container/type_guards';
+import { startDiffingDashboardState } from '../state/diffing/dashboard_diffing_integration';
+import { DASHBOARD_LOADED_EVENT, DEFAULT_DASHBOARD_INPUT } from '../../dashboard_constants';
+import { combineDashboardFiltersWithControlGroupFilters } from './create/controls/dashboard_control_group_integration';
 
 export interface InheritedChildInput {
   filters: Filter[];
@@ -91,25 +69,40 @@ export interface InheritedChildInput {
   executionContext?: KibanaExecutionContext;
 }
 
+type DashboardReduxEmbeddableTools = ReduxEmbeddableTools<
+  DashboardReduxState,
+  typeof dashboardContainerReducers
+>;
+
+export const DashboardContainerContext = createContext<DashboardContainer | null>(null);
+export const useDashboardContainer = (): DashboardContainer => {
+  const dashboard = useContext<DashboardContainer | null>(DashboardContainerContext);
+  if (dashboard == null) {
+    throw new Error('useDashboardContainer must be used inside DashboardContainerContext.');
+  }
+  return dashboard!;
+};
+
 export class DashboardContainer extends Container<InheritedChildInput, DashboardContainerInput> {
   public readonly type = DASHBOARD_CONTAINER_TYPE;
+
+  // state management
+  public select: DashboardReduxEmbeddableTools['select'];
+  public getState: DashboardReduxEmbeddableTools['getState'];
+  public dispatch: DashboardReduxEmbeddableTools['dispatch'];
+  public onStateChange: DashboardReduxEmbeddableTools['onStateChange'];
+
+  public subscriptions: Subscription = new Subscription();
   public controlGroup?: ControlGroupContainer;
 
-  // Dashboard State
-  public onDestroyControlGroup?: () => void;
-  private subscriptions: Subscription = new Subscription();
+  // cleanup
+  public stopSyncingWithUnifiedSearch?: () => void;
+  private cleanupStateTools: () => void;
 
-  private initialized$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+  // performance monitoring
   private dashboardCreationStartTime?: number;
   private savedObjectLoadTime?: number;
 
-  private initialSavedDashboardId?: string;
-
-  private reduxEmbeddableTools?: ReduxEmbeddableTools<
-    DashboardReduxState,
-    typeof dashboardContainerReducers
-  >;
-
   private domNode?: HTMLElement;
   private overlayRef?: OverlayRef;
   private allDataViews: DataView[] = [];
@@ -117,19 +110,19 @@ export class DashboardContainer extends Container<InheritedChildInput, Dashboard
   // Services that are used in the Dashboard container code
   private creationOptions?: DashboardCreationOptions;
   private analyticsService: DashboardAnalyticsService;
-  private dashboardSavedObjectService: DashboardSavedObjectService;
   private theme$;
   private chrome;
   private customBranding;
 
   constructor(
     initialInput: DashboardContainerInput,
+    reduxToolsPackage: ReduxToolsPackage,
+    initialLastSavedInput?: DashboardContainerInput,
     dashboardCreationStartTime?: number,
     parent?: Container,
-    creationOptions?: DashboardCreationOptions
+    creationOptions?: DashboardCreationOptions,
+    savedObjectId?: string
   ) {
-    // we won't initialize any embeddable children until after the dashboard is done initializing.
-    const readyToInitializeChildren$ = new Subject<DashboardContainerInput>();
     const {
       embeddable: { getEmbeddableFactory },
     } = pluginServices.getServices();
@@ -140,15 +133,11 @@ export class DashboardContainer extends Container<InheritedChildInput, Dashboard
       },
       { embeddableLoaded: {} },
       getEmbeddableFactory,
-      parent,
-      {
-        readyToInitializeChildren$,
-      }
+      parent
     );
 
     ({
       analytics: this.analyticsService,
-      dashboardSavedObject: this.dashboardSavedObjectService,
       settings: {
         theme: { theme$: this.theme$ },
       },
@@ -156,215 +145,44 @@ export class DashboardContainer extends Container<InheritedChildInput, Dashboard
       customBranding: this.customBranding,
     } = pluginServices.getServices());
 
-    this.initialSavedDashboardId = dashboardContainerInputIsByValue(this.input)
-      ? undefined
-      : this.input.savedObjectId;
     this.creationOptions = creationOptions;
-
     this.dashboardCreationStartTime = dashboardCreationStartTime;
-    this.initializeDashboard(readyToInitializeChildren$, creationOptions);
-  }
-
-  public getDashboardSavedObjectId() {
-    if (this.initialized$.value) {
-      return this.getReduxEmbeddableTools().getState().componentState.lastSavedId;
-    }
-    return this.initialSavedDashboardId;
-  }
-
-  public getInputAsValueType = () => {
-    if (!dashboardContainerInputIsByValue(this.input)) {
-      throw new Error('cannot get input as value type until after dashboard input is unwrapped.');
-    }
-    return this.getInput() as DashboardContainerByValueInput;
-  };
-
-  private async unwrapDashboardContainerInput(): Promise<
-    DashboardContainerByValueInput | undefined
-  > {
-    if (dashboardContainerInputIsByValue(this.input)) {
-      return this.input;
-    }
-
-    // if this dashboard is loaded by reference, unwrap it and track the saved object load time.
-    const savedObjectLoadStartTime = performance.now();
-    const unwrapResult = await this.dashboardSavedObjectService.loadDashboardStateFromSavedObject({
-      id: this.input.savedObjectId,
-    });
-    this.updateInput({ savedObjectId: undefined });
-    this.savedObjectLoadTime = performance.now() - savedObjectLoadStartTime;
-    if (
-      !this.creationOptions?.validateLoadedSavedObject ||
-      this.creationOptions.validateLoadedSavedObject(unwrapResult)
-    ) {
-      return unwrapResult.dashboardInput;
-    }
-  }
-
-  private async initializeDashboard(
-    readyToInitializeChildren$: Subject<DashboardContainerInput>,
-    creationOptions?: DashboardCreationOptions
-  ) {
-    const {
-      data: { dataViews },
-    } = pluginServices.getServices();
-
-    const reduxEmbeddablePackagePromise = lazyLoadReduxEmbeddablePackage();
-    const defaultDataViewAssignmentPromise = dataViews.getDefaultDataView();
-    const dashboardStateUnwrapPromise = this.unwrapDashboardContainerInput();
-
-    const [reduxEmbeddablePackage, inputFromSavedObject, defaultDataView] = await Promise.all([
-      reduxEmbeddablePackagePromise,
-      dashboardStateUnwrapPromise,
-      defaultDataViewAssignmentPromise,
-    ]);
-
-    if (!defaultDataView) {
-      throw new Error('Dashboard requires at least one data view before it can be initialized.');
-    }
-
-    // inputFromSavedObject will only be undefined if the provided valiation function returns false.
-    if (!inputFromSavedObject) {
-      this.destroy();
-      return;
-    }
-
-    // Gather input from session storage if integration is used
-    let sessionStorageInput: Partial<DashboardContainerByValueInput> = {};
-    if (creationOptions?.useSessionStorageIntegration) {
-      const { dashboardSessionStorage } = pluginServices.getServices();
-      const sessionInput = dashboardSessionStorage.getState(this.initialSavedDashboardId);
-      if (sessionInput) sessionStorageInput = sessionInput;
-    }
-
-    // Combine input from saved object with override input.
-    const initialInput: DashboardContainerByValueInput = cloneDeep({
-      ...inputFromSavedObject,
-      ...sessionStorageInput,
-      ...creationOptions?.overrideInput,
-    });
-
-    // set up execution context
-    initialInput.executionContext = {
-      type: 'dashboard',
-      description: initialInput.title,
-    };
-
-    // set up unified search integration
-    if (
-      creationOptions?.useUnifiedSearchIntegration &&
-      creationOptions.unifiedSearchSettings?.kbnUrlStateStorage
-    ) {
-      const { kbnUrlStateStorage } = creationOptions.unifiedSearchSettings;
-      const initialTimeRange = startUnifiedSearchIntegration.bind(this)({
-        initialInput,
-        kbnUrlStateStorage,
-        setCleanupFunction: (cleanup) => {
-          this.stopSyncingWithUnifiedSearch = cleanup;
-        },
-      });
-      if (initialTimeRange) initialInput.timeRange = initialTimeRange;
-    }
-
-    // place the incoming embeddable if there is one
-    const incomingEmbeddable = creationOptions?.incomingEmbeddable;
-    if (incomingEmbeddable) {
-      initialInput.viewMode = ViewMode.EDIT; // view mode must always be edit to recieve an embeddable.
-      if (
-        incomingEmbeddable.embeddableId &&
-        Boolean(initialInput.panels[incomingEmbeddable.embeddableId])
-      ) {
-        // this embeddable already exists, we will update the explicit input.
-        const panelToUpdate = initialInput.panels[incomingEmbeddable.embeddableId];
-        const sameType = panelToUpdate.type === incomingEmbeddable.type;
-
-        panelToUpdate.type = incomingEmbeddable.type;
-        panelToUpdate.explicitInput = {
-          // if the incoming panel is the same type as what was there before we can safely spread the old panel's explicit input
-          ...(sameType ? panelToUpdate.explicitInput : {}),
-
-          ...incomingEmbeddable.input,
-          id: incomingEmbeddable.embeddableId,
-
-          // maintain hide panel titles setting.
-          hidePanelTitles: panelToUpdate.explicitInput.hidePanelTitles,
-        };
-      } else {
-        // otherwise this incoming embeddable is brand new and can be added via the default method after the dashboard container is created.
-        this.untilInitialized().then(() =>
-          this.addNewEmbeddable(incomingEmbeddable.type, incomingEmbeddable.input)
-        );
-      }
-    }
-
-    // start search sessions integration
-    if (creationOptions?.useSearchSessionsIntegration) {
-      const { initialSearchSessionId, stopSyncingDashboardSearchSessions } =
-        startDashboardSearchSessionIntegration.bind(this)(
-          creationOptions?.searchSessionSettings,
-          incomingEmbeddable
-        );
-      initialInput.searchSessionId = initialSearchSessionId;
-      this.stopSyncingDashboardSearchSessions = stopSyncingDashboardSearchSessions;
-    }
-
-    // update input so the redux embeddable tools get the unwrapped, initial input
-    this.updateInput({ ...initialInput });
-
-    // build Control Group
-    if (creationOptions?.useControlGroupIntegration) {
-      this.controlGroup = await startControlGroupIntegration.bind(this)(initialInput);
-    }
-
-    // now that the input with the initial panel state has been set and the control group is ready, we can tell the container class it's time to start loading children.
-    readyToInitializeChildren$.next(initialInput);
 
     // start diffing dashboard state
-    const diffingMiddleware = startDiffingDashboardState.bind(this)({
-      useSessionBackup: creationOptions?.useSessionStorageIntegration,
-      setCleanupFunction: (cleanup) => {
-        this.stopDiffingDashboardState = cleanup;
-      },
-    });
-
-    // set up data views integration
-    this.dataViewsChangeSubscription = startSyncingDashboardDataViews.bind(this)();
+    const diffingMiddleware = startDiffingDashboardState.bind(this)(creationOptions);
 
     // build redux embeddable tools
-    this.reduxEmbeddableTools = reduxEmbeddablePackage.createTools<
+    const reduxTools = reduxToolsPackage.createReduxEmbeddableTools<
       DashboardReduxState,
       typeof dashboardContainerReducers
     >({
-      embeddable: this as Embeddable<DashboardContainerByValueInput, DashboardContainerOutput>, // cast to unwrapped state type
+      embeddable: this,
       reducers: dashboardContainerReducers,
       additionalMiddleware: [diffingMiddleware],
       initialComponentState: {
-        lastSavedInput: inputFromSavedObject,
+        lastSavedInput: initialLastSavedInput ?? {
+          ...DEFAULT_DASHBOARD_INPUT,
+          id: initialInput.id,
+        },
         hasUnsavedChanges: false, // if there is initial unsaved changes, the initial diff will catch them.
-        lastSavedId: this.initialSavedDashboardId,
+        lastSavedId: savedObjectId,
       },
     });
 
-    this.initialized$.next(true);
+    this.onStateChange = reduxTools.onStateChange;
+    this.cleanupStateTools = reduxTools.cleanup;
+    this.getState = reduxTools.getState;
+    this.dispatch = reduxTools.dispatch;
+    this.select = reduxTools.select;
   }
 
-  public async untilInitialized() {
-    if (this.initialized$.value) return Promise.resolve();
-    return new Promise<void>((resolve) => {
-      const subscription = this.initialized$.subscribe((isInitialized) => {
-        if (isInitialized) {
-          resolve();
-          subscription.unsubscribe();
-        }
-      });
-    });
+  public getDashboardSavedObjectId() {
+    return this.getState().componentState.lastSavedId;
   }
 
   public reportPerformanceMetrics(stats: DashboardRenderPerformanceStats) {
     if (this.analyticsService && this.dashboardCreationStartTime) {
-      const panelCount = Object.keys(
-        this.getReduxEmbeddableTools().getState().explicitInput.panels
-      ).length;
+      const panelCount = Object.keys(this.getState().explicitInput.panels).length;
       const totalDuration = stats.panelsRenderDoneTime - this.dashboardCreationStartTime;
       reportPerformanceMetricEvent(this.analyticsService, {
         eventName: DASHBOARD_LOADED_EVENT,
@@ -393,44 +211,22 @@ export class DashboardContainer extends Container<InheritedChildInput, Dashboard
     return newPanel;
   }
 
-  public async getExplicitInputIsEqual(lastExplicitInput: DashboardContainerByValueInput) {
-    const currentInput = this.getReduxEmbeddableTools().getState().explicitInput;
-    return (
-      omit(
-        Object.keys(await getUnsavedChanges.bind(this)(lastExplicitInput, currentInput)),
-        keysNotConsideredUnsavedChanges
-      ).length > 0
-    );
-  }
-
-  public getReduxEmbeddableTools() {
-    if (!this.reduxEmbeddableTools) {
-      throw new Error('Dashboard must be initialized before accessing redux embeddable tools');
-    }
-    return this.reduxEmbeddableTools;
-  }
-
   public render(dom: HTMLElement) {
-    if (!this.reduxEmbeddableTools) {
-      throw new Error('Dashboard must be initialized before it can be rendered');
-    }
     if (this.domNode) {
       ReactDOM.unmountComponentAtNode(this.domNode);
     }
     this.domNode = dom;
-
     this.domNode.className = 'dashboardContainer';
 
-    const { Wrapper: DashboardReduxWrapper } = this.reduxEmbeddableTools;
     ReactDOM.render(
       <I18nProvider>
         <ExitFullScreenButtonKibanaProvider
           coreStart={{ chrome: this.chrome, customBranding: this.customBranding }}
         >
           <KibanaThemeProvider theme$={this.theme$}>
-            <DashboardReduxWrapper>
+            <DashboardContainerContext.Provider value={this}>
               <DashboardViewport />
-            </DashboardReduxWrapper>
+            </DashboardContainerContext.Provider>
           </KibanaThemeProvider>
         </ExitFullScreenButtonKibanaProvider>
       </I18nProvider>,
@@ -451,7 +247,7 @@ export class DashboardContainer extends Container<InheritedChildInput, Dashboard
       searchSessionId,
       refreshInterval,
       executionContext,
-    } = this.input as DashboardContainerByValueInput;
+    } = this.input;
 
     let combinedFilters = filters;
     if (this.controlGroup) {
@@ -476,20 +272,12 @@ export class DashboardContainer extends Container<InheritedChildInput, Dashboard
   // ------------------------------------------------------------------------------------------------------
   // Cleanup
   // ------------------------------------------------------------------------------------------------------
-  private stopDiffingDashboardState?: () => void;
-  private stopSyncingWithUnifiedSearch?: () => void;
-  private dataViewsChangeSubscription?: Subscription = undefined;
-  private stopSyncingDashboardSearchSessions: (() => void) | undefined;
-
   public destroy() {
     super.destroy();
-    this.onDestroyControlGroup?.();
+    this.cleanupStateTools();
+    this.controlGroup?.destroy();
     this.subscriptions.unsubscribe();
-    this.stopDiffingDashboardState?.();
-    this.reduxEmbeddableTools?.cleanup();
     this.stopSyncingWithUnifiedSearch?.();
-    this.stopSyncingDashboardSearchSessions?.();
-    this.dataViewsChangeSubscription?.unsubscribe();
     if (this.domNode) ReactDOM.unmountComponentAtNode(this.domNode);
   }
 
@@ -529,29 +317,20 @@ export class DashboardContainer extends Container<InheritedChildInput, Dashboard
   public addOrUpdateEmbeddable = addOrUpdateEmbeddable;
 
   public forceRefresh(refreshControlGroup: boolean = true) {
-    const {
-      dispatch,
-      actions: { setLastReloadRequestTimeToNow },
-    } = this.getReduxEmbeddableTools();
-    dispatch(setLastReloadRequestTimeToNow({}));
+    this.dispatch.setLastReloadRequestTimeToNow({});
     if (refreshControlGroup) this.controlGroup?.reload();
   }
 
   public onDataViewsUpdate$ = new Subject<DataView[]>();
 
   public resetToLastSavedState() {
-    const {
-      dispatch,
-      getState,
-      actions: { resetToLastSavedInput },
-    } = this.getReduxEmbeddableTools();
-    dispatch(resetToLastSavedInput({}));
+    this.dispatch.resetToLastSavedInput({});
     const {
       explicitInput: { timeRange, refreshInterval },
       componentState: {
         lastSavedInput: { timeRestore: lastSavedTimeRestore },
       },
-    } = getState();
+    } = this.getState();
 
     // if we are using the unified search integration, we need to force reset the time picker.
     if (this.creationOptions?.useUnifiedSearchIntegration && lastSavedTimeRestore) {
@@ -585,8 +364,11 @@ export class DashboardContainer extends Container<InheritedChildInput, Dashboard
   };
 
   public getExpandedPanelId = () => {
-    if (!this.reduxEmbeddableTools) throw new Error();
-    return this.reduxEmbeddableTools.getState().componentState.expandedPanelId;
+    return this.getState().componentState.expandedPanelId;
+  };
+
+  public setExpandedPanelId = (newId?: string) => {
+    this.dispatch.setExpandedPanelId(newId);
   };
 
   public openOverlay = (ref: OverlayRef) => {
@@ -599,15 +381,6 @@ export class DashboardContainer extends Container<InheritedChildInput, Dashboard
     this.overlayRef?.close();
   };
 
-  public setExpandedPanelId = (newId?: string) => {
-    if (!this.reduxEmbeddableTools) throw new Error();
-    const {
-      actions: { setExpandedPanelId },
-      dispatch,
-    } = this.reduxEmbeddableTools;
-    dispatch(setExpandedPanelId(newId));
-  };
-
   public getPanelCount = () => {
     return Object.keys(this.getInput().panels).length;
   };
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container_factory.tsx b/src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container_factory.tsx
index 7c61591d5ff27..2af0d60572cbd 100644
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container_factory.tsx
+++ b/src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container_factory.tsx
@@ -21,15 +21,10 @@ import { SearchSessionInfoProvider } from '@kbn/data-plugin/public';
 import { IKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public';
 import { EmbeddablePersistableStateService } from '@kbn/embeddable-plugin/common';
 
-import {
-  createInject,
-  createExtract,
-  DashboardContainerInput,
-  DashboardContainerByValueInput,
-} from '../../../common';
 import { DASHBOARD_CONTAINER_TYPE } from '..';
 import type { DashboardContainer } from './dashboard_container';
 import { DEFAULT_DASHBOARD_INPUT } from '../../dashboard_constants';
+import { createInject, createExtract, DashboardContainerInput } from '../../../common';
 import { LoadDashboardFromSavedObjectReturn } from '../../services/dashboard_saved_object/lib/load_dashboard_state_from_saved_object';
 
 export type DashboardContainerFactory = EmbeddableFactory<
@@ -40,7 +35,6 @@ export type DashboardContainerFactory = EmbeddableFactory<
 
 export interface DashboardCreationOptions {
   initialInput?: Partial<DashboardContainerInput>;
-  overrideInput?: Partial<DashboardContainerByValueInput>;
 
   incomingEmbeddable?: EmbeddablePackageState;
 
@@ -97,19 +91,17 @@ export class DashboardContainerFactoryDefinition
   public create = async (
     initialInput: DashboardContainerInput,
     parent?: Container,
-    creationOptions?: DashboardCreationOptions
+    creationOptions?: DashboardCreationOptions,
+    savedObjectId?: string
   ): Promise<DashboardContainer | ErrorEmbeddable> => {
     const dashboardCreationStartTime = performance.now();
-    const { DashboardContainer: DashboardContainerEmbeddable } = await import(
-      './dashboard_container'
-    );
-    return Promise.resolve(
-      new DashboardContainerEmbeddable(
-        initialInput,
-        dashboardCreationStartTime,
-        parent,
-        creationOptions
-      )
-    );
+    const { createDashboard } = await import('./create/create_dashboard');
+    try {
+      return Promise.resolve(
+        createDashboard(initialInput.id, creationOptions, dashboardCreationStartTime, savedObjectId)
+      );
+    } catch (e) {
+      return new ErrorEmbeddable(e.text, { id: e.id });
+    }
   };
 }
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/integrations/index.ts b/src/plugins/dashboard/public/dashboard_container/embeddable/integrations/index.ts
deleted file mode 100644
index f5399991cc8a2..0000000000000
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/integrations/index.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * 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 {
-  getUnsavedChanges,
-  startDiffingDashboardState,
-  keysNotConsideredUnsavedChanges,
-} from './diff_state/dashboard_diffing_integration';
-
-export {
-  startUnifiedSearchIntegration,
-  applySavedFiltersToUnifiedSearch,
-} from './unified_search/start_dashboard_unified_search_integration';
-
-export {
-  startControlGroupIntegration,
-  combineDashboardFiltersWithControlGroupFilters,
-} from './controls/dashboard_control_group_integration';
-
-export { startSyncingDashboardDataViews } from './data_views/sync_dashboard_data_views';
-export { startDashboardSearchSessionIntegration } from './search_sessions/start_dashboard_search_session_integration';
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/integrations/search_sessions/start_dashboard_search_session_integration.ts b/src/plugins/dashboard/public/dashboard_container/embeddable/integrations/search_sessions/start_dashboard_search_session_integration.ts
deleted file mode 100644
index 986a53a022c6a..0000000000000
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/integrations/search_sessions/start_dashboard_search_session_integration.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * 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 { Subscription } from 'rxjs';
-import { debounceTime, pairwise, skip } from 'rxjs/operators';
-import { noSearchSessionStorageCapabilityMessage } from '@kbn/data-plugin/public';
-
-import { DashboardContainer } from '../../dashboard_container';
-import { pluginServices } from '../../../../services/plugin_services';
-import { DashboardContainerByValueInput } from '../../../../../common';
-import { CHANGE_CHECK_DEBOUNCE } from '../../../../dashboard_constants';
-import { DashboardCreationOptions } from '../../dashboard_container_factory';
-import { getShouldRefresh } from '../diff_state/dashboard_diffing_integration';
-
-/**
- * Enables dashboard search sessions.
- */
-export function startDashboardSearchSessionIntegration(
-  this: DashboardContainer,
-  searchSessionSettings: DashboardCreationOptions['searchSessionSettings'],
-  incomingEmbeddable: DashboardCreationOptions['incomingEmbeddable']
-) {
-  if (!searchSessionSettings) {
-    throw new Error('Cannot start search sessions integration without settings');
-  }
-  const {
-    createSessionRestorationDataProvider,
-    sessionIdUrlChangeObservable,
-    getSearchSessionIdFromURL,
-    removeSessionIdFromUrl,
-    sessionIdToRestore,
-  } = searchSessionSettings;
-
-  const {
-    data: {
-      search: { session },
-    },
-    dashboardCapabilities: { storeSearchSession: canStoreSearchSession },
-  } = pluginServices.getServices();
-
-  // if this incoming embeddable has a session, continue it.
-  if (incomingEmbeddable?.searchSessionId) {
-    session.continue(incomingEmbeddable.searchSessionId);
-  }
-  if (sessionIdToRestore) {
-    session.restore(sessionIdToRestore);
-  }
-  const existingSession = session.getSessionId();
-
-  const initialSearchSessionId =
-    sessionIdToRestore ??
-    (existingSession && incomingEmbeddable ? existingSession : session.start());
-
-  session.enableStorage(createSessionRestorationDataProvider(this), {
-    isDisabled: () =>
-      canStoreSearchSession
-        ? { disabled: false }
-        : {
-            disabled: true,
-            reasonText: noSearchSessionStorageCapabilityMessage,
-          },
-  });
-
-  let searchSessionIdChangeSubscription: Subscription | undefined;
-  let checkForSessionChangeSubscription: Subscription | undefined;
-  this.untilInitialized().then(() => {
-    // force refresh when the session id in the URL changes. This will also fire off the "handle search session change" below.
-    searchSessionIdChangeSubscription = sessionIdUrlChangeObservable
-      ?.pipe(skip(1))
-      .subscribe(() => this.forceRefresh());
-
-    // listen to and compare states to determine when to launch a new session.
-    this.getInput$()
-      .pipe(pairwise(), debounceTime(CHANGE_CHECK_DEBOUNCE))
-      .subscribe(async (states) => {
-        const [previous, current] = states as DashboardContainerByValueInput[];
-        const shouldRefetch = await getShouldRefresh.bind(this)(previous, current);
-        if (!shouldRefetch) return;
-
-        const {
-          getState,
-          dispatch,
-          actions: { setSearchSessionId },
-        } = this.getReduxEmbeddableTools();
-        const currentSearchSessionId = getState().explicitInput.searchSessionId;
-
-        const updatedSearchSessionId: string | undefined = (() => {
-          // do not update session id if this is irrelevant state change to prevent excessive searches
-          if (!shouldRefetch) return;
-
-          let searchSessionIdFromURL = getSearchSessionIdFromURL();
-          if (searchSessionIdFromURL) {
-            if (session.isRestore() && session.isCurrentSession(searchSessionIdFromURL)) {
-              // we had previously been in a restored session but have now changed state so remove the session id from the URL.
-              removeSessionIdFromUrl();
-              searchSessionIdFromURL = undefined;
-            } else {
-              session.restore(searchSessionIdFromURL);
-            }
-          }
-          return searchSessionIdFromURL ?? session.start();
-        })();
-
-        if (updatedSearchSessionId && updatedSearchSessionId !== currentSearchSessionId) {
-          dispatch(setSearchSessionId(updatedSearchSessionId));
-        }
-      });
-  });
-
-  return {
-    initialSearchSessionId,
-    stopSyncingDashboardSearchSessions: () => {
-      checkForSessionChangeSubscription?.unsubscribe();
-      searchSessionIdChangeSubscription?.unsubscribe();
-    },
-  };
-}
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/integrations/unified_search/start_dashboard_unified_search_integration.ts b/src/plugins/dashboard/public/dashboard_container/embeddable/integrations/unified_search/start_dashboard_unified_search_integration.ts
deleted file mode 100644
index 322caf7846b60..0000000000000
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/integrations/unified_search/start_dashboard_unified_search_integration.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * 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 { cloneDeep } from 'lodash';
-
-import { syncGlobalQueryStateWithUrl } from '@kbn/data-plugin/public';
-import { IKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public';
-
-import { DashboardContainer } from '../../dashboard_container';
-import { pluginServices } from '../../../../services/plugin_services';
-import { DashboardContainerByValueInput } from '../../../../../common';
-import { syncUnifiedSearchState } from './sync_dashboard_unified_search_state';
-
-/**
- * Applies initial state to the query service, and the saved dashboard search source
- * Sets up syncing and subscriptions between the filter state from the Data plugin
- * and the dashboard Redux store.
- */
-export function startUnifiedSearchIntegration(
-  this: DashboardContainer,
-  {
-    initialInput,
-    setCleanupFunction,
-    kbnUrlStateStorage,
-  }: {
-    kbnUrlStateStorage: IKbnUrlStateStorage;
-    initialInput: DashboardContainerByValueInput;
-    setCleanupFunction: (cleanupFunction: () => void) => void;
-  }
-) {
-  const {
-    data: { query: queryService },
-  } = pluginServices.getServices();
-  const { timefilter } = queryService;
-  const { timefilter: timefilterService } = timefilter;
-
-  // apply initial dashboard saved filters, query, and time range to the query bar.
-  applySavedFiltersToUnifiedSearch.bind(this)(initialInput);
-
-  // starts syncing `_g` portion of url with query services
-  const { stop: stopSyncingQueryServiceStateWithUrl } = syncGlobalQueryStateWithUrl(
-    queryService,
-    kbnUrlStateStorage
-  );
-
-  const initialTimeRange = initialInput.timeRestore ? undefined : timefilterService.getTime();
-  this.untilInitialized().then(() => {
-    const stopSyncingUnifiedSearchState = syncUnifiedSearchState.bind(this)(kbnUrlStateStorage);
-    setCleanupFunction(() => {
-      stopSyncingQueryServiceStateWithUrl?.();
-      stopSyncingUnifiedSearchState?.();
-    });
-  });
-  return initialTimeRange;
-}
-
-export function applySavedFiltersToUnifiedSearch(
-  this: DashboardContainer,
-  initialInput?: DashboardContainerByValueInput
-) {
-  const {
-    data: {
-      query: { filterManager, queryString, timefilter },
-    },
-  } = pluginServices.getServices();
-  const { timefilter: timefilterService } = timefilter;
-
-  const input = initialInput
-    ? initialInput
-    : this.getReduxEmbeddableTools().getState().explicitInput;
-  const { filters, query, timeRestore, timeRange, refreshInterval } = input;
-
-  // apply filters and query to the query service
-  filterManager.setAppFilters(cloneDeep(filters ?? []));
-  queryString.setQuery(query ?? queryString.getDefaultQuery());
-
-  /**
-   * If a global time range is not set explicitly and the time range was saved with the dashboard, apply
-   * time range and refresh interval to the query service.
-   */
-  if (timeRestore) {
-    if (timeRange) timefilterService.setTime(timeRange);
-    if (refreshInterval) timefilterService.setRefreshInterval(refreshInterval);
-  }
-}
diff --git a/src/plugins/dashboard/public/dashboard_container/external_api/dashboard_api.ts b/src/plugins/dashboard/public/dashboard_container/external_api/dashboard_api.ts
new file mode 100644
index 0000000000000..ff71fdc70ccfb
--- /dev/null
+++ b/src/plugins/dashboard/public/dashboard_container/external_api/dashboard_api.ts
@@ -0,0 +1,15 @@
+/*
+ * 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 { DashboardContainer } from '../embeddable/dashboard_container';
+
+// TODO lock down DashboardAPI
+export type DashboardAPI = DashboardContainer;
+export type AwaitingDashboardAPI = DashboardAPI | null;
+
+export const buildApiFromDashboardContainer = (container?: DashboardContainer) => container ?? null;
diff --git a/src/plugins/dashboard/public/dashboard_container/external_api/dashboard_renderer.test.tsx b/src/plugins/dashboard/public/dashboard_container/external_api/dashboard_renderer.test.tsx
new file mode 100644
index 0000000000000..4497812c4c716
--- /dev/null
+++ b/src/plugins/dashboard/public/dashboard_container/external_api/dashboard_renderer.test.tsx
@@ -0,0 +1,102 @@
+/*
+ * 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 { ReactWrapper } from 'enzyme';
+import { act } from 'react-dom/test-utils';
+import { mountWithIntl } from '@kbn/test-jest-helpers';
+
+import { DashboardContainerFactory } from '..';
+import { DASHBOARD_CONTAINER_TYPE } from '../..';
+import { DashboardRenderer } from './dashboard_renderer';
+import { pluginServices } from '../../services/plugin_services';
+import { DashboardContainer } from '../embeddable/dashboard_container';
+import { DashboardCreationOptions } from '../embeddable/dashboard_container_factory';
+
+describe('dashboard renderer', () => {
+  let mockDashboardContainer: DashboardContainer;
+  let mockDashboardFactory: DashboardContainerFactory;
+
+  beforeEach(() => {
+    mockDashboardContainer = {
+      destroy: jest.fn(),
+      render: jest.fn(),
+      isExpectingIdChange: jest.fn().mockReturnValue(false),
+    } as unknown as DashboardContainer;
+    mockDashboardFactory = {
+      create: jest.fn().mockReturnValue(mockDashboardContainer),
+    } as unknown as DashboardContainerFactory;
+    pluginServices.getServices().embeddable.getEmbeddableFactory = jest
+      .fn()
+      .mockReturnValue(mockDashboardFactory);
+  });
+
+  test('calls create method on the Dashboard embeddable factory', async () => {
+    await act(async () => {
+      mountWithIntl(<DashboardRenderer />);
+    });
+    expect(pluginServices.getServices().embeddable.getEmbeddableFactory).toHaveBeenCalledWith(
+      DASHBOARD_CONTAINER_TYPE
+    );
+    expect(mockDashboardFactory.create).toHaveBeenCalled();
+  });
+
+  test('saved object id & creation options are passed to dashboard factory', async () => {
+    const options: DashboardCreationOptions = {
+      useControlGroupIntegration: true,
+      useSessionStorageIntegration: true,
+      useUnifiedSearchIntegration: true,
+    };
+    await act(async () => {
+      mountWithIntl(
+        <DashboardRenderer
+          savedObjectId="saved_object_kibanana"
+          getCreationOptions={() => Promise.resolve(options)}
+        />
+      );
+    });
+    expect(mockDashboardFactory.create).toHaveBeenCalledWith(
+      expect.any(Object),
+      undefined,
+      options,
+      'saved_object_kibanana'
+    );
+  });
+
+  test('destroys dashboard container on unmount', async () => {
+    let wrapper: ReactWrapper;
+    await act(async () => {
+      wrapper = await mountWithIntl(<DashboardRenderer savedObjectId="saved_object_kibanana" />);
+    });
+    wrapper!.unmount();
+    expect(mockDashboardContainer.destroy).toHaveBeenCalledTimes(1);
+  });
+
+  test('destroys dashboard container on unexpected ID change', async () => {
+    let wrapper: ReactWrapper;
+    await act(async () => {
+      wrapper = await mountWithIntl(<DashboardRenderer savedObjectId="saved_object_kibanana" />);
+    });
+    await act(async () => {
+      await wrapper.setProps({ savedObjectId: 'saved_object_kibanakiwi' });
+    });
+    expect(mockDashboardContainer.destroy).toHaveBeenCalledTimes(1);
+  });
+
+  test('does not destroy dashboard container on expected ID change', async () => {
+    let wrapper: ReactWrapper;
+    await act(async () => {
+      wrapper = await mountWithIntl(<DashboardRenderer savedObjectId="saved_object_kibanana" />);
+    });
+    mockDashboardContainer.isExpectingIdChange = jest.fn().mockReturnValue(true);
+    await act(async () => {
+      await wrapper.setProps({ savedObjectId: 'saved_object_kibanakiwi' });
+    });
+    expect(mockDashboardContainer.destroy).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/plugins/dashboard/public/dashboard_container/external_api/dashboard_renderer.tsx b/src/plugins/dashboard/public/dashboard_container/external_api/dashboard_renderer.tsx
new file mode 100644
index 0000000000000..04d85c2f06b9b
--- /dev/null
+++ b/src/plugins/dashboard/public/dashboard_container/external_api/dashboard_renderer.tsx
@@ -0,0 +1,140 @@
+/*
+ * 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 '../_dashboard_container.scss';
+
+import React, {
+  useRef,
+  useMemo,
+  useState,
+  useEffect,
+  forwardRef,
+  useImperativeHandle,
+} from 'react';
+import { v4 as uuidv4 } from 'uuid';
+import classNames from 'classnames';
+
+import { EuiLoadingElastic, EuiLoadingSpinner } from '@elastic/eui';
+
+import {
+  DashboardAPI,
+  AwaitingDashboardAPI,
+  buildApiFromDashboardContainer,
+} from './dashboard_api';
+import {
+  DashboardCreationOptions,
+  DashboardContainerFactory,
+  DashboardContainerFactoryDefinition,
+} from '../embeddable/dashboard_container_factory';
+import { DASHBOARD_CONTAINER_TYPE } from '..';
+import { DashboardContainerInput } from '../../../common';
+import type { DashboardContainer } from '../embeddable/dashboard_container';
+
+export interface DashboardRendererProps {
+  savedObjectId?: string;
+  showPlainSpinner?: boolean;
+  getCreationOptions?: () => Promise<DashboardCreationOptions>;
+}
+
+export const DashboardRenderer = forwardRef<AwaitingDashboardAPI, DashboardRendererProps>(
+  ({ savedObjectId, getCreationOptions, showPlainSpinner }, ref) => {
+    const dashboardRoot = useRef(null);
+    const [loading, setLoading] = useState(true);
+    const [screenshotMode, setScreenshotMode] = useState(false);
+    const [dashboardContainer, setDashboardContainer] = useState<DashboardContainer>();
+    const [dashboardIdToBuild, setDashboardIdToBuild] = useState<string | undefined>(savedObjectId);
+
+    useImperativeHandle(
+      ref,
+      () => buildApiFromDashboardContainer(dashboardContainer) as DashboardAPI,
+      [dashboardContainer]
+    );
+
+    useEffect(() => {
+      (async () => {
+        // Lazy loading all services is required in this component because it is exported and contributes to the bundle size.
+        const { pluginServices } = await import('../../services/plugin_services');
+        const {
+          screenshotMode: { isScreenshotMode },
+        } = pluginServices.getServices();
+        setScreenshotMode(isScreenshotMode());
+      })();
+    }, []);
+
+    useEffect(() => {
+      // check if dashboard container is expecting id change... if not, update dashboardIdToBuild to force it to rebuild the container.
+      if (!dashboardContainer) return;
+      if (!dashboardContainer.isExpectingIdChange()) setDashboardIdToBuild(savedObjectId);
+
+      // Disabling exhaustive deps because this useEffect should only be triggered when the savedObjectId changes.
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [savedObjectId]);
+
+    const id = useMemo(() => uuidv4(), []);
+
+    useEffect(() => {
+      let canceled = false;
+      let destroyContainer: () => void;
+
+      (async () => {
+        const creationOptions = await getCreationOptions?.();
+
+        // Lazy loading all services is required in this component because it is exported and contributes to the bundle size.
+        const { pluginServices } = await import('../../services/plugin_services');
+        const { embeddable } = pluginServices.getServices();
+
+        const dashboardFactory = embeddable.getEmbeddableFactory(
+          DASHBOARD_CONTAINER_TYPE
+        ) as DashboardContainerFactory & { create: DashboardContainerFactoryDefinition['create'] };
+        const container = (await dashboardFactory?.create(
+          { id } as unknown as DashboardContainerInput, // Input from creationOptions is used instead.
+          undefined,
+          creationOptions,
+          savedObjectId
+        )) as DashboardContainer;
+
+        if (canceled) {
+          container.destroy();
+          return;
+        }
+
+        setLoading(false);
+        if (dashboardRoot.current) {
+          container.render(dashboardRoot.current);
+        }
+
+        setDashboardContainer(container);
+        destroyContainer = () => container.destroy();
+      })();
+      return () => {
+        canceled = true;
+        destroyContainer?.();
+      };
+      // Disabling exhaustive deps because embeddable should only be created when the dashboardIdToBuild changes.
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [dashboardIdToBuild]);
+
+    const viewportClasses = classNames(
+      'dashboardViewport',
+      { 'dashboardViewport--screenshotMode': screenshotMode },
+      { 'dashboardViewport--loading': loading }
+    );
+
+    const loadingSpinner = showPlainSpinner ? (
+      <EuiLoadingSpinner size="xxl" />
+    ) : (
+      <EuiLoadingElastic size="xxl" />
+    );
+
+    return (
+      <div className={viewportClasses}>
+        {loading ? loadingSpinner : <div ref={dashboardRoot} />}
+      </div>
+    );
+  }
+);
diff --git a/src/plugins/dashboard/public/dashboard_container/index.ts b/src/plugins/dashboard/public/dashboard_container/index.ts
index 8484caad68db2..5aa300a33df28 100644
--- a/src/plugins/dashboard/public/dashboard_container/index.ts
+++ b/src/plugins/dashboard/public/dashboard_container/index.ts
@@ -6,18 +6,14 @@
  * Side Public License, v 1.
  */
 
-import React from 'react';
-
 export const DASHBOARD_CONTAINER_TYPE = 'dashboard';
 
-export { useDashboardContainerContext } from './dashboard_container_context';
-export const LazyDashboardContainerRenderer = React.lazy(
-  () => import('./dashboard_container_renderer')
-);
-
 export type { DashboardContainer } from './embeddable/dashboard_container';
 export {
   type DashboardContainerFactory,
   type DashboardCreationOptions,
   DashboardContainerFactoryDefinition,
 } from './embeddable/dashboard_container_factory';
+
+export { DashboardRenderer } from './external_api/dashboard_renderer';
+export type { DashboardAPI, AwaitingDashboardAPI } from './external_api/dashboard_api';
diff --git a/src/plugins/dashboard/public/dashboard_container/state/dashboard_container_reducers.ts b/src/plugins/dashboard/public/dashboard_container/state/dashboard_container_reducers.ts
index 9a5d135b0f61e..dcf2167014f19 100644
--- a/src/plugins/dashboard/public/dashboard_container/state/dashboard_container_reducers.ts
+++ b/src/plugins/dashboard/public/dashboard_container/state/dashboard_container_reducers.ts
@@ -7,13 +7,14 @@
  */
 
 import { PayloadAction } from '@reduxjs/toolkit';
+
 import {
-  DashboardPublicState,
   DashboardReduxState,
+  DashboardPublicState,
   DashboardStateFromSaveModal,
   DashboardStateFromSettingsFlyout,
 } from '../types';
-import { DashboardContainerByValueInput } from '../../../common';
+import { DashboardContainerInput } from '../../../common';
 
 export const dashboardContainerReducers = {
   // ------------------------------------------------------------------------------
@@ -21,14 +22,14 @@ export const dashboardContainerReducers = {
   // ------------------------------------------------------------------------------
   setControlGroupState: (
     state: DashboardReduxState,
-    action: PayloadAction<DashboardContainerByValueInput['controlGroupInput']>
+    action: PayloadAction<DashboardContainerInput['controlGroupInput']>
   ) => {
     state.explicitInput.controlGroupInput = action.payload;
   },
 
   setPanels: (
     state: DashboardReduxState,
-    action: PayloadAction<DashboardContainerByValueInput['panels']>
+    action: PayloadAction<DashboardContainerInput['panels']>
   ) => {
     state.explicitInput.panels = action.payload;
   },
@@ -75,35 +76,32 @@ export const dashboardContainerReducers = {
 
   setDescription: (
     state: DashboardReduxState,
-    action: PayloadAction<DashboardContainerByValueInput['description']>
+    action: PayloadAction<DashboardContainerInput['description']>
   ) => {
     state.explicitInput.description = action.payload;
   },
 
   setViewMode: (
     state: DashboardReduxState,
-    action: PayloadAction<DashboardContainerByValueInput['viewMode']>
+    action: PayloadAction<DashboardContainerInput['viewMode']>
   ) => {
     state.explicitInput.viewMode = action.payload;
   },
 
-  setTags: (
-    state: DashboardReduxState,
-    action: PayloadAction<DashboardContainerByValueInput['tags']>
-  ) => {
+  setTags: (state: DashboardReduxState, action: PayloadAction<DashboardContainerInput['tags']>) => {
     state.explicitInput.tags = action.payload;
   },
 
   setTitle: (
     state: DashboardReduxState,
-    action: PayloadAction<DashboardContainerByValueInput['title']>
+    action: PayloadAction<DashboardContainerInput['title']>
   ) => {
     state.explicitInput.title = action.payload;
   },
 
   setSearchSessionId: (
     state: DashboardReduxState,
-    action: PayloadAction<DashboardContainerByValueInput['searchSessionId']>
+    action: PayloadAction<DashboardContainerInput['searchSessionId']>
   ) => {
     state.explicitInput.searchSessionId = action.payload;
   },
@@ -134,7 +132,7 @@ export const dashboardContainerReducers = {
   // ------------------------------------------------------------------------------
   setFiltersAndQuery: (
     state: DashboardReduxState,
-    action: PayloadAction<Pick<DashboardContainerByValueInput, 'filters' | 'query'>>
+    action: PayloadAction<Pick<DashboardContainerInput, 'filters' | 'query'>>
   ) => {
     state.explicitInput.filters = action.payload.filters;
     state.explicitInput.query = action.payload.query;
@@ -146,14 +144,14 @@ export const dashboardContainerReducers = {
 
   setFilters: (
     state: DashboardReduxState,
-    action: PayloadAction<DashboardContainerByValueInput['filters']>
+    action: PayloadAction<DashboardContainerInput['filters']>
   ) => {
     state.explicitInput.filters = action.payload;
   },
 
   setQuery: (
     state: DashboardReduxState,
-    action: PayloadAction<DashboardContainerByValueInput['query']>
+    action: PayloadAction<DashboardContainerInput['query']>
   ) => {
     state.explicitInput.query = action.payload;
   },
@@ -167,28 +165,28 @@ export const dashboardContainerReducers = {
 
   setTimeRestore: (
     state: DashboardReduxState,
-    action: PayloadAction<DashboardContainerByValueInput['timeRestore']>
+    action: PayloadAction<DashboardContainerInput['timeRestore']>
   ) => {
     state.explicitInput.timeRestore = action.payload;
   },
 
   setTimeRange: (
     state: DashboardReduxState,
-    action: PayloadAction<DashboardContainerByValueInput['timeRange']>
+    action: PayloadAction<DashboardContainerInput['timeRange']>
   ) => {
     state.explicitInput.timeRange = action.payload;
   },
 
   setRefreshInterval: (
     state: DashboardReduxState,
-    action: PayloadAction<DashboardContainerByValueInput['refreshInterval']>
+    action: PayloadAction<DashboardContainerInput['refreshInterval']>
   ) => {
     state.explicitInput.refreshInterval = action.payload;
   },
 
   setTimeslice: (
     state: DashboardReduxState,
-    action: PayloadAction<DashboardContainerByValueInput['timeslice']>
+    action: PayloadAction<DashboardContainerInput['timeslice']>
   ) => {
     state.explicitInput.timeslice = action.payload;
   },
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/integrations/diff_state/dashboard_diffing_functions.ts b/src/plugins/dashboard/public/dashboard_container/state/diffing/dashboard_diffing_functions.ts
similarity index 90%
rename from src/plugins/dashboard/public/dashboard_container/embeddable/integrations/diff_state/dashboard_diffing_functions.ts
rename to src/plugins/dashboard/public/dashboard_container/state/diffing/dashboard_diffing_functions.ts
index 36fd494bd0816..7f2a55044b527 100644
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/integrations/diff_state/dashboard_diffing_functions.ts
+++ b/src/plugins/dashboard/public/dashboard_container/state/diffing/dashboard_diffing_functions.ts
@@ -17,27 +17,28 @@ import {
 } from '@kbn/es-query';
 import { shouldRefreshFilterCompareOptions } from '@kbn/embeddable-plugin/public';
 
-import { DashboardContainer } from '../../dashboard_container';
-import { DashboardContainerByValueInput } from '../../../../../common';
+import { DashboardContainer } from '../../embeddable/dashboard_container';
+import { DashboardContainerInput } from '../../../../common';
+import { DashboardContainerInputWithoutId } from '../../types';
 import { areTimesEqual, getPanelLayoutsAreEqual } from './dashboard_diffing_utils';
 
-export interface DiffFunctionProps<Key extends keyof DashboardContainerByValueInput> {
-  currentValue: DashboardContainerByValueInput[Key];
-  lastValue: DashboardContainerByValueInput[Key];
+export interface DiffFunctionProps<Key extends keyof DashboardContainerInput> {
+  currentValue: DashboardContainerInput[Key];
+  lastValue: DashboardContainerInput[Key];
 
-  currentInput: DashboardContainerByValueInput;
-  lastInput: DashboardContainerByValueInput;
+  currentInput: DashboardContainerInputWithoutId;
+  lastInput: DashboardContainerInputWithoutId;
   container: DashboardContainer;
 }
 
 export type DashboardDiffFunctions = {
-  [key in keyof Partial<DashboardContainerByValueInput>]: (
+  [key in keyof Partial<DashboardContainerInput>]: (
     props: DiffFunctionProps<key>
   ) => boolean | Promise<boolean>;
 };
 
 export const isKeyEqual = async (
-  key: keyof DashboardContainerByValueInput,
+  key: keyof DashboardContainerInput,
   diffFunctionProps: DiffFunctionProps<typeof key>,
   diffingFunctions: DashboardDiffFunctions
 ) => {
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/integrations/diff_state/dashboard_diffing_integration.test.ts b/src/plugins/dashboard/public/dashboard_container/state/diffing/dashboard_diffing_integration.test.ts
similarity index 81%
rename from src/plugins/dashboard/public/dashboard_container/embeddable/integrations/diff_state/dashboard_diffing_integration.test.ts
rename to src/plugins/dashboard/public/dashboard_container/state/diffing/dashboard_diffing_integration.test.ts
index 011fd833b6d55..c0953f8bbc98a 100644
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/integrations/diff_state/dashboard_diffing_integration.test.ts
+++ b/src/plugins/dashboard/public/dashboard_container/state/diffing/dashboard_diffing_integration.test.ts
@@ -6,11 +6,13 @@
  * Side Public License, v 1.
  */
 
-import { buildExistsFilter, disableFilter, pinFilter, toggleFilterNegated } from '@kbn/es-query';
 import type { DataViewFieldBase, DataViewBase } from '@kbn/es-query';
+import { buildExistsFilter, disableFilter, pinFilter, toggleFilterNegated } from '@kbn/es-query';
+
 import { getShouldRefresh } from './dashboard_diffing_integration';
-import { DashboardContainer } from '../../dashboard_container';
-import { DashboardContainerByValueInput } from '../../../../../common';
+
+import { DashboardContainerInput } from '../../../../common';
+import { DashboardContainer } from '../../embeddable/dashboard_container';
 
 describe('getShouldRefresh', () => {
   const dashboardContainerMock = {
@@ -30,7 +32,7 @@ describe('getShouldRefresh', () => {
     test('should return false when filters do not change', async () => {
       const lastInput = {
         filters: [existsFilter],
-      } as unknown as DashboardContainerByValueInput;
+      } as unknown as DashboardContainerInput;
       expect(await getShouldRefresh.bind(dashboardContainerMock)(lastInput, lastInput)).toBe(false);
     });
 
@@ -38,10 +40,10 @@ describe('getShouldRefresh', () => {
       const pinnedFilter = pinFilter(existsFilter);
       const lastInput = {
         filters: [pinnedFilter],
-      } as unknown as DashboardContainerByValueInput;
+      } as unknown as DashboardContainerInput;
       const input = {
         filters: [toggleFilterNegated(pinnedFilter)],
-      } as unknown as DashboardContainerByValueInput;
+      } as unknown as DashboardContainerInput;
       expect(await getShouldRefresh.bind(dashboardContainerMock)(lastInput, input)).toBe(true);
     });
 
@@ -49,20 +51,20 @@ describe('getShouldRefresh', () => {
       const disabledFilter = disableFilter(existsFilter);
       const lastInput = {
         filters: [disabledFilter],
-      } as unknown as DashboardContainerByValueInput;
+      } as unknown as DashboardContainerInput;
       const input = {
         filters: [toggleFilterNegated(disabledFilter)],
-      } as unknown as DashboardContainerByValueInput;
+      } as unknown as DashboardContainerInput;
       expect(await getShouldRefresh.bind(dashboardContainerMock)(lastInput, input)).toBe(false);
     });
 
     test('should return false when pinned filter changes to unpinned', async () => {
       const lastInput = {
         filters: [existsFilter],
-      } as unknown as DashboardContainerByValueInput;
+      } as unknown as DashboardContainerInput;
       const input = {
         filters: [pinFilter(existsFilter)],
-      } as unknown as DashboardContainerByValueInput;
+      } as unknown as DashboardContainerInput;
       expect(await getShouldRefresh.bind(dashboardContainerMock)(lastInput, input)).toBe(false);
     });
   });
@@ -71,7 +73,7 @@ describe('getShouldRefresh', () => {
     test('should return false when timeRange does not change', async () => {
       const lastInput = {
         timeRange: { from: 'now-15m', to: 'now' },
-      } as unknown as DashboardContainerByValueInput;
+      } as unknown as DashboardContainerInput;
       expect(await getShouldRefresh.bind(dashboardContainerMock)(lastInput, lastInput)).toBe(false);
     });
 
@@ -79,11 +81,11 @@ describe('getShouldRefresh', () => {
       const lastInput = {
         timeRange: { from: 'now-15m', to: 'now' },
         timeRestore: true,
-      } as unknown as DashboardContainerByValueInput;
+      } as unknown as DashboardContainerInput;
       const input = {
         timeRange: { from: 'now-30m', to: 'now' },
         timeRestore: true,
-      } as unknown as DashboardContainerByValueInput;
+      } as unknown as DashboardContainerInput;
       expect(await getShouldRefresh.bind(dashboardContainerMock)(lastInput, input)).toBe(true);
     });
 
@@ -91,11 +93,11 @@ describe('getShouldRefresh', () => {
       const lastInput = {
         timeRange: { from: 'now-15m', to: 'now' },
         timeRestore: false,
-      } as unknown as DashboardContainerByValueInput;
+      } as unknown as DashboardContainerInput;
       const input = {
         timeRange: { from: 'now-30m', to: 'now' },
         timeRestore: false,
-      } as unknown as DashboardContainerByValueInput;
+      } as unknown as DashboardContainerInput;
       expect(await getShouldRefresh.bind(dashboardContainerMock)(lastInput, input)).toBe(true);
     });
   });
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/integrations/diff_state/dashboard_diffing_integration.ts b/src/plugins/dashboard/public/dashboard_container/state/diffing/dashboard_diffing_integration.ts
similarity index 65%
rename from src/plugins/dashboard/public/dashboard_container/embeddable/integrations/diff_state/dashboard_diffing_integration.ts
rename to src/plugins/dashboard/public/dashboard_container/state/diffing/dashboard_diffing_integration.ts
index 3f5f137d829fa..02399543750cd 100644
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/integrations/diff_state/dashboard_diffing_integration.ts
+++ b/src/plugins/dashboard/public/dashboard_container/state/diffing/dashboard_diffing_integration.ts
@@ -6,27 +6,27 @@
  * Side Public License, v 1.
  */
 import { omit } from 'lodash';
-import { AnyAction, Middleware } from '@reduxjs/toolkit';
+import { AnyAction, Middleware } from 'redux';
 import { debounceTime, Observable, Subject, switchMap } from 'rxjs';
 
-import { DashboardContainer } from '../../dashboard_container';
-import { pluginServices } from '../../../../services/plugin_services';
-import { DashboardContainerByValueInput } from '../../../../../common';
-import { CHANGE_CHECK_DEBOUNCE } from '../../../../dashboard_constants';
+import { DashboardContainerInput } from '../../../../common';
 import type { DashboardDiffFunctions } from './dashboard_diffing_functions';
 import {
   isKeyEqual,
   shouldRefreshDiffingFunctions,
   unsavedChangesDiffingFunctions,
 } from './dashboard_diffing_functions';
-import { dashboardContainerReducers } from '../../../state/dashboard_container_reducers';
+import { pluginServices } from '../../../services/plugin_services';
+import { DashboardContainer, DashboardCreationOptions } from '../..';
+import { CHANGE_CHECK_DEBOUNCE } from '../../../dashboard_constants';
+import { dashboardContainerReducers } from '../dashboard_container_reducers';
 
 /**
  * An array of reducers which cannot cause unsaved changes. Unsaved changes only compares the explicit input
  * and the last saved input, so we can safely ignore any output reducers, and most componentState reducers.
  * This is only for performance reasons, because the diffing function itself can be quite heavy.
  */
-const reducersToIgnore: Array<keyof typeof dashboardContainerReducers> = [
+export const reducersToIgnore: Array<keyof typeof dashboardContainerReducers> = [
   'setTimeslice',
   'setFullScreenMode',
   'setSearchSessionId',
@@ -37,11 +37,12 @@ const reducersToIgnore: Array<keyof typeof dashboardContainerReducers> = [
 /**
  * Some keys will often have deviated from their last saved state, but should not persist over reloads
  */
-const keysToOmitFromSessionStorage: Array<keyof DashboardContainerByValueInput> = [
+const keysToOmitFromSessionStorage: Array<keyof DashboardContainerInput> = [
   'lastReloadRequestTime',
   'executionContext',
   'searchSessionId',
   'timeslice',
+  'id',
 
   'timeRange', // Current behaviour expects time range not to be backed up. Revisit this?
   'refreshInterval',
@@ -51,18 +52,19 @@ const keysToOmitFromSessionStorage: Array<keyof DashboardContainerByValueInput>
  * Some keys will often have deviated from their last saved state, but should be
  * ignored when calculating whether or not this dashboard has unsaved changes.
  */
-export const keysNotConsideredUnsavedChanges: Array<keyof DashboardContainerByValueInput> = [
+export const keysNotConsideredUnsavedChanges: Array<keyof DashboardContainerInput> = [
   'lastReloadRequestTime',
   'executionContext',
   'searchSessionId',
   'timeslice',
   'viewMode',
+  'id',
 ];
 
 /**
  * input keys that will cause a new session to be created.
  */
-const refetchKeys: Array<keyof DashboardContainerByValueInput> = [
+const refetchKeys: Array<keyof DashboardContainerInput> = [
   'query',
   'filters',
   'timeRange',
@@ -82,17 +84,34 @@ const refetchKeys: Array<keyof DashboardContainerByValueInput> = [
  */
 export function startDiffingDashboardState(
   this: DashboardContainer,
-  {
-    useSessionBackup,
-    setCleanupFunction,
-  }: {
-    useSessionBackup?: boolean;
-    setCleanupFunction: (cleanupFunction: () => void) => void;
-  }
+  creationOptions?: DashboardCreationOptions
 ) {
   const checkForUnsavedChangesSubject$ = new Subject<null>();
-
-  // middleware starts the check for unsaved changes function if the action dispatched could cause them.
+  this.subscriptions.add(
+    checkForUnsavedChangesSubject$
+      .pipe(
+        debounceTime(CHANGE_CHECK_DEBOUNCE),
+        switchMap(() => {
+          return new Observable((observer) => {
+            const {
+              explicitInput: currentInput,
+              componentState: { lastSavedInput },
+            } = this.getState();
+            getUnsavedChanges
+              .bind(this)(lastSavedInput, currentInput)
+              .then((unsavedChanges) => {
+                if (observer.closed) return;
+
+                updateUnsavedChangesState.bind(this)(unsavedChanges);
+                if (creationOptions?.useSessionStorageIntegration) {
+                  backupUnsavedChanges.bind(this)(unsavedChanges);
+                }
+              });
+          });
+        })
+      )
+      .subscribe()
+  );
   const diffingMiddleware: Middleware<AnyAction> = (store) => (next) => (action) => {
     const dispatchedActionName = action.type.split('/')?.[1];
     if (
@@ -104,81 +123,28 @@ export function startDiffingDashboardState(
     }
     next(action);
   };
-
-  const getHasUnsavedChangesSubscription = checkForUnsavedChangesSubject$
-    .pipe(
-      debounceTime(CHANGE_CHECK_DEBOUNCE),
-      switchMap(() => {
-        return new Observable((observer) => {
-          const {
-            explicitInput: currentInput,
-            componentState: { lastSavedInput },
-          } = this.getReduxEmbeddableTools().getState();
-          getUnsavedChanges
-            .bind(this)(lastSavedInput, currentInput)
-            .then((unsavedChanges) => {
-              if (observer.closed) return;
-
-              updateUnsavedChangesState.bind(this)(unsavedChanges);
-              if (useSessionBackup) backupUnsavedChanges.bind(this)(unsavedChanges);
-            });
-        });
-      })
-    )
-    .subscribe();
-
-  setCleanupFunction(() => getHasUnsavedChangesSubscription.unsubscribe());
-
   return diffingMiddleware;
 }
 
-function updateUnsavedChangesState(
-  this: DashboardContainer,
-  unsavedChanges: Partial<DashboardContainerByValueInput>
-) {
-  const {
-    getState,
-    dispatch,
-    actions: { setHasUnsavedChanges },
-  } = this.getReduxEmbeddableTools();
-
-  // dispatch has unsaved changes state
-  const hasChanges = Object.keys(omit(unsavedChanges, keysNotConsideredUnsavedChanges)).length > 0;
-  if (getState().componentState.hasUnsavedChanges !== hasChanges) {
-    dispatch(setHasUnsavedChanges(hasChanges));
-  }
-}
-
-function backupUnsavedChanges(
-  this: DashboardContainer,
-  unsavedChanges: Partial<DashboardContainerByValueInput>
-) {
-  const { dashboardSessionStorage } = pluginServices.getServices();
-  dashboardSessionStorage.setState(
-    this.getDashboardSavedObjectId(),
-    omit(unsavedChanges, keysToOmitFromSessionStorage)
-  );
-}
-
 /**
  * Does a shallow diff between @param lastInput and @param input and
  * @returns an object out of the keys which are different.
  */
 export async function getUnsavedChanges(
   this: DashboardContainer,
-  lastInput: DashboardContainerByValueInput,
-  input: DashboardContainerByValueInput
-): Promise<Partial<DashboardContainerByValueInput>> {
+  lastInput: DashboardContainerInput,
+  input: DashboardContainerInput
+): Promise<Partial<DashboardContainerInput>> {
   const allKeys = [...new Set([...Object.keys(lastInput), ...Object.keys(input)])] as Array<
-    keyof DashboardContainerByValueInput
+    keyof DashboardContainerInput
   >;
   return await getInputChanges(this, lastInput, input, allKeys, unsavedChangesDiffingFunctions);
 }
 
 export async function getShouldRefresh(
   this: DashboardContainer,
-  lastInput: DashboardContainerByValueInput,
-  input: DashboardContainerByValueInput
+  lastInput: DashboardContainerInput,
+  input: DashboardContainerInput
 ): Promise<boolean> {
   const inputChanges = await getInputChanges(
     this,
@@ -192,15 +158,14 @@ export async function getShouldRefresh(
 
 async function getInputChanges(
   container: DashboardContainer,
-  lastInput: DashboardContainerByValueInput,
-  input: DashboardContainerByValueInput,
-  keys: Array<keyof DashboardContainerByValueInput>,
+  lastInput: DashboardContainerInput,
+  input: DashboardContainerInput,
+  keys: Array<keyof DashboardContainerInput>,
   diffingFunctions: DashboardDiffFunctions
-): Promise<Partial<DashboardContainerByValueInput>> {
-  await container.untilInitialized();
+): Promise<Partial<DashboardContainerInput>> {
   const keyComparePromises = keys.map(
     (key) =>
-      new Promise<{ key: keyof DashboardContainerByValueInput; isEqual: boolean }>((resolve) => {
+      new Promise<{ key: keyof DashboardContainerInput; isEqual: boolean }>((resolve) => {
         if (input[key] === undefined && lastInput[key] === undefined) {
           resolve({ key, isEqual: true });
         }
@@ -226,6 +191,28 @@ async function getInputChanges(
       if (!isEqual) (changes as { [key: string]: unknown })[key] = input[key];
     }
     return changes;
-  }, {} as Partial<DashboardContainerByValueInput>);
+  }, {} as Partial<DashboardContainerInput>);
   return inputChanges;
 }
+
+function updateUnsavedChangesState(
+  this: DashboardContainer,
+  unsavedChanges: Partial<DashboardContainerInput>
+) {
+  // dispatch has unsaved changes state
+  const hasChanges = Object.keys(omit(unsavedChanges, keysNotConsideredUnsavedChanges)).length > 0;
+  if (this.getState().componentState.hasUnsavedChanges !== hasChanges) {
+    this.dispatch.setHasUnsavedChanges(hasChanges);
+  }
+}
+
+function backupUnsavedChanges(
+  this: DashboardContainer,
+  unsavedChanges: Partial<DashboardContainerInput>
+) {
+  const { dashboardSessionStorage } = pluginServices.getServices();
+  dashboardSessionStorage.setState(
+    this.getDashboardSavedObjectId(),
+    omit(unsavedChanges, keysToOmitFromSessionStorage)
+  );
+}
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/integrations/diff_state/dashboard_diffing_utils.ts b/src/plugins/dashboard/public/dashboard_container/state/diffing/dashboard_diffing_utils.ts
similarity index 97%
rename from src/plugins/dashboard/public/dashboard_container/embeddable/integrations/diff_state/dashboard_diffing_utils.ts
rename to src/plugins/dashboard/public/dashboard_container/state/diffing/dashboard_diffing_utils.ts
index cc69acd8762c3..0b6d2db559b5a 100644
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/integrations/diff_state/dashboard_diffing_utils.ts
+++ b/src/plugins/dashboard/public/dashboard_container/state/diffing/dashboard_diffing_utils.ts
@@ -10,7 +10,7 @@ import { isEmpty, xor } from 'lodash';
 import moment, { Moment } from 'moment';
 import fastIsEqual from 'fast-deep-equal';
 
-import { DashboardPanelMap } from '../../../../../common';
+import { DashboardPanelMap } from '../../../../common';
 
 const convertTimeToUTCString = (time?: string | Moment): undefined | string => {
   if (moment(time).isValid()) {
diff --git a/src/plugins/dashboard/public/dashboard_container/types.ts b/src/plugins/dashboard/public/dashboard_container/types.ts
index 436a6ab0029d8..6e8ff1f5c98a0 100644
--- a/src/plugins/dashboard/public/dashboard_container/types.ts
+++ b/src/plugins/dashboard/public/dashboard_container/types.ts
@@ -8,16 +8,16 @@
 
 import type { ContainerOutput } from '@kbn/embeddable-plugin/public';
 import type { ReduxEmbeddableState } from '@kbn/presentation-util-plugin/public';
-import type { DashboardContainerByValueInput, DashboardOptions } from '../../common';
+import type { DashboardContainerInput, DashboardOptions } from '../../common';
 
 export type DashboardReduxState = ReduxEmbeddableState<
-  DashboardContainerByValueInput,
+  DashboardContainerInput,
   DashboardContainerOutput,
   DashboardPublicState
 >;
 
 export type DashboardStateFromSaveModal = Pick<
-  DashboardContainerByValueInput,
+  DashboardContainerInput,
   'title' | 'description' | 'tags' | 'timeRestore' | 'timeRange' | 'refreshInterval'
 > &
   Pick<DashboardPublicState, 'lastSavedId'>;
@@ -25,7 +25,7 @@ export type DashboardStateFromSaveModal = Pick<
 export type DashboardStateFromSettingsFlyout = DashboardStateFromSaveModal & DashboardOptions;
 
 export interface DashboardPublicState {
-  lastSavedInput: DashboardContainerByValueInput;
+  lastSavedInput: DashboardContainerInput;
   isEmbeddedExternally?: boolean;
   hasUnsavedChanges?: boolean;
   hasOverlays?: boolean;
@@ -41,6 +41,8 @@ export interface DashboardRenderPerformanceStats {
   panelsRenderStartTime: number;
 }
 
+export type DashboardContainerInputWithoutId = Omit<DashboardContainerInput, 'id'>;
+
 export interface DashboardContainerOutput extends ContainerOutput {
   usedDataViewIds?: string[];
 }
diff --git a/src/plugins/dashboard/public/index.ts b/src/plugins/dashboard/public/index.ts
index af7c9a307957d..0bfe5dfae8b4c 100644
--- a/src/plugins/dashboard/public/index.ts
+++ b/src/plugins/dashboard/public/index.ts
@@ -15,11 +15,11 @@ export {
   LEGACY_DASHBOARD_APP_ID,
 } from './dashboard_constants';
 export {
+  type DashboardAPI,
+  type AwaitingDashboardAPI,
+  DashboardRenderer,
   DASHBOARD_CONTAINER_TYPE,
-  type DashboardContainer,
   type DashboardCreationOptions,
-  LazyDashboardContainerRenderer,
-  useDashboardContainerContext,
 } from './dashboard_container';
 export type { DashboardSetup, DashboardStart, DashboardFeatureFlagConfig } from './plugin';
 
diff --git a/src/plugins/dashboard/public/mocks.tsx b/src/plugins/dashboard/public/mocks.tsx
index c6668630548a0..69ec7efadf1ad 100644
--- a/src/plugins/dashboard/public/mocks.tsx
+++ b/src/plugins/dashboard/public/mocks.tsx
@@ -6,14 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { Embeddable, EmbeddableInput, ViewMode } from '@kbn/embeddable-plugin/public';
-import { createReduxEmbeddableTools } from '@kbn/presentation-util-plugin/public/redux_embeddables/create_redux_embeddable_tools';
+import { EmbeddableInput, ViewMode } from '@kbn/embeddable-plugin/public';
+import { mockedReduxEmbeddablePackage } from '@kbn/presentation-util-plugin/public/mocks';
 
 import { DashboardStart } from './plugin';
-import { DashboardContainerByValueInput, DashboardPanelState } from '../common';
-import { DashboardContainerOutput, DashboardReduxState } from './dashboard_container/types';
+import { DashboardContainerInput, DashboardPanelState } from '../common';
 import { DashboardContainer } from './dashboard_container/embeddable/dashboard_container';
-import { dashboardContainerReducers } from './dashboard_container/state/dashboard_container_reducers';
 
 export type Start = jest.Mocked<DashboardStart>;
 
@@ -68,28 +66,15 @@ export function setupIntersectionObserverMock({
   });
 }
 
-export const mockDashboardReduxEmbeddableTools = async (
-  partialState?: Partial<DashboardReduxState>
-) => {
-  const mockDashboard = new DashboardContainer(
-    getSampleDashboardInput(partialState?.explicitInput)
-  ) as Embeddable<DashboardContainerByValueInput, DashboardContainerOutput>;
-
-  const mockReduxEmbeddableTools = createReduxEmbeddableTools<DashboardReduxState>({
-    embeddable: mockDashboard,
-    reducers: dashboardContainerReducers,
-    initialComponentState: { lastSavedInput: mockDashboard.getInput() },
-  });
-
-  return {
-    tools: mockReduxEmbeddableTools,
-    dashboardContainer: mockDashboard as DashboardContainer,
-  };
-};
+export function buildMockDashboard(overrides?: Partial<DashboardContainerInput>) {
+  const initialInput = getSampleDashboardInput(overrides);
+  const dashboardContainer = new DashboardContainer(initialInput, mockedReduxEmbeddablePackage);
+  return dashboardContainer;
+}
 
 export function getSampleDashboardInput(
-  overrides?: Partial<DashboardContainerByValueInput>
-): DashboardContainerByValueInput {
+  overrides?: Partial<DashboardContainerInput>
+): DashboardContainerInput {
   return {
     // options
     useMargins: true,
diff --git a/src/plugins/dashboard/public/services/dashboard_saved_object/lib/load_dashboard_state_from_saved_object.ts b/src/plugins/dashboard/public/services/dashboard_saved_object/lib/load_dashboard_state_from_saved_object.ts
index 15304119e31e9..57e5ea2a21836 100644
--- a/src/plugins/dashboard/public/services/dashboard_saved_object/lib/load_dashboard_state_from_saved_object.ts
+++ b/src/plugins/dashboard/public/services/dashboard_saved_object/lib/load_dashboard_state_from_saved_object.ts
@@ -20,8 +20,8 @@ import { rawControlGroupAttributesToControlGroupInput } from '@kbn/controls-plug
 import { parseSearchSourceJSON, injectSearchSourceReferences } from '@kbn/data-plugin/public';
 
 import {
-  DashboardContainerByValueInput,
   convertSavedPanelsToPanelMap,
+  DashboardContainerInput,
   DashboardAttributes,
   DashboardOptions,
   injectReferences,
@@ -47,7 +47,7 @@ export interface LoadDashboardFromSavedObjectReturn {
   dashboardFound: boolean;
   dashboardId?: string;
   resolveMeta?: Omit<ResolvedSimpleSavedObject, 'saved_object'>;
-  dashboardInput: DashboardContainerByValueInput;
+  dashboardInput: DashboardContainerInput;
 }
 
 export const loadDashboardStateFromSavedObject = async ({
diff --git a/src/plugins/dashboard/public/services/dashboard_saved_object/lib/save_dashboard_state_to_saved_object.ts b/src/plugins/dashboard/public/services/dashboard_saved_object/lib/save_dashboard_state_to_saved_object.ts
index fbb897fca68d4..d19799c02bff5 100644
--- a/src/plugins/dashboard/public/services/dashboard_saved_object/lib/save_dashboard_state_to_saved_object.ts
+++ b/src/plugins/dashboard/public/services/dashboard_saved_object/lib/save_dashboard_state_to_saved_object.ts
@@ -24,7 +24,7 @@ import {
   extractReferences,
   DashboardAttributes,
   convertPanelMapToSavedPanels,
-  DashboardContainerByValueInput,
+  DashboardContainerInput,
 } from '../../../../common';
 import { DashboardSavedObjectRequiredServices } from '../types';
 import { DASHBOARD_SAVED_OBJECT_TYPE } from '../../../dashboard_constants';
@@ -34,13 +34,13 @@ export type SavedDashboardSaveOpts = SavedObjectSaveOpts & { saveAsCopy?: boolea
 
 export type SaveDashboardProps = DashboardSavedObjectRequiredServices & {
   savedObjectsClient: SavedObjectsClientContract;
-  currentState: DashboardContainerByValueInput;
+  currentState: DashboardContainerInput;
   saveOptions: SavedDashboardSaveOpts;
   lastSavedId?: string;
 };
 
 export const serializeControlGroupInput = (
-  controlGroupInput: DashboardContainerByValueInput['controlGroupInput']
+  controlGroupInput: DashboardContainerInput['controlGroupInput']
 ) => {
   // only save to saved object if control group is not default
   if (
diff --git a/src/plugins/dashboard/public/services/dashboard_session_storage/dashboard_session_storage_service.ts b/src/plugins/dashboard/public/services/dashboard_session_storage/dashboard_session_storage_service.ts
index f949657f882d4..279d7fefb6d3d 100644
--- a/src/plugins/dashboard/public/services/dashboard_session_storage/dashboard_session_storage_service.ts
+++ b/src/plugins/dashboard/public/services/dashboard_session_storage/dashboard_session_storage_service.ts
@@ -16,7 +16,7 @@ import type { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/p
 import { DashboardSpacesService } from '../spaces/types';
 import type { DashboardStartDependencies } from '../../plugin';
 import type { DashboardSessionStorageServiceType } from './types';
-import type { DashboardContainerByValueInput } from '../../../common';
+import type { DashboardContainerInput } from '../../../common';
 import { DashboardNotificationsService } from '../notifications/types';
 import { panelStorageErrorStrings } from '../../dashboard_container/_dashboard_container_strings';
 
@@ -68,9 +68,7 @@ class DashboardSessionStorageService implements DashboardSessionStorageServiceTy
     }
   }
 
-  public getState(
-    id = DASHBOARD_PANELS_UNSAVED_ID
-  ): Partial<DashboardContainerByValueInput> | undefined {
+  public getState(id = DASHBOARD_PANELS_UNSAVED_ID): Partial<DashboardContainerInput> | undefined {
     try {
       return this.sessionStorage.get(DASHBOARD_PANELS_SESSION_KEY)?.[this.activeSpaceId]?.[id];
     } catch (e) {
@@ -81,10 +79,7 @@ class DashboardSessionStorageService implements DashboardSessionStorageServiceTy
     }
   }
 
-  public setState(
-    id = DASHBOARD_PANELS_UNSAVED_ID,
-    newState: Partial<DashboardContainerByValueInput>
-  ) {
+  public setState(id = DASHBOARD_PANELS_UNSAVED_ID, newState: Partial<DashboardContainerInput>) {
     try {
       const sessionStateStorage = this.sessionStorage.get(DASHBOARD_PANELS_SESSION_KEY) || {};
       set(sessionStateStorage, [this.activeSpaceId, id], newState);
diff --git a/src/plugins/dashboard/public/services/dashboard_session_storage/types.ts b/src/plugins/dashboard/public/services/dashboard_session_storage/types.ts
index bfd0dc7656598..e02d6463e2d3a 100644
--- a/src/plugins/dashboard/public/services/dashboard_session_storage/types.ts
+++ b/src/plugins/dashboard/public/services/dashboard_session_storage/types.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import type { DashboardContainerByValueInput } from '../../../common';
+import type { DashboardContainerInput } from '../../../common';
 
 export interface DashboardSessionStorageServiceType {
   clearState: (id?: string) => void;
-  getState: (id: string | undefined) => Partial<DashboardContainerByValueInput> | undefined;
-  setState: (id: string | undefined, newState: Partial<DashboardContainerByValueInput>) => void;
+  getState: (id: string | undefined) => Partial<DashboardContainerInput> | undefined;
+  setState: (id: string | undefined, newState: Partial<DashboardContainerInput>) => void;
   getDashboardIdsWithUnsavedChanges: () => string[];
   dashboardHasUnsavedEdits: (id?: string) => boolean;
 }
diff --git a/src/plugins/embeddable/public/lib/containers/container.ts b/src/plugins/embeddable/public/lib/containers/container.ts
index 847d1fa5cd5dc..a53cfb8725fac 100644
--- a/src/plugins/embeddable/public/lib/containers/container.ts
+++ b/src/plugins/embeddable/public/lib/containers/container.ts
@@ -64,7 +64,7 @@ export abstract class Container<
     output: TContainerOutput,
     protected readonly getFactory: EmbeddableStart['getEmbeddableFactory'],
     parent?: IContainer,
-    settings?: EmbeddableContainerSettings<TContainerInput>
+    settings?: EmbeddableContainerSettings
   ) {
     super(input, output, parent);
     this.getFactory = getFactory; // Currently required for using in storybook due to https://github.com/storybookjs/storybook/issues/13834
@@ -74,11 +74,7 @@ export abstract class Container<
       settings?.initializeSequentially || settings?.childIdInitializeOrder
     );
 
-    const initSource = settings?.readyToInitializeChildren$
-      ? settings?.readyToInitializeChildren$
-      : this.getInput$();
-
-    const init$ = initSource.pipe(
+    const init$ = this.getInput$().pipe(
       take(1),
       mergeMap(async (currentInput) => {
         const initPromise = this.initializeChildEmbeddables(currentInput, settings);
@@ -372,7 +368,7 @@ export abstract class Container<
 
   private async initializeChildEmbeddables(
     initialInput: TContainerInput,
-    initializeSettings?: EmbeddableContainerSettings<TContainerInput>
+    initializeSettings?: EmbeddableContainerSettings
   ) {
     let initializeOrder = Object.keys(initialInput.panels);
 
diff --git a/src/plugins/embeddable/public/lib/containers/i_container.ts b/src/plugins/embeddable/public/lib/containers/i_container.ts
index f7ae3d64c6a25..5539f854b24d9 100644
--- a/src/plugins/embeddable/public/lib/containers/i_container.ts
+++ b/src/plugins/embeddable/public/lib/containers/i_container.ts
@@ -6,8 +6,6 @@
  * Side Public License, v 1.
  */
 
-import { Observable } from 'rxjs';
-
 import {
   Embeddable,
   EmbeddableInput,
@@ -30,7 +28,7 @@ export interface ContainerInput<PanelExplicitInput = {}> extends EmbeddableInput
   };
 }
 
-export interface EmbeddableContainerSettings<TContainerInput> {
+export interface EmbeddableContainerSettings {
   /**
    * If true, the container will wait for each embeddable to load after creation before loading the next embeddable.
    */
@@ -39,10 +37,6 @@ export interface EmbeddableContainerSettings<TContainerInput> {
    * Initialise children in the order specified. If an ID does not match it will be skipped and if a child is not included it will be initialized in the default order after the list of provided IDs.
    */
   childIdInitializeOrder?: string[];
-  /**
-   *
-   */
-  readyToInitializeChildren$?: Observable<TContainerInput>;
 }
 
 export interface IContainer<
diff --git a/src/plugins/embeddable/public/lib/test_samples/embeddables/hello_world_container.tsx b/src/plugins/embeddable/public/lib/test_samples/embeddables/hello_world_container.tsx
index 0758103b6f634..18dc9778bc3eb 100644
--- a/src/plugins/embeddable/public/lib/test_samples/embeddables/hello_world_container.tsx
+++ b/src/plugins/embeddable/public/lib/test_samples/embeddables/hello_world_container.tsx
@@ -42,9 +42,7 @@ export class HelloWorldContainer extends Container<InheritedInput, HelloWorldCon
   constructor(
     input: ContainerInput<{ firstName: string; lastName: string }>,
     private readonly options: HelloWorldContainerOptions,
-    initializeSettings?: EmbeddableContainerSettings<
-      ContainerInput<{ firstName: string; lastName: string }>
-    >
+    initializeSettings?: EmbeddableContainerSettings
   ) {
     super(
       input,
diff --git a/src/plugins/embeddable/public/tests/container.test.ts b/src/plugins/embeddable/public/tests/container.test.ts
index 177b1a618282c..c6088e95069cb 100644
--- a/src/plugins/embeddable/public/tests/container.test.ts
+++ b/src/plugins/embeddable/public/tests/container.test.ts
@@ -45,7 +45,7 @@ import { EmbeddableContainerSettings } from '../lib/containers/i_container';
 async function createHelloWorldContainerAndEmbeddable(
   containerInput: ContainerInput = { id: 'hello', panels: {} },
   embeddableInput = {},
-  settings?: EmbeddableContainerSettings<ContainerInput<{ firstName: string; lastName: string }>>
+  settings?: EmbeddableContainerSettings
 ) {
   const coreSetup = coreMock.createSetup();
   const coreStart = coreMock.createStart();
diff --git a/src/plugins/presentation_util/README.mdx b/src/plugins/presentation_util/README.mdx
index 2fc73204db4e1..8bb13a1aaedce 100755
--- a/src/plugins/presentation_util/README.mdx
+++ b/src/plugins/presentation_util/README.mdx
@@ -211,7 +211,7 @@ export function MyComponent() {
 </DocAccordion>
 
 ## Redux Embeddables
-The Redux Embeddables system allows embeddable authors to interact with their embeddables in a standardized way using Redux toolkit. This wrapper abstracts away store and slice creation, embeddable input sync, and context creation. To use this system, a developer can wrap their components in the ReduxEmbeddableWrapper, supplying only an object of reducers.
+The Redux Embeddables system allows embeddable authors to interact with their embeddables in a standardized way using Redux toolkit. This wrapper abstracts away store and slice creation, and embeddable input sync. To use this system, a developer can use CreateReduxEmbeddableTools in the constructor of their embeddable, supplying a collection of reducers.
 
 ### Reducers
 The reducer object expected by the ReduxEmbeddableWrapper is the same type as the reducers expected by [Redux Toolkit's CreateSlice](https://redux-toolkit.js.org/api/createslice).
@@ -233,74 +233,20 @@ export const myEmbeddableReducers = {
 ```
 </DocAccordion>
 
-### Lazy Component and Types
-Because the ReduxEmbeddableWrapper is a lazy component, it also must be unwrapped with the `withSuspense` component from Presentation Util. When you await this component, you must also pass in the type information so that the redux store and actions are properly typed.
- 
- <DocAccordion buttonContent="Awaiting LazyReduxEmbeddableWrapper" initialIsOpen>
-  ```ts
-  // my_embeddable.tsx
-
-  import {
-    withSuspense,
-    LazyReduxEmbeddableWrapper,
-    ReduxEmbeddableWrapperPropsWithChildren,
-  } from '../../../../presentation_util/public';
-
-  export interface MyEmbeddableInput {
-    specialBoolean: boolean
-  }
-
-  const MyEmbeddableReduxWrapper = withSuspense<
-    ReduxEmbeddableWrapperPropsWithChildren<MyEmbeddableInput>
-  >(LazyReduxEmbeddableWrapper);
-      
-  ```
-</DocAccordion>
-
-The ReduxEmbeddableWrapper should be used inside of embeddable classes, and should wrap all components under the embeddable in the render function.
-
-<DocAccordion buttonContent="Wrapping Embeddable Render" initialIsOpen>
-  ```ts
-  // my_embeddable.tsx
-
-  public render(dom: HTMLElement) {
-    if (this.domNode) ReactDOM.unmountComponentAtNode(this.domNode);
-    this.domNode = dom;
-    ReactDOM.render(
-        <MyEmbeddableReduxWrapper embeddable={this} reducers={myEmbeddableReducers}>
-          <MyEmbeddableComponent />
-        </MyEmbeddableReduxWrapper>,
-      dom
-    );
-  }
-  ```
-</DocAccordion>
-
 ### Accessing Actions and State
 
-From components under the embeddable, actions, containerActions, and the current state of the redux store are accessed via the ReduxEmbeddableContext. This context requires the input type and the type of the reducers, and will return the appropriately typed actions, a hook for dispatching actions, a selector to get the current redux state, and a suite of `containerActions` if the embeddable is a Container.
+From components under the embeddable, actions, containerActions, and the current state of the redux store are accessed via the embeddable instance. You can pass the embeddable instance down as a prop, or use a context.
 
 <DocAccordion buttonContent="Accessing Redux Embeddable Context" initialIsOpen>
   ```ts
   // my_embeddable_component.tsx
-  import { useReduxEmbeddableContext } from '../../../../presentation_util/public';
+  const MyEmbeddableComponent = ({ embeddableInstance }: { embeddableInstance: IEmbeddable }) => {
+    // current state
+    const specialBoolean = embeddableInstance.select((state) => state.specialBoolean);
 
-  const {
-    useEmbeddableSelector,
-    useEmbeddableDispatch,
-    actions: { setSpecialBoolean },
-  } = useReduxEmbeddableContext<
-    MyEmbeddableInput,
-    typeof myEmbeddableReducers
-  >();
+    // change specialBoolean after 5 seconds
+    setTimeout(() => embeddableInstance.dispatch.setSpecialBoolean(false), 5000);
 
-  const dispatch = useEmbeddableDispatch();
-
-  // current state
-  const { specialBoolean } = useEmbeddableSelector((state) => state);
-
-  // change specialBoolean after 5 seconds
-  setTimeout(() => dispatch(setSpecialBoolean(false)), 5000);
+  }
   ```
 </DocAccordion>
-
diff --git a/src/plugins/presentation_util/public/components/floating_actions/floating_actions.tsx b/src/plugins/presentation_util/public/components/floating_actions/floating_actions.tsx
index 35c92e83035a0..be0e6ef1054f9 100644
--- a/src/plugins/presentation_util/public/components/floating_actions/floating_actions.tsx
+++ b/src/plugins/presentation_util/public/components/floating_actions/floating_actions.tsx
@@ -8,12 +8,17 @@
 import React, { FC, ReactElement, useEffect, useState } from 'react';
 import classNames from 'classnames';
 
-import { IEmbeddable, panelHoverTrigger, PANEL_HOVER_TRIGGER } from '@kbn/embeddable-plugin/public';
+import {
+  type ViewMode,
+  type IEmbeddable,
+  type EmbeddableInput,
+  panelHoverTrigger,
+  PANEL_HOVER_TRIGGER,
+} from '@kbn/embeddable-plugin/public';
 import { Action } from '@kbn/ui-actions-plugin/public';
 
 import { pluginServices } from '../../services';
 import './floating_actions.scss';
-import { ReduxEmbeddableState } from '../../redux_embeddables';
 
 export interface FloatingActionsProps {
   children: ReactElement;
@@ -21,8 +26,8 @@ export interface FloatingActionsProps {
   className?: string;
   isEnabled?: boolean;
   embeddable?: IEmbeddable;
-  viewMode?: ReduxEmbeddableState['explicitInput']['viewMode'];
-  disabledActions?: ReduxEmbeddableState['explicitInput']['disabledActions'];
+  viewMode?: ViewMode;
+  disabledActions?: EmbeddableInput['disabledActions'];
 }
 
 export const FloatingActions: FC<FloatingActionsProps> = ({
diff --git a/src/plugins/presentation_util/public/index.ts b/src/plugins/presentation_util/public/index.ts
index 51f8a2c902541..f5994b3da82e2 100644
--- a/src/plugins/presentation_util/public/index.ts
+++ b/src/plugins/presentation_util/public/index.ts
@@ -40,13 +40,13 @@ export {
 } from './components';
 
 export {
-  useReduxEmbeddableContext,
-  lazyLoadReduxEmbeddablePackage,
+  lazyLoadReduxToolsPackage,
   cleanFiltersForSerialize,
   type ReduxEmbeddableState,
   type ReduxEmbeddableTools,
-  type ReduxEmbeddablePackage,
-} from './redux_embeddables';
+  type ReduxTools,
+  type ReduxToolsPackage,
+} from './redux_tools';
 
 export type {
   ExpressionInputEditorRef,
diff --git a/src/plugins/presentation_util/public/mocks.ts b/src/plugins/presentation_util/public/mocks.ts
index 2a3bdba1a0a7e..2c59d3ad55aad 100644
--- a/src/plugins/presentation_util/public/mocks.ts
+++ b/src/plugins/presentation_util/public/mocks.ts
@@ -10,7 +10,9 @@ import { CoreStart } from '@kbn/core/public';
 import { PresentationUtilPluginStart } from './types';
 import { pluginServices } from './services';
 import { registry } from './services/plugin_services';
-import { registerExpressionsLanguage } from '.';
+import { ReduxToolsPackage, registerExpressionsLanguage } from '.';
+import { createReduxEmbeddableTools } from './redux_tools/redux_embeddables/create_redux_embeddable_tools';
+import { createReduxTools } from './redux_tools/create_redux_tools';
 
 const createStartContract = (coreStart: CoreStart): PresentationUtilPluginStart => {
   pluginServices.setRegistry(
@@ -29,4 +31,12 @@ export const presentationUtilPluginMock = {
   createStartContract,
 };
 
+/**
+ * A non async-imported version of the real redux embeddable tools package for mocking purposes.
+ */
+export const mockedReduxEmbeddablePackage: ReduxToolsPackage = {
+  createReduxEmbeddableTools,
+  createReduxTools,
+};
+
 export * from './__stories__/fixtures/flights';
diff --git a/src/plugins/presentation_util/public/redux_embeddables/index.ts b/src/plugins/presentation_util/public/redux_embeddables/index.ts
deleted file mode 100644
index d18715cc814df..0000000000000
--- a/src/plugins/presentation_util/public/redux_embeddables/index.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * 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 { ReduxEmbeddablePackage } from './types';
-
-export { useReduxEmbeddableContext } from './use_redux_embeddable_context';
-
-export type { ReduxEmbeddableState, ReduxEmbeddableTools, ReduxEmbeddablePackage } from './types';
-export { cleanFiltersForSerialize } from './clean_redux_embeddable_state';
-
-export const lazyLoadReduxEmbeddablePackage = async (): Promise<ReduxEmbeddablePackage> => {
-  const { createReduxEmbeddableTools } = await import('./create_redux_embeddable_tools');
-  return {
-    createTools: createReduxEmbeddableTools,
-  };
-};
diff --git a/src/plugins/presentation_util/public/redux_embeddables/types.ts b/src/plugins/presentation_util/public/redux_embeddables/types.ts
deleted file mode 100644
index 84e088328b7f9..0000000000000
--- a/src/plugins/presentation_util/public/redux_embeddables/types.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * 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 {
-  Dispatch,
-  AnyAction,
-  CaseReducer,
-  PayloadAction,
-  ActionCreatorWithPayload,
-  EnhancedStore,
-} from '@reduxjs/toolkit';
-import { TypedUseSelectorHook } from 'react-redux';
-import { EmbeddableInput, EmbeddableOutput, Embeddable } from '@kbn/embeddable-plugin/public';
-import { PropsWithChildren } from 'react';
-
-export interface ReduxEmbeddableSyncSettings<
-  ReduxEmbeddableStateType extends ReduxEmbeddableState = ReduxEmbeddableState
-> {
-  disableSync: boolean;
-  isInputEqual?: (
-    a: Partial<ReduxEmbeddableStateType['explicitInput']>,
-    b: Partial<ReduxEmbeddableStateType['explicitInput']>
-  ) => boolean;
-  isOutputEqual?: (
-    a: Partial<ReduxEmbeddableStateType['output']>,
-    b: Partial<ReduxEmbeddableStateType['output']>
-  ) => boolean;
-}
-
-/**
- * The package type is lazily exported from presentation_util and should contain all methods needed to use the redux embeddable tools.
- */
-export interface ReduxEmbeddablePackage {
-  createTools: typeof import('./create_redux_embeddable_tools')['createReduxEmbeddableTools'];
-}
-
-/**
- * The return type from setupReduxEmbeddable. Contains a wrapper which comes with the store provider and provides the context to react components,
- * but also returns the context object to allow the embeddable class to interact with the redux store.
- */
-export interface ReduxEmbeddableTools<
-  ReduxEmbeddableStateType extends ReduxEmbeddableState = ReduxEmbeddableState,
-  ReducerType extends EmbeddableReducers<ReduxEmbeddableStateType> = EmbeddableReducers<ReduxEmbeddableStateType>
-> {
-  cleanup: () => void;
-  Wrapper: React.FC<PropsWithChildren<{}>>;
-  dispatch: EnhancedStore<ReduxEmbeddableStateType>['dispatch'];
-  getState: EnhancedStore<ReduxEmbeddableStateType>['getState'];
-  onStateChange: EnhancedStore<ReduxEmbeddableStateType>['subscribe'];
-  actions: ReduxEmbeddableContext<ReduxEmbeddableStateType, ReducerType>['actions'];
-}
-
-/**
- * The Embeddable Redux store should contain Input, Output and State. Input is serialized and used to create the embeddable,
- * Output is used as a communication layer for state that the Embeddable creates, and State is used to store ephemeral state which needs
- * to be communicated between an embeddable and its inner React components.
- */
-export interface ReduxEmbeddableState<
-  InputType extends EmbeddableInput = EmbeddableInput,
-  OutputType extends EmbeddableOutput = EmbeddableOutput,
-  StateType extends unknown = unknown
-> {
-  explicitInput: InputType;
-  output: OutputType;
-  componentState: StateType;
-}
-
-/**
- * The Embeddable Reducers are the shape of the Raw reducers which will be passed into createSlice. These will be used to populate the actions
- * object which will be returned in the ReduxEmbeddableContext.
- */
-export interface EmbeddableReducers<
-  ReduxEmbeddableStateType extends ReduxEmbeddableState = ReduxEmbeddableState
-> {
-  /**
-   * PayloadAction of type any is strategic here because we want to allow payloads of any shape in generic reducers.
-   * This type will be overridden to remove any and be type safe when returned by setupReduxEmbeddable.
-   */
-  [key: string]: CaseReducer<ReduxEmbeddableStateType, PayloadAction<any>>;
-}
-
-/**
- * This context type contains the actions, selector, and dispatch that embeddables need to interact with their state. This
- * should be passed down from the embeddable class, to its react components by wrapping the embeddable's render output in ReduxEmbeddableContext.
- */
-export interface ReduxEmbeddableContext<
-  ReduxEmbeddableStateType extends ReduxEmbeddableState = ReduxEmbeddableState,
-  ReducerType extends EmbeddableReducers<ReduxEmbeddableStateType> = EmbeddableReducers<ReduxEmbeddableStateType>,
-  EmbeddableType extends Embeddable<
-    ReduxEmbeddableStateType['explicitInput'],
-    ReduxEmbeddableStateType['output']
-  > = Embeddable<ReduxEmbeddableStateType['explicitInput'], ReduxEmbeddableStateType['output']>
-> {
-  actions: {
-    [Property in keyof ReducerType]: ActionCreatorWithPayload<
-      Parameters<ReducerType[Property]>[1]['payload']
-    >;
-  } & {
-    // Generic reducers to interact with embeddable Input and Output.
-    updateEmbeddableReduxInput: ActionCreatorWithPayload<
-      Partial<ReduxEmbeddableStateType['explicitInput']>
-    >;
-    updateEmbeddableReduxOutput: ActionCreatorWithPayload<
-      Partial<ReduxEmbeddableStateType['output']>
-    >;
-  };
-  embeddableInstance: EmbeddableType;
-  useEmbeddableSelector: TypedUseSelectorHook<ReduxEmbeddableStateType>;
-  useEmbeddableDispatch: () => Dispatch<AnyAction>;
-}
diff --git a/src/plugins/presentation_util/public/redux_embeddables/use_redux_embeddable_context.ts b/src/plugins/presentation_util/public/redux_embeddables/use_redux_embeddable_context.ts
deleted file mode 100644
index 6463ea306d3f9..0000000000000
--- a/src/plugins/presentation_util/public/redux_embeddables/use_redux_embeddable_context.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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 { Embeddable } from '@kbn/embeddable-plugin/public';
-import { createContext, useContext } from 'react';
-
-import type { ReduxEmbeddableState, ReduxEmbeddableContext, EmbeddableReducers } from './types';
-
-/**
- * When creating the context, a generic EmbeddableInput as placeholder is used. This will later be cast to
- * the type passed in by the useReduxEmbeddableContext hook
- **/
-export const EmbeddableReduxContext =
-  createContext<ReduxEmbeddableContext<ReduxEmbeddableState> | null>(null);
-
-/**
- * A typed use context hook for embeddables that are not containers. it @returns an
- * ReduxEmbeddableContextServices object typed to the generic inputTypes and ReducerTypes you pass in.
- * Note that the reducer type is optional, but will be required to correctly infer the keys and payload
- * types of your reducers. use `typeof MyReducers` here to retain them.
- */
-export const useReduxEmbeddableContext = <
-  ReduxEmbeddableStateType extends ReduxEmbeddableState = ReduxEmbeddableState,
-  ReducerType extends EmbeddableReducers<ReduxEmbeddableStateType> = EmbeddableReducers<ReduxEmbeddableStateType>,
-  EmbeddableType extends Embeddable<any, any> = Embeddable<
-    ReduxEmbeddableStateType['explicitInput'],
-    ReduxEmbeddableStateType['output']
-  >
->(): ReduxEmbeddableContext<ReduxEmbeddableStateType, ReducerType, EmbeddableType> => {
-  const context = useContext<
-    ReduxEmbeddableContext<ReduxEmbeddableStateType, ReducerType, EmbeddableType>
-  >(
-    EmbeddableReduxContext as unknown as React.Context<
-      ReduxEmbeddableContext<ReduxEmbeddableStateType, ReducerType, EmbeddableType>
-    >
-  );
-  if (context == null) {
-    throw new Error(
-      'useReduxEmbeddableContext must be used inside the ReduxEmbeddableWrapper from build_redux_embeddable_context.'
-    );
-  }
-
-  return context!;
-};
diff --git a/src/plugins/presentation_util/public/redux_tools/create_redux_tools.ts b/src/plugins/presentation_util/public/redux_tools/create_redux_tools.ts
new file mode 100644
index 0000000000000..2cbd4be93d6fb
--- /dev/null
+++ b/src/plugins/presentation_util/public/redux_tools/create_redux_tools.ts
@@ -0,0 +1,83 @@
+/*
+ * 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 {
+  AnyAction,
+  Middleware,
+  createSlice,
+  configureStore,
+  SliceCaseReducers,
+  CaseReducerActions,
+} from '@reduxjs/toolkit';
+import { v4 as uuidv4 } from 'uuid';
+import { createContext } from 'react';
+import { createSelectorHook } from 'react-redux';
+
+import { ReduxTools, ReduxToolsReducers, ReduxToolsSetters } from './types';
+
+export const createReduxTools = <
+  ReduxStateType extends unknown,
+  ReducerType extends ReduxToolsReducers<ReduxStateType> = ReduxToolsReducers<ReduxStateType>
+>({
+  reducers,
+  additionalMiddleware,
+  initialState,
+}: {
+  additionalMiddleware?: Array<Middleware<AnyAction>>;
+  initialState: ReduxStateType;
+  reducers: ReducerType;
+}): ReduxTools<ReduxStateType, ReducerType> => {
+  const id = uuidv4();
+
+  /**
+   * Create slice out of reducers and embeddable initial state.
+   */
+  const slice = createSlice<ReduxStateType, SliceCaseReducers<ReduxStateType>>({
+    initialState,
+    name: id,
+    reducers,
+  });
+
+  const store = configureStore({
+    reducer: slice.reducer,
+    middleware: (getDefaultMiddleware) =>
+      getDefaultMiddleware().concat(...(additionalMiddleware ?? [])),
+  });
+
+  /**
+   * Create an object of setter functions by looping through the reducers, and creating a method that dispatches the related
+   * action to the appropriate store.
+   */
+  const dispatch: ReduxToolsSetters<ReduxStateType, ReducerType> = Object.keys(reducers).reduce(
+    (acc, key: keyof ReducerType) => {
+      const sliceAction =
+        slice.actions[key as keyof CaseReducerActions<SliceCaseReducers<ReduxStateType>>];
+      acc[key] = (payload) => store.dispatch(sliceAction(payload));
+      return acc;
+    },
+    {} as ReduxToolsSetters<ReduxStateType, ReducerType>
+  );
+
+  /**
+   * Create a selector which can be used by react components to get the latest state values and to re-render when state changes.
+   */
+  const select = createSelectorHook(
+    createContext({
+      store,
+      storeState: store.getState(),
+    })
+  );
+
+  return {
+    store,
+    select,
+    dispatch,
+    getState: store.getState,
+    onStateChange: store.subscribe,
+  };
+};
diff --git a/src/plugins/presentation_util/public/redux_tools/index.ts b/src/plugins/presentation_util/public/redux_tools/index.ts
new file mode 100644
index 0000000000000..2b14c0da6b1a2
--- /dev/null
+++ b/src/plugins/presentation_util/public/redux_tools/index.ts
@@ -0,0 +1,24 @@
+/*
+ * 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 { ReduxToolsPackage } from './types';
+
+export type { ReduxEmbeddableState, ReduxEmbeddableTools } from './redux_embeddables/types';
+export { cleanFiltersForSerialize } from './redux_embeddables/clean_redux_embeddable_state';
+export type { ReduxToolsPackage, ReduxTools } from './types';
+
+export const lazyLoadReduxToolsPackage = async (): Promise<ReduxToolsPackage> => {
+  const { createReduxTools } = await import('./create_redux_tools');
+  const { createReduxEmbeddableTools } = await import(
+    './redux_embeddables/create_redux_embeddable_tools'
+  );
+  return {
+    createReduxTools,
+    createReduxEmbeddableTools,
+  };
+};
diff --git a/src/plugins/presentation_util/public/redux_embeddables/clean_redux_embeddable_state.ts b/src/plugins/presentation_util/public/redux_tools/redux_embeddables/clean_redux_embeddable_state.ts
similarity index 94%
rename from src/plugins/presentation_util/public/redux_embeddables/clean_redux_embeddable_state.ts
rename to src/plugins/presentation_util/public/redux_tools/redux_embeddables/clean_redux_embeddable_state.ts
index ebb282285f173..654c3b0bf8b33 100644
--- a/src/plugins/presentation_util/public/redux_embeddables/clean_redux_embeddable_state.ts
+++ b/src/plugins/presentation_util/public/redux_tools/redux_embeddables/clean_redux_embeddable_state.ts
@@ -21,7 +21,8 @@ export const stateContainsFilters = (
   return false;
 };
 
-export const cleanFiltersForSerialize = (filters: Filter[]): Filter[] => {
+export const cleanFiltersForSerialize = (filters?: Filter[]): Filter[] => {
+  if (!filters) return [];
   return filters.map((filter) => {
     if (filter.meta.value) delete filter.meta.value;
     return filter;
diff --git a/src/plugins/presentation_util/public/redux_embeddables/create_redux_embeddable_tools.tsx b/src/plugins/presentation_util/public/redux_tools/redux_embeddables/create_redux_embeddable_tools.ts
similarity index 50%
rename from src/plugins/presentation_util/public/redux_embeddables/create_redux_embeddable_tools.tsx
rename to src/plugins/presentation_util/public/redux_tools/redux_embeddables/create_redux_embeddable_tools.ts
index ed7938a0760b4..bdcf4ee2e3185 100644
--- a/src/plugins/presentation_util/public/redux_embeddables/create_redux_embeddable_tools.tsx
+++ b/src/plugins/presentation_util/public/redux_tools/redux_embeddables/create_redux_embeddable_tools.ts
@@ -6,34 +6,19 @@
  * Side Public License, v 1.
  */
 
-import {
-  AnyAction,
-  configureStore,
-  createSlice,
-  Draft,
-  Middleware,
-  PayloadAction,
-  SliceCaseReducers,
-} from '@reduxjs/toolkit';
-import React, { ReactNode, PropsWithChildren } from 'react';
-import { Provider, TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux';
+import { Draft, AnyAction, Middleware, PayloadAction } from '@reduxjs/toolkit';
 
 import { Embeddable } from '@kbn/embeddable-plugin/public';
 
-import {
-  EmbeddableReducers,
-  ReduxEmbeddableTools,
-  ReduxEmbeddableContext,
-  ReduxEmbeddableState,
-  ReduxEmbeddableSyncSettings,
-} from './types';
+import { ReduxToolsReducers } from '../types';
+import { createReduxTools } from '../create_redux_tools';
 import { syncReduxEmbeddable } from './sync_redux_embeddable';
-import { EmbeddableReduxContext } from './use_redux_embeddable_context';
 import { cleanStateForRedux } from './clean_redux_embeddable_state';
+import { ReduxEmbeddableTools, ReduxEmbeddableState, ReduxEmbeddableSyncSettings } from './types';
 
 export const createReduxEmbeddableTools = <
   ReduxEmbeddableStateType extends ReduxEmbeddableState = ReduxEmbeddableState,
-  ReducerType extends EmbeddableReducers<ReduxEmbeddableStateType> = EmbeddableReducers<ReduxEmbeddableStateType>
+  ReducerType extends ReduxToolsReducers<ReduxEmbeddableStateType> = ReduxToolsReducers<ReduxEmbeddableStateType>
 >({
   reducers,
   embeddable,
@@ -50,7 +35,9 @@ export const createReduxEmbeddableTools = <
   syncSettings?: ReduxEmbeddableSyncSettings;
   reducers: ReducerType;
 }): ReduxEmbeddableTools<ReduxEmbeddableStateType, ReducerType> => {
-  // Additional generic reducers to aid in embeddable syncing
+  /**
+   * Build additional generic reducers to aid in embeddable syncing.
+   */
   const genericReducers = {
     replaceEmbeddableReduxInput: (
       state: Draft<ReduxEmbeddableStateType>,
@@ -65,8 +52,11 @@ export const createReduxEmbeddableTools = <
       state.output = action.payload;
     },
   };
+  const allReducers = { ...reducers, ...genericReducers };
 
-  // create initial state from Embeddable
+  /**
+   * Create initial state from Embeddable.
+   */
   let initialState: ReduxEmbeddableStateType = {
     output: embeddable.getOutput(),
     componentState: initialComponentState ?? {},
@@ -75,51 +65,33 @@ export const createReduxEmbeddableTools = <
 
   initialState = cleanStateForRedux<ReduxEmbeddableStateType>(initialState);
 
-  // create slice out of reducers and embeddable initial state.
-  const slice = createSlice<ReduxEmbeddableStateType, SliceCaseReducers<ReduxEmbeddableStateType>>({
+  const { dispatch, store, select, getState, onStateChange } = createReduxTools<
+    ReduxEmbeddableStateType,
+    typeof allReducers
+  >({
+    reducers: allReducers,
+    additionalMiddleware,
     initialState,
-    name: `${embeddable.type}_${embeddable.id}`,
-    reducers: { ...reducers, ...genericReducers },
   });
 
-  const store = configureStore({
-    reducer: slice.reducer,
-    middleware: (getDefaultMiddleware) =>
-      getDefaultMiddleware().concat(...(additionalMiddleware ?? [])),
-  });
-
-  // create the context which will wrap this embeddable's react components to allow access to update and read from the store.
-  const context = {
-    embeddableInstance: embeddable,
-
-    actions: slice.actions as ReduxEmbeddableContext<
-      ReduxEmbeddableStateType,
-      typeof reducers
-    >['actions'],
-    useEmbeddableDispatch: () => useDispatch<typeof store.dispatch>(),
-    useEmbeddableSelector: useSelector as TypedUseSelectorHook<ReduxEmbeddableStateType>,
-  };
-
-  const Wrapper: React.FC<PropsWithChildren<{}>> = ({ children }: { children?: ReactNode }) => (
-    <Provider store={store}>
-      <EmbeddableReduxContext.Provider value={context}>{children}</EmbeddableReduxContext.Provider>
-    </Provider>
-  );
-
+  /**
+   * Sync redux state with embeddable input and output observables. Eventually we can replace the input and output observables
+   * with redux and remove this sync.
+   */
   const stopReduxEmbeddableSync = syncReduxEmbeddable<ReduxEmbeddableStateType>({
-    actions: context.actions,
+    replaceEmbeddableReduxInput: dispatch.replaceEmbeddableReduxInput,
+    replaceEmbeddableReduxOutput: dispatch.replaceEmbeddableReduxOutput,
     settings: syncSettings,
     embeddable,
     store,
   });
 
-  // return redux tools for the embeddable class to use.
   return {
-    Wrapper,
-    actions: context.actions,
-    dispatch: store.dispatch,
-    getState: store.getState,
-    onStateChange: store.subscribe,
+    store,
+    select,
+    dispatch,
+    getState,
+    onStateChange,
     cleanup: () => stopReduxEmbeddableSync?.(),
   };
 };
diff --git a/src/plugins/presentation_util/public/redux_embeddables/sync_redux_embeddable.ts b/src/plugins/presentation_util/public/redux_tools/redux_embeddables/sync_redux_embeddable.ts
similarity index 89%
rename from src/plugins/presentation_util/public/redux_embeddables/sync_redux_embeddable.ts
rename to src/plugins/presentation_util/public/redux_tools/redux_embeddables/sync_redux_embeddable.ts
index 37aadd1e9fe47..ac8f7765d7270 100644
--- a/src/plugins/presentation_util/public/redux_embeddables/sync_redux_embeddable.ts
+++ b/src/plugins/presentation_util/public/redux_tools/redux_embeddables/sync_redux_embeddable.ts
@@ -7,11 +7,12 @@
  */
 
 import deepEqual from 'fast-deep-equal';
+import { EnhancedStore } from '@reduxjs/toolkit';
 
 import { IEmbeddable } from '@kbn/embeddable-plugin/public';
-import { EnhancedStore } from '@reduxjs/toolkit';
-import { ReduxEmbeddableContext, ReduxEmbeddableState, ReduxEmbeddableSyncSettings } from './types';
+
 import { cleanInputForRedux } from './clean_redux_embeddable_state';
+import { ReduxEmbeddableState, ReduxEmbeddableSyncSettings } from './types';
 
 type Writeable<T> = { -readonly [P in keyof T]: T[P] };
 
@@ -19,17 +20,19 @@ export const syncReduxEmbeddable = <
   ReduxEmbeddableStateType extends ReduxEmbeddableState = ReduxEmbeddableState
 >({
   store,
-  actions,
   settings,
   embeddable,
+  replaceEmbeddableReduxInput,
+  replaceEmbeddableReduxOutput,
 }: {
   settings?: ReduxEmbeddableSyncSettings;
   store: EnhancedStore<ReduxEmbeddableStateType>;
+  replaceEmbeddableReduxInput: (input: ReduxEmbeddableStateType['explicitInput']) => void;
+  replaceEmbeddableReduxOutput: (output: ReduxEmbeddableStateType['output']) => void;
   embeddable: IEmbeddable<
     ReduxEmbeddableStateType['explicitInput'],
     ReduxEmbeddableStateType['output']
   >;
-  actions: ReduxEmbeddableContext<ReduxEmbeddableStateType>['actions'];
 }) => {
   if (settings?.disableSync) {
     return;
@@ -80,9 +83,7 @@ export const syncReduxEmbeddable = <
     >;
 
     if (!inputEqual(reduxExplicitInput, embeddableExplictInput)) {
-      store.dispatch(
-        actions.replaceEmbeddableReduxInput(cleanInputForRedux(embeddableExplictInput))
-      );
+      replaceEmbeddableReduxInput(cleanInputForRedux(embeddableExplictInput));
     }
     embeddableToReduxInProgress = false;
   });
@@ -93,7 +94,7 @@ export const syncReduxEmbeddable = <
     embeddableToReduxInProgress = true;
     const reduxState = store.getState();
     if (!outputEqual(reduxState.output, embeddableOutput)) {
-      store.dispatch(actions.replaceEmbeddableReduxOutput(embeddableOutput));
+      replaceEmbeddableReduxOutput(embeddableOutput);
     }
     embeddableToReduxInProgress = false;
   });
diff --git a/src/plugins/presentation_util/public/redux_tools/redux_embeddables/types.ts b/src/plugins/presentation_util/public/redux_tools/redux_embeddables/types.ts
new file mode 100644
index 0000000000000..44d6d4933a7ae
--- /dev/null
+++ b/src/plugins/presentation_util/public/redux_tools/redux_embeddables/types.ts
@@ -0,0 +1,56 @@
+/*
+ * 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 { EnhancedStore } from '@reduxjs/toolkit';
+import { EmbeddableInput, EmbeddableOutput } from '@kbn/embeddable-plugin/public';
+import { ReduxToolsReducers, ReduxToolsSelect, ReduxToolsSetters } from '../types';
+
+export interface ReduxEmbeddableSyncSettings<
+  ReduxEmbeddableStateType extends ReduxEmbeddableState = ReduxEmbeddableState
+> {
+  disableSync: boolean;
+  isInputEqual?: (
+    a: Partial<ReduxEmbeddableStateType['explicitInput']>,
+    b: Partial<ReduxEmbeddableStateType['explicitInput']>
+  ) => boolean;
+  isOutputEqual?: (
+    a: Partial<ReduxEmbeddableStateType['output']>,
+    b: Partial<ReduxEmbeddableStateType['output']>
+  ) => boolean;
+}
+
+/**
+ * The return type from createReduxEmbeddableTools. Contains tools to get state, select state for react components,
+ * set state, and react to state changes.
+ */
+export interface ReduxEmbeddableTools<
+  ReduxEmbeddableStateType extends ReduxEmbeddableState = ReduxEmbeddableState,
+  ReducerType extends ReduxToolsReducers<ReduxEmbeddableStateType> = ReduxToolsReducers<ReduxEmbeddableStateType>
+> {
+  cleanup: () => void;
+  store: EnhancedStore<ReduxEmbeddableStateType>;
+  select: ReduxToolsSelect<ReduxEmbeddableStateType>;
+  getState: EnhancedStore<ReduxEmbeddableStateType>['getState'];
+  dispatch: ReduxToolsSetters<ReduxEmbeddableStateType, ReducerType>;
+  onStateChange: EnhancedStore<ReduxEmbeddableStateType>['subscribe'];
+}
+
+/**
+ * The Embeddable Redux store should contain Input, Output and State. Input is serialized and used to create the embeddable,
+ * Output is used as a communication layer for state that the Embeddable creates, and State is used to store ephemeral state which needs
+ * to be communicated between an embeddable and its inner React components.
+ */
+export interface ReduxEmbeddableState<
+  InputType extends EmbeddableInput = EmbeddableInput,
+  OutputType extends EmbeddableOutput = EmbeddableOutput,
+  StateType extends unknown = unknown
+> {
+  explicitInput: InputType;
+  output: OutputType;
+  componentState: StateType;
+}
diff --git a/src/plugins/presentation_util/public/redux_tools/types.ts b/src/plugins/presentation_util/public/redux_tools/types.ts
new file mode 100644
index 0000000000000..1cf621f535846
--- /dev/null
+++ b/src/plugins/presentation_util/public/redux_tools/types.ts
@@ -0,0 +1,65 @@
+/*
+ * 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 { CaseReducer, PayloadAction, EnhancedStore } from '@reduxjs/toolkit';
+
+/**
+ * The Redux Tools Selector is a react redux selector function that can be used to grab values from the state, and to make a component
+ * re-render when those values change.
+ */
+export type ReduxToolsSelect<ReduxStateType extends unknown> = <Selected extends unknown>(
+  selector: (state: ReduxStateType) => Selected,
+  equalityFn?: ((previous: Selected, next: Selected) => boolean) | undefined
+) => Selected;
+
+/**
+ * The Redux Embeddable Setters are a collection of functions which dispatch actions to the correct store.
+ */
+export type ReduxToolsSetters<
+  ReduxStateType extends unknown,
+  ReducerType extends ReduxToolsReducers<ReduxStateType> = ReduxToolsReducers<ReduxStateType>
+> = {
+  [ReducerKey in keyof ReducerType]: (
+    payload: Parameters<ReducerType[ReducerKey]>[1]['payload']
+  ) => void;
+};
+
+/**
+ * The return type from createReduxTools. Contains tools to get state, select state for react components,
+ * set state, and react to state changes.
+ */
+export interface ReduxTools<
+  ReduxStateType extends unknown,
+  ReducerType extends ReduxToolsReducers<ReduxStateType> = ReduxToolsReducers<ReduxStateType>
+> {
+  store: EnhancedStore<ReduxStateType>;
+  select: ReduxToolsSelect<ReduxStateType>;
+  getState: EnhancedStore<ReduxStateType>['getState'];
+  onStateChange: EnhancedStore<ReduxStateType>['subscribe'];
+  dispatch: ReduxToolsSetters<ReduxStateType, ReducerType>;
+}
+
+/**
+ * The Redux Tools Reducers are the shape of the Raw reducers which will be passed into createSlice. These will be used to populate the actions
+ * object which the tools will return.
+ */
+export interface ReduxToolsReducers<ReduxStateType extends unknown> {
+  /**
+   * PayloadAction of type any is strategic here because we want to allow payloads of any shape in generic reducers.
+   * This type will be overridden to remove any and be type safe when returned by setupReduxEmbeddable.
+   */
+  [key: string]: CaseReducer<ReduxStateType, PayloadAction<any>>;
+}
+
+/**
+ * The package type is lazily exported from presentation_util and should contain all methods needed to use the redux embeddable tools.
+ */
+export interface ReduxToolsPackage {
+  createReduxTools: typeof import('./create_redux_tools')['createReduxTools'];
+  createReduxEmbeddableTools: typeof import('./redux_embeddables/create_redux_embeddable_tools')['createReduxEmbeddableTools'];
+}
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/components/controls_content.tsx b/x-pack/plugins/infra/public/pages/metrics/hosts/components/controls_content.tsx
index dfe591db4b2af..a3e82b9901422 100644
--- a/x-pack/plugins/infra/public/pages/metrics/hosts/components/controls_content.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/components/controls_content.tsx
@@ -6,12 +6,15 @@
  */
 
 import React, { useCallback, useEffect, useRef } from 'react';
-import { ControlGroupContainer, type ControlGroupInput } from '@kbn/controls-plugin/public';
+import {
+  ControlGroupAPI,
+  ControlGroupRenderer,
+  type ControlGroupInput,
+} from '@kbn/controls-plugin/public';
 import { ViewMode } from '@kbn/embeddable-plugin/public';
 import type { Filter, Query, TimeRange } from '@kbn/es-query';
 import { DataView } from '@kbn/data-views-plugin/public';
 import { Subscription } from 'rxjs';
-import { LazyControlsRenderer } from './lazy_controls_renderer';
 import { useControlPanels } from '../hooks/use_control_panels_url_state';
 
 interface Props {
@@ -50,7 +53,8 @@ export const ControlsContent: React.FC<Props> = ({
   }, [controlPanels, dataView?.id, filters, query, timeRange]);
 
   const loadCompleteHandler = useCallback(
-    (controlGroup: ControlGroupContainer) => {
+    (controlGroup: ControlGroupAPI) => {
+      if (!controlGroup) return;
       inputSubscription.current = controlGroup.onFiltersPublished$.subscribe((newFilters) => {
         onFiltersChange(newFilters);
       });
@@ -70,9 +74,9 @@ export const ControlsContent: React.FC<Props> = ({
   }, []);
 
   return (
-    <LazyControlsRenderer
+    <ControlGroupRenderer
       getCreationOptions={getInitialInput}
-      onLoadComplete={loadCompleteHandler}
+      ref={loadCompleteHandler}
       timeRange={timeRange}
       query={query}
       filters={filters}
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/components/lazy_controls_renderer.tsx b/x-pack/plugins/infra/public/pages/metrics/hosts/components/lazy_controls_renderer.tsx
deleted file mode 100644
index 32a110733ea84..0000000000000
--- a/x-pack/plugins/infra/public/pages/metrics/hosts/components/lazy_controls_renderer.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * 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 { LazyControlGroupRenderer } from '@kbn/controls-plugin/public';
-import { EuiLoadingSpinner, EuiErrorBoundary } from '@elastic/eui';
-import React from 'react';
-
-export const LazyControlsRenderer = (
-  props: React.ComponentProps<typeof LazyControlGroupRenderer>
-) => (
-  <EuiErrorBoundary>
-    <React.Suspense fallback={<EuiLoadingSpinner />}>
-      <LazyControlGroupRenderer {...props} />
-    </React.Suspense>
-  </EuiErrorBoundary>
-);
diff --git a/x-pack/plugins/maps/public/connected_components/timeslider/timeslider.tsx b/x-pack/plugins/maps/public/connected_components/timeslider/timeslider.tsx
index 0d75eae9597a2..8af50ec762286 100644
--- a/x-pack/plugins/maps/public/connected_components/timeslider/timeslider.tsx
+++ b/x-pack/plugins/maps/public/connected_components/timeslider/timeslider.tsx
@@ -11,18 +11,15 @@ import { Observable, Subscription } from 'rxjs';
 import { distinctUntilChanged } from 'rxjs/operators';
 import { ViewMode } from '@kbn/embeddable-plugin/public';
 import {
-  ControlGroupContainer,
   type ControlGroupInput,
-  type controlGroupInputBuilder,
-  LazyControlGroupRenderer,
+  type ControlGroupInputBuilder,
+  type AwaitingControlGroupAPI,
+  ControlGroupRenderer,
 } from '@kbn/controls-plugin/public';
-import { withSuspense } from '@kbn/presentation-util-plugin/public';
 import { first } from 'rxjs/operators';
 import type { TimeRange } from '@kbn/es-query';
 import { Timeslice } from '../../../common/descriptor_types';
 
-const ControlGroupRenderer = withSuspense(LazyControlGroupRenderer);
-
 export interface Props {
   setTimeslice: (timeslice?: Timeslice) => void;
   timeRange: TimeRange;
@@ -44,7 +41,7 @@ export class Timeslider extends Component<Props, {}> {
 
   _getCreationOptions = async (
     initialInput: Partial<ControlGroupInput>,
-    builder: typeof controlGroupInputBuilder
+    builder: ControlGroupInputBuilder
   ) => {
     builder.addTimeSliderControl(initialInput);
     return {
@@ -56,8 +53,8 @@ export class Timeslider extends Component<Props, {}> {
     };
   };
 
-  _onLoadComplete = (controlGroup: ControlGroupContainer) => {
-    if (!this._isMounted) {
+  _onLoadComplete = (controlGroup: AwaitingControlGroupAPI) => {
+    if (!this._isMounted || !controlGroup) {
       return;
     }
 
@@ -92,7 +89,7 @@ export class Timeslider extends Component<Props, {}> {
     return (
       <div className="mapTimeslider mapTimeslider--animation">
         <ControlGroupRenderer
-          onLoadComplete={this._onLoadComplete}
+          ref={this._onLoadComplete}
           getCreationOptions={this._getCreationOptions}
           timeRange={this.props.timeRange}
         />
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/job_from_map/visualization_extractor.ts b/x-pack/plugins/ml/public/application/jobs/new_job/job_from_map/visualization_extractor.ts
index da2b8e29c0010..26972a454ff8b 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/job_from_map/visualization_extractor.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/job_from_map/visualization_extractor.ts
@@ -10,7 +10,7 @@ import type { MapEmbeddable } from '@kbn/maps-plugin/public';
 import type { EuiComboBoxOptionOption } from '@elastic/eui';
 import type { DataView } from '@kbn/data-views-plugin/common';
 import type { Query } from '@kbn/es-query';
-import type { DashboardContainer } from '@kbn/dashboard-plugin/public';
+import type { DashboardAPI } from '@kbn/dashboard-plugin/public';
 import { categoryFieldTypes } from '../../../../../common/util/fields_utils';
 
 export interface LayerResult {
@@ -28,8 +28,7 @@ export class VisualizationExtractor {
 
   public async getResultLayersFromEmbeddable(embeddable: MapEmbeddable): Promise<LayerResult[]> {
     const layers: LayerResult[] = [];
-    const dataViews: DataView[] =
-      (embeddable.getRoot() as DashboardContainer)?.getAllDataViews() ?? [];
+    const dataViews: DataView[] = (embeddable.getRoot() as DashboardAPI)?.getAllDataViews() ?? [];
 
     // Keep track of geoFields for layers as they can be repeated
     const layerGeoFields: Record<string, boolean> = {};
diff --git a/x-pack/plugins/security_solution/public/common/components/dashboards/dashboard_renderer.test.tsx b/x-pack/plugins/security_solution/public/common/components/dashboards/dashboard_renderer.test.tsx
index 78c57d598c3dc..6430e38911b51 100644
--- a/x-pack/plugins/security_solution/public/common/components/dashboards/dashboard_renderer.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/dashboards/dashboard_renderer.test.tsx
@@ -13,7 +13,7 @@ jest.mock('@kbn/dashboard-plugin/public', () => {
   const actual = jest.requireActual('@kbn/dashboard-plugin/public');
   return {
     ...actual,
-    LazyDashboardContainerRenderer: jest
+    DashboardRenderer: jest
       .fn()
       .mockImplementation(() => <div data-test-subj="dashboardRenderer" />),
   };
@@ -45,7 +45,7 @@ describe('DashboardRenderer', () => {
     expect(queryByTestId(`dashboardRenderer`)).toBeInTheDocument();
   });
 
-  it('does not render when No Read Permission', () => {
+  it.skip('does not render when No Read Permission', () => {
     const testProps = {
       ...props,
       canReadDashboard: false,
diff --git a/x-pack/plugins/security_solution/public/common/components/dashboards/dashboard_renderer.tsx b/x-pack/plugins/security_solution/public/common/components/dashboards/dashboard_renderer.tsx
index e8c521e9fd8c4..1f4cdff815dfa 100644
--- a/x-pack/plugins/security_solution/public/common/components/dashboards/dashboard_renderer.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/dashboards/dashboard_renderer.tsx
@@ -5,8 +5,8 @@
  * 2.0.
  */
 import React, { useCallback, useEffect, useState } from 'react';
-import type { DashboardContainer } from '@kbn/dashboard-plugin/public';
-import { LazyDashboardContainerRenderer } from '@kbn/dashboard-plugin/public';
+import type { DashboardAPI } from '@kbn/dashboard-plugin/public';
+import { DashboardRenderer as DashboardContainerRenderer } from '@kbn/dashboard-plugin/public';
 import { ViewMode } from '@kbn/embeddable-plugin/public';
 import type { Filter, Query } from '@kbn/es-query';
 
@@ -28,7 +28,7 @@ const DashboardRendererComponent = ({
   filters?: Filter[];
   id: string;
   inputId?: InputsModelId.global | InputsModelId.timeline;
-  onDashboardContainerLoaded?: (dashboardContainer: DashboardContainer) => void;
+  onDashboardContainerLoaded?: (dashboardContainer: DashboardAPI) => void;
   query?: Query;
   savedObjectId: string | undefined;
   timeRange: {
@@ -39,12 +39,12 @@ const DashboardRendererComponent = ({
   };
 }) => {
   const dispatch = useDispatch();
-  const [dashboardContainer, setDashboardContainer] = useState<DashboardContainer>();
+  const [dashboardContainer, setDashboardContainer] = useState<DashboardAPI>();
 
   const getCreationOptions = useCallback(
     () =>
       Promise.resolve({
-        overrideInput: { timeRange, viewMode: ViewMode.VIEW, query, filters },
+        initialInput: { timeRange, viewMode: ViewMode.VIEW, query, filters },
       }),
     [filters, query, timeRange]
   );
@@ -73,17 +73,17 @@ const DashboardRendererComponent = ({
   }, [dashboardContainer, filters, query, timeRange]);
 
   const handleDashboardLoaded = useCallback(
-    (container: DashboardContainer) => {
+    (container: DashboardAPI) => {
       setDashboardContainer(container);
       onDashboardContainerLoaded?.(container);
     },
     [onDashboardContainerLoaded]
   );
   return savedObjectId && canReadDashboard ? (
-    <LazyDashboardContainerRenderer
+    <DashboardContainerRenderer
+      ref={handleDashboardLoaded}
       savedObjectId={savedObjectId}
       getCreationOptions={getCreationOptions}
-      onDashboardContainerLoaded={handleDashboardLoaded}
     />
   ) : null;
 };
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 49df7a202f9bd..b93457c51e7fc 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
@@ -9,12 +9,12 @@ import type { Filter } from '@kbn/es-query';
 import type { ControlPanelState, OptionsListEmbeddableInput } from '@kbn/controls-plugin/common';
 import type {
   ControlGroupInput,
-  controlGroupInputBuilder,
+  ControlGroupInputBuilder,
   ControlGroupOutput,
   ControlGroupContainer,
   ControlGroupRendererProps,
 } from '@kbn/controls-plugin/public';
-import { LazyControlGroupRenderer } from '@kbn/controls-plugin/public';
+import { ControlGroupRenderer } from '@kbn/controls-plugin/public';
 import type { PropsWithChildren } from 'react';
 import React, { useCallback, useEffect, useState, useRef, useMemo } from 'react';
 import { ViewMode } from '@kbn/embeddable-plugin/public';
@@ -22,7 +22,6 @@ import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 import type { Subscription } from 'rxjs';
 import styled from 'styled-components';
 import { cloneDeep, debounce, isEqual } from 'lodash';
-import { withSuspense } from '@kbn/shared-ux-utility';
 import { useInitializeUrlParam } from '../../utils/global_query_string';
 import { URL_PARAM_KEY } from '../../hooks/use_url_state';
 import type { FilterGroupProps, FilterItemObj } from './types';
@@ -40,10 +39,6 @@ import { FiltersChangedBanner } from './filters_changed_banner';
 import { FilterGroupContext } from './filter_group_context';
 import { NUM_OF_CONTROLS } from './config';
 
-type ControlGroupBuilder = typeof controlGroupInputBuilder;
-
-const ControlGroupRenderer = withSuspense(LazyControlGroupRenderer);
-
 const FilterWrapper = styled.div.attrs((props) => ({
   className: props.className,
 }))`
@@ -197,6 +192,7 @@ const FilterGroupComponent = (props: PropsWithChildren<FilterGroupProps>) => {
 
   const onControlGroupLoadHandler = useCallback(
     (controlGroupContainer: ControlGroupContainer) => {
+      if (!controlGroupContainer) return;
       if (onInit) onInit(controlGroupContainer);
       setControlGroup(controlGroupContainer);
     },
@@ -264,7 +260,7 @@ const FilterGroupComponent = (props: PropsWithChildren<FilterGroupProps>) => {
   const getCreationOptions: ControlGroupRendererProps['getCreationOptions'] = useCallback(
     async (
       defaultInput: Partial<ControlGroupInput>,
-      { addOptionsListControl }: ControlGroupBuilder
+      { addOptionsListControl }: ControlGroupInputBuilder
     ) => {
       const initialInput: Partial<ControlGroupInput> = {
         ...defaultInput,
@@ -406,7 +402,7 @@ const FilterGroupComponent = (props: PropsWithChildren<FilterGroupProps>) => {
           {Array.isArray(initialUrlParam) ? (
             <EuiFlexItem grow={true} data-test-subj="filter_group__items">
               <ControlGroupRenderer
-                onLoadComplete={onControlGroupLoadHandler}
+                ref={onControlGroupLoadHandler}
                 getCreationOptions={getCreationOptions}
               />
               {!controlGroup ? <FilterGroupLoading /> : null}
diff --git a/x-pack/plugins/security_solution/public/dashboards/pages/details/index.tsx b/x-pack/plugins/security_solution/public/dashboards/pages/details/index.tsx
index 124ebb67339c9..aeb7dfcf63420 100644
--- a/x-pack/plugins/security_solution/public/dashboards/pages/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/dashboards/pages/details/index.tsx
@@ -7,7 +7,7 @@
 
 import React, { useState, useCallback, useEffect, useMemo } from 'react';
 import { LEGACY_DASHBOARD_APP_ID } from '@kbn/dashboard-plugin/public';
-import type { DashboardContainer } from '@kbn/dashboard-plugin/public';
+import type { DashboardAPI } from '@kbn/dashboard-plugin/public';
 
 import type { DashboardCapabilities } from '@kbn/dashboard-plugin/common/types';
 import { useParams } from 'react-router-dom';
@@ -52,8 +52,8 @@ const DashboardViewComponent: React.FC = () => {
     canReadDashboard ? null : DashboardViewPromptState.NoReadPermission
   );
   const [dashboardDetails, setDashboardDetails] = useState<DashboardDetails>();
-  const onDashboardContainerLoaded = useCallback((dashboardContainer: DashboardContainer) => {
-    const dashboardTitle = dashboardContainer.getTitle().trim();
+  const onDashboardContainerLoaded = useCallback((dashboard: DashboardAPI) => {
+    const dashboardTitle = dashboard?.getTitle().trim();
     setDashboardDetails({ dashboardTitle });
   }, []);
   const { detailName: savedObjectId } = useParams<{ detailName?: string }>();
diff --git a/x-pack/plugins/security_solution/tsconfig.json b/x-pack/plugins/security_solution/tsconfig.json
index bfc45e92c36a5..622785a43b4e8 100644
--- a/x-pack/plugins/security_solution/tsconfig.json
+++ b/x-pack/plugins/security_solution/tsconfig.json
@@ -38,7 +38,6 @@
     "@kbn/actions-plugin",
     "@kbn/alerting-plugin",
     "@kbn/cases-plugin",
-    "@kbn/cloud-defend-plugin",
     "@kbn/cloud-experiments-plugin",
     "@kbn/cloud-security-posture-plugin",
     "@kbn/encrypted-saved-objects-plugin",
@@ -135,7 +134,6 @@
     "@kbn/repo-info",
     "@kbn/storybook",
     "@kbn/controls-plugin",
-    "@kbn/shared-ux-utility",
     "@kbn/core-saved-objects-common",
     "@kbn/core-saved-objects-import-export-server-mocks",
     "@kbn/user-profile-components",
@@ -145,6 +143,7 @@
     "@kbn/shared-ux-router",
     "@kbn/charts-plugin",
     "@kbn/alerts-as-data-utils",
+    "@kbn/cloud-defend-plugin",
     "@kbn/expandable-flyout",
     "@kbn/securitysolution-grouping",
     "@kbn/securitysolution-data-table",

From e23475b656fec3106a228cf266d308f3d68788fa Mon Sep 17 00:00:00 2001
From: Alexander Wert <AlexanderWert@users.noreply.github.com>
Date: Wed, 19 Apr 2023 21:58:28 +0200
Subject: [PATCH 093/100] [APM] Add messaging queues to the service map
 (#153784)

## Summary

Adds queues to the service map in global service map and service-focused
service maps.
(Adding them to the dependencies tables will follow in separate PRs)

Addresses point 1. of #109209

<img width="958" alt="image"
src="https://user-images.githubusercontent.com/866830/227977218-ec17e7a7-c433-4f61-a506-03e3b8f115a0.png">


Co-authored-by: Dario Gieselaar <dario.gieselaar@elastic.co>
---
 .../transform_service_map_responses.test.ts   | 67 +++++++++++++++++++
 .../transform_service_map_responses.ts        | 55 +++++++++++++--
 2 files changed, 117 insertions(+), 5 deletions(-)

diff --git a/x-pack/plugins/apm/server/routes/service_map/transform_service_map_responses.test.ts b/x-pack/plugins/apm/server/routes/service_map/transform_service_map_responses.test.ts
index 2a61baf923e83..7cf1336f5cfec 100644
--- a/x-pack/plugins/apm/server/routes/service_map/transform_service_map_responses.test.ts
+++ b/x-pack/plugins/apm/server/routes/service_map/transform_service_map_responses.test.ts
@@ -32,6 +32,12 @@ const nodejsExternal = {
   [SPAN_SUBTYPE]: 'aa',
 };
 
+const kafkaExternal = {
+  [SPAN_DESTINATION_SERVICE_RESOURCE]: 'kafka/some-queue',
+  [SPAN_TYPE]: 'messaging',
+  [SPAN_SUBTYPE]: 'kafka',
+};
+
 const javaService = {
   [SERVICE_NAME]: 'opbeans-java',
   [SERVICE_ENVIRONMENT]: 'production',
@@ -88,6 +94,67 @@ describe('transformServiceMapResponses', () => {
     ).toBeUndefined();
   });
 
+  it('adds connection for messaging-based external destinations', () => {
+    const response: ServiceMapResponse = {
+      services: [nodejsService, javaService],
+      discoveredServices: [
+        {
+          from: kafkaExternal,
+          to: nodejsService,
+        },
+      ],
+      connections: [
+        {
+          source: javaService,
+          destination: kafkaExternal,
+        },
+      ],
+      anomalies,
+    };
+
+    const { elements } = transformServiceMapResponses({ response });
+
+    expect(elements.length).toBe(5);
+
+    const connections = elements.filter(
+      (element) => 'source' in element.data && 'target' in element.data
+    );
+    expect(connections.length).toBe(2);
+
+    const sendMessageConnection = connections.find(
+      (element) =>
+        'source' in element.data && element.data.source === 'opbeans-java'
+    );
+
+    expect(sendMessageConnection).toHaveProperty('data');
+    expect(sendMessageConnection?.data).toHaveProperty('target');
+
+    if (sendMessageConnection?.data && 'target' in sendMessageConnection.data) {
+      expect(sendMessageConnection.data.target).toBe('>kafka/some-queue');
+      expect(sendMessageConnection.data.id).toBe(
+        'opbeans-java~>kafka/some-queue'
+      );
+    }
+
+    const receiveMessageConnection = connections.find(
+      (element) =>
+        'target' in element.data && element.data.target === 'opbeans-node'
+    );
+
+    expect(receiveMessageConnection).toHaveProperty('data');
+    expect(receiveMessageConnection?.data).toHaveProperty('target');
+
+    if (
+      receiveMessageConnection?.data &&
+      'source' in receiveMessageConnection.data
+    ) {
+      expect(receiveMessageConnection.data.source).toBe('>kafka/some-queue');
+      expect(receiveMessageConnection.data.id).toBe(
+        '>kafka/some-queue~opbeans-node'
+      );
+    }
+  });
+
   it('collapses external destinations based on span.destination.resource.name', () => {
     const response: ServiceMapResponse = {
       services: [nodejsService, javaService],
diff --git a/x-pack/plugins/apm/server/routes/service_map/transform_service_map_responses.ts b/x-pack/plugins/apm/server/routes/service_map/transform_service_map_responses.ts
index 7ed09d9eb4f65..97a13c368b162 100644
--- a/x-pack/plugins/apm/server/routes/service_map/transform_service_map_responses.ts
+++ b/x-pack/plugins/apm/server/routes/service_map/transform_service_map_responses.ts
@@ -41,6 +41,40 @@ function getConnectionId(connection: Connection) {
   )}`;
 }
 
+function addMessagingConnections(
+  connections: Connection[],
+  discoveredServices: Array<{
+    from: ExternalConnectionNode;
+    to: ServiceConnectionNode;
+  }>
+): Connection[] {
+  const messagingDestinations = connections
+    .map((connection) => connection.destination)
+    .filter(
+      (dest) =>
+        dest['span.type'] === 'messaging' &&
+        SPAN_DESTINATION_SERVICE_RESOURCE in dest
+    );
+  const newConnections = messagingDestinations
+    .map((node) => {
+      const matchedService = discoveredServices.find(
+        ({ from }) =>
+          node[SPAN_DESTINATION_SERVICE_RESOURCE] ===
+          from[SPAN_DESTINATION_SERVICE_RESOURCE]
+      )?.to;
+      if (matchedService) {
+        return {
+          source: node,
+          destination: matchedService,
+        };
+      }
+      return undefined;
+    })
+    .filter((c) => c !== undefined) as Connection[];
+
+  return [...connections, ...newConnections];
+}
+
 export function getAllNodes(
   services: ServiceMapResponse['services'],
   connections: ServiceMapResponse['connections']
@@ -82,8 +116,11 @@ export function transformServiceMapResponses({
   response: ServiceMapResponse;
 }): TransformServiceMapResponse {
   const { discoveredServices, services, connections, anomalies } = response;
-
-  const allNodes = getAllNodes(services, connections);
+  const allConnections = addMessagingConnections(
+    connections,
+    discoveredServices
+  );
+  const allNodes = getAllNodes(services, allConnections);
   const serviceNodes = getServiceNodes(allNodes);
 
   // List of nodes that are externals
@@ -98,9 +135,17 @@ export function transformServiceMapResponses({
     if (!node.id || map[node.id]) {
       return map;
     }
-
+    const outboundConnectionExists = allConnections.some(
+      (con) =>
+        SPAN_DESTINATION_SERVICE_RESOURCE in con.source &&
+        con.source[SPAN_DESTINATION_SERVICE_RESOURCE] ===
+          node[SPAN_DESTINATION_SERVICE_RESOURCE]
+    );
     const matchedService = discoveredServices.find(({ from }) => {
-      if ('span.destination.service.resource' in node) {
+      if (
+        !outboundConnectionExists &&
+        SPAN_DESTINATION_SERVICE_RESOURCE in node
+      ) {
         return (
           node[SPAN_DESTINATION_SERVICE_RESOURCE] ===
           from[SPAN_DESTINATION_SERVICE_RESOURCE]
@@ -162,7 +207,7 @@ export function transformServiceMapResponses({
   }
 
   // Build connections with mapped nodes
-  const mappedConnections = connections
+  const mappedConnections = allConnections
     .map((connection) => {
       const sourceData = getConnectionNode(connection.source);
       const targetData = getConnectionNode(connection.destination);

From e025496e718420a49892d7ef746835009a5478da Mon Sep 17 00:00:00 2001
From: christineweng <18648970+christineweng@users.noreply.github.com>
Date: Wed, 19 Apr 2023 15:04:55 -0500
Subject: [PATCH 094/100] [Security Solution] Expandable flyout analyzer
 preview (#154786)

## Summary

This PR adds additional features to the expandable flyout:

- Adding a new section called `Visualizations` in the expandable flyout
-> right panel -> Overview tab
- Analyzer preview in the `Visualizations` section that includes:
- Analyzer tree than shows current analyzed event, its parent and
children processes (if any)


![image](https://user-images.githubusercontent.com/18648970/231305313-9f606c48-c79b-4eb2-beab-06aadf1c8537.png)

Other states of analyzer preview: empty, loading, and error

![image](https://user-images.githubusercontent.com/18648970/232821516-f2ffcb3c-e41f-468f-b2c9-3587b2da9ba4.png)

**How to test**

- add `xpack.securitySolution.enableExperimental:
['securityFlyoutEnabled']` to the `kibana.dev.json` file
- go to the Alerts page, and click on the expand detail button on any
row of the table
- click on `Overview`, then `Visualizations`

### 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
---
 ...ert_details_right_panel_overview_tab.cy.ts |  13 +
 .../screens/document_expandable_flyout.ts     |   7 +
 .../tasks/document_expandable_flyout.ts       |  11 +
 ...elated_alerts_by_process_ancestry.test.tsx |   8 +
 .../use_alert_prevalence_from_process_tree.ts |  29 +-
 .../flyout/left/components/analyze_graph.tsx  |   2 +-
 .../components/analyzer_preview.test.tsx      |  94 ++++++
 .../right/components/analyzer_preview.tsx     |  59 ++++
 .../right/components/analyzer_tree.test.tsx   |  49 +++
 .../flyout/right/components/analyzer_tree.tsx |  77 +++++
 .../right/components/anayzer_tree.stories.tsx |  61 ++++
 .../right/components/entities_overview.tsx    |   5 +-
 .../right/components/highlighted_fields.tsx   |   5 +-
 .../flyout/right/components/test_ids.ts       |  12 +
 .../flyout/right/components/translations.ts   |  16 +
 .../visualizations_section.test.tsx           |  62 ++++
 .../components/visualizations_section.tsx     |  38 +++
 .../flyout/right/mocks/mock_analyzer_data.ts  | 278 ++++++++++++++++++
 .../public/flyout/right/mocks/mock_context.ts |  37 +++
 .../public/flyout/right/tabs/overview_tab.tsx |   3 +
 .../right/utils/analyzer_helpers.test.tsx     |  69 +++++
 .../flyout/right/utils/analyzer_helpers.ts    |  72 +++++
 22 files changed, 991 insertions(+), 16 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/public/flyout/right/components/analyzer_preview.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/flyout/right/components/analyzer_preview.tsx
 create mode 100644 x-pack/plugins/security_solution/public/flyout/right/components/analyzer_tree.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/flyout/right/components/analyzer_tree.tsx
 create mode 100644 x-pack/plugins/security_solution/public/flyout/right/components/anayzer_tree.stories.tsx
 create mode 100644 x-pack/plugins/security_solution/public/flyout/right/components/visualizations_section.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/flyout/right/components/visualizations_section.tsx
 create mode 100644 x-pack/plugins/security_solution/public/flyout/right/mocks/mock_analyzer_data.ts
 create mode 100644 x-pack/plugins/security_solution/public/flyout/right/utils/analyzer_helpers.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/flyout/right/utils/analyzer_helpers.ts

diff --git a/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/expandable_flyout/alert_details_right_panel_overview_tab.cy.ts b/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/expandable_flyout/alert_details_right_panel_overview_tab.cy.ts
index adb9d75dce78e..c98c84b800079 100644
--- a/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/expandable_flyout/alert_details_right_panel_overview_tab.cy.ts
+++ b/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/expandable_flyout/alert_details_right_panel_overview_tab.cy.ts
@@ -28,6 +28,7 @@ import {
   DOCUMENT_DETAILS_FLYOUT_OVERVIEW_TAB_INSIGHTS_ENTITY_PANEL_CONTENT,
   DOCUMENT_DETAILS_FLYOUT_OVERVIEW_TAB_INSIGHTS_VIEW_ALL_ENTITIES_BUTTON,
   DOCUMENT_DETAILS_FLYOUT_INSIGHTS_TAB_ENTITIES_CONTENT,
+  DOCUMENT_DETAILS_FLYOUT_OVERVIEW_TAB_ANALYZER_TREE,
 } from '../../../screens/document_expandable_flyout';
 import {
   expandFirstAlertExpandableFlyout,
@@ -35,6 +36,7 @@ import {
   toggleOverviewTabDescriptionSection,
   toggleOverviewTabInvestigationSection,
   toggleOverviewTabInsightsSection,
+  toggleOverviewTabVisualizationsSection,
 } from '../../../tasks/document_expandable_flyout';
 import { cleanKibana } from '../../../tasks/common';
 import { login, visit } from '../../../tasks/login';
@@ -179,5 +181,16 @@ describe.skip(
         cy.get(DOCUMENT_DETAILS_FLYOUT_INSIGHTS_TAB_ENTITIES_CONTENT).should('be.visible');
       });
     });
+
+    describe('visualizations section', () => {
+      before(() => {
+        toggleOverviewTabInsightsSection();
+        toggleOverviewTabVisualizationsSection();
+      });
+
+      it('should display analyzer preview', () => {
+        cy.get(DOCUMENT_DETAILS_FLYOUT_OVERVIEW_TAB_ANALYZER_TREE).should('be.visible');
+      });
+    });
   }
 );
diff --git a/x-pack/plugins/security_solution/cypress/screens/document_expandable_flyout.ts b/x-pack/plugins/security_solution/cypress/screens/document_expandable_flyout.ts
index 7dbc04942c71a..2f07705ab18d4 100644
--- a/x-pack/plugins/security_solution/cypress/screens/document_expandable_flyout.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/document_expandable_flyout.ts
@@ -71,6 +71,8 @@ import {
   ENTITY_PANEL_HEADER_TEST_ID,
   ENTITY_PANEL_CONTENT_TEST_ID,
   ENTITIES_VIEW_ALL_BUTTON_TEST_ID,
+  VISUALIZATIONS_SECTION_HEADER_TEST_ID,
+  ANALYZER_TREE_TEST_ID,
 } from '../../public/flyout/right/components/test_ids';
 import {
   getClassSelector,
@@ -300,6 +302,11 @@ export const DOCUMENT_DETAILS_FLYOUT_OVERVIEW_TAB_INSIGHTS_ENTITY_PANEL_HEADER =
 export const DOCUMENT_DETAILS_FLYOUT_OVERVIEW_TAB_INSIGHTS_ENTITY_PANEL_CONTENT =
   getDataTestSubjectSelector(ENTITY_PANEL_CONTENT_TEST_ID);
 
+export const DOCUMENT_DETAILS_FLYOUT_OVERVIEW_TAB_VISUALIZATIONS_SECTION_HEADER =
+  getDataTestSubjectSelector(VISUALIZATIONS_SECTION_HEADER_TEST_ID);
+export const DOCUMENT_DETAILS_FLYOUT_OVERVIEW_TAB_ANALYZER_TREE =
+  getDataTestSubjectSelector(ANALYZER_TREE_TEST_ID);
+
 /* Table tab */
 
 export const DOCUMENT_DETAILS_FLYOUT_TABLE_TAB_FILTER = getClassSelector('euiFieldSearch');
diff --git a/x-pack/plugins/security_solution/cypress/tasks/document_expandable_flyout.ts b/x-pack/plugins/security_solution/cypress/tasks/document_expandable_flyout.ts
index 6665cd4890ecd..8fe8eac97e06b 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/document_expandable_flyout.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/document_expandable_flyout.ts
@@ -33,6 +33,7 @@ import {
   DOCUMENT_DETAILS_FLYOUT_INSIGHTS_TAB_PREVALENCE_BUTTON,
   DOCUMENT_DETAILS_FLYOUT_INSIGHTS_TAB_CORRELATIONS_BUTTON,
   DOCUMENT_DETAILS_FLYOUT_INSIGHTS_TAB_THREAT_INTELLIGENCE_BUTTON,
+  DOCUMENT_DETAILS_FLYOUT_OVERVIEW_TAB_VISUALIZATIONS_SECTION_HEADER,
   DOCUMENT_DETAILS_FLYOUT_FOOTER_TAKE_ACTION_BUTTON_DROPDOWN,
   KIBANA_NAVBAR_ALERTS_PAGE,
   KIBANA_NAVBAR_CASES_PAGE,
@@ -144,6 +145,16 @@ export const toggleOverviewTabInsightsSection = () =>
     .should('be.visible')
     .click();
 
+/**
+ * Toggle the Overview tab visualizations section in the document details expandable flyout right section
+ */
+export const toggleOverviewTabVisualizationsSection = () =>
+  cy
+    .get(DOCUMENT_DETAILS_FLYOUT_OVERVIEW_TAB_VISUALIZATIONS_SECTION_HEADER)
+    .scrollIntoView()
+    .should('be.visible')
+    .click();
+
 /**
  * Open the Table tab in the document details expandable flyout right section
  */
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/insights/related_alerts_by_process_ancestry.test.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/insights/related_alerts_by_process_ancestry.test.tsx
index eb490469d16df..88685262ecc17 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/insights/related_alerts_by_process_ancestry.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/insights/related_alerts_by_process_ancestry.test.tsx
@@ -20,6 +20,7 @@ import {
   PROCESS_ANCESTRY_ERROR,
   PROCESS_ANCESTRY_EMPTY,
 } from './translations';
+import type { StatsNode } from '../../../containers/alerts/use_alert_prevalence_from_process_tree';
 
 jest.mock('../../../containers/alerts/use_alert_prevalence_from_process_tree', () => ({
   useAlertPrevalenceFromProcessTree: jest.fn(),
@@ -96,10 +97,15 @@ describe('RelatedAlertsByProcessAncestry', () => {
 
   it('renders the text with a count and a timeline button when the request works', async () => {
     const mockAlertIds = ['1', '2'];
+    const mockStatsNodes = [
+      { id: 'testid', name: 'process', parent: 'testid2' },
+      { id: 'testid2', name: 'iexplore' },
+    ];
     mockUseAlertPrevalenceFromProcessTree.mockReturnValue({
       loading: false,
       error: false,
       alertIds: mockAlertIds,
+      statsNodes: mockStatsNodes,
     });
 
     render(
@@ -123,6 +129,7 @@ describe('RelatedAlertsByProcessAncestry', () => {
       loading: false,
       error: false,
       alertIds: [] as string[],
+      statsNodes: [] as StatsNode[],
     });
 
     render(
@@ -142,6 +149,7 @@ describe('RelatedAlertsByProcessAncestry', () => {
       loading: false,
       error: false,
       alertIds: undefined,
+      statsNodes: undefined,
     });
 
     render(
diff --git a/x-pack/plugins/security_solution/public/common/containers/alerts/use_alert_prevalence_from_process_tree.ts b/x-pack/plugins/security_solution/public/common/containers/alerts/use_alert_prevalence_from_process_tree.ts
index c48cc90a32f64..753d3a0bddd6d 100644
--- a/x-pack/plugins/security_solution/public/common/containers/alerts/use_alert_prevalence_from_process_tree.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/alerts/use_alert_prevalence_from_process_tree.ts
@@ -10,15 +10,29 @@ import { useTimelineDataFilters } from '../../../timelines/containers/use_timeli
 
 export const DETECTIONS_ALERTS_COUNT_ID = 'detections-alerts-count';
 
+export interface StatsNode {
+  data: object;
+  id: string;
+  name: string;
+  parent?: string;
+  stats: {
+    total: number;
+    byCategory: {
+      alerts?: number;
+    };
+  };
+}
 interface UserAlertPrevalenceFromProcessTreeResult {
   loading: boolean;
   alertIds: undefined | string[];
+  statsNodes: undefined | StatsNode[];
   count?: number;
   error: boolean;
 }
 
 interface ProcessTreeAlertPrevalenceResponse {
   alertIds: string[] | undefined;
+  statsNodes: StatsNode[] | undefined;
 }
 
 interface EntityResponse {
@@ -40,17 +54,7 @@ interface UseAlertDocumentAnalyzerSchema {
 }
 
 interface TreeResponse {
-  statsNodes: Array<{
-    data: object;
-    id: string;
-    parent: string;
-    stats: {
-      total: number;
-      byCategory: {
-        alerts?: number;
-      };
-    };
-  }>;
+  statsNodes: StatsNode[];
   alertIds: string[];
 }
 
@@ -126,18 +130,21 @@ export function useAlertPrevalenceFromProcessTree({
       loading: true,
       error: false,
       alertIds: undefined,
+      statsNodes: undefined,
     };
   } else if (query.data) {
     return {
       loading: false,
       error: false,
       alertIds: query.data.alertIds,
+      statsNodes: query.data.statsNodes,
     };
   } else {
     return {
       loading: false,
       error: true,
       alertIds: undefined,
+      statsNodes: undefined,
     };
   }
 }
diff --git a/x-pack/plugins/security_solution/public/flyout/left/components/analyze_graph.tsx b/x-pack/plugins/security_solution/public/flyout/left/components/analyze_graph.tsx
index 3cb908a849e4d..d0e476e724f9b 100644
--- a/x-pack/plugins/security_solution/public/flyout/left/components/analyze_graph.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/left/components/analyze_graph.tsx
@@ -24,7 +24,7 @@ export const ANALYZE_GRAPH_ID = 'analyze_graph';
  */
 export const AnalyzeGraph: FC = () => {
   const { eventId } = useLeftPanelContext();
-  const scopeId = 'fly-out';
+  const scopeId = 'flyout'; // TO-DO: update to use context
   const { from, to, shouldUpdate, selectedPatterns } = useTimelineDataFilters(
     isActiveTimeline(scopeId)
   );
diff --git a/x-pack/plugins/security_solution/public/flyout/right/components/analyzer_preview.test.tsx b/x-pack/plugins/security_solution/public/flyout/right/components/analyzer_preview.test.tsx
new file mode 100644
index 0000000000000..9b21c296584bc
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/flyout/right/components/analyzer_preview.test.tsx
@@ -0,0 +1,94 @@
+/*
+ * 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 { render } from '@testing-library/react';
+import React from 'react';
+import { TestProviders } from '../../../common/mock';
+import { useAlertPrevalenceFromProcessTree } from '../../../common/containers/alerts/use_alert_prevalence_from_process_tree';
+import { mockContextValue, mockDataFormattedForFieldBrowser } from '../mocks/mock_context';
+import { RightPanelContext } from '../context';
+import { AnalyzerPreview } from './analyzer_preview';
+import { ANALYZER_PREVIEW_TEST_ID, ANALYZER_TREE_TEST_ID } from './test_ids';
+import * as mock from '../mocks/mock_analyzer_data';
+
+jest.mock('../../../common/containers/alerts/use_alert_prevalence_from_process_tree', () => ({
+  useAlertPrevalenceFromProcessTree: jest.fn(),
+}));
+const mockUseAlertPrevalenceFromProcessTree = useAlertPrevalenceFromProcessTree as jest.Mock;
+
+const contextValue = {
+  ...mockContextValue,
+  dataFormattedForFieldBrowser: mockDataFormattedForFieldBrowser,
+};
+
+const contextValueEmpty = {
+  ...mockContextValue,
+  dataFormattedForFieldBrowser: [
+    {
+      category: 'kibana',
+      field: 'kibana.alert.rule.uuid',
+      values: ['rule-uuid'],
+      originalValue: ['rule-uuid'],
+      isObjectArray: false,
+    },
+  ],
+};
+
+describe('<AnalyzerPreview />', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('shows analyzer preview correctly when documentid and index are present', () => {
+    mockUseAlertPrevalenceFromProcessTree.mockReturnValue({
+      loading: false,
+      error: false,
+      alertIds: ['alertid'],
+      statsNodes: mock.mockStatsNodes,
+    });
+    const wrapper = render(
+      <TestProviders>
+        <RightPanelContext.Provider value={contextValue}>
+          <AnalyzerPreview />
+        </RightPanelContext.Provider>
+      </TestProviders>
+    );
+
+    expect(mockUseAlertPrevalenceFromProcessTree).toHaveBeenCalledWith({
+      processEntityId: '',
+      isActiveTimeline: false,
+      documentId: 'ancestors-id',
+      indices: ['rule-parameters-index'],
+    });
+    expect(wrapper.getByTestId(ANALYZER_PREVIEW_TEST_ID)).toBeInTheDocument();
+    expect(wrapper.getByTestId(ANALYZER_TREE_TEST_ID)).toBeInTheDocument();
+  });
+
+  it('does not show analyzer preview when documentid and index are not present', () => {
+    mockUseAlertPrevalenceFromProcessTree.mockReturnValue({
+      loading: false,
+      error: false,
+      alertIds: undefined,
+      statsNodes: undefined,
+    });
+    const { queryByTestId } = render(
+      <TestProviders>
+        <RightPanelContext.Provider value={contextValueEmpty}>
+          <AnalyzerPreview />
+        </RightPanelContext.Provider>
+      </TestProviders>
+    );
+
+    expect(mockUseAlertPrevalenceFromProcessTree).toHaveBeenCalledWith({
+      processEntityId: '',
+      isActiveTimeline: false,
+      documentId: '',
+      indices: [],
+    });
+    expect(queryByTestId(ANALYZER_TREE_TEST_ID)).not.toBeInTheDocument();
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/flyout/right/components/analyzer_preview.tsx b/x-pack/plugins/security_solution/public/flyout/right/components/analyzer_preview.tsx
new file mode 100644
index 0000000000000..4042612bef06f
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/flyout/right/components/analyzer_preview.tsx
@@ -0,0 +1,59 @@
+/*
+ * 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, { useEffect, useState } from 'react';
+import { find } from 'lodash/fp';
+import { ANALYZER_PREVIEW_TEST_ID } from './test_ids';
+import { useRightPanelContext } from '../context';
+import { useAlertPrevalenceFromProcessTree } from '../../../common/containers/alerts/use_alert_prevalence_from_process_tree';
+import type { StatsNode } from '../../../common/containers/alerts/use_alert_prevalence_from_process_tree';
+import { AnalyzerTree } from './analyzer_tree';
+import { isActiveTimeline } from '../../../helpers';
+
+/**
+ * Cache that stores fetched stats nodes
+ */
+interface Cache {
+  statsNodes: StatsNode[];
+}
+
+/**
+ * Analyzer preview under Overview, Visualizations. It shows a tree representation of analyzer.
+ */
+export const AnalyzerPreview: React.FC = () => {
+  const [cache, setCache] = useState<Partial<Cache>>({});
+  const { dataFormattedForFieldBrowser: data, scopeId } = useRightPanelContext();
+
+  const documentId = find({ category: 'kibana', field: 'kibana.alert.ancestors.id' }, data);
+  const processDocumentId =
+    documentId && Array.isArray(documentId.values) ? documentId.values[0] : '';
+
+  const index = find({ category: 'kibana', field: 'kibana.alert.rule.parameters.index' }, data);
+  const indices = index?.values ?? [];
+
+  const { loading, error, statsNodes } = useAlertPrevalenceFromProcessTree({
+    processEntityId: '',
+    isActiveTimeline: isActiveTimeline(scopeId),
+    documentId: processDocumentId,
+    indices,
+  });
+
+  useEffect(() => {
+    if (statsNodes && statsNodes.length !== 0) {
+      setCache({ statsNodes });
+    }
+  }, [statsNodes, setCache]);
+
+  return (
+    <div data-test-subj={ANALYZER_PREVIEW_TEST_ID}>
+      {documentId && index && (
+        <AnalyzerTree statsNodes={cache.statsNodes} loading={loading} error={error} />
+      )}
+    </div>
+  );
+};
+
+AnalyzerPreview.displayName = 'AnalyzerPreview';
diff --git a/x-pack/plugins/security_solution/public/flyout/right/components/analyzer_tree.test.tsx b/x-pack/plugins/security_solution/public/flyout/right/components/analyzer_tree.test.tsx
new file mode 100644
index 0000000000000..b07fe9b17bc2d
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/flyout/right/components/analyzer_tree.test.tsx
@@ -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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { render } from '@testing-library/react';
+import {
+  ANALYZER_TREE_TEST_ID,
+  ANALYZER_TREE_LOADING_TEST_ID,
+  ANALYZER_TREE_ERROR_TEST_ID,
+} from './test_ids';
+import { ANALYZER_PREVIEW_TITLE } from './translations';
+import * as mock from '../mocks/mock_analyzer_data';
+import { AnalyzerTree } from './analyzer_tree';
+
+const defaultProps = {
+  statsNodes: mock.mockStatsNodes,
+  loading: false,
+  error: false,
+};
+describe('<AnalyzerTree />', () => {
+  it('should render the component when data is passed', () => {
+    const { getByTestId, getByText } = render(<AnalyzerTree {...defaultProps} />);
+    expect(getByText(ANALYZER_PREVIEW_TITLE)).toBeInTheDocument();
+    expect(getByTestId(ANALYZER_TREE_TEST_ID)).toBeInTheDocument();
+  });
+
+  it('should render blank when data is not passed', () => {
+    const { queryByTestId, queryByText } = render(
+      <AnalyzerTree {...defaultProps} statsNodes={undefined} />
+    );
+    expect(queryByText(ANALYZER_PREVIEW_TITLE)).not.toBeInTheDocument();
+    expect(queryByTestId(ANALYZER_TREE_TEST_ID)).not.toBeInTheDocument();
+  });
+
+  it('should render loading spinner when loading is true', () => {
+    const { getByTestId } = render(<AnalyzerTree {...defaultProps} loading={true} />);
+    expect(getByTestId(ANALYZER_TREE_LOADING_TEST_ID)).toBeInTheDocument();
+  });
+
+  it('should display error message when error is true', () => {
+    const { getByTestId, getByText } = render(<AnalyzerTree {...defaultProps} error={true} />);
+    expect(getByText('Unable to display analyzer preview.')).toBeInTheDocument();
+    expect(getByTestId(ANALYZER_TREE_ERROR_TEST_ID)).toBeInTheDocument();
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/flyout/right/components/analyzer_tree.tsx b/x-pack/plugins/security_solution/public/flyout/right/components/analyzer_tree.tsx
new file mode 100644
index 0000000000000..99d5924083a12
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/flyout/right/components/analyzer_tree.tsx
@@ -0,0 +1,77 @@
+/*
+ * 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, { useMemo } from 'react';
+import {
+  EuiPanel,
+  EuiButtonEmpty,
+  EuiTreeView,
+  EuiLoadingSpinner,
+  EuiEmptyPrompt,
+} from '@elastic/eui';
+import { ANALYZER_PREVIEW_TITLE, ANALYZER_PREVIEW_TEXT } from './translations';
+import {
+  ANALYZER_TREE_TEST_ID,
+  ANALYZER_TREE_LOADING_TEST_ID,
+  ANALYZER_TREE_ERROR_TEST_ID,
+} from './test_ids';
+import type { StatsNode } from '../../../common/containers/alerts/use_alert_prevalence_from_process_tree';
+import { getTreeNodes } from '../utils/analyzer_helpers';
+import { ERROR_TITLE, ERROR_MESSAGE } from '../../shared/translations';
+
+export interface AnalyzerTreeProps {
+  /**
+   * statsNode data from resolver tree api
+   */
+  statsNodes?: StatsNode[];
+  /**
+   * Boolean value of whether data is in loading
+   */
+  loading: boolean;
+  /**
+   * Boolean value of whether there is error in data fetching
+   */
+  error: boolean;
+}
+
+/**
+ * Analyzer tree that represent a summary view of analyzer. It shows current process, and its parent and child processes
+ */
+export const AnalyzerTree: React.FC<AnalyzerTreeProps> = ({ statsNodes, loading, error }) => {
+  const items = useMemo(() => getTreeNodes(statsNodes ?? []), [statsNodes]);
+
+  if (loading) {
+    return <EuiLoadingSpinner data-test-subj={ANALYZER_TREE_LOADING_TEST_ID} />;
+  }
+
+  if (error) {
+    return (
+      <EuiEmptyPrompt
+        iconType="error"
+        color="danger"
+        title={<h2>{ERROR_TITLE(ANALYZER_PREVIEW_TEXT)}</h2>}
+        body={<p>{ERROR_MESSAGE(ANALYZER_PREVIEW_TEXT)}</p>}
+        data-test-subj={ANALYZER_TREE_ERROR_TEST_ID}
+      />
+    );
+  }
+
+  if (items && items.length !== 0) {
+    return (
+      <EuiPanel hasBorder={true} paddingSize="none" data-test-subj={ANALYZER_TREE_TEST_ID}>
+        <EuiPanel color="subdued" paddingSize="s">
+          <EuiButtonEmpty color="primary" iconType="sessionViewer" onClick={() => {}}>
+            {ANALYZER_PREVIEW_TITLE}
+          </EuiButtonEmpty>
+          <EuiTreeView items={items} display="compressed" aria-label={ANALYZER_PREVIEW_TITLE} />
+        </EuiPanel>
+      </EuiPanel>
+    );
+  }
+  return null;
+};
+
+AnalyzerTree.displayName = 'AnalyzerTree';
diff --git a/x-pack/plugins/security_solution/public/flyout/right/components/anayzer_tree.stories.tsx b/x-pack/plugins/security_solution/public/flyout/right/components/anayzer_tree.stories.tsx
new file mode 100644
index 0000000000000..29bb82b9551ef
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/flyout/right/components/anayzer_tree.stories.tsx
@@ -0,0 +1,61 @@
+/*
+ * 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 type { Story } from '@storybook/react';
+import { AnalyzerTree } from './analyzer_tree';
+import * as mock from '../mocks/mock_analyzer_data';
+
+export default {
+  component: AnalyzerTree,
+  title: 'Flyout/AnalyzerTree',
+};
+
+const defaultProps = {
+  loading: false,
+  error: false,
+};
+
+export const Default: Story<void> = () => {
+  return <AnalyzerTree {...defaultProps} statsNodes={mock.mockStatsNodes} />;
+};
+
+export const HasGrandparent: Story<void> = () => {
+  return <AnalyzerTree {...defaultProps} statsNodes={mock.mockStatsNodesHasGrandparent} />;
+};
+
+export const HasParent: Story<void> = () => {
+  return <AnalyzerTree {...defaultProps} statsNodes={mock.mockStatsNodesHasParent} />;
+};
+
+export const HasChildren: Story<void> = () => {
+  return <AnalyzerTree {...defaultProps} statsNodes={mock.mockStatsNodesHasChildren} />;
+};
+
+export const HasMoreThanThreeChildren: Story<void> = () => {
+  return <AnalyzerTree {...defaultProps} statsNodes={mock.mockStatsNodesMoreThanThreeChildren} />;
+};
+
+export const HasGrandChildren: Story<void> = () => {
+  return <AnalyzerTree {...defaultProps} statsNodes={mock.mockStatsNodesHasGrandchildren} />;
+};
+
+export const SingleNode: Story<void> = () => {
+  return <AnalyzerTree {...defaultProps} statsNodes={mock.mockStatsNodesSingleNode} />;
+};
+
+export const Loading: Story<void> = () => {
+  return <AnalyzerTree loading={true} error={false} />;
+};
+
+export const Error: Story<void> = () => {
+  return <AnalyzerTree loading={false} error={true} />;
+};
+
+export const Empty: Story<void> = () => {
+  return <AnalyzerTree {...defaultProps} />;
+};
diff --git a/x-pack/plugins/security_solution/public/flyout/right/components/entities_overview.tsx b/x-pack/plugins/security_solution/public/flyout/right/components/entities_overview.tsx
index 9d42ddef6ddec..b8ebe27ddd7c4 100644
--- a/x-pack/plugins/security_solution/public/flyout/right/components/entities_overview.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/right/components/entities_overview.tsx
@@ -28,7 +28,7 @@ const HOST_ICON = 'storage';
  * Entities section under Insights section, overview tab. It contains a preview of host and user information.
  */
 export const EntitiesOverview: React.FC = () => {
-  const { eventId, getFieldsData, indexName } = useRightPanelContext();
+  const { eventId, getFieldsData, indexName, scopeId } = useRightPanelContext();
   const { openLeftPanel } = useExpandableFlyoutContext();
   const hostName = getField(getFieldsData('host.name'));
   const userName = getField(getFieldsData('user.name'));
@@ -40,9 +40,10 @@ export const EntitiesOverview: React.FC = () => {
       params: {
         id: eventId,
         indexName,
+        scopeId,
       },
     });
-  }, [eventId, openLeftPanel, indexName]);
+  }, [eventId, openLeftPanel, indexName, scopeId]);
 
   if (!eventId || (!userName && !hostName)) {
     return null;
diff --git a/x-pack/plugins/security_solution/public/flyout/right/components/highlighted_fields.tsx b/x-pack/plugins/security_solution/public/flyout/right/components/highlighted_fields.tsx
index 1c0ee677d9e80..af14a20788466 100644
--- a/x-pack/plugins/security_solution/public/flyout/right/components/highlighted_fields.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/right/components/highlighted_fields.tsx
@@ -17,7 +17,7 @@ import { RightPanelKey, RightPanelTableTabPath } from '..';
 
 export const HighlightedFields: FC = () => {
   const { openRightPanel } = useExpandableFlyoutContext();
-  const { eventId, indexName, dataFormattedForFieldBrowser, browserFields } =
+  const { eventId, indexName, dataFormattedForFieldBrowser, browserFields, scopeId } =
     useRightPanelContext();
 
   const goToTableTab = useCallback(() => {
@@ -27,9 +27,10 @@ export const HighlightedFields: FC = () => {
       params: {
         id: eventId,
         indexName,
+        scopeId,
       },
     });
-  }, [eventId, indexName, openRightPanel]);
+  }, [eventId, indexName, openRightPanel, scopeId]);
 
   if (!dataFormattedForFieldBrowser || !browserFields || !eventId) {
     return <></>;
diff --git a/x-pack/plugins/security_solution/public/flyout/right/components/test_ids.ts b/x-pack/plugins/security_solution/public/flyout/right/components/test_ids.ts
index 65850272b2289..e89c16b3f5f12 100644
--- a/x-pack/plugins/security_solution/public/flyout/right/components/test_ids.ts
+++ b/x-pack/plugins/security_solution/public/flyout/right/components/test_ids.ts
@@ -52,6 +52,9 @@ export const HIGHLIGHTED_FIELDS_DETAILS_TEST_ID =
 export const HIGHLIGHTED_FIELDS_TEST_ID = 'securitySolutionDocumentDetailsFlyoutHighlightedFields';
 export const HIGHLIGHTED_FIELDS_HEADER_EXPAND_ICON_TEST_ID = 'query-toggle-header';
 export const HIGHLIGHTED_FIELDS_GO_TO_TABLE_LINK = 'summary-view-go-to-table-link';
+
+/* Insights section*/
+
 export const INSIGHTS_TEST_ID = 'securitySolutionDocumentDetailsFlyoutInsights';
 export const INSIGHTS_HEADER_TEST_ID = 'securitySolutionDocumentDetailsFlyoutInsightsHeader';
 export const ENTITIES_HEADER_TEST_ID = 'securitySolutionDocumentDetailsFlyoutEntitiesHeader';
@@ -80,3 +83,12 @@ export const ENTITIES_HOST_OVERVIEW_IP_TEST_ID =
   'securitySolutionDocumentDetailsFlyoutEntitiesHostOverviewIP';
 export const ENTITIES_HOST_OVERVIEW_RISK_LEVEL_TEST_ID =
   'securitySolutionDocumentDetailsFlyoutEntitiesHostOverviewRiskLevel';
+
+/* Visualizations section*/
+export const VISUALIZATIONS_SECTION_TEST_ID = 'securitySolutionDocumentDetailsVisualizationsTitle';
+export const VISUALIZATIONS_SECTION_HEADER_TEST_ID =
+  'securitySolutionDocumentDetailsVisualizationsTitleHeader';
+export const ANALYZER_PREVIEW_TEST_ID = 'securitySolutionDocumentDetailsAnalayzerPreview';
+export const ANALYZER_TREE_TEST_ID = 'securitySolutionDocumentDetailsAnalayzerTree';
+export const ANALYZER_TREE_LOADING_TEST_ID = 'securitySolutionDocumentDetailsAnalayzerTreeLoading';
+export const ANALYZER_TREE_ERROR_TEST_ID = 'securitySolutionDocumentDetailsAnalayzerTreeError';
diff --git a/x-pack/plugins/security_solution/public/flyout/right/components/translations.ts b/x-pack/plugins/security_solution/public/flyout/right/components/translations.ts
index 169299e895e24..1a6a2da7344c4 100644
--- a/x-pack/plugins/security_solution/public/flyout/right/components/translations.ts
+++ b/x-pack/plugins/security_solution/public/flyout/right/components/translations.ts
@@ -136,3 +136,19 @@ export const VIEW_ALL = (text: string) =>
     values: { text },
     defaultMessage: 'View all {text}',
   });
+export const VISUALIZATIONS_TITLE = i18n.translate(
+  'xpack.securitySolution.flyout.documentDetails.visualizationsTitle',
+  { defaultMessage: 'Visualizations' }
+);
+
+export const ANALYZER_PREVIEW_TITLE = i18n.translate(
+  'xpack.securitySolution.flyout.documentDetails.analyzerPreviewTitle',
+  { defaultMessage: 'Analyzer preview' }
+);
+
+export const ANALYZER_PREVIEW_TEXT = i18n.translate(
+  'xpack.securitySolution.flyout.documentDetails.analyzerPreviewText',
+  {
+    defaultMessage: 'analyzer preview.',
+  }
+);
diff --git a/x-pack/plugins/security_solution/public/flyout/right/components/visualizations_section.test.tsx b/x-pack/plugins/security_solution/public/flyout/right/components/visualizations_section.test.tsx
new file mode 100644
index 0000000000000..2b447967ca80b
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/flyout/right/components/visualizations_section.test.tsx
@@ -0,0 +1,62 @@
+/*
+ * 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 { render } from '@testing-library/react';
+import { VISUALIZATIONS_SECTION_HEADER_TEST_ID } from './test_ids';
+import { TestProviders } from '../../../common/mock';
+import { VisualizationsSection } from './visualizations_section';
+import { mockContextValue, mockDataFormattedForFieldBrowser } from '../mocks/mock_context';
+import { RightPanelContext } from '../context';
+import { useAlertPrevalenceFromProcessTree } from '../../../common/containers/alerts/use_alert_prevalence_from_process_tree';
+
+jest.mock('../../../common/containers/alerts/use_alert_prevalence_from_process_tree', () => ({
+  useAlertPrevalenceFromProcessTree: jest.fn(),
+}));
+const mockUseAlertPrevalenceFromProcessTree = useAlertPrevalenceFromProcessTree as jest.Mock;
+
+const contextValue = {
+  ...mockContextValue,
+  dataFormattedForFieldBrowser: mockDataFormattedForFieldBrowser,
+};
+
+describe('<VisualizationsSection />', () => {
+  beforeEach(() => {
+    mockUseAlertPrevalenceFromProcessTree.mockReturnValue({
+      loading: false,
+      error: false,
+      alertIds: undefined,
+      statsNodes: undefined,
+    });
+  });
+
+  it('should render visualizations component', () => {
+    const { getByTestId, getAllByRole } = render(
+      <RightPanelContext.Provider value={contextValue}>
+        <VisualizationsSection />
+      </RightPanelContext.Provider>
+    );
+
+    expect(getByTestId(VISUALIZATIONS_SECTION_HEADER_TEST_ID)).toBeInTheDocument();
+    expect(getAllByRole('button')[0]).toHaveAttribute('aria-expanded', 'false');
+    expect(getAllByRole('button')[0]).not.toHaveAttribute('disabled');
+  });
+
+  it('should render visualization component as expanded when expanded is true', () => {
+    const { getByTestId, getAllByRole } = render(
+      <TestProviders>
+        <RightPanelContext.Provider value={contextValue}>
+          <VisualizationsSection expanded={true} />
+        </RightPanelContext.Provider>
+      </TestProviders>
+    );
+
+    expect(getByTestId(VISUALIZATIONS_SECTION_HEADER_TEST_ID)).toBeInTheDocument();
+    expect(getAllByRole('button')[0]).toHaveAttribute('aria-expanded', 'true');
+    expect(getAllByRole('button')[0]).not.toHaveAttribute('disabled');
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/flyout/right/components/visualizations_section.tsx b/x-pack/plugins/security_solution/public/flyout/right/components/visualizations_section.tsx
new file mode 100644
index 0000000000000..c6c84a6a6b34d
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/flyout/right/components/visualizations_section.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 { ExpandableSection } from './expandable_section';
+import { VISUALIZATIONS_SECTION_TEST_ID } from './test_ids';
+import { VISUALIZATIONS_TITLE } from './translations';
+import { AnalyzerPreview } from './analyzer_preview';
+
+export interface VisualizatioinsSectionProps {
+  /**
+   * Boolean to allow the component to be expanded or collapsed on first render
+   */
+  expanded?: boolean;
+}
+
+/**
+ * Visualizations section in overview. It contains analyzer preview and session view preview.
+ */
+export const VisualizationsSection: React.FC<VisualizatioinsSectionProps> = ({
+  expanded = false,
+}) => {
+  return (
+    <ExpandableSection
+      expanded={expanded}
+      title={VISUALIZATIONS_TITLE}
+      data-test-subj={VISUALIZATIONS_SECTION_TEST_ID}
+    >
+      <AnalyzerPreview />
+    </ExpandableSection>
+  );
+};
+
+VisualizationsSection.displayName = 'VisualizationsSection';
diff --git a/x-pack/plugins/security_solution/public/flyout/right/mocks/mock_analyzer_data.ts b/x-pack/plugins/security_solution/public/flyout/right/mocks/mock_analyzer_data.ts
new file mode 100644
index 0000000000000..1ea775b607baa
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/flyout/right/mocks/mock_analyzer_data.ts
@@ -0,0 +1,278 @@
+/*
+ * 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 { StatsNode } from '../../../common/containers/alerts/use_alert_prevalence_from_process_tree';
+
+const mockNode: StatsNode = {
+  id: '70e19mhyda',
+  name: 'mimikatz.exe',
+  parent: '92ogx18xdh',
+  data: {},
+  stats: {
+    total: 2,
+    byCategory: { alerts: 2 },
+  },
+};
+
+const mockParentNodeNoGrandparent: StatsNode = {
+  id: '92ogx18xdh',
+  name: 'explorer.exe',
+  data: {},
+  stats: {
+    total: 0,
+    byCategory: {},
+  },
+};
+
+const mockParentNode: StatsNode = {
+  ...mockParentNodeNoGrandparent,
+  parent: 'skq89ren5b',
+};
+
+const mockGrandparentNode: StatsNode = {
+  id: 'skq89ren5b',
+  name: 'notepad.exe',
+  data: {},
+  stats: {
+    total: 0,
+    byCategory: {},
+  },
+};
+
+export const mockChildrenNodes: StatsNode[] = [
+  {
+    id: '6b4ffkdr0r',
+    parent: '70e19mhyda',
+    name: 'lsass.exe',
+    data: {},
+    stats: {
+      total: 0,
+      byCategory: {},
+    },
+  },
+  {
+    id: 'gimoywlglz',
+    parent: '70e19mhyda',
+    name: 'iexlorer.exe',
+    data: {},
+    stats: {
+      total: 0,
+      byCategory: {},
+    },
+  },
+  {
+    id: 'p6t1v7jum9',
+    parent: '70e19mhyda',
+    name: 'notepad.exe',
+    data: {},
+    stats: {
+      total: 0,
+      byCategory: {},
+    },
+  },
+];
+
+const mockExtraChildrenNodes: StatsNode[] = [
+  {
+    id: 'rxccek8vqu',
+    parent: '70e19mhyda',
+    name: 'powershell.exe',
+    data: {},
+    stats: {
+      total: 0,
+      byCategory: {},
+    },
+  },
+  {
+    id: 'mq0n2g7093',
+    parent: '70e19mhyda',
+    name: 'exlorer.exe',
+    data: {},
+    stats: {
+      total: 0,
+      byCategory: {},
+    },
+  },
+];
+
+const mockGrandchildrenNodes: StatsNode[] = [
+  {
+    id: 't037f0qec3',
+    parent: 'gimoywlglz',
+    name: 'powershell.exe',
+    data: {},
+    stats: {
+      total: 0,
+      byCategory: {},
+    },
+  },
+  {
+    id: '8bxu0crntu',
+    parent: 'gimoywlglz',
+    name: 'lsass.exe',
+    data: {},
+    stats: {
+      total: 0,
+      byCategory: {},
+    },
+  },
+];
+
+export const mockStatsNodesSingleNode: StatsNode[] = [mockNode];
+
+export const mockStatsNodesHasParent: StatsNode[] = [mockNode, mockParentNodeNoGrandparent];
+
+export const mockStatsNodesHasGrandparent: StatsNode[] = [
+  mockNode,
+  mockParentNode,
+  mockGrandparentNode,
+];
+
+export const mockStatsNodesHasChildren: StatsNode[] = [mockNode, ...mockChildrenNodes];
+
+export const mockStatsNodesMoreThanThreeChildren: StatsNode[] = [
+  mockNode,
+  ...mockChildrenNodes,
+  ...mockExtraChildrenNodes,
+];
+
+export const mockStatsNodesHasGrandchildren: StatsNode[] = [
+  mockNode,
+  ...mockChildrenNodes,
+  ...mockGrandchildrenNodes,
+];
+
+export const mockStatsNodes: StatsNode[] = [
+  mockNode,
+  mockParentNode,
+  mockGrandparentNode,
+  ...mockChildrenNodes,
+  ...mockGrandchildrenNodes,
+];
+
+export const mockTreeNodesSingleNode = [
+  {
+    label: '--> (Analyzed Event) mimikatz.exe',
+    id: '70e19mhyda',
+    isExpanded: true,
+    children: [],
+  },
+];
+
+export const mockTreeNodesHasParent = [
+  {
+    label: '--> explorer.exe',
+    id: '92ogx18xdh',
+    isExpanded: true,
+    children: [
+      {
+        label: '--> (Analyzed Event) mimikatz.exe',
+        id: '70e19mhyda',
+        isExpanded: true,
+        children: [],
+      },
+    ],
+  },
+];
+
+export const mockTreeNodesHasGrandparent = [
+  {
+    label: '...',
+    id: 'grandparent',
+    isExpanded: true,
+    children: [
+      {
+        label: '--> explorer.exe',
+        id: '92ogx18xdh',
+        isExpanded: true,
+        children: [
+          {
+            label: '--> (Analyzed Event) mimikatz.exe',
+            id: '70e19mhyda',
+            isExpanded: true,
+            children: [],
+          },
+        ],
+      },
+    ],
+  },
+];
+
+export const mockTreeNodesHasChildren = [
+  {
+    label: '--> (Analyzed Event) mimikatz.exe',
+    id: '70e19mhyda',
+    isExpanded: true,
+    children: [
+      { label: '--> lsass.exe', id: '6b4ffkdr0r', isExpanded: true, children: [] },
+      { label: '--> iexlorer.exe', id: 'gimoywlglz', isExpanded: true, children: [] },
+      { label: '--> notepad.exe', id: 'p6t1v7jum9', isExpanded: true, children: [] },
+    ],
+  },
+];
+
+export const mockTreeNodesHasFourChildren = [
+  {
+    label: '--> (Analyzed Event) mimikatz.exe',
+    id: '70e19mhyda',
+    isExpanded: true,
+    children: [
+      { label: '--> lsass.exe', id: '6b4ffkdr0r', isExpanded: true, children: [] },
+      { label: '--> iexlorer.exe', id: 'gimoywlglz', isExpanded: true, children: [] },
+      { label: '--> notepad.exe', id: 'p6t1v7jum9', isExpanded: true, children: [] },
+      { label: '--> powershell.exe', id: 'rxccek8vqu', isExpanded: true, children: [] },
+    ],
+  },
+];
+
+export const mockTreeNodesHasGrandchildren = [
+  {
+    label: '--> (Analyzed Event) mimikatz.exe',
+    id: '70e19mhyda',
+    isExpanded: true,
+    children: [
+      { label: '--> lsass.exe', id: '6b4ffkdr0r', isExpanded: true, children: [] },
+      { label: '--> iexlorer.exe', id: 'gimoywlglz', isExpanded: true, children: [] },
+      { label: '--> notepad.exe', id: 'p6t1v7jum9', isExpanded: true, children: [] },
+    ],
+  },
+
+  { label: '...', id: 'grandchild', isExpanded: true, children: [] },
+];
+
+export const mockTreeNodes = [
+  {
+    label: '...',
+    id: 'grandparent',
+    isExpanded: true,
+    children: [
+      {
+        label: '--> explorer.exe',
+        id: '92ogx18xdh',
+        isExpanded: true,
+        children: [
+          {
+            label: '--> (Analyzed Event) mimikatz.exe',
+            id: '70e19mhyda',
+            isExpanded: true,
+            children: [
+              { label: '--> lsass.exe', id: '6b4ffkdr0r', isExpanded: true, children: [] },
+              { label: '--> iexlorer.exe', id: 'gimoywlglz', isExpanded: true, children: [] },
+              { label: '--> notepad.exe', id: 'p6t1v7jum9', isExpanded: true, children: [] },
+            ],
+          },
+        ],
+      },
+    ],
+  },
+  { label: '...', id: 'grandchild', isExpanded: true, children: [] },
+];
+
+export const mockChildrenTreeNodes = [
+  { label: 'lsass.exe', id: '6b4ffkdr0r', isExpanded: true, children: [] },
+  { label: 'iexlorer.exe', id: 'gimoywlglz', isExpanded: true, children: [] },
+  { label: 'notepad.exe', id: 'p6t1v7jum9', isExpanded: true, children: [] },
+];
diff --git a/x-pack/plugins/security_solution/public/flyout/right/mocks/mock_context.ts b/x-pack/plugins/security_solution/public/flyout/right/mocks/mock_context.ts
index a4d01bda6bc21..034e18350b1cb 100644
--- a/x-pack/plugins/security_solution/public/flyout/right/mocks/mock_context.ts
+++ b/x-pack/plugins/security_solution/public/flyout/right/mocks/mock_context.ts
@@ -6,6 +6,7 @@
  */
 
 import { ALERT_RISK_SCORE, ALERT_SEVERITY } from '@kbn/rule-data-utils';
+import type { RightPanelContext } from '../context';
 
 /**
  * Returns mocked data for field (mock this method: x-pack/plugins/security_solution/public/common/hooks/use_get_fields_data.ts)
@@ -59,6 +60,27 @@ export const mockDataFormattedForFieldBrowser = [
     originalValue: ['rule-description'],
     isObjectArray: false,
   },
+  {
+    category: 'kibana',
+    field: 'kibana.alert.ancestors.id',
+    values: ['ancestors-id'],
+    originalValue: ['ancestors-id'],
+    isObjectArray: false,
+  },
+  {
+    category: 'kibana',
+    field: 'kibana.alert.rule.parameters.index',
+    values: ['rule-parameters-index'],
+    originalValue: ['rule-parameters-index'],
+    isObjectArray: false,
+  },
+  {
+    category: 'process',
+    field: 'process.entity_id',
+    values: ['process-entity_id'],
+    originalValue: ['process-entity_id'],
+    isObjectArray: false,
+  },
 ];
 
 /**
@@ -115,3 +137,18 @@ export const mockSearchHit = {
     ],
   },
 };
+
+/**
+ * Mock contextValue for right panel context
+ */
+export const mockContextValue: RightPanelContext = {
+  eventId: 'eventId',
+  indexName: 'index',
+  scopeId: 'scopeId',
+  getFieldsData: mockGetFieldsData,
+  dataFormattedForFieldBrowser: null,
+  browserFields: null,
+  dataAsNestedObject: null,
+  searchHit: undefined,
+  refetchFlyoutData: jest.fn(),
+};
diff --git a/x-pack/plugins/security_solution/public/flyout/right/tabs/overview_tab.tsx b/x-pack/plugins/security_solution/public/flyout/right/tabs/overview_tab.tsx
index 0c9e57f99d22f..73131f67a661a 100644
--- a/x-pack/plugins/security_solution/public/flyout/right/tabs/overview_tab.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/right/tabs/overview_tab.tsx
@@ -11,6 +11,7 @@ import { EuiHorizontalRule } from '@elastic/eui';
 import { InvestigationSection } from '../components/investigation_section';
 import { DescriptionSection } from '../components/description_section';
 import { InsightsSection } from '../components/insights_section';
+import { VisualizationsSection } from '../components/visualizations_section';
 
 /**
  * Overview view displayed in the document details expandable flyout right section
@@ -23,6 +24,8 @@ export const OverviewTab: FC = memo(() => {
       <InvestigationSection />
       <EuiHorizontalRule margin="l" />
       <InsightsSection />
+      <EuiHorizontalRule margin="l" />
+      <VisualizationsSection />
     </>
   );
 });
diff --git a/x-pack/plugins/security_solution/public/flyout/right/utils/analyzer_helpers.test.tsx b/x-pack/plugins/security_solution/public/flyout/right/utils/analyzer_helpers.test.tsx
new file mode 100644
index 0000000000000..c3c8fbd6824ac
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/flyout/right/utils/analyzer_helpers.test.tsx
@@ -0,0 +1,69 @@
+/*
+ * 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 { getTreeNodes, hasGrandchildren, getTreeNode } from './analyzer_helpers';
+import * as mock from '../mocks/mock_analyzer_data';
+
+it('test hasGrandchildren', () => {
+  expect(hasGrandchildren([], [])).toBe(false);
+  expect(hasGrandchildren([], mock.mockChildrenNodes)).toBe(false);
+  expect(hasGrandchildren(mock.mockStatsNodesSingleNode, [])).toBe(false);
+  expect(hasGrandchildren(mock.mockStatsNodesHasChildren, mock.mockChildrenNodes)).toBe(false);
+  expect(hasGrandchildren(mock.mockStatsNodesHasGrandchildren, mock.mockChildrenNodes)).toBe(true);
+});
+
+it('test getTreeNode', () => {
+  const mockTreeNode = {
+    label: 'process name',
+    id: 'test id',
+    isExpanded: true,
+    children: mock.mockChildrenTreeNodes,
+  };
+  const mockTreeNodeChildrenIsEmpty = {
+    label: 'process name',
+    id: 'test id',
+    isExpanded: true,
+    children: [],
+  };
+
+  expect(getTreeNode('test id', 'process name', mock.mockChildrenTreeNodes)).toStrictEqual(
+    mockTreeNode
+  );
+  expect(getTreeNode('test id', 'process name', [])).toStrictEqual(mockTreeNodeChildrenIsEmpty);
+});
+
+describe('test getTreeNodes', () => {
+  it('should return the correct tree nodes', () => {
+    expect(getTreeNodes(mock.mockStatsNodes)).toStrictEqual(mock.mockTreeNodes);
+    expect(getTreeNodes(mock.mockStatsNodesHasGrandparent)).toStrictEqual(
+      mock.mockTreeNodesHasGrandparent
+    );
+    expect(getTreeNodes(mock.mockStatsNodesHasParent)).toStrictEqual(mock.mockTreeNodesHasParent);
+
+    expect(getTreeNodes(mock.mockStatsNodesHasChildren)).toStrictEqual(
+      mock.mockTreeNodesHasChildren
+    );
+    expect(getTreeNodes(mock.mockStatsNodesHasGrandchildren)).toStrictEqual(
+      mock.mockTreeNodesHasGrandchildren
+    );
+    expect(getTreeNodes(mock.mockStatsNodesSingleNode)).toStrictEqual(mock.mockTreeNodesSingleNode);
+  });
+
+  it('should return the correct tree nodes with 3 children when child count limit is not passed', () => {
+    expect(getTreeNodes(mock.mockStatsNodesMoreThanThreeChildren)).toStrictEqual(
+      mock.mockTreeNodesHasChildren
+    );
+  });
+  it('should return the correct number of children tree nodes when child count limit is passed', () => {
+    expect(getTreeNodes(mock.mockStatsNodesMoreThanThreeChildren, 4)).toStrictEqual(
+      mock.mockTreeNodesHasFourChildren
+    );
+    expect(getTreeNodes(mock.mockStatsNodesMoreThanThreeChildren, 0)).toStrictEqual(
+      mock.mockTreeNodesSingleNode
+    );
+  });
+  expect(getTreeNodes([])).toStrictEqual([]);
+});
diff --git a/x-pack/plugins/security_solution/public/flyout/right/utils/analyzer_helpers.ts b/x-pack/plugins/security_solution/public/flyout/right/utils/analyzer_helpers.ts
new file mode 100644
index 0000000000000..6e4740463ffbd
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/flyout/right/utils/analyzer_helpers.ts
@@ -0,0 +1,72 @@
+/*
+ * 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 { Node } from '@elastic/eui/src/components/tree_view/tree_view';
+import type { StatsNode } from '../../../common/containers/alerts/use_alert_prevalence_from_process_tree';
+
+/**
+ * Helper function to check if a node has grandchildren
+ * @param statsNodes type StatsNode array
+ * @param children type StatsNode array
+ * @return a boolean of wheather a bode has grandchildren
+ */
+export const hasGrandchildren = (statsNodes: StatsNode[], children: StatsNode[]) => {
+  return children.some((child) => statsNodes.some((node) => node.parent === child.id));
+};
+
+/**
+ * Helper function to create a tree node from id, name and children
+ * @param id type string
+ * @param name type string
+ * @param children children nodes
+ * @return a node of Node type
+ */
+export const getTreeNode = (id: string, name: string, children: Node[]): Node => {
+  return { label: name, id, isExpanded: true, children };
+};
+
+/**
+ * Helper function to create tree nodes based on statsNode list from resolver api
+ * @param statsNodes type StatsNode[]
+ * @param childrenCountLimit optional parameter to limit the number of children displayed, default to 3
+ * @return a node list for EuiTreeView
+ */
+
+export const getTreeNodes = (statsNodes: StatsNode[], childCountLimit: number = 3): Node[] => {
+  if (statsNodes.length === 0) {
+    return [];
+  }
+  const node = statsNodes[0];
+  const nodeList = [];
+  const currentNode = getTreeNode(node.id, `--> (Analyzed Event) ${node.name}`, []);
+
+  const children = statsNodes.filter((item) => item.parent === node.id);
+  if (children && children.length !== 0) {
+    children.forEach((child, idx) => {
+      if (idx < childCountLimit) {
+        currentNode.children?.push(getTreeNode(child.id, `--> ${child.name}`, []));
+      }
+    });
+  }
+
+  const parent = statsNodes.find((item) => item.id === node.parent);
+  if (parent) {
+    const parentNode = getTreeNode(parent.id, `--> ${parent.name}`, [currentNode]);
+    if (parent?.parent) {
+      nodeList.push(getTreeNode('grandparent', '...', [parentNode]));
+    } else {
+      nodeList.push(parentNode);
+    }
+  } else {
+    nodeList.push(currentNode);
+  }
+
+  if (hasGrandchildren(statsNodes, children)) {
+    nodeList.push(getTreeNode('grandchild', '...', []));
+  }
+
+  return nodeList;
+};

From 03a2cd7aeae3dd07597447488469282a3c67972e Mon Sep 17 00:00:00 2001
From: Jeramy Soucy <jeramy.soucy@elastic.co>
Date: Wed, 19 Apr 2023 16:22:30 -0400
Subject: [PATCH 095/100] [Failing Test] Fixes intermittent failures in audit
 log integration tests (#154935)

resolves #119267

## Summary
As [discussed in the
issue](https://github.com/elastic/kibana/issues/119267#issuecomment-1370135711),
we believed the issue to be timing between file write and read, however
this is not the case. I found that two 'saved_object_find' events were
being logged - the expected user one (for a 'dashboard'), and one by the
fleet app (for 'epm-packages'). Should the 'epm-packages' event get
logged before the 'dashboard' event, the test fails because the first
'saved_object_find' event it finds does not contain the expected user
data in the audit. This appears to happen much less frequently in CI
than locally for whatever reason.

## Fix
I have added additional criteria when looking for the
'saved_object_find' event so it will only find an event for a
'dashboard' object.

## Testing
Flaky Test Runner:
https://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/2150
---
 .../tests/audit/audit_log.ts                       | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/x-pack/test/security_api_integration/tests/audit/audit_log.ts b/x-pack/test/security_api_integration/tests/audit/audit_log.ts
index d2bd365ec4c97..2173b9d8e2123 100644
--- a/x-pack/test/security_api_integration/tests/audit/audit_log.ts
+++ b/x-pack/test/security_api_integration/tests/audit/audit_log.ts
@@ -15,8 +15,7 @@ export default function ({ getService }: FtrProviderContext) {
   const retry = getService('retry');
   const { username, password } = getService('config').get('servers.kibana');
 
-  // FLAKY: https://github.com/elastic/kibana/issues/119267
-  describe.skip('Audit Log', function () {
+  describe('Audit Log', function () {
     const logFilePath = Path.resolve(__dirname, '../../plugins/audit_log/audit.log');
     const logFile = new FileWrapper(logFilePath, retry);
 
@@ -27,12 +26,12 @@ export default function ({ getService }: FtrProviderContext) {
     it('logs audit events when reading and writing saved objects', async () => {
       await supertest.get('/audit_log?query=param').set('kbn-xsrf', 'foo').expect(204);
       await retry.waitFor('logs event in the dest file', async () => await logFile.isNotEmpty());
-
       const content = await logFile.readJSON();
 
       const httpEvent = content.find((c) => c.event.action === 'http_request');
       expect(httpEvent).to.be.ok();
       expect(httpEvent.trace.id).to.be.ok();
+
       expect(httpEvent.user.name).to.be(username);
       expect(httpEvent.kibana.space_id).to.be('default');
       expect(httpEvent.http.request.method).to.be('get');
@@ -45,7 +44,12 @@ export default function ({ getService }: FtrProviderContext) {
       expect(createEvent.user.name).to.be(username);
       expect(createEvent.kibana.space_id).to.be('default');
 
-      const findEvent = content.find((c) => c.event.action === 'saved_object_find');
+      // There are two 'saved_object_find' events in the log. One is by the fleet app for
+      // "epm - packages", the other is by the user for a dashboard (this is the one we are
+      // concerned with).
+      const findEvent = content.find(
+        (c) => c.event.action === 'saved_object_find' && c.kibana.saved_object.type === 'dashboard'
+      );
       expect(findEvent).to.be.ok();
       expect(findEvent.trace.id).to.be.ok();
       expect(findEvent.user.name).to.be(username);
@@ -65,7 +69,6 @@ export default function ({ getService }: FtrProviderContext) {
         })
         .expect(200);
       await retry.waitFor('logs event in the dest file', async () => await logFile.isNotEmpty());
-
       const content = await logFile.readJSON();
 
       const loginEvent = content.find((c) => c.event.action === 'user_login');
@@ -90,7 +93,6 @@ export default function ({ getService }: FtrProviderContext) {
         })
         .expect(401);
       await retry.waitFor('logs event in the dest file', async () => await logFile.isNotEmpty());
-
       const content = await logFile.readJSON();
 
       const loginEvent = content.find((c) => c.event.action === 'user_login');

From 6994c9f901c1afbe365a3d319496e076fee9dc1f Mon Sep 17 00:00:00 2001
From: Maxim Palenov <maxim.palenov@elastic.co>
Date: Wed, 19 Apr 2023 23:13:56 +0200
Subject: [PATCH 096/100] [Security Solution] Remove the automatic rule
 mute/unmute logic from all our BE endpoints (#154804)

**Addresses:** https://github.com/elastic/kibana/issues/147736

## Summary

This PR removes automatic rule muting and unmuting at Security solution's APIs.


### Checklist

- [ ] [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
---
 .../logic/bulk_actions/bulk_edit_rules.ts     | 61 +------------------
 .../logic/crud/create_rules.ts                |  6 --
 .../rule_management/logic/crud/patch_rules.ts | 10 ---
 .../logic/crud/update_rules.ts                |  8 ---
 .../logic/rule_actions/muting.ts              | 37 -----------
 .../security_and_spaces/group10/throttle.ts   |  8 +--
 6 files changed, 6 insertions(+), 124 deletions(-)
 delete mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/rule_actions/muting.ts

diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/bulk_actions/bulk_edit_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/bulk_actions/bulk_edit_rules.ts
index 6660ce730f84b..09d4eb691427d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/bulk_actions/bulk_edit_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/bulk_actions/bulk_edit_rules.ts
@@ -5,23 +5,13 @@
  * 2.0.
  */
 
-import type { BulkOperationError, RulesClient } from '@kbn/alerting-plugin/server';
-import pMap from 'p-map';
-import {
-  MAX_RULES_TO_UPDATE_IN_PARALLEL,
-  NOTIFICATION_THROTTLE_NO_ACTIONS,
-} from '../../../../../../common/constants';
+import type { RulesClient } from '@kbn/alerting-plugin/server';
 
-import type {
-  BulkActionEditPayload,
-  BulkActionEditPayloadRuleActions,
-} from '../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
-import { BulkActionEditType } from '../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
+import type { BulkActionEditPayload } from '../../../../../../common/detection_engine/rule_management/api/rules/bulk_actions/request_schema';
 
 import type { MlAuthz } from '../../../../machine_learning/authz';
 
 import { enrichFilterWithRuleTypeMapping } from '../search/enrich_filter_with_rule_type_mappings';
-import { readRules } from '../crud/read_rules';
 import type { RuleAlertType } from '../../../rule_schema';
 
 import { ruleParamsModifier } from './rule_params_modifier';
@@ -67,52 +57,5 @@ export const bulkEditRules = async ({
     },
   });
 
-  // rulesClient bulkEdit currently doesn't support bulk mute/unmute.
-  // this is a workaround to mitigate this,
-  // until https://github.com/elastic/kibana/issues/139084 is resolved
-  // if rule actions has been applied, we go through each rule, unmute it if necessary and refetch it
-  // calling unmute needed only if rule was muted and throttle value is not NOTIFICATION_THROTTLE_NO_ACTIONS
-  const ruleActions = attributesActions.filter((rule): rule is BulkActionEditPayloadRuleActions =>
-    [BulkActionEditType.set_rule_actions, BulkActionEditType.add_rule_actions].includes(rule.type)
-  );
-
-  // bulk edit actions are applied in historical order.
-  // So, we need to find a rule action that will be applied the last, to be able to check if rule should be muted/unmuted
-  const rulesAction = ruleActions.pop();
-
-  if (rulesAction) {
-    const unmuteErrors: BulkOperationError[] = [];
-    const rulesToUnmute = await pMap(
-      result.rules,
-      async (rule) => {
-        try {
-          if (rule.muteAll && rulesAction.value.throttle !== NOTIFICATION_THROTTLE_NO_ACTIONS) {
-            await rulesClient.unmuteAll({ id: rule.id });
-            return (await readRules({ rulesClient, id: rule.id, ruleId: undefined })) ?? rule;
-          }
-
-          return rule;
-        } catch (err) {
-          unmuteErrors.push({
-            message: err.message,
-            rule: {
-              id: rule.id,
-              name: rule.name,
-            },
-          });
-
-          return null;
-        }
-      },
-      { concurrency: MAX_RULES_TO_UPDATE_IN_PARALLEL }
-    );
-
-    return {
-      ...result,
-      rules: rulesToUnmute.filter((rule): rule is RuleAlertType => rule != null),
-      errors: [...result.errors, ...unmuteErrors],
-    };
-  }
-
   return result;
 };
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/crud/create_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/crud/create_rules.ts
index 416edb039919e..5b9f3efa1ad52 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/crud/create_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/crud/create_rules.ts
@@ -9,7 +9,6 @@ import type { SanitizedRule } from '@kbn/alerting-plugin/common';
 import type { RulesClient } from '@kbn/alerting-plugin/server';
 
 import type { RuleCreateProps } from '../../../../../../common/detection_engine/rule_schema';
-import { NOTIFICATION_THROTTLE_NO_ACTIONS } from '../../../../../../common/constants';
 import { convertCreateAPIToInternalSchema } from '../../normalization/rule_converters';
 import type { RuleParams } from '../../../rule_schema';
 
@@ -39,10 +38,5 @@ export const createRules = async ({
     allowMissingConnectorSecrets,
   });
 
-  // Mute the rule if it is first created with the explicit no actions
-  if (params.throttle === NOTIFICATION_THROTTLE_NO_ACTIONS) {
-    await rulesClient.muteAll({ id: rule.id });
-  }
-
   return rule;
 };
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/crud/patch_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/crud/patch_rules.ts
index 3ce61fcc9800b..643750ea78b6d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/crud/patch_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/crud/patch_rules.ts
@@ -10,7 +10,6 @@ import type { PartialRule, RulesClient } from '@kbn/alerting-plugin/server';
 import type { PatchRuleRequestBody } from '../../../../../../common/detection_engine/rule_management';
 import type { RuleAlertType, RuleParams } from '../../../rule_schema';
 import { convertPatchAPIToInternalSchema } from '../../normalization/rule_converters';
-import { maybeMute } from '../rule_actions/muting';
 
 export interface PatchRulesOptions {
   rulesClient: RulesClient;
@@ -41,15 +40,6 @@ export const patchRules = async ({
     shouldIncrementRevision: () => shouldIncrementRevision,
   });
 
-  if (nextParams.throttle !== undefined) {
-    await maybeMute({
-      rulesClient,
-      muteAll: existingRule.muteAll,
-      throttle: nextParams.throttle,
-      id: update.id,
-    });
-  }
-
   if (existingRule.enabled && nextParams.enabled === false) {
     await rulesClient.disable({ id: existingRule.id });
   } else if (!existingRule.enabled && nextParams.enabled === true) {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/crud/update_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/crud/update_rules.ts
index d949fd63136ea..1996cb1652ab6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/crud/update_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/crud/update_rules.ts
@@ -14,7 +14,6 @@ import { transformRuleToAlertAction } from '../../../../../../common/detection_e
 import type { InternalRuleUpdate, RuleParams, RuleAlertType } from '../../../rule_schema';
 import { transformToAlertThrottle, transformToNotifyWhen } from '../../normalization/rule_actions';
 import { typeSpecificSnakeToCamel } from '../../normalization/rule_converters';
-import { maybeMute } from '../rule_actions/muting';
 
 export interface UpdateRulesOptions {
   rulesClient: RulesClient;
@@ -81,13 +80,6 @@ export const updateRules = async ({
     data: newInternalRule,
   });
 
-  await maybeMute({
-    rulesClient,
-    muteAll: existingRule.muteAll,
-    throttle: ruleUpdate.throttle,
-    id: update.id,
-  });
-
   if (existingRule.enabled && enabled === false) {
     await rulesClient.disable({ id: existingRule.id });
   } else if (!existingRule.enabled && enabled === true) {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/rule_actions/muting.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/rule_actions/muting.ts
deleted file mode 100644
index 6c0c7d9686767..0000000000000
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/rule_actions/muting.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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 { RulesClient } from '@kbn/alerting-plugin/server';
-import { NOTIFICATION_THROTTLE_NO_ACTIONS } from '../../../../../../common/constants';
-import type { RuleAlertType } from '../../../rule_schema';
-
-/**
- * Mutes, unmutes, or does nothing to the alert if no changed is detected
- * @param id The id of the alert to (un)mute
- * @param rulesClient the rules client
- * @param muteAll If the existing alert has all actions muted
- * @param throttle If the existing alert has a throttle set
- */
-export const maybeMute = async ({
-  id,
-  rulesClient,
-  muteAll,
-  throttle,
-}: {
-  id: RuleAlertType['id'];
-  rulesClient: RulesClient;
-  muteAll: RuleAlertType['muteAll'];
-  throttle: string | null | undefined;
-}): Promise<void> => {
-  if (muteAll && throttle !== NOTIFICATION_THROTTLE_NO_ACTIONS) {
-    await rulesClient.unmuteAll({ id });
-  } else if (!muteAll && throttle === NOTIFICATION_THROTTLE_NO_ACTIONS) {
-    await rulesClient.muteAll({ id });
-  } else {
-    // Do nothing, no-operation
-  }
-};
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/throttle.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/throttle.ts
index 760e64cc6f102..eedfaee3ec531 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/throttle.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/group10/throttle.ts
@@ -72,7 +72,7 @@ export default ({ getService }: FtrProviderContext) => {
           expect(notifyWhen).to.eql('onActiveAlert');
         });
 
-        it('When creating throttle with "NOTIFICATION_THROTTLE_NO_ACTIONS" set and no actions, the rule should have its kibana alerting "mute_all" set to "true" and notify_when set to null', async () => {
+        it('When creating throttle with "NOTIFICATION_THROTTLE_NO_ACTIONS" set and no actions, the rule should have its kibana alerting "mute_all" set to "false" and notify_when set to null', async () => {
           const ruleWithThrottle: RuleCreateProps = {
             ...getSimpleRule(),
             throttle: NOTIFICATION_THROTTLE_NO_ACTIONS,
@@ -81,11 +81,11 @@ export default ({ getService }: FtrProviderContext) => {
           const {
             body: { mute_all: muteAll, notify_when: notifyWhen },
           } = await supertest.get(`/api/alerting/rule/${rule.id}`);
-          expect(muteAll).to.eql(true);
+          expect(muteAll).to.eql(false);
           expect(notifyWhen).to.eql(null);
         });
 
-        it('When creating throttle with "NOTIFICATION_THROTTLE_NO_ACTIONS" set and with actions set, the rule should have its kibana alerting "mute_all" set to "true" and notify_when set to null', async () => {
+        it('When creating throttle with "NOTIFICATION_THROTTLE_NO_ACTIONS" set and with actions set, the rule should have its kibana alerting "mute_all" set to "false" and notify_when set to null', async () => {
           // create a new action
           const { body: hookAction } = await supertest
             .post('/api/actions/action')
@@ -101,7 +101,7 @@ export default ({ getService }: FtrProviderContext) => {
           const {
             body: { mute_all: muteAll, notify_when: notifyWhen },
           } = await supertest.get(`/api/alerting/rule/${rule.id}`);
-          expect(muteAll).to.eql(true);
+          expect(muteAll).to.eql(false);
           expect(notifyWhen).to.eql(null);
         });
 

From bf468084c7a7d3240cf83e4d9b59bba5c30cd5f7 Mon Sep 17 00:00:00 2001
From: Alexi Doak <109488926+doakalexi@users.noreply.github.com>
Date: Wed, 19 Apr 2023 17:31:03 -0400
Subject: [PATCH 097/100] [ResponseOps][Window Maintenance] Add the maintenance
 window table (#154491)

Resolves https://github.com/elastic/kibana/issues/153770
Resolves https://github.com/elastic/kibana/issues/153773

## Summary

This pr creates the maintenance window table, and adds pagination and
sorting. It also adds the search bar and filtering.

<img width="1711" alt="Screen Shot 2023-04-06 at 9 41 42 AM"
src="https://user-images.githubusercontent.com/109488926/230396037-10336b73-1c2e-4cd3-b7ae-26c834cf500d.png">



### 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

### To verify

- Create a maintenance window and verify you can view it in the table

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
---
 .../use_find_maintenance_windows.test.tsx     |  56 ++++++++
 .../hooks/use_find_maintenance_windows.ts     |  45 ++++++
 .../center_justified_spinner.test.tsx         |  26 ++++
 .../components/center_justified_spinner.tsx   |  23 ++++
 .../create_maintenance_windows_form.tsx       |  12 +-
 .../components/fields/button_group_field.tsx  |   2 -
 .../components/fields/date_picker_field.tsx   |   8 +-
 .../fields/date_picker_range_field.tsx        |  36 +++--
 .../maintenance_windows_list.test.tsx         | 117 ++++++++++++++++
 .../components/maintenance_windows_list.tsx   | 129 ++++++++++++++++++
 .../recurring_schedule.tsx                    |   8 +-
 .../maintenance_windows/components/schema.ts  |   9 +-
 .../components/status_filter.test.tsx         |  40 ++++++
 .../components/status_filter.tsx              |  80 +++++++++++
 .../components/submit_button.test.tsx         |   6 +-
 .../components/submit_button.tsx              |  10 +-
 .../pages/maintenance_windows/constants.ts    |  24 ++++
 .../helpers/convert_to_rrule.ts               |   7 +-
 .../pages/maintenance_windows/index.tsx       |  36 +++--
 .../pages/maintenance_windows/translations.ts |  71 +++++++++-
 .../public/pages/maintenance_windows/types.ts |  30 ++--
 .../maintenance_windows_api/find.test.ts      |  83 +++++++++++
 .../services/maintenance_windows_api/find.ts  |  52 +++++++
 23 files changed, 841 insertions(+), 69 deletions(-)
 create mode 100644 x-pack/plugins/alerting/public/hooks/use_find_maintenance_windows.test.tsx
 create mode 100644 x-pack/plugins/alerting/public/hooks/use_find_maintenance_windows.ts
 create mode 100644 x-pack/plugins/alerting/public/pages/maintenance_windows/components/center_justified_spinner.test.tsx
 create mode 100644 x-pack/plugins/alerting/public/pages/maintenance_windows/components/center_justified_spinner.tsx
 create mode 100644 x-pack/plugins/alerting/public/pages/maintenance_windows/components/maintenance_windows_list.test.tsx
 create mode 100644 x-pack/plugins/alerting/public/pages/maintenance_windows/components/maintenance_windows_list.tsx
 create mode 100644 x-pack/plugins/alerting/public/pages/maintenance_windows/components/status_filter.test.tsx
 create mode 100644 x-pack/plugins/alerting/public/pages/maintenance_windows/components/status_filter.tsx
 create mode 100644 x-pack/plugins/alerting/public/services/maintenance_windows_api/find.test.ts
 create mode 100644 x-pack/plugins/alerting/public/services/maintenance_windows_api/find.ts

diff --git a/x-pack/plugins/alerting/public/hooks/use_find_maintenance_windows.test.tsx b/x-pack/plugins/alerting/public/hooks/use_find_maintenance_windows.test.tsx
new file mode 100644
index 0000000000000..cdd188af84f8b
--- /dev/null
+++ b/x-pack/plugins/alerting/public/hooks/use_find_maintenance_windows.test.tsx
@@ -0,0 +1,56 @@
+/*
+ * 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 { renderHook } from '@testing-library/react-hooks/dom';
+import { waitFor } from '@testing-library/dom';
+
+import { AppMockRenderer, createAppMockRenderer } from '../lib/test_utils';
+import { useFindMaintenanceWindows } from './use_find_maintenance_windows';
+
+const mockAddDanger = jest.fn();
+
+jest.mock('../utils/kibana_react', () => {
+  const originalModule = jest.requireActual('../utils/kibana_react');
+  return {
+    ...originalModule,
+    useKibana: () => {
+      const { services } = originalModule.useKibana();
+      return {
+        services: {
+          ...services,
+          notifications: { toasts: { addDanger: mockAddDanger } },
+        },
+      };
+    },
+  };
+});
+jest.mock('../services/maintenance_windows_api/find', () => ({
+  findMaintenanceWindows: jest.fn(),
+}));
+
+const { findMaintenanceWindows } = jest.requireMock('../services/maintenance_windows_api/find');
+
+let appMockRenderer: AppMockRenderer;
+
+describe('useFindMaintenanceWindows', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    appMockRenderer = createAppMockRenderer();
+  });
+
+  it('should call onError if api fails', async () => {
+    findMaintenanceWindows.mockRejectedValue('This is an error.');
+
+    renderHook(() => useFindMaintenanceWindows(), {
+      wrapper: appMockRenderer.AppWrapper,
+    });
+
+    await waitFor(() =>
+      expect(mockAddDanger).toBeCalledWith('Unable to load maintenance windows.')
+    );
+  });
+});
diff --git a/x-pack/plugins/alerting/public/hooks/use_find_maintenance_windows.ts b/x-pack/plugins/alerting/public/hooks/use_find_maintenance_windows.ts
new file mode 100644
index 0000000000000..dbbd39f523679
--- /dev/null
+++ b/x-pack/plugins/alerting/public/hooks/use_find_maintenance_windows.ts
@@ -0,0 +1,45 @@
+/*
+ * 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 { i18n } from '@kbn/i18n';
+import { useQuery } from '@tanstack/react-query';
+import { useKibana } from '../utils/kibana_react';
+import { findMaintenanceWindows } from '../services/maintenance_windows_api/find';
+
+export const useFindMaintenanceWindows = () => {
+  const {
+    http,
+    notifications: { toasts },
+  } = useKibana().services;
+
+  const queryFn = () => {
+    return findMaintenanceWindows({ http });
+  };
+
+  const onErrorFn = (error: Error) => {
+    if (error) {
+      toasts.addDanger(
+        i18n.translate('xpack.alerting.maintenanceWindowsListFailure', {
+          defaultMessage: 'Unable to load maintenance windows.',
+        })
+      );
+    }
+  };
+
+  const { isLoading, data = [] } = useQuery({
+    queryKey: ['findMaintenanceWindows'],
+    queryFn,
+    onError: onErrorFn,
+    refetchOnWindowFocus: false,
+    retry: false,
+  });
+
+  return {
+    maintenanceWindows: data,
+    isLoading,
+  };
+};
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/center_justified_spinner.test.tsx b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/center_justified_spinner.test.tsx
new file mode 100644
index 0000000000000..f3c6bacaa7917
--- /dev/null
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/center_justified_spinner.test.tsx
@@ -0,0 +1,26 @@
+/*
+ * 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 { AppMockRenderer, createAppMockRenderer } from '../../../lib/test_utils';
+import { CenterJustifiedSpinner } from './center_justified_spinner';
+
+describe('CenterJustifiedSpinner', () => {
+  let appMockRenderer: AppMockRenderer;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    appMockRenderer = createAppMockRenderer();
+  });
+
+  test('it renders', () => {
+    const result = appMockRenderer.render(<CenterJustifiedSpinner />);
+
+    expect(result.getByTestId('center-justified-spinner')).toBeInTheDocument();
+  });
+});
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/center_justified_spinner.tsx b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/center_justified_spinner.tsx
new file mode 100644
index 0000000000000..72cf6345623e3
--- /dev/null
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/center_justified_spinner.tsx
@@ -0,0 +1,23 @@
+/*
+ * 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 { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner } from '@elastic/eui';
+import { EuiLoadingSpinnerSize } from '@elastic/eui/src/components/loading/loading_spinner';
+
+interface Props {
+  size?: EuiLoadingSpinnerSize;
+}
+
+export const CenterJustifiedSpinner: React.FunctionComponent<Props> = ({ size }) => (
+  <EuiFlexGroup data-test-subj="center-justified-spinner" justifyContent="center">
+    <EuiFlexItem grow={false}>
+      <EuiLoadingSpinner size={size || 'xl'} />
+    </EuiFlexItem>
+  </EuiFlexGroup>
+);
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/create_maintenance_windows_form.tsx b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/create_maintenance_windows_form.tsx
index 6778907ade072..41c6dc304d93c 100644
--- a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/create_maintenance_windows_form.tsx
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/create_maintenance_windows_form.tsx
@@ -40,10 +40,12 @@ export const useTimeZone = (): string => {
 
 export const CreateMaintenanceWindowForm = React.memo<CreateMaintenanceWindowFormProps>(
   ({ onCancel, onSuccess, initialValue }) => {
-    const [defaultDateValue] = useState<string>(moment().toISOString());
+    const [defaultStartDateValue] = useState<string>(moment().toISOString());
+    const [defaultEndDateValue] = useState<string>(moment().add(30, 'minutes').toISOString());
     const timezone = useTimeZone();
 
-    const { mutate: createMaintenanceWindow } = useCreateMaintenanceWindow();
+    const { mutate: createMaintenanceWindow, isLoading: isCreateLoading } =
+      useCreateMaintenanceWindow();
 
     const submitMaintenanceWindow = useCallback(
       async (formData, isValid) => {
@@ -101,7 +103,7 @@ export const CreateMaintenanceWindowForm = React.memo<CreateMaintenanceWindowFor
                           path: 'startDate',
                           config: {
                             label: i18n.CREATE_FORM_SCHEDULE,
-                            defaultValue: defaultDateValue,
+                            defaultValue: defaultStartDateValue,
                             validations: [],
                           },
                         },
@@ -109,7 +111,7 @@ export const CreateMaintenanceWindowForm = React.memo<CreateMaintenanceWindowFor
                           path: 'endDate',
                           config: {
                             label: '',
-                            defaultValue: defaultDateValue,
+                            defaultValue: defaultEndDateValue,
                             validations: [],
                           },
                         },
@@ -149,7 +151,7 @@ export const CreateMaintenanceWindowForm = React.memo<CreateMaintenanceWindowFor
             </EuiButtonEmpty>
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
-            <SubmitButton />
+            <SubmitButton isLoading={isCreateLoading} />
           </EuiFlexItem>
         </EuiFlexGroup>
       </Form>
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/fields/button_group_field.tsx b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/fields/button_group_field.tsx
index 65c7e85b79c7a..2c286cb829783 100644
--- a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/fields/button_group_field.tsx
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/fields/button_group_field.tsx
@@ -50,7 +50,6 @@ export const ButtonGroupField: React.FC<ButtonGroupFieldProps> = React.memo(
       <EuiFormRow label={field.label} {...rest} fullWidth>
         {type === 'multi' ? (
           <EuiButtonGroup
-            buttonSize="compressed"
             isFullWidth
             legend={legend}
             onChange={onChangeMulti}
@@ -60,7 +59,6 @@ export const ButtonGroupField: React.FC<ButtonGroupFieldProps> = React.memo(
           />
         ) : (
           <EuiButtonGroup
-            buttonSize="compressed"
             isFullWidth
             legend={legend}
             onChange={onChange}
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/fields/date_picker_field.tsx b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/fields/date_picker_field.tsx
index e9f0d6ddea0a4..b67c15690fbd3 100644
--- a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/fields/date_picker_field.tsx
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/fields/date_picker_field.tsx
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import React, { useCallback } from 'react';
-import { Moment } from 'moment';
+import React, { useCallback, useState } from 'react';
+import moment, { Moment } from 'moment';
 import { EuiDatePicker, EuiFormRow } from '@elastic/eui';
 import {
   useFormData,
@@ -23,6 +23,8 @@ interface DatePickerFieldProps {
 
 export const DatePickerField: React.FC<DatePickerFieldProps> = React.memo(
   ({ field, showTimeSelect = true, ...rest }) => {
+    const [today] = useState<Moment>(moment());
+
     const { setFieldValue } = useFormContext();
     const [form] = useFormData({ watch: [field.path] });
 
@@ -42,7 +44,7 @@ export const DatePickerField: React.FC<DatePickerFieldProps> = React.memo(
           showTimeSelect={showTimeSelect}
           selected={selected}
           onChange={onChange}
-          minDate={selected}
+          minDate={today}
           fullWidth
         />
       </EuiFormRow>
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/fields/date_picker_range_field.tsx b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/fields/date_picker_range_field.tsx
index 91b657500e23b..786ff9aba01db 100644
--- a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/fields/date_picker_range_field.tsx
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/fields/date_picker_range_field.tsx
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import React, { useCallback } from 'react';
-import { Moment } from 'moment';
+import React, { useCallback, useState } from 'react';
+import moment, { Moment } from 'moment';
 import { EuiDatePicker, EuiDatePickerRange, EuiFormRow, EuiSpacer, EuiText } from '@elastic/eui';
 import {
   useFormData,
@@ -24,18 +24,34 @@ interface DatePickerRangeFieldProps {
 
 export const DatePickerRangeField: React.FC<DatePickerRangeFieldProps> = React.memo(
   ({ fields, showTimeSelect = true, ...rest }) => {
+    const [today] = useState<Moment>(moment());
+
     const { setFieldValue } = useFormContext();
     const [form] = useFormData({ watch: [fields.startDate.path, fields.endDate.path] });
 
     const startDate = getSelected(form, fields.startDate.path);
     const endDate = getSelected(form, fields.endDate.path);
 
-    const onChange = useCallback(
-      (currentDate: Moment | null, path: string) => {
+    const onStartDateChange = useCallback(
+      (currentDate: Moment | null) => {
+        if (currentDate && currentDate.isAfter(endDate)) {
+          // if the current start date is ahead of the end date
+          // set the end date to the current start date + 30 min
+          const updatedEndDate = moment(currentDate).add(30, 'minutes');
+          setFieldValue(fields.endDate.path, updatedEndDate);
+        }
+        // convert the moment date back into a string if it's not null
+        setFieldValue(fields.startDate.path, currentDate ? currentDate.toISOString() : currentDate);
+      },
+      [setFieldValue, endDate, fields.endDate.path, fields.startDate.path]
+    );
+
+    const onEndDateChange = useCallback(
+      (currentDate: Moment | null) => {
         // convert the moment date back into a string if it's not null
-        setFieldValue(path, currentDate ? currentDate.toISOString() : currentDate);
+        setFieldValue(fields.endDate.path, currentDate ? currentDate.toISOString() : currentDate);
       },
-      [setFieldValue]
+      [setFieldValue, fields.endDate.path]
     );
     const isInvalid = startDate.isAfter(endDate);
 
@@ -47,23 +63,23 @@ export const DatePickerRangeField: React.FC<DatePickerRangeFieldProps> = React.m
             startDateControl={
               <EuiDatePicker
                 selected={startDate}
-                onChange={(date) => date && onChange(date, fields.startDate.path)}
+                onChange={(date) => date && onStartDateChange(date)}
                 startDate={startDate}
                 endDate={endDate}
                 aria-label="Start date"
                 showTimeSelect={showTimeSelect}
-                minDate={startDate}
+                minDate={today}
               />
             }
             endDateControl={
               <EuiDatePicker
                 selected={endDate}
-                onChange={(date) => date && onChange(date, fields.endDate.path)}
+                onChange={(date) => date && onEndDateChange(date)}
                 startDate={startDate}
                 endDate={endDate}
                 aria-label="End date"
                 showTimeSelect={showTimeSelect}
-                minDate={startDate}
+                minDate={today}
               />
             }
             fullWidth
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
new file mode 100644
index 0000000000000..998ce43cadfe5
--- /dev/null
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/maintenance_windows_list.test.tsx
@@ -0,0 +1,117 @@
+/*
+ * 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 moment from 'moment';
+import { AppMockRenderer, createAppMockRenderer } from '../../../lib/test_utils';
+import { MaintenanceWindowsList } from './maintenance_windows_list';
+import { MaintenanceWindowFindResponse } from '../types';
+import { MaintenanceWindowStatus } from '../../../../common';
+
+describe('MaintenanceWindowsList', () => {
+  const date = moment('2023-04-05').toISOString();
+  const endDate = moment('2023-04-05').add(1, 'month').toISOString();
+  const items: MaintenanceWindowFindResponse[] = [
+    {
+      id: '1',
+      total: 100,
+      title: 'Host maintenance',
+      enabled: true,
+      duration: 1,
+      expirationDate: date,
+      events: [],
+      rRule: { dtstart: date, tzid: 'UTC' },
+      status: MaintenanceWindowStatus.Running,
+      eventStartTime: date,
+      eventEndTime: endDate,
+      createdBy: 'elastic',
+      updatedBy: 'elastic',
+      createdAt: date,
+      updatedAt: date,
+    },
+    {
+      id: '2',
+      total: 0,
+      title: 'Server outage west coast',
+      enabled: true,
+      duration: 1,
+      expirationDate: date,
+      events: [],
+      rRule: { dtstart: date, tzid: 'UTC' },
+      status: MaintenanceWindowStatus.Upcoming,
+      eventStartTime: date,
+      eventEndTime: endDate,
+      createdBy: 'elastic',
+      updatedBy: 'elastic',
+      createdAt: date,
+      updatedAt: date,
+    },
+    {
+      id: '4',
+      total: 1000,
+      title: 'Monthly maintenance window',
+      enabled: true,
+      duration: 1,
+      expirationDate: date,
+      events: [],
+      rRule: { dtstart: date, tzid: 'UTC' },
+      status: MaintenanceWindowStatus.Finished,
+      eventStartTime: date,
+      eventEndTime: endDate,
+      createdBy: 'elastic',
+      updatedBy: 'elastic',
+      createdAt: date,
+      updatedAt: date,
+    },
+    {
+      id: '5',
+      total: 200,
+      title: 'Monthly maintenance window',
+      enabled: true,
+      duration: 1,
+      expirationDate: date,
+      events: [],
+      rRule: { dtstart: date, tzid: 'UTC' },
+      status: MaintenanceWindowStatus.Archived,
+      eventStartTime: date,
+      eventEndTime: endDate,
+      createdBy: 'elastic',
+      updatedBy: 'elastic',
+      createdAt: date,
+      updatedAt: date,
+    },
+  ];
+  let appMockRenderer: AppMockRenderer;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    appMockRenderer = createAppMockRenderer();
+  });
+
+  test('it renders', () => {
+    const result = appMockRenderer.render(<MaintenanceWindowsList loading={false} items={items} />);
+
+    expect(result.getAllByTestId('list-item')).toHaveLength(items.length);
+
+    // check the title
+    expect(result.getAllByText('Host maintenance')).toHaveLength(1);
+    expect(result.getAllByText('Server outage west coast')).toHaveLength(1);
+    expect(result.getAllByText('Monthly maintenance window')).toHaveLength(2);
+
+    // check the status
+    expect(result.getAllByText('Running')).toHaveLength(1);
+    expect(result.getAllByText('Upcoming')).toHaveLength(1);
+    expect(result.getAllByText('Finished')).toHaveLength(1);
+    expect(result.getAllByText('Archived')).toHaveLength(1);
+
+    // check the startDate formatting
+    expect(result.getAllByText('04/05/23 00:00 AM')).toHaveLength(4);
+
+    // check the endDate formatting
+    expect(result.getAllByText('05/05/23 00:00 AM')).toHaveLength(4);
+  });
+});
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
new file mode 100644
index 0000000000000..f7482e1ec78d3
--- /dev/null
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/maintenance_windows_list.tsx
@@ -0,0 +1,129 @@
+/*
+ * 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, { useMemo } from 'react';
+import {
+  formatDate,
+  EuiInMemoryTable,
+  EuiBasicTableColumn,
+  EuiButton,
+  useEuiBackgroundColor,
+  SearchFilterConfig,
+} from '@elastic/eui';
+import { css } from '@emotion/react';
+import { MaintenanceWindowFindResponse, SortDirection } from '../types';
+import * as i18n from '../translations';
+import { StatusColor, STATUS_DISPLAY, STATUS_SORT } from '../constants';
+import { MaintenanceWindowStatus } from '../../../../common';
+import { StatusFilter } from './status_filter';
+
+interface MaintenanceWindowsListProps {
+  loading: boolean;
+  items: MaintenanceWindowFindResponse[];
+}
+
+const columns: Array<EuiBasicTableColumn<MaintenanceWindowFindResponse>> = [
+  {
+    field: 'title',
+    name: i18n.NAME,
+    truncateText: true,
+  },
+  {
+    field: 'status',
+    name: i18n.TABLE_STATUS,
+    render: (status: string) => {
+      return (
+        <EuiButton
+          css={css`
+            cursor: default;
+
+            :hover:not(:disabled) {
+              text-decoration: none;
+            }
+          `}
+          fill={status === MaintenanceWindowStatus.Running}
+          color={STATUS_DISPLAY[status].color as StatusColor}
+          size="s"
+          onClick={() => {}}
+        >
+          {STATUS_DISPLAY[status].label}
+        </EuiButton>
+      );
+    },
+    sortable: ({ status }) => STATUS_SORT[status],
+  },
+  {
+    field: 'eventStartTime',
+    name: i18n.TABLE_START_TIME,
+    dataType: 'date',
+    render: (startDate: string) => formatDate(startDate, 'MM/DD/YY HH:mm A'),
+    sortable: true,
+  },
+  {
+    field: 'eventEndTime',
+    name: i18n.TABLE_END_TIME,
+    dataType: 'date',
+    render: (endDate: string) => formatDate(endDate, 'MM/DD/YY HH:mm A'),
+  },
+];
+
+const sorting = {
+  sort: {
+    field: 'status',
+    direction: SortDirection.asc,
+  },
+};
+
+const rowProps = (item: MaintenanceWindowFindResponse) => ({
+  className: item.status,
+  'data-test-subj': 'list-item',
+});
+
+const search: { filters: SearchFilterConfig[] } = {
+  filters: [
+    {
+      type: 'custom_component',
+      component: StatusFilter,
+    },
+  ],
+};
+
+export const MaintenanceWindowsList = React.memo<MaintenanceWindowsListProps>(
+  ({ loading, items }) => {
+    const warningBackgroundColor = useEuiBackgroundColor('warning');
+    const subduedBackgroundColor = useEuiBackgroundColor('subdued');
+    const tableCss = useMemo(() => {
+      return css`
+        .euiTableRow {
+          &.running {
+            background-color: ${warningBackgroundColor};
+          }
+
+          &.archived {
+            background-color: ${subduedBackgroundColor};
+          }
+        }
+      `;
+    }, [warningBackgroundColor, subduedBackgroundColor]);
+
+    return (
+      <EuiInMemoryTable
+        css={tableCss}
+        itemId="id"
+        loading={loading}
+        tableCaption="Maintenance Windows List"
+        items={items}
+        columns={columns}
+        pagination={true}
+        sorting={sorting}
+        rowProps={rowProps}
+        search={search}
+      />
+    );
+  }
+);
+MaintenanceWindowsList.displayName = 'MaintenanceWindowsList';
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/recurring_schedule_form/recurring_schedule.tsx b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/recurring_schedule_form/recurring_schedule.tsx
index 4b8b5cf8b0791..807c99e390103 100644
--- a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/recurring_schedule_form/recurring_schedule.tsx
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/recurring_schedule_form/recurring_schedule.tsx
@@ -28,9 +28,10 @@ import { FormProps } from '../schema';
 const UseField = getUseField({ component: Field });
 
 export const RecurringSchedule: React.FC = React.memo(() => {
-  const [{ startDate, recurringSchedule }] = useFormData<FormProps>({
+  const [{ startDate, endDate, recurringSchedule }] = useFormData<FormProps>({
     watch: [
       'startDate',
+      'endDate',
       'recurringSchedule.frequency',
       'recurringSchedule.interval',
       'recurringSchedule.ends',
@@ -105,6 +106,11 @@ export const RecurringSchedule: React.FC = React.memo(() => {
         {recurringSchedule?.ends === EndsOptions.ON_DATE ? (
           <UseField
             path="recurringSchedule.until"
+            config={{
+              label: '',
+              defaultValue: moment(endDate).endOf('day').toISOString(),
+              validations: [],
+            }}
             component={DatePickerField}
             componentProps={{
               'data-test-subj': 'until-field',
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/schema.ts b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/schema.ts
index c81fdbaa01dbe..9191e3065d68e 100644
--- a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/schema.ts
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/schema.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import moment from 'moment';
 import type { FormSchema } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 import { FIELD_TYPES } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 import { fieldValidators } from '@kbn/es-ui-shared-plugin/static/forms/helpers';
@@ -37,7 +36,7 @@ export interface RecurringScheduleFormProps {
 export const schema: FormSchema<FormProps> = {
   title: {
     type: FIELD_TYPES.TEXT,
-    label: i18n.CREATE_FORM_NAME,
+    label: i18n.NAME,
     validations: [
       {
         validator: emptyField(i18n.CREATE_FORM_NAME_REQUIRED),
@@ -72,11 +71,7 @@ export const schema: FormSchema<FormProps> = {
       defaultValue: EndsOptions.NEVER,
       validations: [],
     },
-    until: {
-      label: '',
-      defaultValue: moment().endOf('day').toISOString(),
-      validations: [],
-    },
+    until: {},
     count: {
       label: '',
       type: FIELD_TYPES.TEXT,
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/status_filter.test.tsx b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/status_filter.test.tsx
new file mode 100644
index 0000000000000..f7cb8023323ef
--- /dev/null
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/status_filter.test.tsx
@@ -0,0 +1,40 @@
+/*
+ * 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 { Query } from '@elastic/eui';
+import { fireEvent } from '@testing-library/dom';
+import React from 'react';
+
+import { AppMockRenderer, createAppMockRenderer } from '../../../lib/test_utils';
+import { StatusFilter } from './status_filter';
+
+describe('StatusFilter', () => {
+  let appMockRenderer: AppMockRenderer;
+  const onChange = jest.fn();
+  const query = Query.parse('');
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    appMockRenderer = createAppMockRenderer();
+  });
+
+  test('it renders', () => {
+    const result = appMockRenderer.render(<StatusFilter query={query} onChange={onChange} />);
+
+    expect(result.getByTestId('status-filter-button')).toBeInTheDocument();
+  });
+
+  test('it shows the popover', () => {
+    const result = appMockRenderer.render(<StatusFilter query={query} onChange={onChange} />);
+
+    fireEvent.click(result.getByTestId('status-filter-button'));
+    expect(result.getByTestId('status-filter-running')).toBeInTheDocument();
+    expect(result.getByTestId('status-filter-upcoming')).toBeInTheDocument();
+    expect(result.getByTestId('status-filter-finished')).toBeInTheDocument();
+    expect(result.getByTestId('status-filter-archived')).toBeInTheDocument();
+  });
+});
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/status_filter.tsx b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/status_filter.tsx
new file mode 100644
index 0000000000000..d9f7802050d8d
--- /dev/null
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/status_filter.tsx
@@ -0,0 +1,80 @@
+/*
+ * 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, { useState, useCallback } from 'react';
+import { EuiFilterButton, EuiPopover, EuiFilterGroup, EuiFilterSelectItem } from '@elastic/eui';
+import { CustomComponentProps } from '@elastic/eui/src/components/search_bar/filters/custom_component_filter';
+import { STATUS_OPTIONS } from '../constants';
+import * as i18n from '../translations';
+
+export const StatusFilter: React.FC<CustomComponentProps> = React.memo(({ query, onChange }) => {
+  const [selectedOptions, setSelectedOptions] = useState<string[]>([]);
+  const [isPopoverOpen, setIsPopoverOpen] = useState<boolean>(false);
+
+  const onFilterItemClick = useCallback(
+    (newOption: string) => () => {
+      const options = selectedOptions.includes(newOption)
+        ? selectedOptions.filter((option) => option !== newOption)
+        : [...selectedOptions, newOption];
+      setSelectedOptions(options);
+
+      let q = query.removeSimpleFieldClauses('status').removeOrFieldClauses('status');
+      if (options.length > 0) {
+        q = options.reduce((acc, curr) => {
+          return acc.addOrFieldValue('status', curr, true, 'eq');
+        }, q);
+      }
+      onChange?.(q);
+    },
+    [query, onChange, selectedOptions]
+  );
+
+  const openPopover = useCallback(() => {
+    setIsPopoverOpen((prevIsOpen) => !prevIsOpen);
+  }, [setIsPopoverOpen]);
+
+  const closePopover = useCallback(() => {
+    setIsPopoverOpen(false);
+  }, [setIsPopoverOpen]);
+
+  return (
+    <EuiFilterGroup>
+      <EuiPopover
+        isOpen={isPopoverOpen}
+        closePopover={closePopover}
+        button={
+          <EuiFilterButton
+            data-test-subj="status-filter-button"
+            iconType="arrowDown"
+            hasActiveFilters={selectedOptions.length > 0}
+            numActiveFilters={selectedOptions.length}
+            numFilters={selectedOptions.length}
+            onClick={openPopover}
+          >
+            {i18n.TABLE_STATUS}
+          </EuiFilterButton>
+        }
+      >
+        <>
+          {STATUS_OPTIONS.map((status) => {
+            return (
+              <EuiFilterSelectItem
+                key={status.value}
+                data-test-subj={`status-filter-${status.value}`}
+                onClick={onFilterItemClick(status.value)}
+                checked={selectedOptions.includes(status.value) ? 'on' : undefined}
+              >
+                {status.name}
+              </EuiFilterSelectItem>
+            );
+          })}
+        </>
+      </EuiPopover>
+    </EuiFilterGroup>
+  );
+});
+StatusFilter.displayName = 'StatusFilter';
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/submit_button.test.tsx b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/submit_button.test.tsx
index c208312a78f2b..7f5906dfc7e00 100644
--- a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/submit_button.test.tsx
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/submit_button.test.tsx
@@ -39,7 +39,7 @@ describe('SubmitButton', () => {
   it('it renders', async () => {
     const result = appMockRenderer.render(
       <MockHookWrapperComponent>
-        <SubmitButton />
+        <SubmitButton isLoading={false} />
       </MockHookWrapperComponent>
     );
 
@@ -49,7 +49,7 @@ describe('SubmitButton', () => {
   it('it submits', async () => {
     const result = appMockRenderer.render(
       <MockHookWrapperComponent>
-        <SubmitButton />
+        <SubmitButton isLoading={false} />
       </MockHookWrapperComponent>
     );
 
@@ -60,7 +60,7 @@ describe('SubmitButton', () => {
   it('it disables when submitting', async () => {
     const result = appMockRenderer.render(
       <MockHookWrapperComponent>
-        <SubmitButton />
+        <SubmitButton isLoading={false} />
       </MockHookWrapperComponent>
     );
 
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/submit_button.tsx b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/submit_button.tsx
index 1e48d96026e78..d02e003347162 100644
--- a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/submit_button.tsx
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/submit_button.tsx
@@ -11,15 +11,19 @@ import { EuiButton } from '@elastic/eui';
 import { useFormContext } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 import * as i18n from '../translations';
 
-export const SubmitButton: React.FC = React.memo(() => {
+interface SubmitButtonProps {
+  isLoading: boolean;
+}
+
+export const SubmitButton: React.FC<SubmitButtonProps> = React.memo(({ isLoading }) => {
   const { submit, isSubmitting } = useFormContext();
 
   return (
     <EuiButton
       data-test-subj="create-submit"
       fill
-      isDisabled={isSubmitting}
-      isLoading={isSubmitting}
+      isDisabled={isLoading || isSubmitting}
+      isLoading={isLoading || isSubmitting}
       onClick={submit}
     >
       {i18n.CREATE_MAINTENANCE_WINDOW}
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/constants.ts b/x-pack/plugins/alerting/public/pages/maintenance_windows/constants.ts
index 2b06ff8fd41a5..1aed4dac0568c 100644
--- a/x-pack/plugins/alerting/public/pages/maintenance_windows/constants.ts
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/constants.ts
@@ -7,6 +7,7 @@
 import { invert, mapValues } from 'lodash';
 import moment from 'moment';
 import * as i18n from './translations';
+import { MaintenanceWindowStatus } from '../../../common';
 
 // TODO - consolidate enum with backend
 export enum Frequency {
@@ -105,3 +106,26 @@ export const ISO_WEEKDAYS_TO_RRULE: Record<number, string> = {
 export const RRULE_WEEKDAYS_TO_ISO_WEEKDAYS = mapValues(invert(ISO_WEEKDAYS_TO_RRULE), (v) =>
   Number(v)
 );
+
+export const STATUS_DISPLAY: Record<string, { color: string; label: string }> = {
+  [MaintenanceWindowStatus.Running]: { color: 'warning', label: i18n.TABLE_STATUS_RUNNING },
+  [MaintenanceWindowStatus.Upcoming]: { color: 'warning', label: i18n.TABLE_STATUS_UPCOMING },
+  [MaintenanceWindowStatus.Finished]: { color: 'success', label: i18n.TABLE_STATUS_FINISHED },
+  [MaintenanceWindowStatus.Archived]: { color: 'text', label: i18n.TABLE_STATUS_ARCHIVED },
+};
+
+export type StatusColor = 'warning' | 'success' | 'text';
+
+export const STATUS_SORT = {
+  [MaintenanceWindowStatus.Running]: 0,
+  [MaintenanceWindowStatus.Upcoming]: 1,
+  [MaintenanceWindowStatus.Finished]: 2,
+  [MaintenanceWindowStatus.Archived]: 3,
+};
+
+export const STATUS_OPTIONS = [
+  { value: MaintenanceWindowStatus.Running, name: i18n.TABLE_STATUS_RUNNING },
+  { value: MaintenanceWindowStatus.Upcoming, name: i18n.TABLE_STATUS_UPCOMING },
+  { value: MaintenanceWindowStatus.Finished, name: i18n.TABLE_STATUS_FINISHED },
+  { value: MaintenanceWindowStatus.Archived, name: i18n.TABLE_STATUS_ARCHIVED },
+];
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/helpers/convert_to_rrule.ts b/x-pack/plugins/alerting/public/pages/maintenance_windows/helpers/convert_to_rrule.ts
index 0f20d1c335365..42935ae291934 100644
--- a/x-pack/plugins/alerting/public/pages/maintenance_windows/helpers/convert_to_rrule.ts
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/helpers/convert_to_rrule.ts
@@ -6,20 +6,21 @@
  */
 
 import { Moment } from 'moment';
-import { RRule, RRuleFrequency, RRuleFrequencyMap } from '../types';
+import { RRuleFrequency, RRuleFrequencyMap } from '../types';
 import { Frequency, ISO_WEEKDAYS_TO_RRULE } from '../constants';
 import { getNthByWeekday } from './get_nth_by_weekday';
 import { RecurringScheduleFormProps } from '../components/schema';
 import { getPresets } from './get_presets';
+import { RRuleParams } from '../../../../common';
 
 export const convertToRRule = (
   startDate: Moment,
   timezone: string,
   recurringForm?: RecurringScheduleFormProps
-): RRule => {
+): RRuleParams => {
   const presets = getPresets(startDate);
 
-  const rRule: RRule = {
+  const rRule: RRuleParams = {
     dtstart: startDate.toISOString(),
     tzid: timezone,
   };
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 80a35e4a02aee..486c0538db8b5 100644
--- a/x-pack/plugins/alerting/public/pages/maintenance_windows/index.tsx
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/index.tsx
@@ -6,23 +6,22 @@
  */
 
 import React, { useCallback } from 'react';
-import { EuiPageHeader } from '@elastic/eui';
+import { EuiButton, EuiPageHeader, EuiSpacer } from '@elastic/eui';
 import { useKibana } from '../../utils/kibana_react';
 import { useBreadcrumbs } from '../../hooks/use_breadcrumbs';
 import { EmptyPrompt } from './components/empty_prompt';
 import * as i18n from './translations';
 import { useCreateMaintenanceWindowNavigation } from '../../hooks/use_navigation';
 import { AlertingDeepLinkId } from '../../config';
+import { MaintenanceWindowsList } from './components/maintenance_windows_list';
+import { useFindMaintenanceWindows } from '../../hooks/use_find_maintenance_windows';
+import { CenterJustifiedSpinner } from './components/center_justified_spinner';
 
 export const MaintenanceWindowsPage = React.memo(() => {
   const { docLinks } = useKibana().services;
   const { navigateToCreateMaintenanceWindow } = useCreateMaintenanceWindowNavigation();
 
-  const { isLoading, maintenanceWindowsList } = {
-    isLoading: false,
-    maintenanceWindowsList: { total: 0 },
-  };
-  const { total } = maintenanceWindowsList || {};
+  const { isLoading, maintenanceWindows } = useFindMaintenanceWindows();
 
   useBreadcrumbs(AlertingDeepLinkId.maintenanceWindows);
 
@@ -30,17 +29,36 @@ export const MaintenanceWindowsPage = React.memo(() => {
     navigateToCreateMaintenanceWindow();
   }, [navigateToCreateMaintenanceWindow]);
 
+  const showEmptyPrompt = !isLoading && maintenanceWindows.length === 0;
+
+  if (isLoading) {
+    return <CenterJustifiedSpinner />;
+  }
+
   return (
     <>
       <EuiPageHeader
         bottomBorder
         pageTitle={i18n.MAINTENANCE_WINDOWS}
         description={i18n.MAINTENANCE_WINDOWS_DESCRIPTION}
+        rightSideItems={
+          !showEmptyPrompt
+            ? [
+                <EuiButton onClick={handleClickCreate} iconType="plusInCircle" fill>
+                  {i18n.CREATE_NEW_BUTTON}
+                </EuiButton>,
+              ]
+            : []
+        }
       />
-
-      {!isLoading && total === 0 ? (
+      {showEmptyPrompt ? (
         <EmptyPrompt onClickCreate={handleClickCreate} docLinks={docLinks.links} />
-      ) : null}
+      ) : (
+        <>
+          <EuiSpacer size="xl" />
+          <MaintenanceWindowsList 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 be8eb9e891bf0..64b0c0fae247f 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,13 @@ export const MAINTENANCE_WINDOWS_DESCRIPTION = i18n.translate(
   }
 );
 
+export const CREATE_NEW_BUTTON = i18n.translate(
+  'xpack.alerting.maintenanceWindows.createNewButton',
+  {
+    defaultMessage: 'Create new',
+  }
+);
+
 export const EMPTY_PROMPT_BUTTON = i18n.translate(
   'xpack.alerting.maintenanceWindows.emptyPrompt.button',
   {
@@ -70,12 +77,9 @@ export const MAINTENANCE_WINDOWS_RETURN_LINK = i18n.translate(
   }
 );
 
-export const CREATE_FORM_NAME = i18n.translate(
-  'xpack.alerting.maintenanceWindows.createForm.name',
-  {
-    defaultMessage: 'Name',
-  }
-);
+export const NAME = i18n.translate('xpack.alerting.maintenanceWindows.name', {
+  defaultMessage: 'Name',
+});
 
 export const CREATE_FORM_NAME_REQUIRED = i18n.translate(
   'xpack.alerting.maintenanceWindows.createForm.nameFieldRequiredError',
@@ -369,3 +373,58 @@ export const CREATE_FORM_YEARLY_BY_MONTH_SUMMARY = (date: string) =>
 export const CANCEL = i18n.translate('xpack.alerting.maintenanceWindows.createForm.cancel', {
   defaultMessage: 'Cancel',
 });
+
+export const TABLE_ALERTS = i18n.translate('xpack.alerting.maintenanceWindows.table.alerts', {
+  defaultMessage: 'Alerts',
+});
+
+// Add this tooltip to the Alerts column heading on the MW table
+export const TABLE_ALERTS_TOOLTIP = i18n.translate(
+  'xpack.alerting.maintenanceWindows.table.alertsTooltip',
+  {
+    defaultMessage: 'The total number of alerts created in the maintenance window.',
+  }
+);
+
+export const TABLE_STATUS = i18n.translate('xpack.alerting.maintenanceWindows.table.status', {
+  defaultMessage: 'Status',
+});
+
+export const TABLE_STATUS_RUNNING = i18n.translate(
+  'xpack.alerting.maintenanceWindows.table.statusRunning',
+  {
+    defaultMessage: 'Running',
+  }
+);
+
+export const TABLE_STATUS_UPCOMING = i18n.translate(
+  'xpack.alerting.maintenanceWindows.table.statusUpcoming',
+  {
+    defaultMessage: 'Upcoming',
+  }
+);
+
+export const TABLE_STATUS_FINISHED = i18n.translate(
+  'xpack.alerting.maintenanceWindows.table.statusFinished',
+  {
+    defaultMessage: 'Finished',
+  }
+);
+
+export const TABLE_STATUS_ARCHIVED = i18n.translate(
+  'xpack.alerting.maintenanceWindows.table.statusArchived',
+  {
+    defaultMessage: 'Archived',
+  }
+);
+
+export const TABLE_START_TIME = i18n.translate(
+  'xpack.alerting.maintenanceWindows.table.startTime',
+  {
+    defaultMessage: 'Start time',
+  }
+);
+
+export const TABLE_END_TIME = i18n.translate('xpack.alerting.maintenanceWindows.table.endTime', {
+  defaultMessage: 'End time',
+});
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/types.ts b/x-pack/plugins/alerting/public/pages/maintenance_windows/types.ts
index e2a3eb3e732cb..e6be4af6b8675 100644
--- a/x-pack/plugins/alerting/public/pages/maintenance_windows/types.ts
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/types.ts
@@ -5,6 +5,11 @@
  * 2.0.
  */
 
+import {
+  MaintenanceWindow as MaintenanceWindowServerSide,
+  MaintenanceWindowModificationMetadata,
+} from '../../../common';
+
 export enum RRuleFrequency {
   YEARLY = 0,
   MONTHLY = 1,
@@ -19,23 +24,14 @@ export const RRuleFrequencyMap = {
   '3': RRuleFrequency.DAILY,
 };
 
-export interface RecurringSchedule {
-  freq: RRuleFrequency;
-  interval: number;
-  until?: string;
-  count?: number;
-  byweekday?: string[];
-  bymonthday?: number[];
-  bymonth?: number[];
-}
+export type MaintenanceWindow = Pick<MaintenanceWindowServerSide, 'title' | 'duration' | 'rRule'>;
 
-export type RRule = Partial<RecurringSchedule> & {
-  dtstart: string;
-  tzid: string;
-};
+export type MaintenanceWindowFindResponse = MaintenanceWindowServerSide &
+  MaintenanceWindowModificationMetadata & {
+    total: number;
+  };
 
-export interface MaintenanceWindow {
-  title: string;
-  duration: number;
-  rRule: RRule;
+export enum SortDirection {
+  asc = 'asc',
+  desc = 'desc',
 }
diff --git a/x-pack/plugins/alerting/public/services/maintenance_windows_api/find.test.ts b/x-pack/plugins/alerting/public/services/maintenance_windows_api/find.test.ts
new file mode 100644
index 0000000000000..de38f6de5af00
--- /dev/null
+++ b/x-pack/plugins/alerting/public/services/maintenance_windows_api/find.test.ts
@@ -0,0 +1,83 @@
+/*
+ * 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 { httpServiceMock } from '@kbn/core/public/mocks';
+import { MaintenanceWindowFindResponse } from '../../pages/maintenance_windows/types';
+import { findMaintenanceWindows } from './find';
+import { MaintenanceWindowStatus } from '../../../common';
+
+const http = httpServiceMock.createStartContract();
+
+beforeEach(() => jest.resetAllMocks());
+
+describe('findMaintenanceWindows', () => {
+  test('should call find maintenance windows api', async () => {
+    const apiResponse = {
+      data: [
+        {
+          id: '1',
+          title: 'test',
+          enabled: true,
+          duration: 1,
+          expiration_date: '2023-03-23T19:16:21.293Z',
+          events: [],
+          r_rule: {
+            dtstart: '2023-03-23T19:16:21.293Z',
+            tzid: 'America/New_York',
+            freq: 3,
+            interval: 1,
+            byweekday: ['TH'],
+          },
+          status: MaintenanceWindowStatus.Upcoming,
+          event_start_time: '2023-03-23T19:16:21.293Z',
+          event_end_time: '2023-03-23T19:16:21.293Z',
+          created_by: null,
+          updated_by: null,
+          created_at: '2023-03-23T19:16:21.293Z',
+          updated_at: '2023-03-23T19:16:21.293Z',
+          total: 1000,
+        },
+      ],
+      total: 1,
+    };
+    http.get.mockResolvedValueOnce(apiResponse);
+
+    const maintenanceWindow: MaintenanceWindowFindResponse[] = [
+      {
+        id: '1',
+        title: 'test',
+        enabled: true,
+        duration: 1,
+        expirationDate: '2023-03-23T19:16:21.293Z',
+        events: [],
+        rRule: {
+          dtstart: '2023-03-23T19:16:21.293Z',
+          tzid: 'America/New_York',
+          freq: 3,
+          interval: 1,
+          byweekday: ['TH'],
+        },
+        status: MaintenanceWindowStatus.Upcoming,
+        eventStartTime: '2023-03-23T19:16:21.293Z',
+        eventEndTime: '2023-03-23T19:16:21.293Z',
+        createdBy: null,
+        updatedBy: null,
+        createdAt: '2023-03-23T19:16:21.293Z',
+        updatedAt: '2023-03-23T19:16:21.293Z',
+        total: 1000,
+      },
+    ];
+
+    const result = await findMaintenanceWindows({ http });
+    expect(result).toEqual(maintenanceWindow);
+    expect(http.get.mock.calls[0]).toMatchInlineSnapshot(`
+      Array [
+        "/internal/alerting/rules/maintenance_window/_find",
+      ]
+    `);
+  });
+});
diff --git a/x-pack/plugins/alerting/public/services/maintenance_windows_api/find.ts b/x-pack/plugins/alerting/public/services/maintenance_windows_api/find.ts
new file mode 100644
index 0000000000000..cc407c2eacb12
--- /dev/null
+++ b/x-pack/plugins/alerting/public/services/maintenance_windows_api/find.ts
@@ -0,0 +1,52 @@
+/*
+ * 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 { HttpSetup } from '@kbn/core/public';
+import { AsApiContract, RewriteRequestCase } from '@kbn/actions-plugin/common';
+
+import { MaintenanceWindowFindResponse } from '../../pages/maintenance_windows/types';
+import { INTERNAL_BASE_ALERTING_API_PATH } from '../../../common';
+
+const rewriteBodyRes = (results: {
+  data: Array<AsApiContract<MaintenanceWindowFindResponse>>;
+  total: number;
+}): MaintenanceWindowFindResponse[] => {
+  return results.data.map((item) => transform(item));
+};
+
+const transform: RewriteRequestCase<MaintenanceWindowFindResponse> = ({
+  expiration_date: expirationDate,
+  r_rule: rRule,
+  event_start_time: eventStartTime,
+  event_end_time: eventEndTime,
+  created_by: createdBy,
+  updated_by: updatedBy,
+  created_at: createdAt,
+  updated_at: updatedAt,
+  ...rest
+}) => ({
+  ...rest,
+  expirationDate,
+  rRule: { ...rRule },
+  eventStartTime,
+  eventEndTime,
+  createdBy,
+  updatedBy,
+  createdAt,
+  updatedAt,
+});
+
+export async function findMaintenanceWindows({
+  http,
+}: {
+  http: HttpSetup;
+}): Promise<MaintenanceWindowFindResponse[]> {
+  const res = await http.get<{
+    data: Array<AsApiContract<MaintenanceWindowFindResponse>>;
+    total: number;
+  }>(`${INTERNAL_BASE_ALERTING_API_PATH}/rules/maintenance_window/_find`);
+  return rewriteBodyRes(res);
+}

From 80fb9390fc4ec6038169b8b054b686fb3d48579e Mon Sep 17 00:00:00 2001
From: Kfir Peled <61654899+kfirpeled@users.noreply.github.com>
Date: Wed, 19 Apr 2023 17:43:48 -0600
Subject: [PATCH 098/100] [Cloud Security] [CNVM] Fixed vulnerabilities
 transform unique key (#155206)

---
 .../create_transforms/latest_vulnerabilities_transforms.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/cloud_security_posture/server/create_transforms/latest_vulnerabilities_transforms.ts b/x-pack/plugins/cloud_security_posture/server/create_transforms/latest_vulnerabilities_transforms.ts
index 9af2d91a2b730..fb30631cab240 100644
--- a/x-pack/plugins/cloud_security_posture/server/create_transforms/latest_vulnerabilities_transforms.ts
+++ b/x-pack/plugins/cloud_security_posture/server/create_transforms/latest_vulnerabilities_transforms.ts
@@ -37,7 +37,12 @@ export const latestVulnerabilitiesTransform: TransformPutTransformRequest = {
   },
   latest: {
     sort: '@timestamp',
-    unique_key: ['vulnerability.id', 'resource.id', 'package.version'],
+    unique_key: [
+      'vulnerability.id',
+      'resource.id',
+      'vulnerability.package.name',
+      'vulnerability.package.version',
+    ],
   },
   _meta: {
     package: {

From 4d8915232680520d210c70f9b7bb2e4cf054c711 Mon Sep 17 00:00:00 2001
From: Jiawei Wu <74562234+JiaweiWu@users.noreply.github.com>
Date: Wed, 19 Apr 2023 17:31:48 -0700
Subject: [PATCH 099/100] [RAM] Maintenance Window - Expose Active Maintenance
 Window Route (#155321)

## Summary
Resolves: https://github.com/elastic/kibana/issues/155306

Exposes the `/_active` route to get all currently active maintenance
windows

```
GET `${INTERNAL_BASE_ALERTING_API_PATH}/rules/maintenance_window/_active`
body: {}

Response: MaintenanceWindow[]
```
### 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
---
 .../methods/get_active_maintenance_windows.ts |   4 +-
 .../plugins/alerting/server/routes/index.ts   |   2 +
 .../active_maintenance_windows.test.ts        |  97 +++++++++++
 .../active_maintenance_windows.ts             |  37 +++++
 .../active_maintenance_windows.ts             | 153 ++++++++++++++++++
 .../group3/tests/maintenance_window/index.ts  |   1 +
 6 files changed, 292 insertions(+), 2 deletions(-)
 create mode 100644 x-pack/plugins/alerting/server/routes/maintenance_window/active_maintenance_windows.test.ts
 create mode 100644 x-pack/plugins/alerting/server/routes/maintenance_window/active_maintenance_windows.ts
 create mode 100644 x-pack/test/alerting_api_integration/security_and_spaces/group3/tests/maintenance_window/active_maintenance_windows.ts

diff --git a/x-pack/plugins/alerting/server/maintenance_window_client/methods/get_active_maintenance_windows.ts b/x-pack/plugins/alerting/server/maintenance_window_client/methods/get_active_maintenance_windows.ts
index 5b9478a427645..004e68bbc5c7d 100644
--- a/x-pack/plugins/alerting/server/maintenance_window_client/methods/get_active_maintenance_windows.ts
+++ b/x-pack/plugins/alerting/server/maintenance_window_client/methods/get_active_maintenance_windows.ts
@@ -29,7 +29,7 @@ export interface MaintenanceWindowAggregationResult {
 
 export interface ActiveParams {
   start?: string;
-  interval: string;
+  interval?: string;
 }
 
 export async function getActiveMaintenanceWindows(
@@ -40,7 +40,7 @@ export async function getActiveMaintenanceWindows(
   const { start, interval } = params;
 
   const startDate = start ? new Date(start) : new Date();
-  const duration = parseDuration(interval);
+  const duration = interval ? parseDuration(interval) : 0;
   const endDate = moment.utc(startDate).add(duration, 'ms').toDate();
 
   const startDateISO = startDate.toISOString();
diff --git a/x-pack/plugins/alerting/server/routes/index.ts b/x-pack/plugins/alerting/server/routes/index.ts
index 9a0b8be33db42..4c13090f80bd3 100644
--- a/x-pack/plugins/alerting/server/routes/index.ts
+++ b/x-pack/plugins/alerting/server/routes/index.ts
@@ -53,6 +53,7 @@ import { deleteMaintenanceWindowRoute } from './maintenance_window/delete_mainte
 import { findMaintenanceWindowsRoute } from './maintenance_window/find_maintenance_windows';
 import { archiveMaintenanceWindowRoute } from './maintenance_window/archive_maintenance_window';
 import { finishMaintenanceWindowRoute } from './maintenance_window/finish_maintenance_window';
+import { activeMaintenanceWindowsRoute } from './maintenance_window/active_maintenance_windows';
 
 export interface RouteOptions {
   router: IRouter<AlertingRequestHandlerContext>;
@@ -108,4 +109,5 @@ export function defineRoutes(opts: RouteOptions) {
   findMaintenanceWindowsRoute(router, licenseState);
   archiveMaintenanceWindowRoute(router, licenseState);
   finishMaintenanceWindowRoute(router, licenseState);
+  activeMaintenanceWindowsRoute(router, licenseState);
 }
diff --git a/x-pack/plugins/alerting/server/routes/maintenance_window/active_maintenance_windows.test.ts b/x-pack/plugins/alerting/server/routes/maintenance_window/active_maintenance_windows.test.ts
new file mode 100644
index 0000000000000..70ebcde490a65
--- /dev/null
+++ b/x-pack/plugins/alerting/server/routes/maintenance_window/active_maintenance_windows.test.ts
@@ -0,0 +1,97 @@
+/*
+ * 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 { httpServiceMock } from '@kbn/core/server/mocks';
+import { licenseStateMock } from '../../lib/license_state.mock';
+import { verifyApiAccess } from '../../lib/license_api_access';
+import { mockHandlerArguments } from '../_mock_handler_arguments';
+import { maintenanceWindowClientMock } from '../../maintenance_window_client.mock';
+import { activeMaintenanceWindowsRoute } from './active_maintenance_windows';
+import { getMockMaintenanceWindow } from '../../maintenance_window_client/methods/test_helpers';
+import { MaintenanceWindowStatus } from '../../../common';
+import { rewriteMaintenanceWindowRes } from '../lib';
+
+const maintenanceWindowClient = maintenanceWindowClientMock.create();
+
+jest.mock('../../lib/license_api_access', () => ({
+  verifyApiAccess: jest.fn(),
+}));
+
+const mockMaintenanceWindows = [
+  {
+    ...getMockMaintenanceWindow(),
+    eventStartTime: new Date().toISOString(),
+    eventEndTime: new Date().toISOString(),
+    status: MaintenanceWindowStatus.Running,
+    id: 'test-id1',
+  },
+  {
+    ...getMockMaintenanceWindow(),
+    eventStartTime: new Date().toISOString(),
+    eventEndTime: new Date().toISOString(),
+    status: MaintenanceWindowStatus.Running,
+    id: 'test-id2',
+  },
+];
+
+describe('activeMaintenanceWindowsRoute', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  test('should get the currently active maintenance windows', async () => {
+    const licenseState = licenseStateMock.create();
+    const router = httpServiceMock.createRouter();
+
+    activeMaintenanceWindowsRoute(router, licenseState);
+
+    maintenanceWindowClient.getActiveMaintenanceWindows.mockResolvedValueOnce(
+      mockMaintenanceWindows
+    );
+    const [config, handler] = router.get.mock.calls[0];
+    const [context, req, res] = mockHandlerArguments({ maintenanceWindowClient }, { body: {} });
+
+    expect(config.path).toEqual('/internal/alerting/rules/maintenance_window/_active');
+    expect(config.options?.tags?.[0]).toEqual('access:read-maintenance-window');
+
+    await handler(context, req, res);
+
+    expect(maintenanceWindowClient.getActiveMaintenanceWindows).toHaveBeenCalled();
+    expect(res.ok).toHaveBeenLastCalledWith({
+      body: mockMaintenanceWindows.map((data) => rewriteMaintenanceWindowRes(data)),
+    });
+  });
+
+  test('ensures the license allows for getting active maintenance windows', async () => {
+    const licenseState = licenseStateMock.create();
+    const router = httpServiceMock.createRouter();
+
+    activeMaintenanceWindowsRoute(router, licenseState);
+
+    maintenanceWindowClient.getActiveMaintenanceWindows.mockResolvedValueOnce(
+      mockMaintenanceWindows
+    );
+    const [, handler] = router.get.mock.calls[0];
+    const [context, req, res] = mockHandlerArguments({ maintenanceWindowClient }, { body: {} });
+    await handler(context, req, res);
+    expect(verifyApiAccess).toHaveBeenCalledWith(licenseState);
+  });
+
+  test('ensures the license check prevents for getting active maintenance windows', async () => {
+    const licenseState = licenseStateMock.create();
+    const router = httpServiceMock.createRouter();
+
+    activeMaintenanceWindowsRoute(router, licenseState);
+
+    (verifyApiAccess as jest.Mock).mockImplementation(() => {
+      throw new Error('Failure');
+    });
+    const [, handler] = router.get.mock.calls[0];
+    const [context, req, res] = mockHandlerArguments({ maintenanceWindowClient }, { body: {} });
+    expect(handler(context, req, res)).rejects.toMatchInlineSnapshot(`[Error: Failure]`);
+  });
+});
diff --git a/x-pack/plugins/alerting/server/routes/maintenance_window/active_maintenance_windows.ts b/x-pack/plugins/alerting/server/routes/maintenance_window/active_maintenance_windows.ts
new file mode 100644
index 0000000000000..706630edfbd4a
--- /dev/null
+++ b/x-pack/plugins/alerting/server/routes/maintenance_window/active_maintenance_windows.ts
@@ -0,0 +1,37 @@
+/*
+ * 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 { IRouter } from '@kbn/core/server';
+import { ILicenseState } from '../../lib';
+import { verifyAccessAndContext, rewriteMaintenanceWindowRes } from '../lib';
+import { AlertingRequestHandlerContext, INTERNAL_BASE_ALERTING_API_PATH } from '../../types';
+import { MAINTENANCE_WINDOW_API_PRIVILEGES } from '../../../common';
+
+export const activeMaintenanceWindowsRoute = (
+  router: IRouter<AlertingRequestHandlerContext>,
+  licenseState: ILicenseState
+) => {
+  router.get(
+    {
+      path: `${INTERNAL_BASE_ALERTING_API_PATH}/rules/maintenance_window/_active`,
+      validate: {},
+      options: {
+        tags: [`access:${MAINTENANCE_WINDOW_API_PRIVILEGES.READ_MAINTENANCE_WINDOW}`],
+      },
+    },
+    router.handleLegacyErrors(
+      verifyAccessAndContext(licenseState, async function (context, req, res) {
+        const maintenanceWindowClient = (await context.alerting).getMaintenanceWindowClient();
+        const result = await maintenanceWindowClient.getActiveMaintenanceWindows({});
+
+        return res.ok({
+          body: result.map((maintenanceWindow) => rewriteMaintenanceWindowRes(maintenanceWindow)),
+        });
+      })
+    )
+  );
+};
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group3/tests/maintenance_window/active_maintenance_windows.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group3/tests/maintenance_window/active_maintenance_windows.ts
new file mode 100644
index 0000000000000..abd837485c7ec
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/group3/tests/maintenance_window/active_maintenance_windows.ts
@@ -0,0 +1,153 @@
+/*
+ * 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 moment from 'moment';
+import expect from '@kbn/expect';
+import { UserAtSpaceScenarios } from '../../../scenarios';
+import { getUrlPrefix, ObjectRemover } from '../../../../common/lib';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default function activeMaintenanceWindowTests({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+  describe('activeMaintenanceWindow', () => {
+    const objectRemover = new ObjectRemover(supertest);
+    const createParams = {
+      title: 'test-maintenance-window',
+      duration: 60 * 60 * 1000, // 1 hr
+      r_rule: {
+        dtstart: new Date().toISOString(),
+        tzid: 'UTC',
+        freq: 2, // weekly
+      },
+    };
+    after(() => objectRemover.removeAll());
+
+    for (const scenario of UserAtSpaceScenarios) {
+      const { user, space } = scenario;
+      describe(scenario.id, () => {
+        afterEach(() => objectRemover.removeAll());
+        it('should handle update maintenance window request appropriately', async () => {
+          // Create 2 active and 1 inactive maintenance window
+          const { body: createdMaintenanceWindow1 } = await supertest
+            .post(`${getUrlPrefix(space.id)}/internal/alerting/rules/maintenance_window`)
+            .set('kbn-xsrf', 'foo')
+            .send(createParams);
+
+          const { body: createdMaintenanceWindow2 } = await supertest
+            .post(`${getUrlPrefix(space.id)}/internal/alerting/rules/maintenance_window`)
+            .set('kbn-xsrf', 'foo')
+            .send(createParams);
+
+          const { body: createdMaintenanceWindow3 } = await supertest
+            .post(`${getUrlPrefix(space.id)}/internal/alerting/rules/maintenance_window`)
+            .set('kbn-xsrf', 'foo')
+            .send({
+              ...createParams,
+              r_rule: {
+                ...createParams.r_rule,
+                dtstart: moment.utc().add(1, 'day').toISOString(),
+              },
+            });
+
+          objectRemover.add(
+            space.id,
+            createdMaintenanceWindow1.id,
+            'rules/maintenance_window',
+            'alerting',
+            true
+          );
+          objectRemover.add(
+            space.id,
+            createdMaintenanceWindow2.id,
+            'rules/maintenance_window',
+            'alerting',
+            true
+          );
+          objectRemover.add(
+            space.id,
+            createdMaintenanceWindow3.id,
+            'rules/maintenance_window',
+            'alerting',
+            true
+          );
+
+          const response = await supertestWithoutAuth
+            .get(`${getUrlPrefix(space.id)}/internal/alerting/rules/maintenance_window/_active`)
+            .set('kbn-xsrf', 'foo')
+            .auth(user.username, user.password)
+            .send({});
+
+          switch (scenario.id) {
+            case 'no_kibana_privileges at space1':
+            case 'space_1_all at space2':
+            case 'space_1_all_with_restricted_fixture at space1':
+            case 'space_1_all_alerts_none_actions at space1':
+              expect(response.statusCode).to.eql(403);
+              expect(response.body).to.eql({
+                error: 'Forbidden',
+                message: 'Forbidden',
+                statusCode: 403,
+              });
+              break;
+            case 'global_read at space1':
+            case 'superuser at space1':
+            case 'space_1_all at space1':
+              expect(response.body.length).to.eql(2);
+              expect(response.statusCode).to.eql(200);
+              expect(response.body[0].title).to.eql('test-maintenance-window');
+              expect(response.body[0].duration).to.eql(3600000);
+              expect(response.body[0].r_rule.dtstart).to.eql(createParams.r_rule.dtstart);
+              expect(response.body[0].events.length).to.be.greaterThan(0);
+              expect(response.body[0].status).to.eql('running');
+
+              const ids = response.body.map(
+                (maintenanceWindow: { id: string }) => maintenanceWindow.id
+              );
+              expect(ids.sort()).to.eql(
+                [createdMaintenanceWindow1.id, createdMaintenanceWindow2.id].sort()
+              );
+              break;
+            default:
+              throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
+          }
+        });
+      });
+    }
+
+    it('should return an empty array if there are no active maintenance windows', async () => {
+      const { body: createdMaintenanceWindow } = await supertest
+        .post(`${getUrlPrefix('space1')}/internal/alerting/rules/maintenance_window`)
+        .set('kbn-xsrf', 'foo')
+        .send({
+          ...createParams,
+          r_rule: {
+            ...createParams.r_rule,
+            dtstart: moment.utc().add(1, 'day').toISOString(),
+          },
+        });
+
+      objectRemover.add(
+        'space1',
+        createdMaintenanceWindow.id,
+        'rules/maintenance_window',
+        'alerting',
+        true
+      );
+
+      const response = await supertest
+        .get(`${getUrlPrefix('space1')}/internal/alerting/rules/maintenance_window/_active`)
+        .set('kbn-xsrf', 'foo')
+        .send({})
+        .expect(200);
+
+      expect(response.body).to.eql([]);
+    });
+  });
+}
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group3/tests/maintenance_window/index.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group3/tests/maintenance_window/index.ts
index 70a90a4f63c7c..a848a14d3e1b7 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/group3/tests/maintenance_window/index.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/group3/tests/maintenance_window/index.ts
@@ -27,6 +27,7 @@ export default function maintenanceWindowTests({ loadTestFile, getService }: Ftr
       loadTestFile(require.resolve('./archive_maintenance_window'));
       loadTestFile(require.resolve('./finish_maintenance_window'));
       loadTestFile(require.resolve('./find_maintenance_windows'));
+      loadTestFile(require.resolve('./active_maintenance_windows'));
     });
   });
 }

From 40d730b2ede39e7e566645737fbb92e26feeda9c Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Thu, 20 Apr 2023 00:48:17 -0400
Subject: [PATCH 100/100] [api-docs] 2023-04-20 Daily api_docs build (#155343)

Generated by
https://buildkite.com/elastic/kibana-api-docs-daily/builds/313
---
 api_docs/actions.mdx                          |    2 +-
 api_docs/advanced_settings.mdx                |    2 +-
 api_docs/aiops.devdocs.json                   |   20 +
 api_docs/aiops.mdx                            |    4 +-
 api_docs/alerting.devdocs.json                |   14 +
 api_docs/alerting.mdx                         |    4 +-
 api_docs/apm.mdx                              |    2 +-
 api_docs/asset_manager.mdx                    |    2 +-
 api_docs/banners.mdx                          |    2 +-
 api_docs/bfetch.mdx                           |    2 +-
 api_docs/canvas.mdx                           |    2 +-
 api_docs/cases.mdx                            |    2 +-
 api_docs/charts.mdx                           |    2 +-
 api_docs/cloud.mdx                            |    2 +-
 api_docs/cloud_chat.mdx                       |    2 +-
 api_docs/cloud_data_migration.mdx             |    2 +-
 api_docs/cloud_defend.mdx                     |    2 +-
 api_docs/cloud_experiments.mdx                |    2 +-
 api_docs/cloud_security_posture.mdx           |    2 +-
 api_docs/console.mdx                          |    2 +-
 api_docs/content_management.mdx               |    2 +-
 api_docs/controls.devdocs.json                | 1287 ++++++++----
 api_docs/controls.mdx                         |    4 +-
 api_docs/custom_integrations.mdx              |    2 +-
 api_docs/dashboard.devdocs.json               | 1753 +----------------
 api_docs/dashboard.mdx                        |    7 +-
 api_docs/dashboard_enhanced.mdx               |    2 +-
 api_docs/data.devdocs.json                    |   24 +-
 api_docs/data.mdx                             |    2 +-
 api_docs/data_query.devdocs.json              |   88 +-
 api_docs/data_query.mdx                       |    2 +-
 api_docs/data_search.devdocs.json             |   16 +-
 api_docs/data_search.mdx                      |    2 +-
 api_docs/data_view_editor.mdx                 |    2 +-
 api_docs/data_view_field_editor.mdx           |    2 +-
 api_docs/data_view_management.mdx             |    2 +-
 api_docs/data_views.devdocs.json              |   24 +
 api_docs/data_views.mdx                       |    2 +-
 api_docs/data_visualizer.mdx                  |    2 +-
 api_docs/deprecations_by_api.mdx              |   14 +-
 api_docs/deprecations_by_plugin.mdx           |   11 +-
 api_docs/deprecations_by_team.mdx             |    2 +-
 api_docs/dev_tools.mdx                        |    2 +-
 api_docs/discover.mdx                         |    2 +-
 api_docs/discover_enhanced.mdx                |    2 +-
 api_docs/ecs_data_quality_dashboard.mdx       |    2 +-
 api_docs/embeddable.devdocs.json              |   33 +-
 api_docs/embeddable.mdx                       |    4 +-
 api_docs/embeddable_enhanced.mdx              |    2 +-
 api_docs/encrypted_saved_objects.mdx          |    2 +-
 api_docs/enterprise_search.mdx                |    2 +-
 api_docs/es_ui_shared.mdx                     |    2 +-
 api_docs/event_annotation.mdx                 |    2 +-
 api_docs/event_log.devdocs.json               |    6 +-
 api_docs/event_log.mdx                        |    2 +-
 api_docs/exploratory_view.mdx                 |    2 +-
 api_docs/expression_error.mdx                 |    2 +-
 api_docs/expression_gauge.mdx                 |    2 +-
 api_docs/expression_heatmap.mdx               |    2 +-
 api_docs/expression_image.mdx                 |    2 +-
 api_docs/expression_legacy_metric_vis.mdx     |    2 +-
 api_docs/expression_metric.mdx                |    2 +-
 api_docs/expression_metric_vis.mdx            |    2 +-
 api_docs/expression_partition_vis.mdx         |    2 +-
 api_docs/expression_repeat_image.mdx          |    2 +-
 api_docs/expression_reveal_image.mdx          |    2 +-
 api_docs/expression_shape.mdx                 |    2 +-
 api_docs/expression_tagcloud.mdx              |    2 +-
 api_docs/expression_x_y.mdx                   |    2 +-
 api_docs/expressions.mdx                      |    2 +-
 api_docs/features.mdx                         |    2 +-
 api_docs/field_formats.mdx                    |    2 +-
 api_docs/file_upload.mdx                      |    2 +-
 api_docs/files.mdx                            |    2 +-
 api_docs/files_management.mdx                 |    2 +-
 api_docs/fleet.devdocs.json                   |   54 +
 api_docs/fleet.mdx                            |    4 +-
 api_docs/global_search.mdx                    |    2 +-
 api_docs/guided_onboarding.mdx                |    2 +-
 api_docs/home.mdx                             |    2 +-
 api_docs/image_embeddable.mdx                 |    2 +-
 api_docs/index_lifecycle_management.mdx       |    2 +-
 api_docs/index_management.mdx                 |    2 +-
 api_docs/infra.devdocs.json                   |   14 +
 api_docs/infra.mdx                            |    4 +-
 api_docs/inspector.mdx                        |    2 +-
 api_docs/interactive_setup.mdx                |    2 +-
 api_docs/kbn_ace.mdx                          |    2 +-
 api_docs/kbn_aiops_components.mdx             |    2 +-
 api_docs/kbn_aiops_utils.mdx                  |    2 +-
 api_docs/kbn_alerting_state_types.mdx         |    2 +-
 api_docs/kbn_alerts.mdx                       |    2 +-
 .../kbn_alerts_as_data_utils.devdocs.json     |    4 +-
 api_docs/kbn_alerts_as_data_utils.mdx         |    2 +-
 api_docs/kbn_alerts_ui_shared.mdx             |    2 +-
 api_docs/kbn_analytics.mdx                    |    2 +-
 api_docs/kbn_analytics_client.mdx             |    2 +-
 ..._analytics_shippers_elastic_v3_browser.mdx |    2 +-
 ...n_analytics_shippers_elastic_v3_common.mdx |    2 +-
 ...n_analytics_shippers_elastic_v3_server.mdx |    2 +-
 api_docs/kbn_analytics_shippers_fullstory.mdx |    2 +-
 api_docs/kbn_analytics_shippers_gainsight.mdx |    2 +-
 api_docs/kbn_apm_config_loader.mdx            |    2 +-
 api_docs/kbn_apm_synthtrace.mdx               |    2 +-
 api_docs/kbn_apm_synthtrace_client.mdx        |    2 +-
 api_docs/kbn_apm_utils.mdx                    |    2 +-
 api_docs/kbn_axe_config.mdx                   |    2 +-
 api_docs/kbn_cases_components.mdx             |    2 +-
 api_docs/kbn_cell_actions.mdx                 |    2 +-
 api_docs/kbn_chart_expressions_common.mdx     |    2 +-
 api_docs/kbn_chart_icons.mdx                  |    2 +-
 api_docs/kbn_ci_stats_core.mdx                |    2 +-
 api_docs/kbn_ci_stats_performance_metrics.mdx |    2 +-
 api_docs/kbn_ci_stats_reporter.mdx            |    2 +-
 api_docs/kbn_cli_dev_mode.mdx                 |    2 +-
 api_docs/kbn_code_editor.mdx                  |    2 +-
 api_docs/kbn_code_editor_mocks.mdx            |    2 +-
 api_docs/kbn_coloring.mdx                     |    2 +-
 api_docs/kbn_config.mdx                       |    2 +-
 api_docs/kbn_config_mocks.mdx                 |    2 +-
 api_docs/kbn_config_schema.mdx                |    2 +-
 .../kbn_content_management_content_editor.mdx |    2 +-
 .../kbn_content_management_table_list.mdx     |    2 +-
 api_docs/kbn_core_analytics_browser.mdx       |    2 +-
 .../kbn_core_analytics_browser_internal.mdx   |    2 +-
 api_docs/kbn_core_analytics_browser_mocks.mdx |    2 +-
 api_docs/kbn_core_analytics_server.mdx        |    2 +-
 .../kbn_core_analytics_server_internal.mdx    |    2 +-
 api_docs/kbn_core_analytics_server_mocks.mdx  |    2 +-
 api_docs/kbn_core_application_browser.mdx     |    2 +-
 .../kbn_core_application_browser_internal.mdx |    2 +-
 .../kbn_core_application_browser_mocks.mdx    |    2 +-
 api_docs/kbn_core_application_common.mdx      |    2 +-
 api_docs/kbn_core_apps_browser_internal.mdx   |    2 +-
 api_docs/kbn_core_apps_browser_mocks.mdx      |    2 +-
 api_docs/kbn_core_apps_server_internal.mdx    |    2 +-
 api_docs/kbn_core_base_browser_mocks.mdx      |    2 +-
 api_docs/kbn_core_base_common.mdx             |    2 +-
 api_docs/kbn_core_base_server_internal.mdx    |    2 +-
 api_docs/kbn_core_base_server_mocks.mdx       |    2 +-
 .../kbn_core_capabilities_browser_mocks.mdx   |    2 +-
 api_docs/kbn_core_capabilities_common.mdx     |    2 +-
 api_docs/kbn_core_capabilities_server.mdx     |    2 +-
 .../kbn_core_capabilities_server_mocks.mdx    |    2 +-
 api_docs/kbn_core_chrome_browser.mdx          |    2 +-
 api_docs/kbn_core_chrome_browser_mocks.mdx    |    2 +-
 api_docs/kbn_core_config_server_internal.mdx  |    2 +-
 api_docs/kbn_core_custom_branding_browser.mdx |    2 +-
 ..._core_custom_branding_browser_internal.mdx |    2 +-
 ...kbn_core_custom_branding_browser_mocks.mdx |    2 +-
 api_docs/kbn_core_custom_branding_common.mdx  |    2 +-
 api_docs/kbn_core_custom_branding_server.mdx  |    2 +-
 ...n_core_custom_branding_server_internal.mdx |    2 +-
 .../kbn_core_custom_branding_server_mocks.mdx |    2 +-
 api_docs/kbn_core_deprecations_browser.mdx    |    2 +-
 ...kbn_core_deprecations_browser_internal.mdx |    2 +-
 .../kbn_core_deprecations_browser_mocks.mdx   |    2 +-
 api_docs/kbn_core_deprecations_common.mdx     |    2 +-
 api_docs/kbn_core_deprecations_server.mdx     |    2 +-
 .../kbn_core_deprecations_server_internal.mdx |    2 +-
 .../kbn_core_deprecations_server_mocks.mdx    |    2 +-
 api_docs/kbn_core_doc_links_browser.mdx       |    2 +-
 api_docs/kbn_core_doc_links_browser_mocks.mdx |    2 +-
 api_docs/kbn_core_doc_links_server.mdx        |    2 +-
 api_docs/kbn_core_doc_links_server_mocks.mdx  |    2 +-
 ...e_elasticsearch_client_server_internal.mdx |    2 +-
 ...core_elasticsearch_client_server_mocks.mdx |    2 +-
 api_docs/kbn_core_elasticsearch_server.mdx    |    2 +-
 ...kbn_core_elasticsearch_server_internal.mdx |    2 +-
 .../kbn_core_elasticsearch_server_mocks.mdx   |    2 +-
 .../kbn_core_environment_server_internal.mdx  |    2 +-
 .../kbn_core_environment_server_mocks.mdx     |    2 +-
 .../kbn_core_execution_context_browser.mdx    |    2 +-
 ...ore_execution_context_browser_internal.mdx |    2 +-
 ...n_core_execution_context_browser_mocks.mdx |    2 +-
 .../kbn_core_execution_context_common.mdx     |    2 +-
 .../kbn_core_execution_context_server.mdx     |    2 +-
 ...core_execution_context_server_internal.mdx |    2 +-
 ...bn_core_execution_context_server_mocks.mdx |    2 +-
 api_docs/kbn_core_fatal_errors_browser.mdx    |    2 +-
 .../kbn_core_fatal_errors_browser_mocks.mdx   |    2 +-
 api_docs/kbn_core_http_browser.mdx            |    2 +-
 api_docs/kbn_core_http_browser_internal.mdx   |    2 +-
 api_docs/kbn_core_http_browser_mocks.mdx      |    2 +-
 api_docs/kbn_core_http_common.mdx             |    2 +-
 .../kbn_core_http_context_server_mocks.mdx    |    2 +-
 ...re_http_request_handler_context_server.mdx |    2 +-
 api_docs/kbn_core_http_resources_server.mdx   |    2 +-
 ...bn_core_http_resources_server_internal.mdx |    2 +-
 .../kbn_core_http_resources_server_mocks.mdx  |    2 +-
 .../kbn_core_http_router_server_internal.mdx  |    2 +-
 .../kbn_core_http_router_server_mocks.mdx     |    2 +-
 api_docs/kbn_core_http_server.mdx             |    2 +-
 api_docs/kbn_core_http_server_internal.mdx    |    2 +-
 api_docs/kbn_core_http_server_mocks.mdx       |    2 +-
 api_docs/kbn_core_i18n_browser.mdx            |    2 +-
 api_docs/kbn_core_i18n_browser_mocks.mdx      |    2 +-
 api_docs/kbn_core_i18n_server.mdx             |    2 +-
 api_docs/kbn_core_i18n_server_internal.mdx    |    2 +-
 api_docs/kbn_core_i18n_server_mocks.mdx       |    2 +-
 ...n_core_injected_metadata_browser_mocks.mdx |    2 +-
 ...kbn_core_integrations_browser_internal.mdx |    2 +-
 .../kbn_core_integrations_browser_mocks.mdx   |    2 +-
 api_docs/kbn_core_lifecycle_browser.mdx       |    2 +-
 api_docs/kbn_core_lifecycle_browser_mocks.mdx |    2 +-
 api_docs/kbn_core_lifecycle_server.mdx        |    2 +-
 api_docs/kbn_core_lifecycle_server_mocks.mdx  |    2 +-
 api_docs/kbn_core_logging_browser_mocks.mdx   |    2 +-
 api_docs/kbn_core_logging_common_internal.mdx |    2 +-
 api_docs/kbn_core_logging_server.mdx          |    2 +-
 api_docs/kbn_core_logging_server_internal.mdx |    2 +-
 api_docs/kbn_core_logging_server_mocks.mdx    |    2 +-
 ...ore_metrics_collectors_server_internal.mdx |    2 +-
 ...n_core_metrics_collectors_server_mocks.mdx |    2 +-
 api_docs/kbn_core_metrics_server.mdx          |    2 +-
 api_docs/kbn_core_metrics_server_internal.mdx |    2 +-
 api_docs/kbn_core_metrics_server_mocks.mdx    |    2 +-
 api_docs/kbn_core_mount_utils_browser.mdx     |    2 +-
 api_docs/kbn_core_node_server.mdx             |    2 +-
 api_docs/kbn_core_node_server_internal.mdx    |    2 +-
 api_docs/kbn_core_node_server_mocks.mdx       |    2 +-
 api_docs/kbn_core_notifications_browser.mdx   |    2 +-
 ...bn_core_notifications_browser_internal.mdx |    2 +-
 .../kbn_core_notifications_browser_mocks.mdx  |    2 +-
 api_docs/kbn_core_overlays_browser.mdx        |    2 +-
 .../kbn_core_overlays_browser_internal.mdx    |    2 +-
 api_docs/kbn_core_overlays_browser_mocks.mdx  |    2 +-
 api_docs/kbn_core_plugins_browser.mdx         |    2 +-
 api_docs/kbn_core_plugins_browser_mocks.mdx   |    2 +-
 api_docs/kbn_core_plugins_server.mdx          |    2 +-
 api_docs/kbn_core_plugins_server_mocks.mdx    |    2 +-
 api_docs/kbn_core_preboot_server.mdx          |    2 +-
 api_docs/kbn_core_preboot_server_mocks.mdx    |    2 +-
 api_docs/kbn_core_rendering_browser_mocks.mdx |    2 +-
 .../kbn_core_rendering_server_internal.mdx    |    2 +-
 api_docs/kbn_core_rendering_server_mocks.mdx  |    2 +-
 api_docs/kbn_core_root_server_internal.mdx    |    2 +-
 .../kbn_core_saved_objects_api_browser.mdx    |    2 +-
 ...core_saved_objects_api_server.devdocs.json |   38 +-
 .../kbn_core_saved_objects_api_server.mdx     |    2 +-
 ...core_saved_objects_api_server_internal.mdx |    2 +-
 ...bn_core_saved_objects_api_server_mocks.mdx |    2 +-
 ...ore_saved_objects_base_server_internal.mdx |    2 +-
 ...n_core_saved_objects_base_server_mocks.mdx |    2 +-
 api_docs/kbn_core_saved_objects_browser.mdx   |    2 +-
 ...bn_core_saved_objects_browser_internal.mdx |    2 +-
 .../kbn_core_saved_objects_browser_mocks.mdx  |    2 +-
 ...kbn_core_saved_objects_common.devdocs.json |   64 +-
 api_docs/kbn_core_saved_objects_common.mdx    |    2 +-
 ..._objects_import_export_server_internal.mdx |    2 +-
 ...ved_objects_import_export_server_mocks.mdx |    2 +-
 ...aved_objects_migration_server_internal.mdx |    2 +-
 ...e_saved_objects_migration_server_mocks.mdx |    2 +-
 ...kbn_core_saved_objects_server.devdocs.json |   38 +-
 api_docs/kbn_core_saved_objects_server.mdx    |    2 +-
 ...kbn_core_saved_objects_server_internal.mdx |    2 +-
 .../kbn_core_saved_objects_server_mocks.mdx   |    2 +-
 .../kbn_core_saved_objects_utils_server.mdx   |    2 +-
 api_docs/kbn_core_status_common.mdx           |    2 +-
 api_docs/kbn_core_status_common_internal.mdx  |    2 +-
 api_docs/kbn_core_status_server.mdx           |    2 +-
 api_docs/kbn_core_status_server_internal.mdx  |    2 +-
 api_docs/kbn_core_status_server_mocks.mdx     |    2 +-
 ...core_test_helpers_deprecations_getters.mdx |    2 +-
 ...n_core_test_helpers_http_setup_browser.mdx |    2 +-
 api_docs/kbn_core_test_helpers_kbn_server.mdx |    2 +-
 ...n_core_test_helpers_so_type_serializer.mdx |    2 +-
 api_docs/kbn_core_test_helpers_test_utils.mdx |    2 +-
 api_docs/kbn_core_theme_browser.mdx           |    2 +-
 api_docs/kbn_core_theme_browser_internal.mdx  |    2 +-
 api_docs/kbn_core_theme_browser_mocks.mdx     |    2 +-
 api_docs/kbn_core_ui_settings_browser.mdx     |    2 +-
 .../kbn_core_ui_settings_browser_internal.mdx |    2 +-
 .../kbn_core_ui_settings_browser_mocks.mdx    |    2 +-
 api_docs/kbn_core_ui_settings_common.mdx      |    2 +-
 api_docs/kbn_core_ui_settings_server.mdx      |    2 +-
 .../kbn_core_ui_settings_server_internal.mdx  |    2 +-
 .../kbn_core_ui_settings_server_mocks.mdx     |    2 +-
 api_docs/kbn_core_usage_data_server.mdx       |    2 +-
 .../kbn_core_usage_data_server_internal.mdx   |    2 +-
 api_docs/kbn_core_usage_data_server_mocks.mdx |    2 +-
 api_docs/kbn_crypto.mdx                       |    2 +-
 api_docs/kbn_crypto_browser.mdx               |    2 +-
 api_docs/kbn_cypress_config.mdx               |    2 +-
 api_docs/kbn_datemath.mdx                     |    2 +-
 api_docs/kbn_dev_cli_errors.mdx               |    2 +-
 api_docs/kbn_dev_cli_runner.mdx               |    2 +-
 api_docs/kbn_dev_proc_runner.mdx              |    2 +-
 api_docs/kbn_dev_utils.mdx                    |    2 +-
 api_docs/kbn_doc_links.mdx                    |    2 +-
 api_docs/kbn_docs_utils.mdx                   |    2 +-
 api_docs/kbn_dom_drag_drop.devdocs.json       |  126 +-
 api_docs/kbn_dom_drag_drop.mdx                |    4 +-
 api_docs/kbn_ebt_tools.mdx                    |    2 +-
 api_docs/kbn_ecs.mdx                          |    2 +-
 api_docs/kbn_ecs_data_quality_dashboard.mdx   |    2 +-
 api_docs/kbn_es.mdx                           |    2 +-
 api_docs/kbn_es_archiver.mdx                  |    2 +-
 api_docs/kbn_es_errors.mdx                    |    2 +-
 api_docs/kbn_es_query.devdocs.json            |   24 +-
 api_docs/kbn_es_query.mdx                     |    2 +-
 api_docs/kbn_es_types.mdx                     |    2 +-
 api_docs/kbn_eslint_plugin_imports.mdx        |    2 +-
 api_docs/kbn_expandable_flyout.mdx            |    2 +-
 api_docs/kbn_field_types.mdx                  |    2 +-
 api_docs/kbn_find_used_node_modules.mdx       |    2 +-
 .../kbn_ftr_common_functional_services.mdx    |    2 +-
 api_docs/kbn_generate.mdx                     |    2 +-
 api_docs/kbn_generate_csv.mdx                 |    2 +-
 api_docs/kbn_generate_csv_types.mdx           |    2 +-
 api_docs/kbn_guided_onboarding.mdx            |    2 +-
 api_docs/kbn_handlebars.mdx                   |    2 +-
 api_docs/kbn_hapi_mocks.mdx                   |    2 +-
 api_docs/kbn_health_gateway_server.mdx        |    2 +-
 api_docs/kbn_home_sample_data_card.mdx        |    2 +-
 api_docs/kbn_home_sample_data_tab.mdx         |    2 +-
 api_docs/kbn_i18n.mdx                         |    2 +-
 api_docs/kbn_i18n_react.mdx                   |    2 +-
 api_docs/kbn_import_resolver.mdx              |    2 +-
 api_docs/kbn_interpreter.mdx                  |    2 +-
 api_docs/kbn_io_ts_utils.mdx                  |    2 +-
 api_docs/kbn_jest_serializers.mdx             |    2 +-
 api_docs/kbn_journeys.mdx                     |    2 +-
 api_docs/kbn_json_ast.mdx                     |    2 +-
 api_docs/kbn_kibana_manifest_schema.mdx       |    2 +-
 .../kbn_language_documentation_popover.mdx    |    2 +-
 api_docs/kbn_logging.mdx                      |    2 +-
 api_docs/kbn_logging_mocks.mdx                |    2 +-
 api_docs/kbn_managed_vscode_config.mdx        |    2 +-
 api_docs/kbn_mapbox_gl.mdx                    |    2 +-
 api_docs/kbn_ml_agg_utils.mdx                 |    2 +-
 api_docs/kbn_ml_date_picker.devdocs.json      |   20 +-
 api_docs/kbn_ml_date_picker.mdx               |    2 +-
 api_docs/kbn_ml_is_defined.mdx                |    2 +-
 api_docs/kbn_ml_is_populated_object.mdx       |    2 +-
 api_docs/kbn_ml_local_storage.mdx             |    2 +-
 api_docs/kbn_ml_nested_property.mdx           |    2 +-
 api_docs/kbn_ml_number_utils.mdx              |    2 +-
 api_docs/kbn_ml_query_utils.mdx               |    2 +-
 api_docs/kbn_ml_random_sampler_utils.mdx      |    2 +-
 api_docs/kbn_ml_route_utils.devdocs.json      |    9 +-
 api_docs/kbn_ml_route_utils.mdx               |    2 +-
 api_docs/kbn_ml_string_hash.mdx               |    2 +-
 api_docs/kbn_ml_trained_models_utils.mdx      |    2 +-
 api_docs/kbn_ml_url_state.mdx                 |    2 +-
 api_docs/kbn_monaco.mdx                       |    2 +-
 api_docs/kbn_object_versioning.mdx            |    2 +-
 api_docs/kbn_observability_alert_details.mdx  |    2 +-
 api_docs/kbn_optimizer.mdx                    |    2 +-
 api_docs/kbn_optimizer_webpack_helpers.mdx    |    2 +-
 api_docs/kbn_osquery_io_ts_types.mdx          |    2 +-
 ..._performance_testing_dataset_extractor.mdx |    2 +-
 api_docs/kbn_plugin_generator.mdx             |    2 +-
 api_docs/kbn_plugin_helpers.mdx               |    2 +-
 api_docs/kbn_react_field.devdocs.json         |   40 +-
 api_docs/kbn_react_field.mdx                  |    4 +-
 api_docs/kbn_repo_file_maps.mdx               |    2 +-
 api_docs/kbn_repo_linter.mdx                  |    2 +-
 api_docs/kbn_repo_path.mdx                    |    2 +-
 api_docs/kbn_repo_source_classifier.mdx       |    2 +-
 api_docs/kbn_reporting_common.mdx             |    2 +-
 api_docs/kbn_rison.mdx                        |    2 +-
 api_docs/kbn_rule_data_utils.devdocs.json     |   19 +-
 api_docs/kbn_rule_data_utils.mdx              |    4 +-
 api_docs/kbn_saved_objects_settings.mdx       |    2 +-
 api_docs/kbn_security_solution_side_nav.mdx   |    2 +-
 ...kbn_security_solution_storybook_config.mdx |    2 +-
 .../kbn_securitysolution_autocomplete.mdx     |    2 +-
 api_docs/kbn_securitysolution_data_table.mdx  |    2 +-
 api_docs/kbn_securitysolution_ecs.mdx         |    2 +-
 api_docs/kbn_securitysolution_es_utils.mdx    |    2 +-
 ...ritysolution_exception_list_components.mdx |    2 +-
 api_docs/kbn_securitysolution_grouping.mdx    |    2 +-
 api_docs/kbn_securitysolution_hook_utils.mdx  |    2 +-
 ..._securitysolution_io_ts_alerting_types.mdx |    2 +-
 .../kbn_securitysolution_io_ts_list_types.mdx |    2 +-
 api_docs/kbn_securitysolution_io_ts_types.mdx |    2 +-
 api_docs/kbn_securitysolution_io_ts_utils.mdx |    2 +-
 api_docs/kbn_securitysolution_list_api.mdx    |    2 +-
 .../kbn_securitysolution_list_constants.mdx   |    2 +-
 api_docs/kbn_securitysolution_list_hooks.mdx  |    2 +-
 api_docs/kbn_securitysolution_list_utils.mdx  |    2 +-
 api_docs/kbn_securitysolution_rules.mdx       |    2 +-
 api_docs/kbn_securitysolution_t_grid.mdx      |    2 +-
 api_docs/kbn_securitysolution_utils.mdx       |    2 +-
 api_docs/kbn_server_http_tools.mdx            |    2 +-
 api_docs/kbn_server_route_repository.mdx      |    2 +-
 api_docs/kbn_shared_svg.mdx                   |    2 +-
 api_docs/kbn_shared_ux_avatar_solution.mdx    |    2 +-
 ...ared_ux_avatar_user_profile_components.mdx |    2 +-
 .../kbn_shared_ux_button_exit_full_screen.mdx |    2 +-
 ...hared_ux_button_exit_full_screen_mocks.mdx |    2 +-
 api_docs/kbn_shared_ux_button_toolbar.mdx     |    2 +-
 api_docs/kbn_shared_ux_card_no_data.mdx       |    2 +-
 api_docs/kbn_shared_ux_card_no_data_mocks.mdx |    2 +-
 api_docs/kbn_shared_ux_file_context.mdx       |    2 +-
 api_docs/kbn_shared_ux_file_image.mdx         |    2 +-
 api_docs/kbn_shared_ux_file_image_mocks.mdx   |    2 +-
 api_docs/kbn_shared_ux_file_mocks.mdx         |    2 +-
 api_docs/kbn_shared_ux_file_picker.mdx        |    2 +-
 api_docs/kbn_shared_ux_file_types.mdx         |    2 +-
 api_docs/kbn_shared_ux_file_upload.mdx        |    2 +-
 api_docs/kbn_shared_ux_file_util.mdx          |    2 +-
 api_docs/kbn_shared_ux_link_redirect_app.mdx  |    2 +-
 .../kbn_shared_ux_link_redirect_app_mocks.mdx |    2 +-
 api_docs/kbn_shared_ux_markdown.mdx           |    2 +-
 api_docs/kbn_shared_ux_markdown_mocks.mdx     |    2 +-
 .../kbn_shared_ux_page_analytics_no_data.mdx  |    2 +-
 ...shared_ux_page_analytics_no_data_mocks.mdx |    2 +-
 .../kbn_shared_ux_page_kibana_no_data.mdx     |    2 +-
 ...bn_shared_ux_page_kibana_no_data_mocks.mdx |    2 +-
 .../kbn_shared_ux_page_kibana_template.mdx    |    2 +-
 ...n_shared_ux_page_kibana_template_mocks.mdx |    2 +-
 api_docs/kbn_shared_ux_page_no_data.mdx       |    2 +-
 .../kbn_shared_ux_page_no_data_config.mdx     |    2 +-
 ...bn_shared_ux_page_no_data_config_mocks.mdx |    2 +-
 api_docs/kbn_shared_ux_page_no_data_mocks.mdx |    2 +-
 api_docs/kbn_shared_ux_page_solution_nav.mdx  |    2 +-
 .../kbn_shared_ux_prompt_no_data_views.mdx    |    2 +-
 ...n_shared_ux_prompt_no_data_views_mocks.mdx |    2 +-
 api_docs/kbn_shared_ux_prompt_not_found.mdx   |    2 +-
 api_docs/kbn_shared_ux_router.mdx             |    2 +-
 api_docs/kbn_shared_ux_router_mocks.mdx       |    2 +-
 api_docs/kbn_shared_ux_storybook_config.mdx   |    2 +-
 api_docs/kbn_shared_ux_storybook_mock.mdx     |    2 +-
 api_docs/kbn_shared_ux_utility.mdx            |    2 +-
 api_docs/kbn_slo_schema.mdx                   |    2 +-
 api_docs/kbn_some_dev_log.mdx                 |    2 +-
 api_docs/kbn_std.mdx                          |    2 +-
 api_docs/kbn_stdio_dev_helpers.mdx            |    2 +-
 api_docs/kbn_storybook.mdx                    |    2 +-
 api_docs/kbn_telemetry_tools.mdx              |    2 +-
 api_docs/kbn_test.mdx                         |    2 +-
 api_docs/kbn_test_jest_helpers.mdx            |    2 +-
 api_docs/kbn_test_subj_selector.mdx           |    2 +-
 api_docs/kbn_tooling_log.mdx                  |    2 +-
 api_docs/kbn_ts_projects.mdx                  |    2 +-
 api_docs/kbn_typed_react_router_config.mdx    |    2 +-
 api_docs/kbn_ui_actions_browser.mdx           |    2 +-
 api_docs/kbn_ui_shared_deps_src.mdx           |    2 +-
 api_docs/kbn_ui_theme.mdx                     |    2 +-
 api_docs/kbn_user_profile_components.mdx      |    2 +-
 api_docs/kbn_utility_types.mdx                |    2 +-
 api_docs/kbn_utility_types_jest.mdx           |    2 +-
 api_docs/kbn_utils.mdx                        |    2 +-
 api_docs/kbn_yarn_lock_validator.mdx          |    2 +-
 api_docs/kibana_overview.mdx                  |    2 +-
 api_docs/kibana_react.devdocs.json            |   12 -
 api_docs/kibana_react.mdx                     |    2 +-
 api_docs/kibana_utils.mdx                     |    2 +-
 api_docs/kubernetes_security.mdx              |    2 +-
 api_docs/lens.mdx                             |    2 +-
 api_docs/license_api_guard.mdx                |    2 +-
 api_docs/license_management.mdx               |    2 +-
 api_docs/licensing.mdx                        |    2 +-
 api_docs/lists.mdx                            |    2 +-
 api_docs/management.mdx                       |    2 +-
 api_docs/maps.mdx                             |    2 +-
 api_docs/maps_ems.mdx                         |    2 +-
 api_docs/ml.mdx                               |    2 +-
 api_docs/monitoring.mdx                       |    2 +-
 api_docs/monitoring_collection.mdx            |    2 +-
 api_docs/navigation.mdx                       |    2 +-
 api_docs/newsfeed.mdx                         |    2 +-
 api_docs/notifications.mdx                    |    2 +-
 api_docs/observability.devdocs.json           |   10 +-
 api_docs/observability.mdx                    |    2 +-
 api_docs/observability_shared.mdx             |    2 +-
 api_docs/osquery.devdocs.json                 |    4 +-
 api_docs/osquery.mdx                          |    2 +-
 api_docs/plugin_directory.mdx                 |   30 +-
 api_docs/presentation_util.devdocs.json       |  815 ++++----
 api_docs/presentation_util.mdx                |    4 +-
 api_docs/profiling.mdx                        |    2 +-
 api_docs/remote_clusters.mdx                  |    2 +-
 api_docs/reporting.mdx                        |    2 +-
 api_docs/rollup.mdx                           |    2 +-
 api_docs/rule_registry.devdocs.json           |   12 +-
 api_docs/rule_registry.mdx                    |    2 +-
 api_docs/runtime_fields.mdx                   |    2 +-
 api_docs/saved_objects.mdx                    |    2 +-
 api_docs/saved_objects_finder.mdx             |    2 +-
 api_docs/saved_objects_management.mdx         |    2 +-
 api_docs/saved_objects_tagging.mdx            |    2 +-
 api_docs/saved_objects_tagging_oss.mdx        |    2 +-
 api_docs/saved_search.devdocs.json            |    8 +-
 api_docs/saved_search.mdx                     |    2 +-
 api_docs/screenshot_mode.mdx                  |    2 +-
 api_docs/screenshotting.mdx                   |    2 +-
 api_docs/security.devdocs.json                |   30 +-
 api_docs/security.mdx                         |    4 +-
 api_docs/security_solution.mdx                |    2 +-
 api_docs/session_view.mdx                     |    2 +-
 api_docs/share.mdx                            |    2 +-
 api_docs/snapshot_restore.mdx                 |    2 +-
 api_docs/spaces.mdx                           |    2 +-
 api_docs/stack_alerts.mdx                     |    2 +-
 api_docs/stack_connectors.mdx                 |    2 +-
 api_docs/task_manager.mdx                     |    2 +-
 api_docs/telemetry.mdx                        |    2 +-
 api_docs/telemetry_collection_manager.mdx     |    2 +-
 api_docs/telemetry_collection_xpack.mdx       |    2 +-
 api_docs/telemetry_management_section.mdx     |    2 +-
 api_docs/threat_intelligence.mdx              |    2 +-
 api_docs/timelines.mdx                        |    2 +-
 api_docs/transform.mdx                        |    2 +-
 api_docs/triggers_actions_ui.devdocs.json     |    2 +-
 api_docs/triggers_actions_ui.mdx              |    2 +-
 api_docs/ui_actions.mdx                       |    2 +-
 api_docs/ui_actions_enhanced.mdx              |    2 +-
 api_docs/unified_field_list.devdocs.json      |  321 ++-
 api_docs/unified_field_list.mdx               |    4 +-
 api_docs/unified_histogram.mdx                |    2 +-
 api_docs/unified_search.mdx                   |    2 +-
 api_docs/unified_search_autocomplete.mdx      |    2 +-
 api_docs/url_forwarding.mdx                   |    2 +-
 api_docs/usage_collection.mdx                 |    2 +-
 api_docs/ux.mdx                               |    2 +-
 api_docs/vis_default_editor.mdx               |    2 +-
 api_docs/vis_type_gauge.mdx                   |    2 +-
 api_docs/vis_type_heatmap.mdx                 |    2 +-
 api_docs/vis_type_pie.mdx                     |    2 +-
 api_docs/vis_type_table.mdx                   |    2 +-
 api_docs/vis_type_timelion.mdx                |    2 +-
 api_docs/vis_type_timeseries.mdx              |    2 +-
 api_docs/vis_type_vega.mdx                    |    2 +-
 api_docs/vis_type_vislib.mdx                  |    2 +-
 api_docs/vis_type_xy.mdx                      |    2 +-
 api_docs/visualizations.devdocs.json          |   24 +-
 api_docs/visualizations.mdx                   |    2 +-
 530 files changed, 2860 insertions(+), 3167 deletions(-)

diff --git a/api_docs/actions.mdx b/api_docs/actions.mdx
index 139f36cb6eeff..0bda3b189fa1d 100644
--- a/api_docs/actions.mdx
+++ b/api_docs/actions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/actions
 title: "actions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the actions plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
 ---
 import actionsObj from './actions.devdocs.json';
diff --git a/api_docs/advanced_settings.mdx b/api_docs/advanced_settings.mdx
index ef559a0a5d7d7..348dec0d0e80a 100644
--- a/api_docs/advanced_settings.mdx
+++ b/api_docs/advanced_settings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/advancedSettings
 title: "advancedSettings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the advancedSettings plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
 ---
 import advancedSettingsObj from './advanced_settings.devdocs.json';
diff --git a/api_docs/aiops.devdocs.json b/api_docs/aiops.devdocs.json
index 1d4576e8b91bb..409240044a405 100644
--- a/api_docs/aiops.devdocs.json
+++ b/api_docs/aiops.devdocs.json
@@ -215,6 +215,26 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "aiops",
+            "id": "def-public.AiopsAppDependencies.executionContext",
+            "type": "Object",
+            "tags": [],
+            "label": "executionContext",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/core-execution-context-browser",
+                "scope": "common",
+                "docId": "kibKbnCoreExecutionContextBrowserPluginApi",
+                "section": "def-common.ExecutionContextSetup",
+                "text": "ExecutionContextSetup"
+              }
+            ],
+            "path": "x-pack/plugins/aiops/public/hooks/use_aiops_app_context.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "aiops",
             "id": "def-public.AiopsAppDependencies.charts",
diff --git a/api_docs/aiops.mdx b/api_docs/aiops.mdx
index 06179f373550e..10881ef4a3846 100644
--- a/api_docs/aiops.mdx
+++ b/api_docs/aiops.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiops
 title: "aiops"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the aiops plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
 ---
 import aiopsObj from './aiops.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/ml-ui](https://github.com/orgs/elastic/teams/ml-ui) for questi
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 37 | 0 | 22 | 0 |
+| 38 | 0 | 23 | 0 |
 
 ## Client
 
diff --git a/api_docs/alerting.devdocs.json b/api_docs/alerting.devdocs.json
index ff1ed064224ef..007a6f4481be6 100644
--- a/api_docs/alerting.devdocs.json
+++ b/api_docs/alerting.devdocs.json
@@ -2481,6 +2481,20 @@
             "path": "x-pack/plugins/alerting/server/types.ts",
             "deprecated": false,
             "trackAdoption": false
+          },
+          {
+            "parentPluginId": "alerting",
+            "id": "def-server.RuleExecutorOptions.maintenanceWindowIds",
+            "type": "Array",
+            "tags": [],
+            "label": "maintenanceWindowIds",
+            "description": [],
+            "signature": [
+              "string[] | undefined"
+            ],
+            "path": "x-pack/plugins/alerting/server/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
           }
         ],
         "initialIsOpen": false
diff --git a/api_docs/alerting.mdx b/api_docs/alerting.mdx
index 45d873622cc86..f55155afb84e6 100644
--- a/api_docs/alerting.mdx
+++ b/api_docs/alerting.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/alerting
 title: "alerting"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the alerting plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'alerting']
 ---
 import alertingObj from './alerting.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-o
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 601 | 1 | 580 | 42 |
+| 602 | 1 | 581 | 42 |
 
 ## Client
 
diff --git a/api_docs/apm.mdx b/api_docs/apm.mdx
index e5bbbe4962403..c998a7a7144e3 100644
--- a/api_docs/apm.mdx
+++ b/api_docs/apm.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/apm
 title: "apm"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the apm plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apm']
 ---
 import apmObj from './apm.devdocs.json';
diff --git a/api_docs/asset_manager.mdx b/api_docs/asset_manager.mdx
index 3ac0fced2b457..e848436d777e3 100644
--- a/api_docs/asset_manager.mdx
+++ b/api_docs/asset_manager.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/assetManager
 title: "assetManager"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the assetManager plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'assetManager']
 ---
 import assetManagerObj from './asset_manager.devdocs.json';
diff --git a/api_docs/banners.mdx b/api_docs/banners.mdx
index f6f092e5107d3..2a2128100d52b 100644
--- a/api_docs/banners.mdx
+++ b/api_docs/banners.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/banners
 title: "banners"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the banners plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'banners']
 ---
 import bannersObj from './banners.devdocs.json';
diff --git a/api_docs/bfetch.mdx b/api_docs/bfetch.mdx
index c414bab498ebb..a8f930db9e65c 100644
--- a/api_docs/bfetch.mdx
+++ b/api_docs/bfetch.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/bfetch
 title: "bfetch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the bfetch plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'bfetch']
 ---
 import bfetchObj from './bfetch.devdocs.json';
diff --git a/api_docs/canvas.mdx b/api_docs/canvas.mdx
index 92e14941438e6..5f5bba2336e34 100644
--- a/api_docs/canvas.mdx
+++ b/api_docs/canvas.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/canvas
 title: "canvas"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the canvas plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'canvas']
 ---
 import canvasObj from './canvas.devdocs.json';
diff --git a/api_docs/cases.mdx b/api_docs/cases.mdx
index 0d6a40ab12ce6..2d5921d0a7fa9 100644
--- a/api_docs/cases.mdx
+++ b/api_docs/cases.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cases
 title: "cases"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cases plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cases']
 ---
 import casesObj from './cases.devdocs.json';
diff --git a/api_docs/charts.mdx b/api_docs/charts.mdx
index 3eeb9afd99e19..3768780876d40 100644
--- a/api_docs/charts.mdx
+++ b/api_docs/charts.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/charts
 title: "charts"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the charts plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'charts']
 ---
 import chartsObj from './charts.devdocs.json';
diff --git a/api_docs/cloud.mdx b/api_docs/cloud.mdx
index c06de42b2b643..9cd07109fd4c6 100644
--- a/api_docs/cloud.mdx
+++ b/api_docs/cloud.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloud
 title: "cloud"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloud plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloud']
 ---
 import cloudObj from './cloud.devdocs.json';
diff --git a/api_docs/cloud_chat.mdx b/api_docs/cloud_chat.mdx
index 58149b8a1328b..b95eb71a01306 100644
--- a/api_docs/cloud_chat.mdx
+++ b/api_docs/cloud_chat.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudChat
 title: "cloudChat"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudChat plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudChat']
 ---
 import cloudChatObj from './cloud_chat.devdocs.json';
diff --git a/api_docs/cloud_data_migration.mdx b/api_docs/cloud_data_migration.mdx
index cfb98e4160b23..884a85b316bf8 100644
--- a/api_docs/cloud_data_migration.mdx
+++ b/api_docs/cloud_data_migration.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudDataMigration
 title: "cloudDataMigration"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudDataMigration plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudDataMigration']
 ---
 import cloudDataMigrationObj from './cloud_data_migration.devdocs.json';
diff --git a/api_docs/cloud_defend.mdx b/api_docs/cloud_defend.mdx
index 3ea5f9b64d1cd..67f71e567ed0e 100644
--- a/api_docs/cloud_defend.mdx
+++ b/api_docs/cloud_defend.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudDefend
 title: "cloudDefend"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudDefend plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudDefend']
 ---
 import cloudDefendObj from './cloud_defend.devdocs.json';
diff --git a/api_docs/cloud_experiments.mdx b/api_docs/cloud_experiments.mdx
index 19c8ac364cca9..adb9e2df05e93 100644
--- a/api_docs/cloud_experiments.mdx
+++ b/api_docs/cloud_experiments.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudExperiments
 title: "cloudExperiments"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudExperiments plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudExperiments']
 ---
 import cloudExperimentsObj from './cloud_experiments.devdocs.json';
diff --git a/api_docs/cloud_security_posture.mdx b/api_docs/cloud_security_posture.mdx
index bb4a888ea42b7..3e5562983375b 100644
--- a/api_docs/cloud_security_posture.mdx
+++ b/api_docs/cloud_security_posture.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudSecurityPosture
 title: "cloudSecurityPosture"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudSecurityPosture plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudSecurityPosture']
 ---
 import cloudSecurityPostureObj from './cloud_security_posture.devdocs.json';
diff --git a/api_docs/console.mdx b/api_docs/console.mdx
index 57dff11f3c70c..945b06637a3ce 100644
--- a/api_docs/console.mdx
+++ b/api_docs/console.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/console
 title: "console"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the console plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'console']
 ---
 import consoleObj from './console.devdocs.json';
diff --git a/api_docs/content_management.mdx b/api_docs/content_management.mdx
index 86adcb31a05df..603f9a2ee1dff 100644
--- a/api_docs/content_management.mdx
+++ b/api_docs/content_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/contentManagement
 title: "contentManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the contentManagement plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'contentManagement']
 ---
 import contentManagementObj from './content_management.devdocs.json';
diff --git a/api_docs/controls.devdocs.json b/api_docs/controls.devdocs.json
index ad5df876690bd..42f533bf0fddc 100644
--- a/api_docs/controls.devdocs.json
+++ b/api_docs/controls.devdocs.json
@@ -78,6 +78,155 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "controls",
+            "id": "def-public.ControlGroupContainer.select",
+            "type": "Function",
+            "tags": [],
+            "label": "select",
+            "description": [],
+            "signature": [
+              "<Selected extends unknown>(selector: (state: ",
+              "ControlGroupReduxState",
+              ") => Selected, equalityFn?: ((previous: Selected, next: Selected) => boolean) | undefined) => Selected"
+            ],
+            "path": "src/plugins/controls/public/control_group/embeddable/control_group_container.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "returnComment": [],
+            "children": [
+              {
+                "parentPluginId": "controls",
+                "id": "def-public.ControlGroupContainer.select.$1",
+                "type": "Function",
+                "tags": [],
+                "label": "selector",
+                "description": [],
+                "signature": [
+                  "(state: ReduxStateType) => Selected"
+                ],
+                "path": "src/plugins/presentation_util/public/redux_tools/types.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "returnComment": [],
+                "children": [
+                  {
+                    "parentPluginId": "controls",
+                    "id": "def-public.ControlGroupContainer.select.$1.$1",
+                    "type": "Uncategorized",
+                    "tags": [],
+                    "label": "state",
+                    "description": [],
+                    "signature": [
+                      "ReduxStateType"
+                    ],
+                    "path": "src/plugins/presentation_util/public/redux_tools/types.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  }
+                ]
+              },
+              {
+                "parentPluginId": "controls",
+                "id": "def-public.ControlGroupContainer.select.$2",
+                "type": "Function",
+                "tags": [],
+                "label": "equalityFn",
+                "description": [],
+                "signature": [
+                  "((previous: Selected, next: Selected) => boolean) | undefined"
+                ],
+                "path": "src/plugins/presentation_util/public/redux_tools/types.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
+          },
+          {
+            "parentPluginId": "controls",
+            "id": "def-public.ControlGroupContainer.getState",
+            "type": "Function",
+            "tags": [],
+            "label": "getState",
+            "description": [],
+            "signature": [
+              "() => ",
+              "ControlGroupReduxState"
+            ],
+            "path": "src/plugins/controls/public/control_group/embeddable/control_group_container.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "returnComment": [],
+            "children": []
+          },
+          {
+            "parentPluginId": "controls",
+            "id": "def-public.ControlGroupContainer.dispatch",
+            "type": "Object",
+            "tags": [],
+            "label": "dispatch",
+            "description": [],
+            "signature": [
+              "{ setControlStyle: (payload: ",
+              "ControlStyle",
+              ") => void; setChainingSystem: (payload: ",
+              "ControlGroupChainingSystem",
+              ") => void; setDefaultControlWidth: (payload: ",
+              {
+                "pluginId": "controls",
+                "scope": "common",
+                "docId": "kibControlsPluginApi",
+                "section": "def-common.ControlWidth",
+                "text": "ControlWidth"
+              },
+              " | undefined) => void; setDefaultControlGrow: (payload: boolean | undefined) => void; setControlWidth: (payload: { width: ",
+              {
+                "pluginId": "controls",
+                "scope": "common",
+                "docId": "kibControlsPluginApi",
+                "section": "def-common.ControlWidth",
+                "text": "ControlWidth"
+              },
+              "; embeddableId: string; }) => void; setControlGrow: (payload: { grow: boolean; embeddableId: string; }) => void; setControlOrders: (payload: { ids: string[]; }) => void; }"
+            ],
+            "path": "src/plugins/controls/public/control_group/embeddable/control_group_container.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "controls",
+            "id": "def-public.ControlGroupContainer.onStateChange",
+            "type": "Function",
+            "tags": [],
+            "label": "onStateChange",
+            "description": [],
+            "signature": [
+              "(listener: () => void) => ",
+              "Unsubscribe"
+            ],
+            "path": "src/plugins/controls/public/control_group/embeddable/control_group_container.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "returnComment": [],
+            "children": [
+              {
+                "parentPluginId": "controls",
+                "id": "def-public.ControlGroupContainer.onStateChange.$1",
+                "type": "Function",
+                "tags": [],
+                "label": "listener",
+                "description": [],
+                "signature": [
+                  "() => void"
+                ],
+                "path": "node_modules/redux/index.d.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "returnComment": [],
+                "children": []
+              }
+            ]
+          },
           {
             "parentPluginId": "controls",
             "id": "def-public.ControlGroupContainer.onFiltersPublished$",
@@ -116,6 +265,119 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "controls",
+            "id": "def-public.ControlGroupContainer.Unnamed",
+            "type": "Function",
+            "tags": [],
+            "label": "Constructor",
+            "description": [],
+            "signature": [
+              "any"
+            ],
+            "path": "src/plugins/controls/public/control_group/embeddable/control_group_container.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "controls",
+                "id": "def-public.ControlGroupContainer.Unnamed.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "reduxToolsPackage",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "presentationUtil",
+                    "scope": "public",
+                    "docId": "kibPresentationUtilPluginApi",
+                    "section": "def-public.ReduxToolsPackage",
+                    "text": "ReduxToolsPackage"
+                  }
+                ],
+                "path": "src/plugins/controls/public/control_group/embeddable/control_group_container.tsx",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "controls",
+                "id": "def-public.ControlGroupContainer.Unnamed.$2",
+                "type": "Object",
+                "tags": [],
+                "label": "initialInput",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "controls",
+                    "scope": "common",
+                    "docId": "kibControlsPluginApi",
+                    "section": "def-common.ControlGroupInput",
+                    "text": "ControlGroupInput"
+                  }
+                ],
+                "path": "src/plugins/controls/public/control_group/embeddable/control_group_container.tsx",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "controls",
+                "id": "def-public.ControlGroupContainer.Unnamed.$3",
+                "type": "Object",
+                "tags": [],
+                "label": "parent",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "embeddable",
+                    "scope": "public",
+                    "docId": "kibEmbeddablePluginApi",
+                    "section": "def-public.Container",
+                    "text": "Container"
+                  },
+                  "<{}, ",
+                  {
+                    "pluginId": "embeddable",
+                    "scope": "public",
+                    "docId": "kibEmbeddablePluginApi",
+                    "section": "def-public.ContainerInput",
+                    "text": "ContainerInput"
+                  },
+                  "<{}>, ",
+                  {
+                    "pluginId": "embeddable",
+                    "scope": "public",
+                    "docId": "kibEmbeddablePluginApi",
+                    "section": "def-public.ContainerOutput",
+                    "text": "ContainerOutput"
+                  },
+                  "> | undefined"
+                ],
+                "path": "src/plugins/controls/public/control_group/embeddable/control_group_container.tsx",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": false
+              },
+              {
+                "parentPluginId": "controls",
+                "id": "def-public.ControlGroupContainer.Unnamed.$4",
+                "type": "Object",
+                "tags": [],
+                "label": "settings",
+                "description": [],
+                "signature": [
+                  "ControlGroupSettings",
+                  " | undefined"
+                ],
+                "path": "src/plugins/controls/public/control_group/embeddable/control_group_container.tsx",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": false
+              }
+            ],
+            "returnComment": []
+          },
           {
             "parentPluginId": "controls",
             "id": "def-public.ControlGroupContainer.setLastUsedDataViewId",
@@ -196,74 +458,6 @@
             "children": [],
             "returnComment": []
           },
-          {
-            "parentPluginId": "controls",
-            "id": "def-public.ControlGroupContainer.getReduxEmbeddableTools",
-            "type": "Function",
-            "tags": [],
-            "label": "getReduxEmbeddableTools",
-            "description": [],
-            "signature": [
-              "() => ",
-              {
-                "pluginId": "presentationUtil",
-                "scope": "public",
-                "docId": "kibPresentationUtilPluginApi",
-                "section": "def-public.ReduxEmbeddableTools",
-                "text": "ReduxEmbeddableTools"
-              },
-              "<",
-              "ControlGroupReduxState",
-              ", { setControlStyle: (state: ",
-              "WritableDraft",
-              "<",
-              "ControlGroupReduxState",
-              ">, action: { payload: ",
-              "ControlStyle",
-              "; type: string; }) => void; setDefaultControlWidth: (state: ",
-              "WritableDraft",
-              "<",
-              "ControlGroupReduxState",
-              ">, action: { payload: ",
-              {
-                "pluginId": "controls",
-                "scope": "common",
-                "docId": "kibControlsPluginApi",
-                "section": "def-common.ControlWidth",
-                "text": "ControlWidth"
-              },
-              " | undefined; type: string; }) => void; setDefaultControlGrow: (state: ",
-              "WritableDraft",
-              "<",
-              "ControlGroupReduxState",
-              ">, action: { payload: boolean | undefined; type: string; }) => void; setControlWidth: (state: ",
-              "WritableDraft",
-              "<",
-              "ControlGroupReduxState",
-              ">, action: { payload: { width: ",
-              {
-                "pluginId": "controls",
-                "scope": "common",
-                "docId": "kibControlsPluginApi",
-                "section": "def-common.ControlWidth",
-                "text": "ControlWidth"
-              },
-              "; embeddableId: string; }; type: string; }) => void; setControlGrow: (state: ",
-              "WritableDraft",
-              "<",
-              "ControlGroupReduxState",
-              ">, action: { payload: { grow: boolean; embeddableId: string; }; type: string; }) => void; setControlOrders: (state: ",
-              "WritableDraft",
-              "<",
-              "ControlGroupReduxState",
-              ">, action: { payload: { ids: string[]; }; type: string; }) => void; }>"
-            ],
-            "path": "src/plugins/controls/public/control_group/embeddable/control_group_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
           {
             "parentPluginId": "controls",
             "id": "def-public.ControlGroupContainer.closeAllFlyouts",
@@ -445,7 +639,13 @@
             "description": [],
             "signature": [
               "(controlProps: ",
-              "AddRangeSliderControlProps",
+              {
+                "pluginId": "controls",
+                "scope": "public",
+                "docId": "kibControlsPluginApi",
+                "section": "def-public.AddRangeSliderControlProps",
+                "text": "AddRangeSliderControlProps"
+              },
               ") => Promise<",
               {
                 "pluginId": "embeddable",
@@ -492,7 +692,13 @@
                 "label": "controlProps",
                 "description": [],
                 "signature": [
-                  "AddRangeSliderControlProps"
+                  {
+                    "pluginId": "controls",
+                    "scope": "public",
+                    "docId": "kibControlsPluginApi",
+                    "section": "def-public.AddRangeSliderControlProps",
+                    "text": "AddRangeSliderControlProps"
+                  }
                 ],
                 "path": "src/plugins/controls/public/control_group/embeddable/control_group_container.tsx",
                 "deprecated": false,
@@ -566,150 +772,67 @@
                 "section": "def-public.ControlGroupContainer",
                 "text": "ControlGroupContainer"
               },
-              ") => void"
-            ],
-            "path": "src/plugins/controls/public/control_group/embeddable/control_group_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "returnComment": [],
-            "children": []
-          },
-          {
-            "parentPluginId": "controls",
-            "id": "def-public.ControlGroupContainer.openEditControlGroupFlyout",
-            "type": "Function",
-            "tags": [],
-            "label": "openEditControlGroupFlyout",
-            "description": [],
-            "signature": [
-              "(this: ",
+              ", controlInputTransform?: ",
               {
                 "pluginId": "controls",
-                "scope": "public",
+                "scope": "common",
                 "docId": "kibControlsPluginApi",
-                "section": "def-public.ControlGroupContainer",
-                "text": "ControlGroupContainer"
+                "section": "def-common.ControlInputTransform",
+                "text": "ControlInputTransform"
               },
-              ") => void"
+              " | undefined) => void"
             ],
             "path": "src/plugins/controls/public/control_group/embeddable/control_group_container.tsx",
             "deprecated": false,
             "trackAdoption": false,
             "returnComment": [],
-            "children": []
-          },
-          {
-            "parentPluginId": "controls",
-            "id": "def-public.ControlGroupContainer.Unnamed",
-            "type": "Function",
-            "tags": [],
-            "label": "Constructor",
-            "description": [],
-            "signature": [
-              "any"
-            ],
-            "path": "src/plugins/controls/public/control_group/embeddable/control_group_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
             "children": [
               {
                 "parentPluginId": "controls",
-                "id": "def-public.ControlGroupContainer.Unnamed.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "reduxEmbeddablePackage",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "presentationUtil",
-                    "scope": "public",
-                    "docId": "kibPresentationUtilPluginApi",
-                    "section": "def-public.ReduxEmbeddablePackage",
-                    "text": "ReduxEmbeddablePackage"
-                  }
-                ],
-                "path": "src/plugins/controls/public/control_group/embeddable/control_group_container.tsx",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              },
-              {
-                "parentPluginId": "controls",
-                "id": "def-public.ControlGroupContainer.Unnamed.$2",
-                "type": "Object",
+                "id": "def-public.ControlGroupContainer.openAddDataControlFlyout.$1",
+                "type": "Function",
                 "tags": [],
-                "label": "initialInput",
+                "label": "controlInputTransform",
                 "description": [],
                 "signature": [
                   {
                     "pluginId": "controls",
                     "scope": "common",
                     "docId": "kibControlsPluginApi",
-                    "section": "def-common.ControlGroupInput",
-                    "text": "ControlGroupInput"
-                  }
-                ],
-                "path": "src/plugins/controls/public/control_group/embeddable/control_group_container.tsx",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              },
-              {
-                "parentPluginId": "controls",
-                "id": "def-public.ControlGroupContainer.Unnamed.$3",
-                "type": "Object",
-                "tags": [],
-                "label": "parent",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "embeddable",
-                    "scope": "public",
-                    "docId": "kibEmbeddablePluginApi",
-                    "section": "def-public.Container",
-                    "text": "Container"
-                  },
-                  "<{}, ",
-                  {
-                    "pluginId": "embeddable",
-                    "scope": "public",
-                    "docId": "kibEmbeddablePluginApi",
-                    "section": "def-public.ContainerInput",
-                    "text": "ContainerInput"
-                  },
-                  "<{}>, ",
-                  {
-                    "pluginId": "embeddable",
-                    "scope": "public",
-                    "docId": "kibEmbeddablePluginApi",
-                    "section": "def-public.ContainerOutput",
-                    "text": "ContainerOutput"
+                    "section": "def-common.ControlInputTransform",
+                    "text": "ControlInputTransform"
                   },
-                  "> | undefined"
-                ],
-                "path": "src/plugins/controls/public/control_group/embeddable/control_group_container.tsx",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": false
-              },
-              {
-                "parentPluginId": "controls",
-                "id": "def-public.ControlGroupContainer.Unnamed.$4",
-                "type": "Object",
-                "tags": [],
-                "label": "settings",
-                "description": [],
-                "signature": [
-                  "ControlGroupSettings",
                   " | undefined"
                 ],
-                "path": "src/plugins/controls/public/control_group/embeddable/control_group_container.tsx",
+                "path": "src/plugins/controls/public/control_group/editor/open_add_data_control_flyout.tsx",
                 "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": false
+                "trackAdoption": false
               }
+            ]
+          },
+          {
+            "parentPluginId": "controls",
+            "id": "def-public.ControlGroupContainer.openEditControlGroupFlyout",
+            "type": "Function",
+            "tags": [],
+            "label": "openEditControlGroupFlyout",
+            "description": [],
+            "signature": [
+              "(this: ",
+              {
+                "pluginId": "controls",
+                "scope": "public",
+                "docId": "kibControlsPluginApi",
+                "section": "def-public.ControlGroupContainer",
+                "text": "ControlGroupContainer"
+              },
+              ") => void"
             ],
-            "returnComment": []
+            "path": "src/plugins/controls/public/control_group/embeddable/control_group_container.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "returnComment": [],
+            "children": []
           },
           {
             "parentPluginId": "controls",
@@ -1587,6 +1710,155 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "controls",
+            "id": "def-public.OptionsListEmbeddable.select",
+            "type": "Function",
+            "tags": [],
+            "label": "select",
+            "description": [],
+            "signature": [
+              "<Selected extends unknown>(selector: (state: ",
+              "OptionsListReduxState",
+              ") => Selected, equalityFn?: ((previous: Selected, next: Selected) => boolean) | undefined) => Selected"
+            ],
+            "path": "src/plugins/controls/public/options_list/embeddable/options_list_embeddable.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "returnComment": [],
+            "children": [
+              {
+                "parentPluginId": "controls",
+                "id": "def-public.OptionsListEmbeddable.select.$1",
+                "type": "Function",
+                "tags": [],
+                "label": "selector",
+                "description": [],
+                "signature": [
+                  "(state: ReduxStateType) => Selected"
+                ],
+                "path": "src/plugins/presentation_util/public/redux_tools/types.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "returnComment": [],
+                "children": [
+                  {
+                    "parentPluginId": "controls",
+                    "id": "def-public.OptionsListEmbeddable.select.$1.$1",
+                    "type": "Uncategorized",
+                    "tags": [],
+                    "label": "state",
+                    "description": [],
+                    "signature": [
+                      "ReduxStateType"
+                    ],
+                    "path": "src/plugins/presentation_util/public/redux_tools/types.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  }
+                ]
+              },
+              {
+                "parentPluginId": "controls",
+                "id": "def-public.OptionsListEmbeddable.select.$2",
+                "type": "Function",
+                "tags": [],
+                "label": "equalityFn",
+                "description": [],
+                "signature": [
+                  "((previous: Selected, next: Selected) => boolean) | undefined"
+                ],
+                "path": "src/plugins/presentation_util/public/redux_tools/types.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
+          },
+          {
+            "parentPluginId": "controls",
+            "id": "def-public.OptionsListEmbeddable.getState",
+            "type": "Function",
+            "tags": [],
+            "label": "getState",
+            "description": [],
+            "signature": [
+              "() => ",
+              "OptionsListReduxState"
+            ],
+            "path": "src/plugins/controls/public/options_list/embeddable/options_list_embeddable.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "returnComment": [],
+            "children": []
+          },
+          {
+            "parentPluginId": "controls",
+            "id": "def-public.OptionsListEmbeddable.dispatch",
+            "type": "Object",
+            "tags": [],
+            "label": "dispatch",
+            "description": [],
+            "signature": [
+              "{ deselectOption: (payload: string) => void; setSearchString: (payload: string) => void; setAllowExpensiveQueries: (payload: boolean) => void; setPopoverOpen: (payload: boolean) => void; setSort: (payload: Partial<",
+              "OptionsListSortingType",
+              ">) => void; selectExists: (payload: boolean) => void; selectOption: (payload: string) => void; replaceSelection: (payload: string) => void; clearSelections: (payload: unknown) => void; setExclude: (payload: boolean) => void; clearValidAndInvalidSelections: (payload: unknown) => void; setValidAndInvalidSelections: (payload: { validSelections: string[]; invalidSelections: string[]; }) => void; setLoading: (payload: boolean) => void; setField: (payload: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.FieldSpec",
+                "text": "FieldSpec"
+              },
+              " | undefined) => void; updateQueryResults: (payload: Pick<",
+              "OptionsListComponentState",
+              ", \"availableOptions\" | \"invalidSelections\" | \"validSelections\" | \"totalCardinality\">) => void; publishFilters: (payload: ",
+              {
+                "pluginId": "@kbn/es-query",
+                "scope": "common",
+                "docId": "kibKbnEsQueryPluginApi",
+                "section": "def-common.Filter",
+                "text": "Filter"
+              },
+              "[] | undefined) => void; setDataViewId: (payload: string | undefined) => void; }"
+            ],
+            "path": "src/plugins/controls/public/options_list/embeddable/options_list_embeddable.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "controls",
+            "id": "def-public.OptionsListEmbeddable.onStateChange",
+            "type": "Function",
+            "tags": [],
+            "label": "onStateChange",
+            "description": [],
+            "signature": [
+              "(listener: () => void) => ",
+              "Unsubscribe"
+            ],
+            "path": "src/plugins/controls/public/options_list/embeddable/options_list_embeddable.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "returnComment": [],
+            "children": [
+              {
+                "parentPluginId": "controls",
+                "id": "def-public.OptionsListEmbeddable.onStateChange.$1",
+                "type": "Function",
+                "tags": [],
+                "label": "listener",
+                "description": [],
+                "signature": [
+                  "() => void"
+                ],
+                "path": "node_modules/redux/index.d.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "returnComment": [],
+                "children": []
+              }
+            ]
+          },
           {
             "parentPluginId": "controls",
             "id": "def-public.OptionsListEmbeddable.Unnamed",
@@ -1606,15 +1878,15 @@
                 "id": "def-public.OptionsListEmbeddable.Unnamed.$1",
                 "type": "Object",
                 "tags": [],
-                "label": "reduxEmbeddablePackage",
+                "label": "reduxToolsPackage",
                 "description": [],
                 "signature": [
                   {
                     "pluginId": "presentationUtil",
                     "scope": "public",
                     "docId": "kibPresentationUtilPluginApi",
-                    "section": "def-public.ReduxEmbeddablePackage",
-                    "text": "ReduxEmbeddablePackage"
+                    "section": "def-public.ReduxToolsPackage",
+                    "text": "ReduxToolsPackage"
                   }
                 ],
                 "path": "src/plugins/controls/public/options_list/embeddable/options_list_embeddable.tsx",
@@ -2557,6 +2829,153 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "controls",
+            "id": "def-public.RangeSliderEmbeddable.select",
+            "type": "Function",
+            "tags": [],
+            "label": "select",
+            "description": [],
+            "signature": [
+              "<Selected extends unknown>(selector: (state: ",
+              "RangeSliderReduxState",
+              ") => Selected, equalityFn?: ((previous: Selected, next: Selected) => boolean) | undefined) => Selected"
+            ],
+            "path": "src/plugins/controls/public/range_slider/embeddable/range_slider_embeddable.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "returnComment": [],
+            "children": [
+              {
+                "parentPluginId": "controls",
+                "id": "def-public.RangeSliderEmbeddable.select.$1",
+                "type": "Function",
+                "tags": [],
+                "label": "selector",
+                "description": [],
+                "signature": [
+                  "(state: ReduxStateType) => Selected"
+                ],
+                "path": "src/plugins/presentation_util/public/redux_tools/types.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "returnComment": [],
+                "children": [
+                  {
+                    "parentPluginId": "controls",
+                    "id": "def-public.RangeSliderEmbeddable.select.$1.$1",
+                    "type": "Uncategorized",
+                    "tags": [],
+                    "label": "state",
+                    "description": [],
+                    "signature": [
+                      "ReduxStateType"
+                    ],
+                    "path": "src/plugins/presentation_util/public/redux_tools/types.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  }
+                ]
+              },
+              {
+                "parentPluginId": "controls",
+                "id": "def-public.RangeSliderEmbeddable.select.$2",
+                "type": "Function",
+                "tags": [],
+                "label": "equalityFn",
+                "description": [],
+                "signature": [
+                  "((previous: Selected, next: Selected) => boolean) | undefined"
+                ],
+                "path": "src/plugins/presentation_util/public/redux_tools/types.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
+          },
+          {
+            "parentPluginId": "controls",
+            "id": "def-public.RangeSliderEmbeddable.getState",
+            "type": "Function",
+            "tags": [],
+            "label": "getState",
+            "description": [],
+            "signature": [
+              "() => ",
+              "RangeSliderReduxState"
+            ],
+            "path": "src/plugins/controls/public/range_slider/embeddable/range_slider_embeddable.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "returnComment": [],
+            "children": []
+          },
+          {
+            "parentPluginId": "controls",
+            "id": "def-public.RangeSliderEmbeddable.dispatch",
+            "type": "Object",
+            "tags": [],
+            "label": "dispatch",
+            "description": [],
+            "signature": [
+              "{ setSelectedRange: (payload: ",
+              "RangeValue",
+              ") => void; setField: (payload: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.FieldSpec",
+                "text": "FieldSpec"
+              },
+              " | undefined) => void; setDataViewId: (payload: string | undefined) => void; setLoading: (payload: boolean) => void; setMinMax: (payload: { min: string; max: string; }) => void; publishFilters: (payload: ",
+              {
+                "pluginId": "@kbn/es-query",
+                "scope": "common",
+                "docId": "kibKbnEsQueryPluginApi",
+                "section": "def-common.Filter",
+                "text": "Filter"
+              },
+              "[] | undefined) => void; setIsInvalid: (payload: boolean) => void; }"
+            ],
+            "path": "src/plugins/controls/public/range_slider/embeddable/range_slider_embeddable.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "controls",
+            "id": "def-public.RangeSliderEmbeddable.onStateChange",
+            "type": "Function",
+            "tags": [],
+            "label": "onStateChange",
+            "description": [],
+            "signature": [
+              "(listener: () => void) => ",
+              "Unsubscribe"
+            ],
+            "path": "src/plugins/controls/public/range_slider/embeddable/range_slider_embeddable.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "returnComment": [],
+            "children": [
+              {
+                "parentPluginId": "controls",
+                "id": "def-public.RangeSliderEmbeddable.onStateChange.$1",
+                "type": "Function",
+                "tags": [],
+                "label": "listener",
+                "description": [],
+                "signature": [
+                  "() => void"
+                ],
+                "path": "node_modules/redux/index.d.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "returnComment": [],
+                "children": []
+              }
+            ]
+          },
           {
             "parentPluginId": "controls",
             "id": "def-public.RangeSliderEmbeddable.Unnamed",
@@ -2576,15 +2995,15 @@
                 "id": "def-public.RangeSliderEmbeddable.Unnamed.$1",
                 "type": "Object",
                 "tags": [],
-                "label": "reduxEmbeddablePackage",
+                "label": "reduxToolsPackage",
                 "description": [],
                 "signature": [
                   {
                     "pluginId": "presentationUtil",
                     "scope": "public",
                     "docId": "kibPresentationUtilPluginApi",
-                    "section": "def-public.ReduxEmbeddablePackage",
-                    "text": "ReduxEmbeddablePackage"
+                    "section": "def-public.ReduxToolsPackage",
+                    "text": "ReduxToolsPackage"
                   }
                 ],
                 "path": "src/plugins/controls/public/range_slider/embeddable/range_slider_embeddable.tsx",
@@ -3351,13 +3770,13 @@
     "functions": [
       {
         "parentPluginId": "controls",
-        "id": "def-public.LazyControlGroupRenderer",
+        "id": "def-public.ControlGroupRenderer",
         "type": "Function",
         "tags": [],
-        "label": "LazyControlGroupRenderer",
+        "label": "ControlGroupRenderer",
         "description": [],
         "signature": [
-          "React.ExoticComponent<",
+          "React.ForwardRefExoticComponent<",
           {
             "pluginId": "controls",
             "scope": "public",
@@ -3365,107 +3784,36 @@
             "section": "def-public.ControlGroupRendererProps",
             "text": "ControlGroupRendererProps"
           },
-          "> & { readonly _result: ({ onLoadComplete, getCreationOptions, filters, timeRange, query, }: ",
+          " & React.RefAttributes<",
           {
             "pluginId": "controls",
             "scope": "public",
             "docId": "kibControlsPluginApi",
-            "section": "def-public.ControlGroupRendererProps",
-            "text": "ControlGroupRendererProps"
+            "section": "def-public.AwaitingControlGroupAPI",
+            "text": "AwaitingControlGroupAPI"
           },
-          ") => JSX.Element; }"
+          ">>"
         ],
-        "path": "src/plugins/controls/public/control_group/index.ts",
+        "path": "src/plugins/controls/public/control_group/external_api/control_group_renderer.tsx",
         "deprecated": false,
         "trackAdoption": false,
         "returnComment": [],
         "children": [
           {
             "parentPluginId": "controls",
-            "id": "def-public.LazyControlGroupRenderer.$1",
+            "id": "def-public.ControlGroupRenderer.$1",
             "type": "Uncategorized",
             "tags": [],
             "label": "props",
-            "description": [],
-            "signature": [
-              "P"
-            ],
-            "path": "node_modules/@types/react/index.d.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          }
-        ],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "controls",
-        "id": "def-public.useControlGroupContainerContext",
-        "type": "Function",
-        "tags": [],
-        "label": "useControlGroupContainerContext",
-        "description": [],
-        "signature": [
-          "() => ",
-          "ReduxEmbeddableContext",
-          "<",
-          "ControlGroupReduxState",
-          ", { setControlStyle: (state: ",
-          "WritableDraft",
-          "<",
-          "ControlGroupReduxState",
-          ">, action: { payload: ",
-          "ControlStyle",
-          "; type: string; }) => void; setDefaultControlWidth: (state: ",
-          "WritableDraft",
-          "<",
-          "ControlGroupReduxState",
-          ">, action: { payload: ",
-          {
-            "pluginId": "controls",
-            "scope": "common",
-            "docId": "kibControlsPluginApi",
-            "section": "def-common.ControlWidth",
-            "text": "ControlWidth"
-          },
-          " | undefined; type: string; }) => void; setDefaultControlGrow: (state: ",
-          "WritableDraft",
-          "<",
-          "ControlGroupReduxState",
-          ">, action: { payload: boolean | undefined; type: string; }) => void; setControlWidth: (state: ",
-          "WritableDraft",
-          "<",
-          "ControlGroupReduxState",
-          ">, action: { payload: { width: ",
-          {
-            "pluginId": "controls",
-            "scope": "common",
-            "docId": "kibControlsPluginApi",
-            "section": "def-common.ControlWidth",
-            "text": "ControlWidth"
-          },
-          "; embeddableId: string; }; type: string; }) => void; setControlGrow: (state: ",
-          "WritableDraft",
-          "<",
-          "ControlGroupReduxState",
-          ">, action: { payload: { grow: boolean; embeddableId: string; }; type: string; }) => void; setControlOrders: (state: ",
-          "WritableDraft",
-          "<",
-          "ControlGroupReduxState",
-          ">, action: { payload: { ids: string[]; }; type: string; }) => void; }, ",
-          {
-            "pluginId": "controls",
-            "scope": "public",
-            "docId": "kibControlsPluginApi",
-            "section": "def-public.ControlGroupContainer",
-            "text": "ControlGroupContainer"
-          },
-          ">"
+            "description": [],
+            "signature": [
+              "P"
+            ],
+            "path": "node_modules/@types/react/index.d.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
         ],
-        "path": "src/plugins/controls/public/control_group/control_group_renderer.tsx",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [],
-        "returnComment": [],
         "initialIsOpen": false
       }
     ],
@@ -3477,7 +3825,7 @@
         "tags": [],
         "label": "AddDataControlProps",
         "description": [],
-        "path": "src/plugins/controls/public/control_group/control_group_input_builder.ts",
+        "path": "src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -3491,7 +3839,7 @@
             "signature": [
               "string | undefined"
             ],
-            "path": "src/plugins/controls/public/control_group/control_group_input_builder.ts",
+            "path": "src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -3502,7 +3850,7 @@
             "tags": [],
             "label": "dataViewId",
             "description": [],
-            "path": "src/plugins/controls/public/control_group/control_group_input_builder.ts",
+            "path": "src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -3513,7 +3861,7 @@
             "tags": [],
             "label": "fieldName",
             "description": [],
-            "path": "src/plugins/controls/public/control_group/control_group_input_builder.ts",
+            "path": "src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -3527,7 +3875,7 @@
             "signature": [
               "boolean | undefined"
             ],
-            "path": "src/plugins/controls/public/control_group/control_group_input_builder.ts",
+            "path": "src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -3541,7 +3889,7 @@
             "signature": [
               "string | undefined"
             ],
-            "path": "src/plugins/controls/public/control_group/control_group_input_builder.ts",
+            "path": "src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -3562,7 +3910,7 @@
               },
               " | undefined"
             ],
-            "path": "src/plugins/controls/public/control_group/control_group_input_builder.ts",
+            "path": "src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -3836,7 +4184,7 @@
         "tags": [],
         "label": "ControlGroupRendererProps",
         "description": [],
-        "path": "src/plugins/controls/public/control_group/control_group_renderer.tsx",
+        "path": "src/plugins/controls/public/control_group/external_api/control_group_renderer.tsx",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -3857,7 +4205,7 @@
               },
               "[] | undefined"
             ],
-            "path": "src/plugins/controls/public/control_group/control_group_renderer.tsx",
+            "path": "src/plugins/controls/public/control_group/external_api/control_group_renderer.tsx",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -3869,7 +4217,7 @@
             "label": "getCreationOptions",
             "description": [],
             "signature": [
-              "(initialInput: Partial<",
+              "((initialInput: Partial<",
               {
                 "pluginId": "controls",
                 "scope": "common",
@@ -3918,7 +4266,13 @@
                 "text": "ControlGroupInput"
               },
               ">, controlProps: ",
-              "AddRangeSliderControlProps",
+              {
+                "pluginId": "controls",
+                "scope": "public",
+                "docId": "kibControlsPluginApi",
+                "section": "def-public.AddRangeSliderControlProps",
+                "text": "AddRangeSliderControlProps"
+              },
               ") => void; addTimeSliderControl: (initialInput: Partial<",
               {
                 "pluginId": "controls",
@@ -3929,9 +4283,9 @@
               },
               ">) => void; }) => Promise<",
               "ControlGroupCreationOptions",
-              ">"
+              ">) | undefined"
             ],
-            "path": "src/plugins/controls/public/control_group/control_group_renderer.tsx",
+            "path": "src/plugins/controls/public/control_group/external_api/control_group_renderer.tsx",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
@@ -3953,7 +4307,7 @@
                   },
                   ">"
                 ],
-                "path": "src/plugins/controls/public/control_group/control_group_renderer.tsx",
+                "path": "src/plugins/controls/public/control_group/external_api/control_group_renderer.tsx",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -4007,7 +4361,13 @@
                     "text": "ControlGroupInput"
                   },
                   ">, controlProps: ",
-                  "AddRangeSliderControlProps",
+                  {
+                    "pluginId": "controls",
+                    "scope": "public",
+                    "docId": "kibControlsPluginApi",
+                    "section": "def-public.AddRangeSliderControlProps",
+                    "text": "AddRangeSliderControlProps"
+                  },
                   ") => void; addTimeSliderControl: (initialInput: Partial<",
                   {
                     "pluginId": "controls",
@@ -4018,53 +4378,7 @@
                   },
                   ">) => void; }"
                 ],
-                "path": "src/plugins/controls/public/control_group/control_group_renderer.tsx",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "controls",
-            "id": "def-public.ControlGroupRendererProps.onLoadComplete",
-            "type": "Function",
-            "tags": [],
-            "label": "onLoadComplete",
-            "description": [],
-            "signature": [
-              "((controlGroup: ",
-              {
-                "pluginId": "controls",
-                "scope": "public",
-                "docId": "kibControlsPluginApi",
-                "section": "def-public.ControlGroupContainer",
-                "text": "ControlGroupContainer"
-              },
-              ") => void) | undefined"
-            ],
-            "path": "src/plugins/controls/public/control_group/control_group_renderer.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "controls",
-                "id": "def-public.ControlGroupRendererProps.onLoadComplete.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "controlGroup",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "controls",
-                    "scope": "public",
-                    "docId": "kibControlsPluginApi",
-                    "section": "def-public.ControlGroupContainer",
-                    "text": "ControlGroupContainer"
-                  }
-                ],
-                "path": "src/plugins/controls/public/control_group/control_group_renderer.tsx",
+                "path": "src/plugins/controls/public/control_group/external_api/control_group_renderer.tsx",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -4089,7 +4403,7 @@
               },
               " | undefined"
             ],
-            "path": "src/plugins/controls/public/control_group/control_group_renderer.tsx",
+            "path": "src/plugins/controls/public/control_group/external_api/control_group_renderer.tsx",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -4110,7 +4424,7 @@
               },
               " | undefined"
             ],
-            "path": "src/plugins/controls/public/control_group/control_group_renderer.tsx",
+            "path": "src/plugins/controls/public/control_group/external_api/control_group_renderer.tsx",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -4709,7 +5023,53 @@
           },
           ">"
         ],
-        "path": "src/plugins/controls/public/control_group/control_group_input_builder.ts",
+        "path": "src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "controls",
+        "id": "def-public.AddRangeSliderControlProps",
+        "type": "Type",
+        "tags": [],
+        "label": "AddRangeSliderControlProps",
+        "description": [],
+        "signature": [
+          {
+            "pluginId": "controls",
+            "scope": "public",
+            "docId": "kibControlsPluginApi",
+            "section": "def-public.AddDataControlProps",
+            "text": "AddDataControlProps"
+          },
+          " & { value?: ",
+          "RangeValue",
+          " | undefined; }"
+        ],
+        "path": "src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "controls",
+        "id": "def-public.AwaitingControlGroupAPI",
+        "type": "Type",
+        "tags": [],
+        "label": "AwaitingControlGroupAPI",
+        "description": [],
+        "signature": [
+          {
+            "pluginId": "controls",
+            "scope": "public",
+            "docId": "kibControlsPluginApi",
+            "section": "def-public.ControlGroupContainer",
+            "text": "ControlGroupContainer"
+          },
+          " | null"
+        ],
+        "path": "src/plugins/controls/public/control_group/external_api/control_group_api.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
@@ -4801,6 +5161,98 @@
         "trackAdoption": false,
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "controls",
+        "id": "def-public.ControlGroupAPI",
+        "type": "Type",
+        "tags": [],
+        "label": "ControlGroupAPI",
+        "description": [],
+        "signature": [
+          {
+            "pluginId": "controls",
+            "scope": "public",
+            "docId": "kibControlsPluginApi",
+            "section": "def-public.ControlGroupContainer",
+            "text": "ControlGroupContainer"
+          }
+        ],
+        "path": "src/plugins/controls/public/control_group/external_api/control_group_api.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "controls",
+        "id": "def-public.ControlGroupInputBuilder",
+        "type": "Type",
+        "tags": [],
+        "label": "ControlGroupInputBuilder",
+        "description": [],
+        "signature": [
+          "{ addDataControlFromField: (initialInput: Partial<",
+          {
+            "pluginId": "controls",
+            "scope": "common",
+            "docId": "kibControlsPluginApi",
+            "section": "def-common.ControlGroupInput",
+            "text": "ControlGroupInput"
+          },
+          ">, controlProps: ",
+          {
+            "pluginId": "controls",
+            "scope": "public",
+            "docId": "kibControlsPluginApi",
+            "section": "def-public.AddDataControlProps",
+            "text": "AddDataControlProps"
+          },
+          ") => Promise<void>; addOptionsListControl: (initialInput: Partial<",
+          {
+            "pluginId": "controls",
+            "scope": "common",
+            "docId": "kibControlsPluginApi",
+            "section": "def-common.ControlGroupInput",
+            "text": "ControlGroupInput"
+          },
+          ">, controlProps: ",
+          {
+            "pluginId": "controls",
+            "scope": "public",
+            "docId": "kibControlsPluginApi",
+            "section": "def-public.AddOptionsListControlProps",
+            "text": "AddOptionsListControlProps"
+          },
+          ") => void; addRangeSliderControl: (initialInput: Partial<",
+          {
+            "pluginId": "controls",
+            "scope": "common",
+            "docId": "kibControlsPluginApi",
+            "section": "def-common.ControlGroupInput",
+            "text": "ControlGroupInput"
+          },
+          ">, controlProps: ",
+          {
+            "pluginId": "controls",
+            "scope": "public",
+            "docId": "kibControlsPluginApi",
+            "section": "def-public.AddRangeSliderControlProps",
+            "text": "AddRangeSliderControlProps"
+          },
+          ") => void; addTimeSliderControl: (initialInput: Partial<",
+          {
+            "pluginId": "controls",
+            "scope": "common",
+            "docId": "kibControlsPluginApi",
+            "section": "def-common.ControlGroupInput",
+            "text": "ControlGroupInput"
+          },
+          ">) => void; }"
+        ],
+        "path": "src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "controls",
         "id": "def-public.ControlGroupOutput",
@@ -5044,7 +5496,7 @@
         "tags": [],
         "label": "controlGroupInputBuilder",
         "description": [],
-        "path": "src/plugins/controls/public/control_group/control_group_input_builder.ts",
+        "path": "src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -5074,7 +5526,7 @@
               },
               ") => Promise<void>"
             ],
-            "path": "src/plugins/controls/public/control_group/control_group_input_builder.ts",
+            "path": "src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
@@ -5096,7 +5548,7 @@
                   },
                   ">"
                 ],
-                "path": "src/plugins/controls/public/control_group/control_group_input_builder.ts",
+                "path": "src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -5117,7 +5569,7 @@
                     "text": "AddDataControlProps"
                   }
                 ],
-                "path": "src/plugins/controls/public/control_group/control_group_input_builder.ts",
+                "path": "src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -5151,7 +5603,7 @@
               },
               ") => void"
             ],
-            "path": "src/plugins/controls/public/control_group/control_group_input_builder.ts",
+            "path": "src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
@@ -5173,7 +5625,7 @@
                   },
                   ">"
                 ],
-                "path": "src/plugins/controls/public/control_group/control_group_input_builder.ts",
+                "path": "src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -5194,7 +5646,7 @@
                     "text": "AddOptionsListControlProps"
                   }
                 ],
-                "path": "src/plugins/controls/public/control_group/control_group_input_builder.ts",
+                "path": "src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -5219,10 +5671,16 @@
                 "text": "ControlGroupInput"
               },
               ">, controlProps: ",
-              "AddRangeSliderControlProps",
+              {
+                "pluginId": "controls",
+                "scope": "public",
+                "docId": "kibControlsPluginApi",
+                "section": "def-public.AddRangeSliderControlProps",
+                "text": "AddRangeSliderControlProps"
+              },
               ") => void"
             ],
-            "path": "src/plugins/controls/public/control_group/control_group_input_builder.ts",
+            "path": "src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
@@ -5244,7 +5702,7 @@
                   },
                   ">"
                 ],
-                "path": "src/plugins/controls/public/control_group/control_group_input_builder.ts",
+                "path": "src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -5257,9 +5715,15 @@
                 "label": "controlProps",
                 "description": [],
                 "signature": [
-                  "AddRangeSliderControlProps"
+                  {
+                    "pluginId": "controls",
+                    "scope": "public",
+                    "docId": "kibControlsPluginApi",
+                    "section": "def-public.AddRangeSliderControlProps",
+                    "text": "AddRangeSliderControlProps"
+                  }
                 ],
-                "path": "src/plugins/controls/public/control_group/control_group_input_builder.ts",
+                "path": "src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -5285,7 +5749,7 @@
               },
               ">) => void"
             ],
-            "path": "src/plugins/controls/public/control_group/control_group_input_builder.ts",
+            "path": "src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
@@ -5307,7 +5771,7 @@
                   },
                   ">"
                 ],
-                "path": "src/plugins/controls/public/control_group/control_group_input_builder.ts",
+                "path": "src/plugins/controls/public/control_group/external_api/control_group_input_builder.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -6239,6 +6703,105 @@
         "trackAdoption": false,
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "controls",
+        "id": "def-common.ControlInputTransform",
+        "type": "Type",
+        "tags": [],
+        "label": "ControlInputTransform",
+        "description": [],
+        "signature": [
+          "(newState: Partial<",
+          "ControlInput",
+          ">, controlType: string) => Partial<",
+          "ControlInput",
+          ">"
+        ],
+        "path": "src/plugins/controls/common/types.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "returnComment": [],
+        "children": [
+          {
+            "parentPluginId": "controls",
+            "id": "def-common.ControlInputTransform.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "newState",
+            "description": [],
+            "signature": [
+              "{ viewMode?: ",
+              {
+                "pluginId": "embeddable",
+                "scope": "common",
+                "docId": "kibEmbeddablePluginApi",
+                "section": "def-common.ViewMode",
+                "text": "ViewMode"
+              },
+              " | undefined; title?: string | undefined; description?: string | undefined; id?: string | undefined; lastReloadRequestTime?: number | undefined; hidePanelTitles?: boolean | undefined; enhancements?: ",
+              {
+                "pluginId": "@kbn/utility-types",
+                "scope": "common",
+                "docId": "kibKbnUtilityTypesPluginApi",
+                "section": "def-common.SerializableRecord",
+                "text": "SerializableRecord"
+              },
+              " | undefined; disabledActions?: string[] | undefined; disableTriggers?: boolean | undefined; searchSessionId?: string | undefined; syncColors?: boolean | undefined; syncCursor?: boolean | undefined; syncTooltips?: boolean | undefined; executionContext?: ",
+              {
+                "pluginId": "@kbn/core-execution-context-common",
+                "scope": "common",
+                "docId": "kibKbnCoreExecutionContextCommonPluginApi",
+                "section": "def-common.KibanaExecutionContext",
+                "text": "KibanaExecutionContext"
+              },
+              " | undefined; query?: ",
+              {
+                "pluginId": "@kbn/es-query",
+                "scope": "common",
+                "docId": "kibKbnEsQueryPluginApi",
+                "section": "def-common.Query",
+                "text": "Query"
+              },
+              " | undefined; filters?: ",
+              {
+                "pluginId": "@kbn/es-query",
+                "scope": "common",
+                "docId": "kibKbnEsQueryPluginApi",
+                "section": "def-common.Filter",
+                "text": "Filter"
+              },
+              "[] | undefined; timeRange?: ",
+              {
+                "pluginId": "@kbn/es-query",
+                "scope": "common",
+                "docId": "kibKbnEsQueryPluginApi",
+                "section": "def-common.TimeRange",
+                "text": "TimeRange"
+              },
+              " | undefined; timeslice?: [number, number] | undefined; controlStyle?: ",
+              "ControlStyle",
+              " | undefined; ignoreParentSettings?: ",
+              "ParentIgnoreSettings",
+              " | undefined; }"
+            ],
+            "path": "src/plugins/controls/common/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "controls",
+            "id": "def-common.ControlInputTransform.$2",
+            "type": "string",
+            "tags": [],
+            "label": "controlType",
+            "description": [],
+            "path": "src/plugins/controls/common/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "controls",
         "id": "def-common.ControlWidth",
diff --git a/api_docs/controls.mdx b/api_docs/controls.mdx
index 3288f1d17baab..b7531a38a9fd2 100644
--- a/api_docs/controls.mdx
+++ b/api_docs/controls.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/controls
 title: "controls"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the controls plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'controls']
 ---
 import controlsObj from './controls.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kib
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 273 | 0 | 269 | 10 |
+| 301 | 0 | 294 | 13 |
 
 ## Client
 
diff --git a/api_docs/custom_integrations.mdx b/api_docs/custom_integrations.mdx
index e13ca8288243b..2e462d1ada11b 100644
--- a/api_docs/custom_integrations.mdx
+++ b/api_docs/custom_integrations.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/customIntegrations
 title: "customIntegrations"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the customIntegrations plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'customIntegrations']
 ---
 import customIntegrationsObj from './custom_integrations.devdocs.json';
diff --git a/api_docs/dashboard.devdocs.json b/api_docs/dashboard.devdocs.json
index a4f01007d7d75..477a7221a9ec3 100644
--- a/api_docs/dashboard.devdocs.json
+++ b/api_docs/dashboard.devdocs.json
@@ -1,1438 +1,7 @@
 {
   "id": "dashboard",
   "client": {
-    "classes": [
-      {
-        "parentPluginId": "dashboard",
-        "id": "def-public.DashboardContainer",
-        "type": "Class",
-        "tags": [],
-        "label": "DashboardContainer",
-        "description": [],
-        "signature": [
-          {
-            "pluginId": "dashboard",
-            "scope": "public",
-            "docId": "kibDashboardPluginApi",
-            "section": "def-public.DashboardContainer",
-            "text": "DashboardContainer"
-          },
-          " extends ",
-          {
-            "pluginId": "embeddable",
-            "scope": "public",
-            "docId": "kibEmbeddablePluginApi",
-            "section": "def-public.Container",
-            "text": "Container"
-          },
-          "<",
-          "InheritedChildInput",
-          ", ",
-          {
-            "pluginId": "dashboard",
-            "scope": "common",
-            "docId": "kibDashboardPluginApi",
-            "section": "def-common.DashboardContainerInput",
-            "text": "DashboardContainerInput"
-          },
-          ", ",
-          {
-            "pluginId": "embeddable",
-            "scope": "public",
-            "docId": "kibEmbeddablePluginApi",
-            "section": "def-public.ContainerOutput",
-            "text": "ContainerOutput"
-          },
-          ">"
-        ],
-        "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.type",
-            "type": "string",
-            "tags": [],
-            "label": "type",
-            "description": [],
-            "signature": [
-              "\"dashboard\""
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.controlGroup",
-            "type": "Object",
-            "tags": [],
-            "label": "controlGroup",
-            "description": [],
-            "signature": [
-              {
-                "pluginId": "controls",
-                "scope": "public",
-                "docId": "kibControlsPluginApi",
-                "section": "def-public.ControlGroupContainer",
-                "text": "ControlGroupContainer"
-              },
-              " | undefined"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.onDestroyControlGroup",
-            "type": "Function",
-            "tags": [],
-            "label": "onDestroyControlGroup",
-            "description": [],
-            "signature": [
-              "(() => void) | undefined"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.Unnamed",
-            "type": "Function",
-            "tags": [],
-            "label": "Constructor",
-            "description": [],
-            "signature": [
-              "any"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "dashboard",
-                "id": "def-public.DashboardContainer.Unnamed.$1",
-                "type": "CompoundType",
-                "tags": [],
-                "label": "initialInput",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "dashboard",
-                    "scope": "common",
-                    "docId": "kibDashboardPluginApi",
-                    "section": "def-common.DashboardContainerInput",
-                    "text": "DashboardContainerInput"
-                  }
-                ],
-                "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              },
-              {
-                "parentPluginId": "dashboard",
-                "id": "def-public.DashboardContainer.Unnamed.$2",
-                "type": "number",
-                "tags": [],
-                "label": "dashboardCreationStartTime",
-                "description": [],
-                "signature": [
-                  "number | undefined"
-                ],
-                "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": false
-              },
-              {
-                "parentPluginId": "dashboard",
-                "id": "def-public.DashboardContainer.Unnamed.$3",
-                "type": "Object",
-                "tags": [],
-                "label": "parent",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "embeddable",
-                    "scope": "public",
-                    "docId": "kibEmbeddablePluginApi",
-                    "section": "def-public.Container",
-                    "text": "Container"
-                  },
-                  "<{}, ",
-                  {
-                    "pluginId": "embeddable",
-                    "scope": "public",
-                    "docId": "kibEmbeddablePluginApi",
-                    "section": "def-public.ContainerInput",
-                    "text": "ContainerInput"
-                  },
-                  "<{}>, ",
-                  {
-                    "pluginId": "embeddable",
-                    "scope": "public",
-                    "docId": "kibEmbeddablePluginApi",
-                    "section": "def-public.ContainerOutput",
-                    "text": "ContainerOutput"
-                  },
-                  "> | undefined"
-                ],
-                "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": false
-              },
-              {
-                "parentPluginId": "dashboard",
-                "id": "def-public.DashboardContainer.Unnamed.$4",
-                "type": "Object",
-                "tags": [],
-                "label": "creationOptions",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "dashboard",
-                    "scope": "public",
-                    "docId": "kibDashboardPluginApi",
-                    "section": "def-public.DashboardCreationOptions",
-                    "text": "DashboardCreationOptions"
-                  },
-                  " | undefined"
-                ],
-                "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": false
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.getDashboardSavedObjectId",
-            "type": "Function",
-            "tags": [],
-            "label": "getDashboardSavedObjectId",
-            "description": [],
-            "signature": [
-              "() => string | undefined"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.getInputAsValueType",
-            "type": "Function",
-            "tags": [],
-            "label": "getInputAsValueType",
-            "description": [],
-            "signature": [
-              "() => ",
-              {
-                "pluginId": "dashboard",
-                "scope": "common",
-                "docId": "kibDashboardPluginApi",
-                "section": "def-common.DashboardContainerByValueInput",
-                "text": "DashboardContainerByValueInput"
-              }
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.untilInitialized",
-            "type": "Function",
-            "tags": [],
-            "label": "untilInitialized",
-            "description": [],
-            "signature": [
-              "() => Promise<void>"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.reportPerformanceMetrics",
-            "type": "Function",
-            "tags": [],
-            "label": "reportPerformanceMetrics",
-            "description": [],
-            "signature": [
-              "(stats: ",
-              "DashboardRenderPerformanceStats",
-              ") => void"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "dashboard",
-                "id": "def-public.DashboardContainer.reportPerformanceMetrics.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "stats",
-                "description": [],
-                "signature": [
-                  "DashboardRenderPerformanceStats"
-                ],
-                "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.createNewPanelState",
-            "type": "Function",
-            "tags": [],
-            "label": "createNewPanelState",
-            "description": [],
-            "signature": [
-              "<TEmbeddableInput extends ",
-              {
-                "pluginId": "embeddable",
-                "scope": "common",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-common.EmbeddableInput",
-                "text": "EmbeddableInput"
-              },
-              ", TEmbeddable extends ",
-              {
-                "pluginId": "embeddable",
-                "scope": "public",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-public.IEmbeddable",
-                "text": "IEmbeddable"
-              },
-              "<TEmbeddableInput, any, any>>(factory: ",
-              {
-                "pluginId": "embeddable",
-                "scope": "public",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-public.EmbeddableFactory",
-                "text": "EmbeddableFactory"
-              },
-              "<TEmbeddableInput, any, TEmbeddable, unknown>, partial?: Partial<TEmbeddableInput>) => ",
-              {
-                "pluginId": "dashboard",
-                "scope": "common",
-                "docId": "kibDashboardPluginApi",
-                "section": "def-common.DashboardPanelState",
-                "text": "DashboardPanelState"
-              },
-              "<TEmbeddableInput>"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "dashboard",
-                "id": "def-public.DashboardContainer.createNewPanelState.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "factory",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "embeddable",
-                    "scope": "public",
-                    "docId": "kibEmbeddablePluginApi",
-                    "section": "def-public.EmbeddableFactory",
-                    "text": "EmbeddableFactory"
-                  },
-                  "<TEmbeddableInput, any, TEmbeddable, unknown>"
-                ],
-                "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              },
-              {
-                "parentPluginId": "dashboard",
-                "id": "def-public.DashboardContainer.createNewPanelState.$2",
-                "type": "Object",
-                "tags": [],
-                "label": "partial",
-                "description": [],
-                "signature": [
-                  "Partial<TEmbeddableInput>"
-                ],
-                "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.getExplicitInputIsEqual",
-            "type": "Function",
-            "tags": [],
-            "label": "getExplicitInputIsEqual",
-            "description": [],
-            "signature": [
-              "(lastExplicitInput: ",
-              {
-                "pluginId": "dashboard",
-                "scope": "common",
-                "docId": "kibDashboardPluginApi",
-                "section": "def-common.DashboardContainerByValueInput",
-                "text": "DashboardContainerByValueInput"
-              },
-              ") => Promise<boolean>"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "dashboard",
-                "id": "def-public.DashboardContainer.getExplicitInputIsEqual.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "lastExplicitInput",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "dashboard",
-                    "scope": "common",
-                    "docId": "kibDashboardPluginApi",
-                    "section": "def-common.DashboardContainerByValueInput",
-                    "text": "DashboardContainerByValueInput"
-                  }
-                ],
-                "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.getReduxEmbeddableTools",
-            "type": "Function",
-            "tags": [],
-            "label": "getReduxEmbeddableTools",
-            "description": [],
-            "signature": [
-              "() => ",
-              {
-                "pluginId": "presentationUtil",
-                "scope": "public",
-                "docId": "kibPresentationUtilPluginApi",
-                "section": "def-public.ReduxEmbeddableTools",
-                "text": "ReduxEmbeddableTools"
-              },
-              "<",
-              "DashboardReduxState",
-              ", { setControlGroupState: (state: ",
-              "DashboardReduxState",
-              ", action: { payload: ",
-              {
-                "pluginId": "controls",
-                "scope": "common",
-                "docId": "kibControlsPluginApi",
-                "section": "def-common.PersistableControlGroupInput",
-                "text": "PersistableControlGroupInput"
-              },
-              " | undefined; type: string; }) => void; setPanels: (state: ",
-              "DashboardReduxState",
-              ", action: { payload: ",
-              {
-                "pluginId": "dashboard",
-                "scope": "common",
-                "docId": "kibDashboardPluginApi",
-                "section": "def-common.DashboardPanelMap",
-                "text": "DashboardPanelMap"
-              },
-              "; type: string; }) => void; setStateFromSaveModal: (state: ",
-              "DashboardReduxState",
-              ", action: { payload: ",
-              "DashboardStateFromSaveModal",
-              "; type: string; }) => void; setStateFromSettingsFlyout: (state: ",
-              "DashboardReduxState",
-              ", action: { payload: ",
-              "DashboardStateFromSettingsFlyout",
-              "; type: string; }) => void; setDescription: (state: ",
-              "DashboardReduxState",
-              ", action: { payload: string | undefined; type: string; }) => void; setViewMode: (state: ",
-              "DashboardReduxState",
-              ", action: { payload: ",
-              {
-                "pluginId": "embeddable",
-                "scope": "common",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-common.ViewMode",
-                "text": "ViewMode"
-              },
-              "; type: string; }) => void; setTags: (state: ",
-              "DashboardReduxState",
-              ", action: { payload: string[]; type: string; }) => void; setTitle: (state: ",
-              "DashboardReduxState",
-              ", action: { payload: string; type: string; }) => void; setSearchSessionId: (state: ",
-              "DashboardReduxState",
-              ", action: { payload: string | undefined; type: string; }) => void; setHasUnsavedChanges: (state: ",
-              "DashboardReduxState",
-              ", action: { payload: boolean | undefined; type: string; }) => void; setLastSavedInput: (state: ",
-              "DashboardReduxState",
-              ", action: { payload: ",
-              {
-                "pluginId": "dashboard",
-                "scope": "common",
-                "docId": "kibDashboardPluginApi",
-                "section": "def-common.DashboardContainerByValueInput",
-                "text": "DashboardContainerByValueInput"
-              },
-              "; type: string; }) => void; resetToLastSavedInput: (state: ",
-              "DashboardReduxState",
-              ") => void; setFiltersAndQuery: (state: ",
-              "DashboardReduxState",
-              ", action: { payload: Pick<",
-              {
-                "pluginId": "dashboard",
-                "scope": "common",
-                "docId": "kibDashboardPluginApi",
-                "section": "def-common.DashboardContainerByValueInput",
-                "text": "DashboardContainerByValueInput"
-              },
-              ", \"query\" | \"filters\">; type: string; }) => void; setLastReloadRequestTimeToNow: (state: ",
-              "DashboardReduxState",
-              ") => void; setFilters: (state: ",
-              "DashboardReduxState",
-              ", action: { payload: ",
-              {
-                "pluginId": "@kbn/es-query",
-                "scope": "common",
-                "docId": "kibKbnEsQueryPluginApi",
-                "section": "def-common.Filter",
-                "text": "Filter"
-              },
-              "[]; type: string; }) => void; setQuery: (state: ",
-              "DashboardReduxState",
-              ", action: { payload: ",
-              {
-                "pluginId": "@kbn/es-query",
-                "scope": "common",
-                "docId": "kibKbnEsQueryPluginApi",
-                "section": "def-common.Query",
-                "text": "Query"
-              },
-              "; type: string; }) => void; setSavedQueryId: (state: ",
-              "DashboardReduxState",
-              ", action: { payload: string | undefined; type: string; }) => void; setTimeRestore: (state: ",
-              "DashboardReduxState",
-              ", action: { payload: boolean; type: string; }) => void; setTimeRange: (state: ",
-              "DashboardReduxState",
-              ", action: { payload: ",
-              {
-                "pluginId": "@kbn/es-query",
-                "scope": "common",
-                "docId": "kibKbnEsQueryPluginApi",
-                "section": "def-common.TimeRange",
-                "text": "TimeRange"
-              },
-              " | undefined; type: string; }) => void; setRefreshInterval: (state: ",
-              "DashboardReduxState",
-              ", action: { payload: ",
-              {
-                "pluginId": "data",
-                "scope": "common",
-                "docId": "kibDataQueryPluginApi",
-                "section": "def-common.RefreshInterval",
-                "text": "RefreshInterval"
-              },
-              " | undefined; type: string; }) => void; setTimeslice: (state: ",
-              "DashboardReduxState",
-              ", action: { payload: [number, number] | undefined; type: string; }) => void; setExpandedPanelId: (state: ",
-              "DashboardReduxState",
-              ", action: { payload: string | undefined; type: string; }) => void; setFullScreenMode: (state: ",
-              "DashboardReduxState",
-              ", action: { payload: boolean; type: string; }) => void; setHasOverlays: (state: ",
-              "DashboardReduxState",
-              ", action: { payload: boolean; type: string; }) => void; }>"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.render",
-            "type": "Function",
-            "tags": [],
-            "label": "render",
-            "description": [],
-            "signature": [
-              "(dom: HTMLElement) => void"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "dashboard",
-                "id": "def-public.DashboardContainer.render.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "dom",
-                "description": [],
-                "signature": [
-                  "HTMLElement"
-                ],
-                "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.getInheritedInput",
-            "type": "Function",
-            "tags": [],
-            "label": "getInheritedInput",
-            "description": [],
-            "signature": [
-              "(id: string) => ",
-              "InheritedChildInput"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "dashboard",
-                "id": "def-public.DashboardContainer.getInheritedInput.$1",
-                "type": "string",
-                "tags": [],
-                "label": "id",
-                "description": [],
-                "signature": [
-                  "string"
-                ],
-                "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.destroy",
-            "type": "Function",
-            "tags": [],
-            "label": "destroy",
-            "description": [],
-            "signature": [
-              "() => void"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.isExpectingIdChange",
-            "type": "Function",
-            "tags": [],
-            "label": "isExpectingIdChange",
-            "description": [
-              "\nSometimes when the ID changes, it's due to a clone operation, or a save as operation. In these cases,\nmost of the state hasn't actually changed, so there isn't any reason to destroy this container and\nload up a fresh one. When an id change is in progress, the renderer can check this method, and if it returns\ntrue, the renderer can safely skip destroying and rebuilding the container."
-            ],
-            "signature": [
-              "() => boolean"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.expectIdChange",
-            "type": "Function",
-            "tags": [],
-            "label": "expectIdChange",
-            "description": [],
-            "signature": [
-              "() => void"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.runClone",
-            "type": "Function",
-            "tags": [],
-            "label": "runClone",
-            "description": [],
-            "signature": [
-              "(this: ",
-              {
-                "pluginId": "dashboard",
-                "scope": "public",
-                "docId": "kibDashboardPluginApi",
-                "section": "def-public.DashboardContainer",
-                "text": "DashboardContainer"
-              },
-              ") => Promise<",
-              "SaveDashboardReturn",
-              " | undefined>"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "returnComment": [],
-            "children": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.runSaveAs",
-            "type": "Function",
-            "tags": [],
-            "label": "runSaveAs",
-            "description": [],
-            "signature": [
-              "(this: ",
-              {
-                "pluginId": "dashboard",
-                "scope": "public",
-                "docId": "kibDashboardPluginApi",
-                "section": "def-public.DashboardContainer",
-                "text": "DashboardContainer"
-              },
-              ") => Promise<",
-              "SaveDashboardReturn",
-              " | undefined>"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "returnComment": [],
-            "children": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.runQuickSave",
-            "type": "Function",
-            "tags": [],
-            "label": "runQuickSave",
-            "description": [],
-            "signature": [
-              "(this: ",
-              {
-                "pluginId": "dashboard",
-                "scope": "public",
-                "docId": "kibDashboardPluginApi",
-                "section": "def-public.DashboardContainer",
-                "text": "DashboardContainer"
-              },
-              ") => Promise<",
-              "SaveDashboardReturn",
-              ">"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "returnComment": [],
-            "children": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.showSettings",
-            "type": "Function",
-            "tags": [],
-            "label": "showSettings",
-            "description": [],
-            "signature": [
-              "(this: ",
-              {
-                "pluginId": "dashboard",
-                "scope": "public",
-                "docId": "kibDashboardPluginApi",
-                "section": "def-public.DashboardContainer",
-                "text": "DashboardContainer"
-              },
-              ") => void"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "returnComment": [],
-            "children": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.addFromLibrary",
-            "type": "Function",
-            "tags": [],
-            "label": "addFromLibrary",
-            "description": [],
-            "signature": [
-              "(this: ",
-              {
-                "pluginId": "dashboard",
-                "scope": "public",
-                "docId": "kibDashboardPluginApi",
-                "section": "def-public.DashboardContainer",
-                "text": "DashboardContainer"
-              },
-              ") => void"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "returnComment": [],
-            "children": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.replacePanel",
-            "type": "Function",
-            "tags": [],
-            "label": "replacePanel",
-            "description": [],
-            "signature": [
-              "(this: ",
-              {
-                "pluginId": "dashboard",
-                "scope": "public",
-                "docId": "kibDashboardPluginApi",
-                "section": "def-public.DashboardContainer",
-                "text": "DashboardContainer"
-              },
-              ", previousPanelState: ",
-              {
-                "pluginId": "dashboard",
-                "scope": "common",
-                "docId": "kibDashboardPluginApi",
-                "section": "def-common.DashboardPanelState",
-                "text": "DashboardPanelState"
-              },
-              "<",
-              {
-                "pluginId": "embeddable",
-                "scope": "common",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-common.EmbeddableInput",
-                "text": "EmbeddableInput"
-              },
-              ">, newPanelState: Partial<",
-              {
-                "pluginId": "embeddable",
-                "scope": "common",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-common.PanelState",
-                "text": "PanelState"
-              },
-              "<{ id: string; }>>, generateNewId?: boolean | undefined) => Promise<string>"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "returnComment": [],
-            "children": [
-              {
-                "parentPluginId": "dashboard",
-                "id": "def-public.DashboardContainer.replacePanel.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "previousPanelState",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "dashboard",
-                    "scope": "common",
-                    "docId": "kibDashboardPluginApi",
-                    "section": "def-common.DashboardPanelState",
-                    "text": "DashboardPanelState"
-                  },
-                  "<",
-                  {
-                    "pluginId": "embeddable",
-                    "scope": "common",
-                    "docId": "kibEmbeddablePluginApi",
-                    "section": "def-common.EmbeddableInput",
-                    "text": "EmbeddableInput"
-                  },
-                  ">"
-                ],
-                "path": "src/plugins/dashboard/public/dashboard_container/embeddable/api/panel_management.ts",
-                "deprecated": false,
-                "trackAdoption": false
-              },
-              {
-                "parentPluginId": "dashboard",
-                "id": "def-public.DashboardContainer.replacePanel.$2",
-                "type": "Object",
-                "tags": [],
-                "label": "newPanelState",
-                "description": [],
-                "signature": [
-                  "{ type?: string | undefined; explicitInput?: (Partial<{ id: string; }> & { id: string; }) | undefined; }"
-                ],
-                "path": "src/plugins/dashboard/public/dashboard_container/embeddable/api/panel_management.ts",
-                "deprecated": false,
-                "trackAdoption": false
-              },
-              {
-                "parentPluginId": "dashboard",
-                "id": "def-public.DashboardContainer.replacePanel.$3",
-                "type": "CompoundType",
-                "tags": [],
-                "label": "generateNewId",
-                "description": [],
-                "signature": [
-                  "boolean | undefined"
-                ],
-                "path": "src/plugins/dashboard/public/dashboard_container/embeddable/api/panel_management.ts",
-                "deprecated": false,
-                "trackAdoption": false
-              }
-            ]
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.showPlaceholderUntil",
-            "type": "Function",
-            "tags": [],
-            "label": "showPlaceholderUntil",
-            "description": [],
-            "signature": [
-              "<TPlacementMethodArgs extends ",
-              "IPanelPlacementArgs",
-              ">(this: ",
-              {
-                "pluginId": "dashboard",
-                "scope": "public",
-                "docId": "kibDashboardPluginApi",
-                "section": "def-public.DashboardContainer",
-                "text": "DashboardContainer"
-              },
-              ", newStateComplete: Promise<Partial<",
-              {
-                "pluginId": "embeddable",
-                "scope": "common",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-common.PanelState",
-                "text": "PanelState"
-              },
-              "<{ id: string; }>>>, placementMethod?: ",
-              "PanelPlacementMethod",
-              "<TPlacementMethodArgs> | undefined, placementArgs?: TPlacementMethodArgs | undefined) => void"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "returnComment": [],
-            "children": [
-              {
-                "parentPluginId": "dashboard",
-                "id": "def-public.DashboardContainer.showPlaceholderUntil.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "newStateComplete",
-                "description": [],
-                "signature": [
-                  "Promise<Partial<",
-                  {
-                    "pluginId": "embeddable",
-                    "scope": "common",
-                    "docId": "kibEmbeddablePluginApi",
-                    "section": "def-common.PanelState",
-                    "text": "PanelState"
-                  },
-                  "<{ id: string; }>>>"
-                ],
-                "path": "src/plugins/dashboard/public/dashboard_container/embeddable/api/panel_management.ts",
-                "deprecated": false,
-                "trackAdoption": false
-              },
-              {
-                "parentPluginId": "dashboard",
-                "id": "def-public.DashboardContainer.showPlaceholderUntil.$2",
-                "type": "Function",
-                "tags": [],
-                "label": "placementMethod",
-                "description": [],
-                "signature": [
-                  "PanelPlacementMethod",
-                  "<TPlacementMethodArgs> | undefined"
-                ],
-                "path": "src/plugins/dashboard/public/dashboard_container/embeddable/api/panel_management.ts",
-                "deprecated": false,
-                "trackAdoption": false
-              },
-              {
-                "parentPluginId": "dashboard",
-                "id": "def-public.DashboardContainer.showPlaceholderUntil.$3",
-                "type": "Uncategorized",
-                "tags": [],
-                "label": "placementArgs",
-                "description": [],
-                "signature": [
-                  "TPlacementMethodArgs | undefined"
-                ],
-                "path": "src/plugins/dashboard/public/dashboard_container/embeddable/api/panel_management.ts",
-                "deprecated": false,
-                "trackAdoption": false
-              }
-            ]
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.addOrUpdateEmbeddable",
-            "type": "Function",
-            "tags": [],
-            "label": "addOrUpdateEmbeddable",
-            "description": [],
-            "signature": [
-              "<EEI extends ",
-              {
-                "pluginId": "embeddable",
-                "scope": "common",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-common.EmbeddableInput",
-                "text": "EmbeddableInput"
-              },
-              " = ",
-              {
-                "pluginId": "embeddable",
-                "scope": "common",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-common.EmbeddableInput",
-                "text": "EmbeddableInput"
-              },
-              ", EEO extends ",
-              {
-                "pluginId": "embeddable",
-                "scope": "public",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-public.EmbeddableOutput",
-                "text": "EmbeddableOutput"
-              },
-              " = ",
-              {
-                "pluginId": "embeddable",
-                "scope": "public",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-public.EmbeddableOutput",
-                "text": "EmbeddableOutput"
-              },
-              ", E extends ",
-              {
-                "pluginId": "embeddable",
-                "scope": "public",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-public.IEmbeddable",
-                "text": "IEmbeddable"
-              },
-              "<EEI, EEO, any> = ",
-              {
-                "pluginId": "embeddable",
-                "scope": "public",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-public.IEmbeddable",
-                "text": "IEmbeddable"
-              },
-              "<EEI, EEO, any>>(this: ",
-              {
-                "pluginId": "dashboard",
-                "scope": "public",
-                "docId": "kibDashboardPluginApi",
-                "section": "def-public.DashboardContainer",
-                "text": "DashboardContainer"
-              },
-              ", type: string, explicitInput: Partial<EEI>, embeddableId?: string | undefined) => Promise<string | ",
-              {
-                "pluginId": "embeddable",
-                "scope": "public",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-public.ErrorEmbeddable",
-                "text": "ErrorEmbeddable"
-              },
-              " | E>"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "returnComment": [],
-            "children": [
-              {
-                "parentPluginId": "dashboard",
-                "id": "def-public.DashboardContainer.addOrUpdateEmbeddable.$1",
-                "type": "string",
-                "tags": [],
-                "label": "type",
-                "description": [],
-                "path": "src/plugins/dashboard/public/dashboard_container/embeddable/api/panel_management.ts",
-                "deprecated": false,
-                "trackAdoption": false
-              },
-              {
-                "parentPluginId": "dashboard",
-                "id": "def-public.DashboardContainer.addOrUpdateEmbeddable.$2",
-                "type": "Object",
-                "tags": [],
-                "label": "explicitInput",
-                "description": [],
-                "signature": [
-                  "{ [P in keyof EEI]?: EEI[P] | undefined; }"
-                ],
-                "path": "src/plugins/dashboard/public/dashboard_container/embeddable/api/panel_management.ts",
-                "deprecated": false,
-                "trackAdoption": false
-              },
-              {
-                "parentPluginId": "dashboard",
-                "id": "def-public.DashboardContainer.addOrUpdateEmbeddable.$3",
-                "type": "string",
-                "tags": [],
-                "label": "embeddableId",
-                "description": [],
-                "signature": [
-                  "string | undefined"
-                ],
-                "path": "src/plugins/dashboard/public/dashboard_container/embeddable/api/panel_management.ts",
-                "deprecated": false,
-                "trackAdoption": false
-              }
-            ]
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.forceRefresh",
-            "type": "Function",
-            "tags": [],
-            "label": "forceRefresh",
-            "description": [],
-            "signature": [
-              "(refreshControlGroup?: boolean) => void"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "dashboard",
-                "id": "def-public.DashboardContainer.forceRefresh.$1",
-                "type": "boolean",
-                "tags": [],
-                "label": "refreshControlGroup",
-                "description": [],
-                "signature": [
-                  "boolean"
-                ],
-                "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.onDataViewsUpdate$",
-            "type": "Object",
-            "tags": [],
-            "label": "onDataViewsUpdate$",
-            "description": [],
-            "signature": [
-              "Subject",
-              "<",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              "[]>"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.resetToLastSavedState",
-            "type": "Function",
-            "tags": [],
-            "label": "resetToLastSavedState",
-            "description": [],
-            "signature": [
-              "() => void"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.getAllDataViews",
-            "type": "Function",
-            "tags": [],
-            "label": "getAllDataViews",
-            "description": [
-              "\nGets all the dataviews that are actively being used in the dashboard"
-            ],
-            "signature": [
-              "() => ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              "[]"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": [
-              "An array of dataviews"
-            ]
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.setAllDataViews",
-            "type": "Function",
-            "tags": [],
-            "label": "setAllDataViews",
-            "description": [
-              "\nUse this to set the dataviews that are used in the dashboard when they change/update"
-            ],
-            "signature": [
-              "(newDataViews: ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              "[]) => void"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "dashboard",
-                "id": "def-public.DashboardContainer.setAllDataViews.$1",
-                "type": "Array",
-                "tags": [],
-                "label": "newDataViews",
-                "description": [
-                  "The new array of dataviews that will overwrite the old dataviews array"
-                ],
-                "signature": [
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.DataView",
-                    "text": "DataView"
-                  },
-                  "[]"
-                ],
-                "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.getExpandedPanelId",
-            "type": "Function",
-            "tags": [],
-            "label": "getExpandedPanelId",
-            "description": [],
-            "signature": [
-              "() => string | undefined"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.openOverlay",
-            "type": "Function",
-            "tags": [],
-            "label": "openOverlay",
-            "description": [],
-            "signature": [
-              "(ref: ",
-              {
-                "pluginId": "@kbn/core-mount-utils-browser",
-                "scope": "common",
-                "docId": "kibKbnCoreMountUtilsBrowserPluginApi",
-                "section": "def-common.OverlayRef",
-                "text": "OverlayRef"
-              },
-              ") => void"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "dashboard",
-                "id": "def-public.DashboardContainer.openOverlay.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "ref",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "@kbn/core-mount-utils-browser",
-                    "scope": "common",
-                    "docId": "kibKbnCoreMountUtilsBrowserPluginApi",
-                    "section": "def-common.OverlayRef",
-                    "text": "OverlayRef"
-                  }
-                ],
-                "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.clearOverlays",
-            "type": "Function",
-            "tags": [],
-            "label": "clearOverlays",
-            "description": [],
-            "signature": [
-              "() => void"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.setExpandedPanelId",
-            "type": "Function",
-            "tags": [],
-            "label": "setExpandedPanelId",
-            "description": [],
-            "signature": [
-              "(newId?: string | undefined) => void"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "dashboard",
-                "id": "def-public.DashboardContainer.setExpandedPanelId.$1",
-                "type": "string",
-                "tags": [],
-                "label": "newId",
-                "description": [],
-                "signature": [
-                  "string | undefined"
-                ],
-                "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": false
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.getPanelCount",
-            "type": "Function",
-            "tags": [],
-            "label": "getPanelCount",
-            "description": [],
-            "signature": [
-              "() => number"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.getPanelTitles",
-            "type": "Function",
-            "tags": [],
-            "label": "getPanelTitles",
-            "description": [],
-            "signature": [
-              "() => Promise<string[]>"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          }
-        ],
-        "initialIsOpen": false
-      }
-    ],
+    "classes": [],
     "functions": [
       {
         "parentPluginId": "dashboard",
@@ -1552,26 +121,32 @@
       },
       {
         "parentPluginId": "dashboard",
-        "id": "def-public.LazyDashboardContainerRenderer",
+        "id": "def-public.DashboardRenderer",
         "type": "Function",
         "tags": [],
-        "label": "LazyDashboardContainerRenderer",
+        "label": "DashboardRenderer",
         "description": [],
         "signature": [
-          "React.ExoticComponent<",
-          "DashboardContainerRendererProps",
-          "> & { readonly _result: ({ savedObjectId, getCreationOptions, onDashboardContainerLoaded, }: ",
-          "DashboardContainerRendererProps",
-          ") => JSX.Element; }"
+          "React.ForwardRefExoticComponent<",
+          "DashboardRendererProps",
+          " & React.RefAttributes<",
+          {
+            "pluginId": "dashboard",
+            "scope": "public",
+            "docId": "kibDashboardPluginApi",
+            "section": "def-public.AwaitingDashboardAPI",
+            "text": "AwaitingDashboardAPI"
+          },
+          ">>"
         ],
-        "path": "src/plugins/dashboard/public/dashboard_container/index.ts",
+        "path": "src/plugins/dashboard/public/dashboard_container/external_api/dashboard_renderer.tsx",
         "deprecated": false,
         "trackAdoption": false,
         "returnComment": [],
         "children": [
           {
             "parentPluginId": "dashboard",
-            "id": "def-public.LazyDashboardContainerRenderer.$1",
+            "id": "def-public.DashboardRenderer.$1",
             "type": "Uncategorized",
             "tags": [],
             "label": "props",
@@ -1585,159 +160,6 @@
           }
         ],
         "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "dashboard",
-        "id": "def-public.useDashboardContainerContext",
-        "type": "Function",
-        "tags": [],
-        "label": "useDashboardContainerContext",
-        "description": [],
-        "signature": [
-          "() => ",
-          "ReduxEmbeddableContext",
-          "<",
-          "DashboardReduxState",
-          ", { setControlGroupState: (state: ",
-          "DashboardReduxState",
-          ", action: { payload: ",
-          {
-            "pluginId": "controls",
-            "scope": "common",
-            "docId": "kibControlsPluginApi",
-            "section": "def-common.PersistableControlGroupInput",
-            "text": "PersistableControlGroupInput"
-          },
-          " | undefined; type: string; }) => void; setPanels: (state: ",
-          "DashboardReduxState",
-          ", action: { payload: ",
-          {
-            "pluginId": "dashboard",
-            "scope": "common",
-            "docId": "kibDashboardPluginApi",
-            "section": "def-common.DashboardPanelMap",
-            "text": "DashboardPanelMap"
-          },
-          "; type: string; }) => void; setStateFromSaveModal: (state: ",
-          "DashboardReduxState",
-          ", action: { payload: ",
-          "DashboardStateFromSaveModal",
-          "; type: string; }) => void; setStateFromSettingsFlyout: (state: ",
-          "DashboardReduxState",
-          ", action: { payload: ",
-          "DashboardStateFromSettingsFlyout",
-          "; type: string; }) => void; setDescription: (state: ",
-          "DashboardReduxState",
-          ", action: { payload: string | undefined; type: string; }) => void; setViewMode: (state: ",
-          "DashboardReduxState",
-          ", action: { payload: ",
-          {
-            "pluginId": "embeddable",
-            "scope": "common",
-            "docId": "kibEmbeddablePluginApi",
-            "section": "def-common.ViewMode",
-            "text": "ViewMode"
-          },
-          "; type: string; }) => void; setTags: (state: ",
-          "DashboardReduxState",
-          ", action: { payload: string[]; type: string; }) => void; setTitle: (state: ",
-          "DashboardReduxState",
-          ", action: { payload: string; type: string; }) => void; setSearchSessionId: (state: ",
-          "DashboardReduxState",
-          ", action: { payload: string | undefined; type: string; }) => void; setHasUnsavedChanges: (state: ",
-          "DashboardReduxState",
-          ", action: { payload: boolean | undefined; type: string; }) => void; setLastSavedInput: (state: ",
-          "DashboardReduxState",
-          ", action: { payload: ",
-          {
-            "pluginId": "dashboard",
-            "scope": "common",
-            "docId": "kibDashboardPluginApi",
-            "section": "def-common.DashboardContainerByValueInput",
-            "text": "DashboardContainerByValueInput"
-          },
-          "; type: string; }) => void; resetToLastSavedInput: (state: ",
-          "DashboardReduxState",
-          ") => void; setFiltersAndQuery: (state: ",
-          "DashboardReduxState",
-          ", action: { payload: Pick<",
-          {
-            "pluginId": "dashboard",
-            "scope": "common",
-            "docId": "kibDashboardPluginApi",
-            "section": "def-common.DashboardContainerByValueInput",
-            "text": "DashboardContainerByValueInput"
-          },
-          ", \"query\" | \"filters\">; type: string; }) => void; setLastReloadRequestTimeToNow: (state: ",
-          "DashboardReduxState",
-          ") => void; setFilters: (state: ",
-          "DashboardReduxState",
-          ", action: { payload: ",
-          {
-            "pluginId": "@kbn/es-query",
-            "scope": "common",
-            "docId": "kibKbnEsQueryPluginApi",
-            "section": "def-common.Filter",
-            "text": "Filter"
-          },
-          "[]; type: string; }) => void; setQuery: (state: ",
-          "DashboardReduxState",
-          ", action: { payload: ",
-          {
-            "pluginId": "@kbn/es-query",
-            "scope": "common",
-            "docId": "kibKbnEsQueryPluginApi",
-            "section": "def-common.Query",
-            "text": "Query"
-          },
-          "; type: string; }) => void; setSavedQueryId: (state: ",
-          "DashboardReduxState",
-          ", action: { payload: string | undefined; type: string; }) => void; setTimeRestore: (state: ",
-          "DashboardReduxState",
-          ", action: { payload: boolean; type: string; }) => void; setTimeRange: (state: ",
-          "DashboardReduxState",
-          ", action: { payload: ",
-          {
-            "pluginId": "@kbn/es-query",
-            "scope": "common",
-            "docId": "kibKbnEsQueryPluginApi",
-            "section": "def-common.TimeRange",
-            "text": "TimeRange"
-          },
-          " | undefined; type: string; }) => void; setRefreshInterval: (state: ",
-          "DashboardReduxState",
-          ", action: { payload: ",
-          {
-            "pluginId": "data",
-            "scope": "common",
-            "docId": "kibDataQueryPluginApi",
-            "section": "def-common.RefreshInterval",
-            "text": "RefreshInterval"
-          },
-          " | undefined; type: string; }) => void; setTimeslice: (state: ",
-          "DashboardReduxState",
-          ", action: { payload: [number, number] | undefined; type: string; }) => void; setExpandedPanelId: (state: ",
-          "DashboardReduxState",
-          ", action: { payload: string | undefined; type: string; }) => void; setFullScreenMode: (state: ",
-          "DashboardReduxState",
-          ", action: { payload: boolean; type: string; }) => void; setHasOverlays: (state: ",
-          "DashboardReduxState",
-          ", action: { payload: boolean; type: string; }) => void; }, ",
-          {
-            "pluginId": "dashboard",
-            "scope": "public",
-            "docId": "kibDashboardPluginApi",
-            "section": "def-public.DashboardContainer",
-            "text": "DashboardContainer"
-          },
-          ">"
-        ],
-        "path": "src/plugins/dashboard/public/dashboard_container/dashboard_container_context.tsx",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [],
-        "returnComment": [],
-        "initialIsOpen": false
       }
     ],
     "interfaces": [
@@ -1755,7 +177,7 @@
           {
             "parentPluginId": "dashboard",
             "id": "def-public.DashboardCreationOptions.initialInput",
-            "type": "CompoundType",
+            "type": "Object",
             "tags": [],
             "label": "initialInput",
             "description": [],
@@ -1774,28 +196,6 @@
             "deprecated": false,
             "trackAdoption": false
           },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardCreationOptions.overrideInput",
-            "type": "Object",
-            "tags": [],
-            "label": "overrideInput",
-            "description": [],
-            "signature": [
-              "Partial<",
-              {
-                "pluginId": "dashboard",
-                "scope": "common",
-                "docId": "kibDashboardPluginApi",
-                "section": "def-common.DashboardContainerByValueInput",
-                "text": "DashboardContainerByValueInput"
-              },
-              "> | undefined"
-            ],
-            "path": "src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container_factory.tsx",
-            "deprecated": false,
-            "trackAdoption": false
-          },
           {
             "parentPluginId": "dashboard",
             "id": "def-public.DashboardCreationOptions.incomingEmbeddable",
@@ -1842,13 +242,7 @@
               "{ sessionIdToRestore?: string | undefined; sessionIdUrlChangeObservable?: ",
               "Observable",
               "<string | undefined> | undefined; getSearchSessionIdFromURL: () => string | undefined; removeSessionIdFromUrl: () => void; createSessionRestorationDataProvider: (container: ",
-              {
-                "pluginId": "dashboard",
-                "scope": "public",
-                "docId": "kibDashboardPluginApi",
-                "section": "def-public.DashboardContainer",
-                "text": "DashboardContainer"
-              },
+              "DashboardContainer",
               ") => ",
               {
                 "pluginId": "data",
@@ -2000,6 +394,22 @@
     ],
     "enums": [],
     "misc": [
+      {
+        "parentPluginId": "dashboard",
+        "id": "def-public.AwaitingDashboardAPI",
+        "type": "Type",
+        "tags": [],
+        "label": "AwaitingDashboardAPI",
+        "description": [],
+        "signature": [
+          "DashboardContainer",
+          " | null"
+        ],
+        "path": "src/plugins/dashboard/public/dashboard_container/external_api/dashboard_api.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "dashboard",
         "id": "def-public.DASHBOARD_APP_ID",
@@ -2030,6 +440,21 @@
         "trackAdoption": false,
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "dashboard",
+        "id": "def-public.DashboardAPI",
+        "type": "Type",
+        "tags": [],
+        "label": "DashboardAPI",
+        "description": [],
+        "signature": [
+          "DashboardContainer"
+        ],
+        "path": "src/plugins/dashboard/public/dashboard_container/external_api/dashboard_api.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "dashboard",
         "id": "def-public.DashboardAppLocator",
@@ -2073,8 +498,8 @@
             "pluginId": "dashboard",
             "scope": "common",
             "docId": "kibDashboardPluginApi",
-            "section": "def-common.DashboardContainerByValueInput",
-            "text": "DashboardContainerByValueInput"
+            "section": "def-common.DashboardContainerInput",
+            "text": "DashboardContainerInput"
           },
           ", \"executionContext\" | \"panels\" | \"controlGroupInput\" | \"isEmbeddedExternally\">> & { dashboardId?: string | undefined; useHash?: boolean | undefined; preserveSavedFilters?: boolean | undefined; searchSessionId?: string | undefined; panels?: (",
           {
@@ -3120,18 +1545,18 @@
       },
       {
         "parentPluginId": "dashboard",
-        "id": "def-common.DashboardContainerByValueInput",
+        "id": "def-common.DashboardContainerInput",
         "type": "Interface",
         "tags": [],
-        "label": "DashboardContainerByValueInput",
+        "label": "DashboardContainerInput",
         "description": [],
         "signature": [
           {
             "pluginId": "dashboard",
             "scope": "common",
             "docId": "kibDashboardPluginApi",
-            "section": "def-common.DashboardContainerByValueInput",
-            "text": "DashboardContainerByValueInput"
+            "section": "def-common.DashboardContainerInput",
+            "text": "DashboardContainerInput"
           },
           " extends ",
           {
@@ -3148,7 +1573,7 @@
         "children": [
           {
             "parentPluginId": "dashboard",
-            "id": "def-common.DashboardContainerByValueInput.query",
+            "id": "def-common.DashboardContainerInput.query",
             "type": "Object",
             "tags": [],
             "label": "query",
@@ -3162,7 +1587,7 @@
           },
           {
             "parentPluginId": "dashboard",
-            "id": "def-common.DashboardContainerByValueInput.filters",
+            "id": "def-common.DashboardContainerInput.filters",
             "type": "Array",
             "tags": [],
             "label": "filters",
@@ -3183,7 +1608,7 @@
           },
           {
             "parentPluginId": "dashboard",
-            "id": "def-common.DashboardContainerByValueInput.timeRestore",
+            "id": "def-common.DashboardContainerInput.timeRestore",
             "type": "boolean",
             "tags": [],
             "label": "timeRestore",
@@ -3194,7 +1619,7 @@
           },
           {
             "parentPluginId": "dashboard",
-            "id": "def-common.DashboardContainerByValueInput.timeRange",
+            "id": "def-common.DashboardContainerInput.timeRange",
             "type": "Object",
             "tags": [],
             "label": "timeRange",
@@ -3215,7 +1640,7 @@
           },
           {
             "parentPluginId": "dashboard",
-            "id": "def-common.DashboardContainerByValueInput.timeslice",
+            "id": "def-common.DashboardContainerInput.timeslice",
             "type": "Object",
             "tags": [],
             "label": "timeslice",
@@ -3229,7 +1654,7 @@
           },
           {
             "parentPluginId": "dashboard",
-            "id": "def-common.DashboardContainerByValueInput.refreshInterval",
+            "id": "def-common.DashboardContainerInput.refreshInterval",
             "type": "Object",
             "tags": [],
             "label": "refreshInterval",
@@ -3250,7 +1675,7 @@
           },
           {
             "parentPluginId": "dashboard",
-            "id": "def-common.DashboardContainerByValueInput.title",
+            "id": "def-common.DashboardContainerInput.title",
             "type": "string",
             "tags": [],
             "label": "title",
@@ -3261,7 +1686,7 @@
           },
           {
             "parentPluginId": "dashboard",
-            "id": "def-common.DashboardContainerByValueInput.tags",
+            "id": "def-common.DashboardContainerInput.tags",
             "type": "Array",
             "tags": [],
             "label": "tags",
@@ -3275,7 +1700,7 @@
           },
           {
             "parentPluginId": "dashboard",
-            "id": "def-common.DashboardContainerByValueInput.viewMode",
+            "id": "def-common.DashboardContainerInput.viewMode",
             "type": "Enum",
             "tags": [],
             "label": "viewMode",
@@ -3295,7 +1720,7 @@
           },
           {
             "parentPluginId": "dashboard",
-            "id": "def-common.DashboardContainerByValueInput.description",
+            "id": "def-common.DashboardContainerInput.description",
             "type": "string",
             "tags": [],
             "label": "description",
@@ -3309,7 +1734,7 @@
           },
           {
             "parentPluginId": "dashboard",
-            "id": "def-common.DashboardContainerByValueInput.isEmbeddedExternally",
+            "id": "def-common.DashboardContainerInput.isEmbeddedExternally",
             "type": "CompoundType",
             "tags": [],
             "label": "isEmbeddedExternally",
@@ -3323,7 +1748,7 @@
           },
           {
             "parentPluginId": "dashboard",
-            "id": "def-common.DashboardContainerByValueInput.executionContext",
+            "id": "def-common.DashboardContainerInput.executionContext",
             "type": "Object",
             "tags": [],
             "label": "executionContext",
@@ -3344,7 +1769,7 @@
           },
           {
             "parentPluginId": "dashboard",
-            "id": "def-common.DashboardContainerByValueInput.hidePanelTitles",
+            "id": "def-common.DashboardContainerInput.hidePanelTitles",
             "type": "boolean",
             "tags": [],
             "label": "hidePanelTitles",
@@ -3355,7 +1780,7 @@
           },
           {
             "parentPluginId": "dashboard",
-            "id": "def-common.DashboardContainerByValueInput.syncTooltips",
+            "id": "def-common.DashboardContainerInput.syncTooltips",
             "type": "boolean",
             "tags": [],
             "label": "syncTooltips",
@@ -3366,7 +1791,7 @@
           },
           {
             "parentPluginId": "dashboard",
-            "id": "def-common.DashboardContainerByValueInput.useMargins",
+            "id": "def-common.DashboardContainerInput.useMargins",
             "type": "boolean",
             "tags": [],
             "label": "useMargins",
@@ -3377,7 +1802,7 @@
           },
           {
             "parentPluginId": "dashboard",
-            "id": "def-common.DashboardContainerByValueInput.syncColors",
+            "id": "def-common.DashboardContainerInput.syncColors",
             "type": "boolean",
             "tags": [],
             "label": "syncColors",
@@ -3388,7 +1813,7 @@
           },
           {
             "parentPluginId": "dashboard",
-            "id": "def-common.DashboardContainerByValueInput.syncCursor",
+            "id": "def-common.DashboardContainerInput.syncCursor",
             "type": "boolean",
             "tags": [],
             "label": "syncCursor",
@@ -3399,7 +1824,7 @@
           },
           {
             "parentPluginId": "dashboard",
-            "id": "def-common.DashboardContainerByValueInput.controlGroupInput",
+            "id": "def-common.DashboardContainerInput.controlGroupInput",
             "type": "Object",
             "tags": [],
             "label": "controlGroupInput",
@@ -3420,7 +1845,7 @@
           },
           {
             "parentPluginId": "dashboard",
-            "id": "def-common.DashboardContainerByValueInput.panels",
+            "id": "def-common.DashboardContainerInput.panels",
             "type": "Object",
             "tags": [],
             "label": "panels",
@@ -3841,36 +2266,6 @@
             "docId": "kibEmbeddablePluginApi",
             "section": "def-common.SavedObjectEmbeddableInput",
             "text": "SavedObjectEmbeddableInput"
-          },
-          " & { panels: never; }"
-        ],
-        "path": "src/plugins/dashboard/common/dashboard_container/types.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "dashboard",
-        "id": "def-common.DashboardContainerInput",
-        "type": "Type",
-        "tags": [],
-        "label": "DashboardContainerInput",
-        "description": [],
-        "signature": [
-          {
-            "pluginId": "dashboard",
-            "scope": "common",
-            "docId": "kibDashboardPluginApi",
-            "section": "def-common.DashboardContainerByValueInput",
-            "text": "DashboardContainerByValueInput"
-          },
-          " | ",
-          {
-            "pluginId": "dashboard",
-            "scope": "common",
-            "docId": "kibDashboardPluginApi",
-            "section": "def-common.DashboardContainerByReferenceInput",
-            "text": "DashboardContainerByReferenceInput"
           }
         ],
         "path": "src/plugins/dashboard/common/dashboard_container/types.ts",
diff --git a/api_docs/dashboard.mdx b/api_docs/dashboard.mdx
index 1cf38f45d5ed3..8567dd037fc43 100644
--- a/api_docs/dashboard.mdx
+++ b/api_docs/dashboard.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dashboard
 title: "dashboard"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dashboard plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dashboard']
 ---
 import dashboardObj from './dashboard.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kib
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 190 | 0 | 181 | 14 |
+| 130 | 0 | 125 | 7 |
 
 ## Client
 
@@ -34,9 +34,6 @@ Contact [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kib
 ### Functions
 <DocDefinitionList data={dashboardObj.client.functions}/>
 
-### Classes
-<DocDefinitionList data={dashboardObj.client.classes}/>
-
 ### Interfaces
 <DocDefinitionList data={dashboardObj.client.interfaces}/>
 
diff --git a/api_docs/dashboard_enhanced.mdx b/api_docs/dashboard_enhanced.mdx
index 30a849b2cd99a..09b0eaa2c4c92 100644
--- a/api_docs/dashboard_enhanced.mdx
+++ b/api_docs/dashboard_enhanced.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dashboardEnhanced
 title: "dashboardEnhanced"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dashboardEnhanced plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dashboardEnhanced']
 ---
 import dashboardEnhancedObj from './dashboard_enhanced.devdocs.json';
diff --git a/api_docs/data.devdocs.json b/api_docs/data.devdocs.json
index db375b8cd5665..85576fb9250b9 100644
--- a/api_docs/data.devdocs.json
+++ b/api_docs/data.devdocs.json
@@ -10104,9 +10104,7 @@
           "SearchResponse",
           "<unknown, Record<string, ",
           "AggregationsAggregate",
-          ">>>; history: ",
-          "SearchRequest",
-          "[]; setOverwriteDataViewType: (overwriteType: string | false | undefined) => void; setField: <K extends keyof ",
+          ">>>; setField: <K extends keyof ",
           {
             "pluginId": "data",
             "scope": "common",
@@ -10130,7 +10128,9 @@
             "section": "def-common.SearchSource",
             "text": "SearchSource"
           },
-          "; removeField: <K extends keyof ",
+          "; history: ",
+          "SearchRequest",
+          "[]; setOverwriteDataViewType: (overwriteType: string | false | undefined) => void; removeField: <K extends keyof ",
           {
             "pluginId": "data",
             "scope": "common",
@@ -13997,6 +13997,10 @@
                 "plugin": "canvas",
                 "path": "x-pack/plugins/canvas/public/components/datasource/datasource_component.js"
               },
+              {
+                "plugin": "enterpriseSearch",
+                "path": "x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.ts"
+              },
               {
                 "plugin": "graph",
                 "path": "x-pack/plugins/graph/public/state_management/datasource.sagas.ts"
@@ -14121,6 +14125,10 @@
                 "plugin": "maps",
                 "path": "x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.test.ts"
               },
+              {
+                "plugin": "enterpriseSearch",
+                "path": "x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.test.ts"
+              },
               {
                 "plugin": "ml",
                 "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts"
@@ -21627,6 +21635,10 @@
                 "plugin": "canvas",
                 "path": "x-pack/plugins/canvas/public/components/datasource/datasource_component.js"
               },
+              {
+                "plugin": "enterpriseSearch",
+                "path": "x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.ts"
+              },
               {
                 "plugin": "graph",
                 "path": "x-pack/plugins/graph/public/state_management/datasource.sagas.ts"
@@ -21751,6 +21763,10 @@
                 "plugin": "maps",
                 "path": "x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.test.ts"
               },
+              {
+                "plugin": "enterpriseSearch",
+                "path": "x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.test.ts"
+              },
               {
                 "plugin": "ml",
                 "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts"
diff --git a/api_docs/data.mdx b/api_docs/data.mdx
index 6d7ecdba213c3..3f5c1bae7a4bb 100644
--- a/api_docs/data.mdx
+++ b/api_docs/data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/data
 title: "data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the data plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'data']
 ---
 import dataObj from './data.devdocs.json';
diff --git a/api_docs/data_query.devdocs.json b/api_docs/data_query.devdocs.json
index 5ac67e7776d7e..30d5d5a046c8b 100644
--- a/api_docs/data_query.devdocs.json
+++ b/api_docs/data_query.devdocs.json
@@ -2410,7 +2410,7 @@
             "label": "queryString",
             "description": [],
             "signature": [
-              "{ setQuery: (query: ",
+              "{ getDefaultQuery: () => { query: string; language: any; }; formatQuery: (query: string | ",
               {
                 "pluginId": "@kbn/es-query",
                 "scope": "common",
@@ -2426,7 +2426,7 @@
                 "section": "def-common.AggregateQuery",
                 "text": "AggregateQuery"
               },
-              ") => void; getDefaultQuery: () => { query: string; language: any; }; formatQuery: (query: string | ",
+              " | undefined) => ",
               {
                 "pluginId": "@kbn/es-query",
                 "scope": "common",
@@ -2442,7 +2442,9 @@
                 "section": "def-common.AggregateQuery",
                 "text": "AggregateQuery"
               },
-              " | undefined) => ",
+              "; getUpdates$: () => ",
+              "Observable",
+              "<",
               {
                 "pluginId": "@kbn/es-query",
                 "scope": "common",
@@ -2458,9 +2460,7 @@
                 "section": "def-common.AggregateQuery",
                 "text": "AggregateQuery"
               },
-              "; getUpdates$: () => ",
-              "Observable",
-              "<",
+              ">; getQuery: () => ",
               {
                 "pluginId": "@kbn/es-query",
                 "scope": "common",
@@ -2476,7 +2476,7 @@
                 "section": "def-common.AggregateQuery",
                 "text": "AggregateQuery"
               },
-              ">; getQuery: () => ",
+              "; setQuery: (query: ",
               {
                 "pluginId": "@kbn/es-query",
                 "scope": "common",
@@ -2492,7 +2492,7 @@
                 "section": "def-common.AggregateQuery",
                 "text": "AggregateQuery"
               },
-              "; clearQuery: () => void; }"
+              ") => void; clearQuery: () => void; }"
             ],
             "path": "src/plugins/data/public/query/query_service.ts",
             "deprecated": false,
@@ -2640,7 +2640,7 @@
             "label": "queryString",
             "description": [],
             "signature": [
-              "{ setQuery: (query: ",
+              "{ getDefaultQuery: () => { query: string; language: any; }; formatQuery: (query: string | ",
               {
                 "pluginId": "@kbn/es-query",
                 "scope": "common",
@@ -2656,7 +2656,7 @@
                 "section": "def-common.AggregateQuery",
                 "text": "AggregateQuery"
               },
-              ") => void; getDefaultQuery: () => { query: string; language: any; }; formatQuery: (query: string | ",
+              " | undefined) => ",
               {
                 "pluginId": "@kbn/es-query",
                 "scope": "common",
@@ -2672,7 +2672,9 @@
                 "section": "def-common.AggregateQuery",
                 "text": "AggregateQuery"
               },
-              " | undefined) => ",
+              "; getUpdates$: () => ",
+              "Observable",
+              "<",
               {
                 "pluginId": "@kbn/es-query",
                 "scope": "common",
@@ -2688,9 +2690,7 @@
                 "section": "def-common.AggregateQuery",
                 "text": "AggregateQuery"
               },
-              "; getUpdates$: () => ",
-              "Observable",
-              "<",
+              ">; getQuery: () => ",
               {
                 "pluginId": "@kbn/es-query",
                 "scope": "common",
@@ -2706,7 +2706,7 @@
                 "section": "def-common.AggregateQuery",
                 "text": "AggregateQuery"
               },
-              ">; getQuery: () => ",
+              "; setQuery: (query: ",
               {
                 "pluginId": "@kbn/es-query",
                 "scope": "common",
@@ -2722,7 +2722,7 @@
                 "section": "def-common.AggregateQuery",
                 "text": "AggregateQuery"
               },
-              "; clearQuery: () => void; }"
+              ") => void; clearQuery: () => void; }"
             ],
             "path": "src/plugins/data/public/query/query_service.ts",
             "deprecated": false,
@@ -3394,15 +3394,7 @@
             "label": "timefilter",
             "description": [],
             "signature": [
-              "{ setRefreshInterval: (refreshInterval: Partial<",
-              {
-                "pluginId": "data",
-                "scope": "common",
-                "docId": "kibDataQueryPluginApi",
-                "section": "def-common.RefreshInterval",
-                "text": "RefreshInterval"
-              },
-              ">) => void; isTimeRangeSelectorEnabled: () => boolean; isAutoRefreshSelectorEnabled: () => boolean; isTimeTouched: () => boolean; isRefreshIntervalTouched: () => boolean; getEnabledUpdated$: () => ",
+              "{ isTimeRangeSelectorEnabled: () => boolean; isAutoRefreshSelectorEnabled: () => boolean; isTimeTouched: () => boolean; isRefreshIntervalTouched: () => boolean; getEnabledUpdated$: () => ",
               "Observable",
               "<boolean>; getTimeUpdate$: () => ",
               "Observable",
@@ -3446,7 +3438,15 @@
                 "section": "def-common.RefreshInterval",
                 "text": "RefreshInterval"
               },
-              "; createFilter: (indexPattern: ",
+              "; setRefreshInterval: (refreshInterval: Partial<",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataQueryPluginApi",
+                "section": "def-common.RefreshInterval",
+                "text": "RefreshInterval"
+              },
+              ">) => void; createFilter: (indexPattern: ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
@@ -3671,7 +3671,7 @@
         "label": "QueryStringContract",
         "description": [],
         "signature": [
-          "{ setQuery: (query: ",
+          "{ getDefaultQuery: () => { query: string; language: any; }; formatQuery: (query: string | ",
           {
             "pluginId": "@kbn/es-query",
             "scope": "common",
@@ -3687,7 +3687,7 @@
             "section": "def-common.AggregateQuery",
             "text": "AggregateQuery"
           },
-          ") => void; getDefaultQuery: () => { query: string; language: any; }; formatQuery: (query: string | ",
+          " | undefined) => ",
           {
             "pluginId": "@kbn/es-query",
             "scope": "common",
@@ -3703,7 +3703,9 @@
             "section": "def-common.AggregateQuery",
             "text": "AggregateQuery"
           },
-          " | undefined) => ",
+          "; getUpdates$: () => ",
+          "Observable",
+          "<",
           {
             "pluginId": "@kbn/es-query",
             "scope": "common",
@@ -3719,9 +3721,7 @@
             "section": "def-common.AggregateQuery",
             "text": "AggregateQuery"
           },
-          "; getUpdates$: () => ",
-          "Observable",
-          "<",
+          ">; getQuery: () => ",
           {
             "pluginId": "@kbn/es-query",
             "scope": "common",
@@ -3737,7 +3737,7 @@
             "section": "def-common.AggregateQuery",
             "text": "AggregateQuery"
           },
-          ">; getQuery: () => ",
+          "; setQuery: (query: ",
           {
             "pluginId": "@kbn/es-query",
             "scope": "common",
@@ -3753,7 +3753,7 @@
             "section": "def-common.AggregateQuery",
             "text": "AggregateQuery"
           },
-          "; clearQuery: () => void; }"
+          ") => void; clearQuery: () => void; }"
         ],
         "path": "src/plugins/data/public/query/query_string/query_string_manager.ts",
         "deprecated": false,
@@ -3798,15 +3798,7 @@
         "label": "TimefilterContract",
         "description": [],
         "signature": [
-          "{ setRefreshInterval: (refreshInterval: Partial<",
-          {
-            "pluginId": "data",
-            "scope": "common",
-            "docId": "kibDataQueryPluginApi",
-            "section": "def-common.RefreshInterval",
-            "text": "RefreshInterval"
-          },
-          ">) => void; isTimeRangeSelectorEnabled: () => boolean; isAutoRefreshSelectorEnabled: () => boolean; isTimeTouched: () => boolean; isRefreshIntervalTouched: () => boolean; getEnabledUpdated$: () => ",
+          "{ isTimeRangeSelectorEnabled: () => boolean; isAutoRefreshSelectorEnabled: () => boolean; isTimeTouched: () => boolean; isRefreshIntervalTouched: () => boolean; getEnabledUpdated$: () => ",
           "Observable",
           "<boolean>; getTimeUpdate$: () => ",
           "Observable",
@@ -3850,7 +3842,15 @@
             "section": "def-common.RefreshInterval",
             "text": "RefreshInterval"
           },
-          "; createFilter: (indexPattern: ",
+          "; setRefreshInterval: (refreshInterval: Partial<",
+          {
+            "pluginId": "data",
+            "scope": "common",
+            "docId": "kibDataQueryPluginApi",
+            "section": "def-common.RefreshInterval",
+            "text": "RefreshInterval"
+          },
+          ">) => void; createFilter: (indexPattern: ",
           {
             "pluginId": "dataViews",
             "scope": "common",
diff --git a/api_docs/data_query.mdx b/api_docs/data_query.mdx
index 89f562f1f76aa..cf7d8aa206fff 100644
--- a/api_docs/data_query.mdx
+++ b/api_docs/data_query.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/data-query
 title: "data.query"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the data.query plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'data.query']
 ---
 import dataQueryObj from './data_query.devdocs.json';
diff --git a/api_docs/data_search.devdocs.json b/api_docs/data_search.devdocs.json
index 3f27dab1ede57..e48c5fe51292f 100644
--- a/api_docs/data_search.devdocs.json
+++ b/api_docs/data_search.devdocs.json
@@ -7310,9 +7310,7 @@
                   "SearchResponse",
                   "<unknown, Record<string, ",
                   "AggregationsAggregate",
-                  ">>>; history: ",
-                  "SearchRequest",
-                  "[]; setOverwriteDataViewType: (overwriteType: string | false | undefined) => void; setField: <K extends keyof ",
+                  ">>>; setField: <K extends keyof ",
                   {
                     "pluginId": "data",
                     "scope": "common",
@@ -7336,7 +7334,9 @@
                     "section": "def-common.SearchSource",
                     "text": "SearchSource"
                   },
-                  "; removeField: <K extends keyof ",
+                  "; history: ",
+                  "SearchRequest",
+                  "[]; setOverwriteDataViewType: (overwriteType: string | false | undefined) => void; removeField: <K extends keyof ",
                   {
                     "pluginId": "data",
                     "scope": "common",
@@ -34923,9 +34923,7 @@
           "SearchResponse",
           "<unknown, Record<string, ",
           "AggregationsAggregate",
-          ">>>; history: ",
-          "SearchRequest",
-          "[]; setOverwriteDataViewType: (overwriteType: string | false | undefined) => void; setField: <K extends keyof ",
+          ">>>; setField: <K extends keyof ",
           {
             "pluginId": "data",
             "scope": "common",
@@ -34949,7 +34947,9 @@
             "section": "def-common.SearchSource",
             "text": "SearchSource"
           },
-          "; removeField: <K extends keyof ",
+          "; history: ",
+          "SearchRequest",
+          "[]; setOverwriteDataViewType: (overwriteType: string | false | undefined) => void; removeField: <K extends keyof ",
           {
             "pluginId": "data",
             "scope": "common",
diff --git a/api_docs/data_search.mdx b/api_docs/data_search.mdx
index e134bb5db798f..3f05adde84d4b 100644
--- a/api_docs/data_search.mdx
+++ b/api_docs/data_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/data-search
 title: "data.search"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the data.search plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'data.search']
 ---
 import dataSearchObj from './data_search.devdocs.json';
diff --git a/api_docs/data_view_editor.mdx b/api_docs/data_view_editor.mdx
index aaa7085b8fc33..f7e1deab79008 100644
--- a/api_docs/data_view_editor.mdx
+++ b/api_docs/data_view_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViewEditor
 title: "dataViewEditor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataViewEditor plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViewEditor']
 ---
 import dataViewEditorObj from './data_view_editor.devdocs.json';
diff --git a/api_docs/data_view_field_editor.mdx b/api_docs/data_view_field_editor.mdx
index fa2bd9ba306da..5c09a7b3ca916 100644
--- a/api_docs/data_view_field_editor.mdx
+++ b/api_docs/data_view_field_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViewFieldEditor
 title: "dataViewFieldEditor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataViewFieldEditor plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViewFieldEditor']
 ---
 import dataViewFieldEditorObj from './data_view_field_editor.devdocs.json';
diff --git a/api_docs/data_view_management.mdx b/api_docs/data_view_management.mdx
index d70538091beeb..a3d412dc348cd 100644
--- a/api_docs/data_view_management.mdx
+++ b/api_docs/data_view_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViewManagement
 title: "dataViewManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataViewManagement plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViewManagement']
 ---
 import dataViewManagementObj from './data_view_management.devdocs.json';
diff --git a/api_docs/data_views.devdocs.json b/api_docs/data_views.devdocs.json
index 7d419403e8ded..59294bf0b6169 100644
--- a/api_docs/data_views.devdocs.json
+++ b/api_docs/data_views.devdocs.json
@@ -555,6 +555,10 @@
                 "plugin": "canvas",
                 "path": "x-pack/plugins/canvas/public/components/datasource/datasource_component.js"
               },
+              {
+                "plugin": "enterpriseSearch",
+                "path": "x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.ts"
+              },
               {
                 "plugin": "graph",
                 "path": "x-pack/plugins/graph/public/state_management/datasource.sagas.ts"
@@ -679,6 +683,10 @@
                 "plugin": "maps",
                 "path": "x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.test.ts"
               },
+              {
+                "plugin": "enterpriseSearch",
+                "path": "x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.test.ts"
+              },
               {
                 "plugin": "ml",
                 "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts"
@@ -8812,6 +8820,10 @@
                 "plugin": "canvas",
                 "path": "x-pack/plugins/canvas/public/components/datasource/datasource_component.js"
               },
+              {
+                "plugin": "enterpriseSearch",
+                "path": "x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.ts"
+              },
               {
                 "plugin": "graph",
                 "path": "x-pack/plugins/graph/public/state_management/datasource.sagas.ts"
@@ -8936,6 +8948,10 @@
                 "plugin": "maps",
                 "path": "x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.test.ts"
               },
+              {
+                "plugin": "enterpriseSearch",
+                "path": "x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.test.ts"
+              },
               {
                 "plugin": "ml",
                 "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts"
@@ -16126,6 +16142,10 @@
                 "plugin": "canvas",
                 "path": "x-pack/plugins/canvas/public/components/datasource/datasource_component.js"
               },
+              {
+                "plugin": "enterpriseSearch",
+                "path": "x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.ts"
+              },
               {
                 "plugin": "graph",
                 "path": "x-pack/plugins/graph/public/state_management/datasource.sagas.ts"
@@ -16250,6 +16270,10 @@
                 "plugin": "maps",
                 "path": "x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.test.ts"
               },
+              {
+                "plugin": "enterpriseSearch",
+                "path": "x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.test.ts"
+              },
               {
                 "plugin": "ml",
                 "path": "x-pack/plugins/ml/public/application/services/new_job_capabilities/remove_nested_field_children.test.ts"
diff --git a/api_docs/data_views.mdx b/api_docs/data_views.mdx
index c7a761b939ded..6613d7b5cce3c 100644
--- a/api_docs/data_views.mdx
+++ b/api_docs/data_views.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViews
 title: "dataViews"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataViews plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViews']
 ---
 import dataViewsObj from './data_views.devdocs.json';
diff --git a/api_docs/data_visualizer.mdx b/api_docs/data_visualizer.mdx
index c62fc0e0da847..ed4a651881e8a 100644
--- a/api_docs/data_visualizer.mdx
+++ b/api_docs/data_visualizer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataVisualizer
 title: "dataVisualizer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataVisualizer plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataVisualizer']
 ---
 import dataVisualizerObj from './data_visualizer.devdocs.json';
diff --git a/api_docs/deprecations_by_api.mdx b/api_docs/deprecations_by_api.mdx
index 36b1791990c4b..0d65891b71bad 100644
--- a/api_docs/deprecations_by_api.mdx
+++ b/api_docs/deprecations_by_api.mdx
@@ -7,7 +7,7 @@ id: kibDevDocsDeprecationsByApi
 slug: /kibana-dev-docs/api-meta/deprecated-api-list-by-api
 title: Deprecated API usage by API
 description: A list of deprecated APIs, which plugins are still referencing them, and when they need to be removed by.
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana']
 ---
 
@@ -17,10 +17,10 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | Deprecated API | Referencing plugin(s) | Remove By |
 | ---------------|-----------|-----------|
 | <DocLink id="kibAlertingPluginApi" section="def-public.PluginSetupContract.registerNavigation" text="registerNavigation"/> | ml, stackAlerts | - |
-| <DocLink id="kibDataPluginApi" section="def-common.DataView.title" text="title"/> | @kbn/es-query, securitySolution, timelines, lists, threatIntelligence, dataViews, savedObjectsManagement, unifiedSearch, controls, unifiedFieldList, lens, triggersActionsUi, aiops, ml, infra, visTypeTimeseries, apm, exploratoryView, observability, dataVisualizer, fleet, canvas, graph, stackAlerts, synthetics, transform, upgradeAssistant, ux, maps, dataViewManagement, inputControlVis, visDefaultEditor, presentationUtil, visTypeTimelion, visTypeVega, discover, data | - |
-| <DocLink id="kibDataPluginApi" section="def-server.DataView.title" text="title"/> | @kbn/es-query, securitySolution, timelines, lists, threatIntelligence, dataViews, savedObjectsManagement, unifiedSearch, controls, unifiedFieldList, lens, triggersActionsUi, aiops, ml, infra, visTypeTimeseries, apm, exploratoryView, observability, dataVisualizer, fleet, canvas, graph, stackAlerts, synthetics, transform, upgradeAssistant, ux, maps, dataViewManagement, inputControlVis, visDefaultEditor, presentationUtil, visTypeTimelion, visTypeVega, discover, data | - |
-| <DocLink id="kibDataViewsPluginApi" section="def-public.DataView.title" text="title"/> | @kbn/es-query, securitySolution, timelines, lists, threatIntelligence, data, savedObjectsManagement, unifiedSearch, controls, unifiedFieldList, lens, triggersActionsUi, aiops, ml, infra, visTypeTimeseries, apm, exploratoryView, observability, dataVisualizer, fleet, canvas, graph, stackAlerts, synthetics, transform, upgradeAssistant, ux, maps, dataViewManagement, inputControlVis, visDefaultEditor, presentationUtil, visTypeTimelion, visTypeVega, discover | - |
-| <DocLink id="kibKibanaReactPluginApi" section="def-public.RedirectAppLinks" text="RedirectAppLinks"/> | home, data, esUiShared, spaces, savedObjectsManagement, exploratoryView, fleet, observability, ml, apm, enterpriseSearch, indexLifecycleManagement, synthetics, upgradeAssistant, ux, kibanaOverview | - |
+| <DocLink id="kibDataPluginApi" section="def-common.DataView.title" text="title"/> | @kbn/es-query, securitySolution, timelines, lists, threatIntelligence, dataViews, savedObjectsManagement, unifiedSearch, controls, unifiedFieldList, lens, triggersActionsUi, aiops, ml, infra, visTypeTimeseries, apm, exploratoryView, observability, dataVisualizer, fleet, canvas, enterpriseSearch, graph, stackAlerts, synthetics, transform, upgradeAssistant, ux, maps, dataViewManagement, inputControlVis, visDefaultEditor, presentationUtil, visTypeTimelion, visTypeVega, discover, data | - |
+| <DocLink id="kibDataPluginApi" section="def-server.DataView.title" text="title"/> | @kbn/es-query, securitySolution, timelines, lists, threatIntelligence, dataViews, savedObjectsManagement, unifiedSearch, controls, unifiedFieldList, lens, triggersActionsUi, aiops, ml, infra, visTypeTimeseries, apm, exploratoryView, observability, dataVisualizer, fleet, canvas, enterpriseSearch, graph, stackAlerts, synthetics, transform, upgradeAssistant, ux, maps, dataViewManagement, inputControlVis, visDefaultEditor, presentationUtil, visTypeTimelion, visTypeVega, discover, data | - |
+| <DocLink id="kibDataViewsPluginApi" section="def-public.DataView.title" text="title"/> | @kbn/es-query, securitySolution, timelines, lists, threatIntelligence, data, savedObjectsManagement, unifiedSearch, controls, unifiedFieldList, lens, triggersActionsUi, aiops, ml, infra, visTypeTimeseries, apm, exploratoryView, observability, dataVisualizer, fleet, canvas, enterpriseSearch, graph, stackAlerts, synthetics, transform, upgradeAssistant, ux, maps, dataViewManagement, inputControlVis, visDefaultEditor, presentationUtil, visTypeTimelion, visTypeVega, discover | - |
+| <DocLink id="kibKibanaReactPluginApi" section="def-public.RedirectAppLinks" text="RedirectAppLinks"/> | home, data, esUiShared, spaces, savedObjectsManagement, exploratoryView, fleet, observability, ml, apm, indexLifecycleManagement, synthetics, upgradeAssistant, ux, kibanaOverview | - |
 | <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginSetup.authc" text="authc"/> | encryptedSavedObjects, actions, data, ml, logstash, securitySolution, cloudChat | - |
 | <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginSetup.authz" text="authz"/> | actions, ml, savedObjectsTagging, enterpriseSearch | - |
 | <DocLink id="kibKbnCoreLifecycleBrowserPluginApi" section="def-common.CoreStart.savedObjects" text="savedObjects"/> | @kbn/core-plugins-browser-internal, @kbn/core-root-browser-internal, dataViews, home, data, savedObjects, unifiedSearch, presentationUtil, visualizations, dashboard, lens, discover, fileUpload, ml, infra, fleet, canvas, dashboardEnhanced, graph, monitoring, synthetics, transform, dataVisualizer, cloudSecurityPosture, securitySolution | - |
@@ -37,6 +37,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibDataPluginApi" section="def-public.SearchSource.create" text="create"/> | alerting, discover, securitySolution | - |
 | <DocLink id="kibDataPluginApi" section="def-common.SearchSource.create" text="create"/> | alerting, discover, securitySolution | - |
 | <DocLink id="kibTaskManagerPluginApi" section="def-server.TaskManagerSetupContract.index" text="index"/> | actions, alerting | - |
+| <DocLink id="kibKbnCoreSavedObjectsApiServerPluginApi" section="def-common.SavedObject.migrationVersion" text="migrationVersion"/> | @kbn/core-saved-objects-api-browser, @kbn/core-saved-objects-browser-internal, @kbn/core-saved-objects-browser-mocks, @kbn/core-saved-objects-api-server-internal, @kbn/core-saved-objects-import-export-server-internal, @kbn/core-saved-objects-server-internal, home, fleet, graph, lists, securitySolution, alerting | - |
 | <DocLink id="kibKbnCoreSavedObjectsServerPluginApi" section="def-common.SavedObjectsType.convertToMultiNamespaceTypeVersion" text="convertToMultiNamespaceTypeVersion"/> | @kbn/core-saved-objects-migration-server-internal, actions, dataViews, data, alerting, lens, cases, savedObjectsTagging, savedSearch, canvas, graph, lists, maps, securitySolution, dashboard, visualizations, @kbn/core-test-helpers-so-type-serializer | - |
 | <DocLink id="kibDataPluginApi" section="def-common.EsQuerySearchAfter" text="EsQuerySearchAfter"/> | discover | - |
 | <DocLink id="kibUiActionsPluginApi" section="def-public.UiActionsService.executeTriggerActions" text="executeTriggerActions"/> | data, discover, imageEmbeddable, embeddable | - |
@@ -44,7 +45,6 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibDataPluginApi" section="def-public.SavedObject" text="SavedObject"/> | @kbn/core-saved-objects-common, @kbn/core-saved-objects-api-browser, @kbn/core-saved-objects-browser-internal, @kbn/core-saved-objects-api-server, @kbn/core, home, dataViews, savedObjectsTagging, fleet, canvas, osquery, synthetics, savedObjects, @kbn/core-saved-objects-browser-mocks, @kbn/core-saved-objects-import-export-server-internal, savedObjectsTaggingOss, cases, lists, securitySolution, upgradeAssistant, savedObjectsManagement, @kbn/core-ui-settings-server-internal, dashboard | - |
 | <DocLink id="kibDataPluginApi" section="def-common.SavedObject" text="SavedObject"/> | @kbn/core-saved-objects-common, @kbn/core-saved-objects-api-browser, @kbn/core-saved-objects-browser-internal, @kbn/core-saved-objects-api-server, @kbn/core, home, dataViews, savedObjectsTagging, fleet, canvas, osquery, synthetics, savedObjects, @kbn/core-saved-objects-browser-mocks, @kbn/core-saved-objects-import-export-server-internal, savedObjectsTaggingOss, cases, lists, securitySolution, upgradeAssistant, savedObjectsManagement, @kbn/core-ui-settings-server-internal, data | - |
 | <DocLink id="kibDataPluginApi" section="def-common.EqlSearchStrategyRequest.options" text="options"/> | securitySolution | - |
-| <DocLink id="kibKbnCoreSavedObjectsApiServerPluginApi" section="def-common.SavedObject.migrationVersion" text="migrationVersion"/> | @kbn/core-saved-objects-api-browser, @kbn/core-saved-objects-browser-internal, @kbn/core-saved-objects-browser-mocks, @kbn/core-saved-objects-api-server-internal, @kbn/core-saved-objects-import-export-server-internal, @kbn/core-saved-objects-server-internal, home, fleet, graph, lists, securitySolution | - |
 | <DocLink id="kibKbnSecuritysolutionListConstantsPluginApi" section="def-common.ENDPOINT_TRUSTED_APPS_LIST_ID" text="ENDPOINT_TRUSTED_APPS_LIST_ID"/> | lists, securitySolution, @kbn/securitysolution-io-ts-list-types | - |
 | <DocLink id="kibKbnSecuritysolutionListConstantsPluginApi" section="def-common.ENDPOINT_TRUSTED_APPS_LIST_NAME" text="ENDPOINT_TRUSTED_APPS_LIST_NAME"/> | lists, securitySolution, @kbn/securitysolution-io-ts-list-types | - |
 | <DocLink id="kibKbnSecuritysolutionListConstantsPluginApi" section="def-common.ENDPOINT_TRUSTED_APPS_LIST_DESCRIPTION" text="ENDPOINT_TRUSTED_APPS_LIST_DESCRIPTION"/> | lists, securitySolution, @kbn/securitysolution-io-ts-list-types | - |
@@ -115,13 +115,13 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibDataViewsPluginApi" section="def-public.DataView.getNonScriptedFields" text="getNonScriptedFields"/> | visTypeTimeseries, graph, dataViewManagement | - |
 | <DocLink id="kibDataViewsPluginApi" section="def-server.getFieldByName" text="getFieldByName"/> | unifiedSearch | - |
 | <DocLink id="kibDataViewsPluginApi" section="def-server.findIndexPatternById" text="findIndexPatternById"/> | unifiedSearch | - |
+| <DocLink id="kibSecurityPluginApi" section="def-public.SecurityPluginStart.uiApi" text="uiApi"/> | enterpriseSearch | - |
 | <DocLink id="kibDataViewsPluginApi" section="def-public.DataView.flattenHit" text="flattenHit"/> | maps | - |
 | <DocLink id="kibDataViewsPluginApi" section="def-public.DataView.removeScriptedField" text="removeScriptedField"/> | dataViewManagement | - |
 | <DocLink id="kibDataViewsPluginApi" section="def-public.DataView.getScriptedFields" text="getScriptedFields"/> | dataViewManagement | - |
 | <DocLink id="kibExpressionGaugePluginApi" section="def-common.GaugeState.percentageMode" text="percentageMode"/> | visTypeGauge | - |
 | <DocLink id="kibExpressionPartitionVisPluginApi" section="def-common.LabelsParams.truncate" text="truncate"/> | visTypePie | - |
 | <DocLink id="kibExpressionPartitionVisPluginApi" section="def-common.LabelsParams.last_level" text="last_level"/> | visTypePie | - |
-| <DocLink id="kibSecurityPluginApi" section="def-public.SecurityPluginStart.uiApi" text="uiApi"/> | enterpriseSearch | - |
 | <DocLink id="kibKbnCoreSavedObjectsServerPluginApi" section="def-common.SavedObjectMigrationContext.convertToMultiNamespaceTypeVersion" text="convertToMultiNamespaceTypeVersion"/> | encryptedSavedObjects | - |
 | <DocLink id="kibKbnCoreElasticsearchServerPluginApi" section="def-common.ElasticsearchServiceSetup.legacy" text="legacy"/> | @kbn/core-elasticsearch-server-internal, @kbn/core-plugins-server-internal, console | - |
 | <DocLink id="kibKbnCorePluginsServerPluginApi" section="def-common.PluginManifest.extraPublicDirs" text="extraPublicDirs"/> | @kbn/core-plugins-server-internal | - |
diff --git a/api_docs/deprecations_by_plugin.mdx b/api_docs/deprecations_by_plugin.mdx
index 747673056fa15..bb2ecce66530d 100644
--- a/api_docs/deprecations_by_plugin.mdx
+++ b/api_docs/deprecations_by_plugin.mdx
@@ -7,7 +7,7 @@ id: kibDevDocsDeprecationsByPlugin
 slug: /kibana-dev-docs/api-meta/deprecated-api-list-by-plugin
 title: Deprecated API usage by plugin
 description: A list of deprecated APIs, which plugins are still referencing them, and when they need to be removed by.
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana']
 ---
 
@@ -343,6 +343,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibFeaturesPluginApi" section="def-server.PluginSetupContract.getKibanaFeatures" text="getKibanaFeatures"/> | [plugin.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/server/plugin.test.ts#:~:text=getKibanaFeatures) | 8.8.0 |
 | <DocLink id="kibLicensingPluginApi" section="def-server.LicensingPluginSetup.license$" text="license$"/> | [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/server/plugin.ts#:~:text=license%24), [license_state.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/server/lib/license_state.test.ts#:~:text=license%24), [license_state.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/server/lib/license_state.test.ts#:~:text=license%24) | 8.8.0 |
 | <DocLink id="kibTaskManagerPluginApi" section="def-server.TaskManagerSetupContract.index" text="index"/> | [task.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/server/usage/task.ts#:~:text=index) | - |
+| <DocLink id="kibKbnCoreSavedObjectsApiServerPluginApi" section="def-common.SavedObject.migrationVersion" text="migrationVersion"/> | [retrieve_migrated_legacy_actions.mock.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock.ts#:~:text=migrationVersion), [retrieve_migrated_legacy_actions.mock.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock.ts#:~:text=migrationVersion), [retrieve_migrated_legacy_actions.mock.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock.ts#:~:text=migrationVersion), [retrieve_migrated_legacy_actions.mock.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock.ts#:~:text=migrationVersion), [retrieve_migrated_legacy_actions.mock.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock.ts#:~:text=migrationVersion), [retrieve_migrated_legacy_actions.mock.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock.ts#:~:text=migrationVersion), [retrieve_migrated_legacy_actions.mock.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock.ts#:~:text=migrationVersion), [retrieve_migrated_legacy_actions.mock.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock.ts#:~:text=migrationVersion), [retrieve_migrated_legacy_actions.mock.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock.ts#:~:text=migrationVersion), [retrieve_migrated_legacy_actions.mock.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock.ts#:~:text=migrationVersion) | - |
 | <DocLink id="kibKbnCoreSavedObjectsApiServerPluginApi" section="def-common.SavedObjectAttributes" text="SavedObjectAttributes"/> | [rule.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/common/rule.ts#:~:text=SavedObjectAttributes), [rule.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/common/rule.ts#:~:text=SavedObjectAttributes), [rule.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/common/rule.ts#:~:text=SavedObjectAttributes), [rule.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/common/rule.ts#:~:text=SavedObjectAttributes), [rule.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/common/rule.ts#:~:text=SavedObjectAttributes), [rule.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/common/rule.ts#:~:text=SavedObjectAttributes), [rule.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/common/rule.ts#:~:text=SavedObjectAttributes), [rule.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/common/rule.ts#:~:text=SavedObjectAttributes), [rule.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/common/rule.ts#:~:text=SavedObjectAttributes), [rule.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/common/rule.ts#:~:text=SavedObjectAttributes)+ 44 more | - |
 | <DocLink id="kibKbnCoreSavedObjectsServerPluginApi" section="def-common.SavedObjectsType.convertToMultiNamespaceTypeVersion" text="convertToMultiNamespaceTypeVersion"/> | [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/server/saved_objects/index.ts#:~:text=convertToMultiNamespaceTypeVersion) | - |
 
@@ -624,7 +625,9 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 
 | Deprecated API | Reference location(s) | Remove By |
 | ---------------|-----------|-----------|
-| <DocLink id="kibKibanaReactPluginApi" section="def-public.RedirectAppLinks" text="RedirectAppLinks"/> | [analytics_collection_toolbar.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_toolbar/analytics_collection_toolbar.tsx#:~:text=RedirectAppLinks), [analytics_collection_toolbar.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_toolbar/analytics_collection_toolbar.tsx#:~:text=RedirectAppLinks), [analytics_collection_toolbar.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_toolbar/analytics_collection_toolbar.tsx#:~:text=RedirectAppLinks) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.DataView.title" text="title"/> | [find_or_create_data_view.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.ts#:~:text=title), [find_or_create_data_view.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.test.ts#:~:text=title), [find_or_create_data_view.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.ts#:~:text=title), [find_or_create_data_view.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.test.ts#:~:text=title) | - |
+| <DocLink id="kibDataPluginApi" section="def-server.DataView.title" text="title"/> | [find_or_create_data_view.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.ts#:~:text=title), [find_or_create_data_view.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.test.ts#:~:text=title), [find_or_create_data_view.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.ts#:~:text=title), [find_or_create_data_view.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.test.ts#:~:text=title) | - |
+| <DocLink id="kibDataViewsPluginApi" section="def-public.DataView.title" text="title"/> | [find_or_create_data_view.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.ts#:~:text=title), [find_or_create_data_view.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/public/applications/analytics/utils/find_or_create_data_view.test.ts#:~:text=title) | - |
 | <DocLink id="kibSecurityPluginApi" section="def-public.SecurityPluginStart.uiApi" text="uiApi"/> | [account_settings.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/account_settings/account_settings.tsx#:~:text=uiApi), [account_settings.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/account_settings/account_settings.tsx#:~:text=uiApi), [account_settings.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/account_settings/account_settings.tsx#:~:text=uiApi), [account_settings.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/account_settings/account_settings.tsx#:~:text=uiApi) | - |
 | <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginSetup.authz" text="authz"/> | [check_access.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/server/lib/check_access.ts#:~:text=authz), [check_access.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/server/lib/check_access.ts#:~:text=authz), [check_access.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/server/lib/check_access.ts#:~:text=authz) | - |
 | <DocLink id="kibKbnCoreSavedObjectsApiServerPluginApi" section="def-common.SavedObjectAttributes" text="SavedObjectAttributes"/> | [telemetry.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.ts#:~:text=SavedObjectAttributes), [telemetry.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.ts#:~:text=SavedObjectAttributes), [telemetry.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.ts#:~:text=SavedObjectAttributes), [telemetry.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.ts#:~:text=SavedObjectAttributes), [telemetry.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.ts#:~:text=SavedObjectAttributes), [telemetry.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.ts#:~:text=SavedObjectAttributes) | - |
@@ -788,7 +791,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnCoreSavedObjectsApiBrowserPluginApi" section="def-common.SavedObjectsCreateOptions" text="SavedObjectsCreateOptions"/> | [use_create_saved_object.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/hooks/use_create_saved_object.tsx#:~:text=SavedObjectsCreateOptions), [use_create_saved_object.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/hooks/use_create_saved_object.tsx#:~:text=SavedObjectsCreateOptions), [use_update_saved_object.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/hooks/use_update_saved_object.tsx#:~:text=SavedObjectsCreateOptions), [use_update_saved_object.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/hooks/use_update_saved_object.tsx#:~:text=SavedObjectsCreateOptions) | - |
 | <DocLink id="kibKbnCoreSavedObjectsApiBrowserPluginApi" section="def-common.SavedObjectsBatchResponse" text="SavedObjectsBatchResponse"/> | [use_find_saved_object.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/hooks/use_find_saved_object.tsx#:~:text=SavedObjectsBatchResponse), [use_find_saved_object.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/hooks/use_find_saved_object.tsx#:~:text=SavedObjectsBatchResponse) | - |
 | <DocLink id="kibKbnCoreSavedObjectsCommonPluginApi" section="def-common.SavedObjectAttributes" text="SavedObjectAttributes"/> | [use_find_saved_object.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/hooks/use_find_saved_object.tsx#:~:text=SavedObjectAttributes), [use_find_saved_object.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/hooks/use_find_saved_object.tsx#:~:text=SavedObjectAttributes), [use_create_saved_object.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/hooks/use_create_saved_object.tsx#:~:text=SavedObjectAttributes), [use_create_saved_object.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/hooks/use_create_saved_object.tsx#:~:text=SavedObjectAttributes), [use_create_saved_object.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/hooks/use_create_saved_object.tsx#:~:text=SavedObjectAttributes), [use_get_saved_object.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/hooks/use_get_saved_object.tsx#:~:text=SavedObjectAttributes), [use_get_saved_object.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/hooks/use_get_saved_object.tsx#:~:text=SavedObjectAttributes), [use_update_saved_object.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/hooks/use_update_saved_object.tsx#:~:text=SavedObjectAttributes), [use_update_saved_object.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/hooks/use_update_saved_object.tsx#:~:text=SavedObjectAttributes), [use_update_saved_object.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/hooks/use_update_saved_object.tsx#:~:text=SavedObjectAttributes)+ 2 more | - |
-| <DocLink id="kibKbnCoreSavedObjectsCommonPluginApi" section="def-common.SavedObjectReference" text="SavedObjectReference"/> | [log_threshold_references_manager.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_references_manager.ts#:~:text=SavedObjectReference), [log_threshold_references_manager.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_references_manager.ts#:~:text=SavedObjectReference), [log_threshold_references_manager.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_references_manager.ts#:~:text=SavedObjectReference), [utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/common/visualizations/lens/utils.ts#:~:text=SavedObjectReference), [utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/common/visualizations/lens/utils.ts#:~:text=SavedObjectReference), [types.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/common/visualizations/lens/types.ts#:~:text=SavedObjectReference), [types.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/common/visualizations/lens/types.ts#:~:text=SavedObjectReference), [load.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/common/visualizations/lens/hosts/load.ts#:~:text=SavedObjectReference), [load.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/common/visualizations/lens/hosts/load.ts#:~:text=SavedObjectReference), [log_threshold_references_manager.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_references_manager.test.ts#:~:text=SavedObjectReference)+ 1 more | - |
+| <DocLink id="kibKbnCoreSavedObjectsCommonPluginApi" section="def-common.SavedObjectReference" text="SavedObjectReference"/> | [log_threshold_references_manager.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_references_manager.ts#:~:text=SavedObjectReference), [log_threshold_references_manager.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_references_manager.ts#:~:text=SavedObjectReference), [log_threshold_references_manager.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_references_manager.ts#:~:text=SavedObjectReference), [utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/common/visualizations/lens/utils.ts#:~:text=SavedObjectReference), [utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/common/visualizations/lens/utils.ts#:~:text=SavedObjectReference), [line_chart.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/common/visualizations/lens/visualization_types/line_chart.ts#:~:text=SavedObjectReference), [line_chart.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/common/visualizations/lens/visualization_types/line_chart.ts#:~:text=SavedObjectReference), [metric_chart.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/common/visualizations/lens/visualization_types/metric_chart.ts#:~:text=SavedObjectReference), [metric_chart.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/common/visualizations/lens/visualization_types/metric_chart.ts#:~:text=SavedObjectReference), [types.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/infra/public/common/visualizations/types.ts#:~:text=SavedObjectReference)+ 3 more | - |
 
 
 
@@ -1149,7 +1152,7 @@ migrates to using the Kibana Privilege model: https://github.com/elastic/kibana/
 | <DocLink id="kibKbnCoreLifecycleBrowserPluginApi" section="def-common.CoreStart.savedObjects" text="savedObjects"/> | [use_dashboard_button_href.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/hooks/use_dashboard_button_href.ts#:~:text=savedObjects), [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/index.tsx#:~:text=savedObjects) | - |
 | <DocLink id="kibKbnCoreSavedObjectsApiBrowserPluginApi" section="def-common.SavedObjectsClientContract.find" text="find"/> | [use_dashboard_button_href.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/hooks/use_dashboard_button_href.ts#:~:text=find), [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/index.tsx#:~:text=find), [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/index.tsx#:~:text=find) | - |
 | <DocLink id="kibKbnCoreSavedObjectsApiBrowserPluginApi" section="def-common.SimpleSavedObject" text="SimpleSavedObject"/> | [types.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/hooks/types.ts#:~:text=SimpleSavedObject), [types.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/hooks/types.ts#:~:text=SimpleSavedObject) | - |
-| <DocLink id="kibKbnCoreSavedObjectsApiServerPluginApi" section="def-common.SavedObject.migrationVersion" text="migrationVersion"/> | [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion)+ 44 more | - |
+| <DocLink id="kibKbnCoreSavedObjectsApiServerPluginApi" section="def-common.SavedObject.migrationVersion" text="migrationVersion"/> | [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion)+ 34 more | - |
 | <DocLink id="kibKbnCoreSavedObjectsApiServerPluginApi" section="def-common.SavedObjectAttributes" text="SavedObjectAttributes"/> | [legacy_types.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_types.ts#:~:text=SavedObjectAttributes), [legacy_types.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_types.ts#:~:text=SavedObjectAttributes), [legacy_migrations.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_migrations.ts#:~:text=SavedObjectAttributes), [legacy_migrations.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_migrations.ts#:~:text=SavedObjectAttributes), [legacy_types.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_types.ts#:~:text=SavedObjectAttributes), [legacy_types.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_types.ts#:~:text=SavedObjectAttributes), [legacy_migrations.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_migrations.ts#:~:text=SavedObjectAttributes), [legacy_migrations.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_migrations.ts#:~:text=SavedObjectAttributes) | - |
 | <DocLink id="kibKbnCoreSavedObjectsServerPluginApi" section="def-common.SavedObjectsType.convertToMultiNamespaceTypeVersion" text="convertToMultiNamespaceTypeVersion"/> | [timelines.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/timelines.ts#:~:text=convertToMultiNamespaceTypeVersion), [notes.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/notes.ts#:~:text=convertToMultiNamespaceTypeVersion), [pinned_events.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/timeline/saved_object_mappings/pinned_events.ts#:~:text=convertToMultiNamespaceTypeVersion), [legacy_saved_object_mappings.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_saved_object_mappings.ts#:~:text=convertToMultiNamespaceTypeVersion) | - |
 | <DocLink id="kibKbnSecuritysolutionListConstantsPluginApi" section="def-common.ENDPOINT_TRUSTED_APPS_LIST_ID" text="ENDPOINT_TRUSTED_APPS_LIST_ID"/> | [policy_hooks.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_hooks.ts#:~:text=ENDPOINT_TRUSTED_APPS_LIST_ID), [policy_hooks.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_hooks.ts#:~:text=ENDPOINT_TRUSTED_APPS_LIST_ID), [constants.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/management/pages/trusted_apps/constants.ts#:~:text=ENDPOINT_TRUSTED_APPS_LIST_ID), [constants.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/management/pages/trusted_apps/constants.ts#:~:text=ENDPOINT_TRUSTED_APPS_LIST_ID), [api_client.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/api_client.ts#:~:text=ENDPOINT_TRUSTED_APPS_LIST_ID), [api_client.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/api_client.ts#:~:text=ENDPOINT_TRUSTED_APPS_LIST_ID), [api_client.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/api_client.ts#:~:text=ENDPOINT_TRUSTED_APPS_LIST_ID), [lists.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.ts#:~:text=ENDPOINT_TRUSTED_APPS_LIST_ID), [manifest_manager.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts#:~:text=ENDPOINT_TRUSTED_APPS_LIST_ID), [manifest_manager.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts#:~:text=ENDPOINT_TRUSTED_APPS_LIST_ID)+ 34 more | - |
diff --git a/api_docs/deprecations_by_team.mdx b/api_docs/deprecations_by_team.mdx
index f5763c23b9b37..60757f77d1709 100644
--- a/api_docs/deprecations_by_team.mdx
+++ b/api_docs/deprecations_by_team.mdx
@@ -7,7 +7,7 @@ id: kibDevDocsDeprecationsDueByTeam
 slug: /kibana-dev-docs/api-meta/deprecations-due-by-team
 title: Deprecated APIs due to be removed, by team
 description: Lists the teams that are referencing deprecated APIs with a remove by date.
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana']
 ---
 
diff --git a/api_docs/dev_tools.mdx b/api_docs/dev_tools.mdx
index bcf610652648e..c5476bbaa6ab9 100644
--- a/api_docs/dev_tools.mdx
+++ b/api_docs/dev_tools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/devTools
 title: "devTools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the devTools plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'devTools']
 ---
 import devToolsObj from './dev_tools.devdocs.json';
diff --git a/api_docs/discover.mdx b/api_docs/discover.mdx
index 5fbb097256f14..4371518bfaa3b 100644
--- a/api_docs/discover.mdx
+++ b/api_docs/discover.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/discover
 title: "discover"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the discover plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'discover']
 ---
 import discoverObj from './discover.devdocs.json';
diff --git a/api_docs/discover_enhanced.mdx b/api_docs/discover_enhanced.mdx
index 54a9f327c9f01..20e88ee9a6cc6 100644
--- a/api_docs/discover_enhanced.mdx
+++ b/api_docs/discover_enhanced.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/discoverEnhanced
 title: "discoverEnhanced"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the discoverEnhanced plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'discoverEnhanced']
 ---
 import discoverEnhancedObj from './discover_enhanced.devdocs.json';
diff --git a/api_docs/ecs_data_quality_dashboard.mdx b/api_docs/ecs_data_quality_dashboard.mdx
index 846c5ca955d1a..a461bbadec29e 100644
--- a/api_docs/ecs_data_quality_dashboard.mdx
+++ b/api_docs/ecs_data_quality_dashboard.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ecsDataQualityDashboard
 title: "ecsDataQualityDashboard"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the ecsDataQualityDashboard plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ecsDataQualityDashboard']
 ---
 import ecsDataQualityDashboardObj from './ecs_data_quality_dashboard.devdocs.json';
diff --git a/api_docs/embeddable.devdocs.json b/api_docs/embeddable.devdocs.json
index 9bb3fe64f3e52..59ef54b7c5b64 100644
--- a/api_docs/embeddable.devdocs.json
+++ b/api_docs/embeddable.devdocs.json
@@ -1023,7 +1023,7 @@
                     "section": "def-public.EmbeddableContainerSettings",
                     "text": "EmbeddableContainerSettings"
                   },
-                  "<TContainerInput> | undefined"
+                  " | undefined"
                 ],
                 "path": "src/plugins/embeddable/public/lib/containers/container.ts",
                 "deprecated": false,
@@ -6912,16 +6912,6 @@
         "tags": [],
         "label": "EmbeddableContainerSettings",
         "description": [],
-        "signature": [
-          {
-            "pluginId": "embeddable",
-            "scope": "public",
-            "docId": "kibEmbeddablePluginApi",
-            "section": "def-public.EmbeddableContainerSettings",
-            "text": "EmbeddableContainerSettings"
-          },
-          "<TContainerInput>"
-        ],
         "path": "src/plugins/embeddable/public/lib/containers/i_container.ts",
         "deprecated": false,
         "trackAdoption": false,
@@ -6957,23 +6947,6 @@
             "path": "src/plugins/embeddable/public/lib/containers/i_container.ts",
             "deprecated": false,
             "trackAdoption": false
-          },
-          {
-            "parentPluginId": "embeddable",
-            "id": "def-public.EmbeddableContainerSettings.readyToInitializeChildren$",
-            "type": "Object",
-            "tags": [],
-            "label": "readyToInitializeChildren$",
-            "description": [
-              "\n"
-            ],
-            "signature": [
-              "Observable",
-              "<TContainerInput> | undefined"
-            ],
-            "path": "src/plugins/embeddable/public/lib/containers/i_container.ts",
-            "deprecated": false,
-            "trackAdoption": false
           }
         ],
         "initialIsOpen": false
@@ -7963,7 +7936,7 @@
             "label": "status",
             "description": [],
             "signature": [
-              "\"error\" | \"loading\" | \"rendered\" | \"loaded\""
+              "\"error\" | \"loading\" | \"loaded\" | \"rendered\""
             ],
             "path": "src/plugins/embeddable/public/lib/containers/embeddable_child_panel.tsx",
             "deprecated": false,
@@ -10493,7 +10466,7 @@
         "label": "EmbeddablePhase",
         "description": [],
         "signature": [
-          "\"error\" | \"loading\" | \"rendered\" | \"loaded\""
+          "\"error\" | \"loading\" | \"loaded\" | \"rendered\""
         ],
         "path": "src/plugins/embeddable/public/lib/containers/embeddable_child_panel.tsx",
         "deprecated": false,
diff --git a/api_docs/embeddable.mdx b/api_docs/embeddable.mdx
index 02977e3729e9f..8007a28a54c7c 100644
--- a/api_docs/embeddable.mdx
+++ b/api_docs/embeddable.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/embeddable
 title: "embeddable"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the embeddable plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'embeddable']
 ---
 import embeddableObj from './embeddable.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kib
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 545 | 11 | 442 | 4 |
+| 544 | 11 | 442 | 4 |
 
 ## Client
 
diff --git a/api_docs/embeddable_enhanced.mdx b/api_docs/embeddable_enhanced.mdx
index 14506c9223e2f..4d9c5c8e7b08b 100644
--- a/api_docs/embeddable_enhanced.mdx
+++ b/api_docs/embeddable_enhanced.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/embeddableEnhanced
 title: "embeddableEnhanced"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the embeddableEnhanced plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'embeddableEnhanced']
 ---
 import embeddableEnhancedObj from './embeddable_enhanced.devdocs.json';
diff --git a/api_docs/encrypted_saved_objects.mdx b/api_docs/encrypted_saved_objects.mdx
index 6b95e96118bbe..b31c6d4cc56b0 100644
--- a/api_docs/encrypted_saved_objects.mdx
+++ b/api_docs/encrypted_saved_objects.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/encryptedSavedObjects
 title: "encryptedSavedObjects"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the encryptedSavedObjects plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'encryptedSavedObjects']
 ---
 import encryptedSavedObjectsObj from './encrypted_saved_objects.devdocs.json';
diff --git a/api_docs/enterprise_search.mdx b/api_docs/enterprise_search.mdx
index 103ba9e65a7f3..ffdd53dbd62fc 100644
--- a/api_docs/enterprise_search.mdx
+++ b/api_docs/enterprise_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/enterpriseSearch
 title: "enterpriseSearch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the enterpriseSearch plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'enterpriseSearch']
 ---
 import enterpriseSearchObj from './enterprise_search.devdocs.json';
diff --git a/api_docs/es_ui_shared.mdx b/api_docs/es_ui_shared.mdx
index e35fd39160a86..c775996206174 100644
--- a/api_docs/es_ui_shared.mdx
+++ b/api_docs/es_ui_shared.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/esUiShared
 title: "esUiShared"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the esUiShared plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'esUiShared']
 ---
 import esUiSharedObj from './es_ui_shared.devdocs.json';
diff --git a/api_docs/event_annotation.mdx b/api_docs/event_annotation.mdx
index e516bb6a05bb9..ae832bf824d2b 100644
--- a/api_docs/event_annotation.mdx
+++ b/api_docs/event_annotation.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/eventAnnotation
 title: "eventAnnotation"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the eventAnnotation plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'eventAnnotation']
 ---
 import eventAnnotationObj from './event_annotation.devdocs.json';
diff --git a/api_docs/event_log.devdocs.json b/api_docs/event_log.devdocs.json
index 081ec670ea20f..c4bf518f79333 100644
--- a/api_docs/event_log.devdocs.json
+++ b/api_docs/event_log.devdocs.json
@@ -1514,7 +1514,7 @@
             "label": "data",
             "description": [],
             "signature": [
-              "(Readonly<{ log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; message?: string | undefined; tags?: string[] | undefined; rule?: Readonly<{ id?: string | undefined; name?: string | undefined; description?: string | undefined; category?: string | undefined; uuid?: string | undefined; version?: string | undefined; license?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; } & {}> | undefined; kibana?: Readonly<{ action?: Readonly<{ id?: string | undefined; name?: string | undefined; execution?: Readonly<{ source?: string | undefined; uuid?: string | undefined; } & {}> | undefined; } & {}> | undefined; alerting?: Readonly<{ outcome?: string | undefined; summary?: Readonly<{ recovered?: Readonly<{ count?: string | number | undefined; } & {}> | undefined; new?: Readonly<{ count?: string | number | undefined; } & {}> | undefined; ongoing?: Readonly<{ count?: string | number | undefined; } & {}> | undefined; } & {}> | undefined; status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; alert?: Readonly<{ rule?: Readonly<{ consumer?: string | undefined; execution?: Readonly<{ uuid?: string | undefined; metrics?: Readonly<{ number_of_triggered_actions?: string | number | undefined; number_of_generated_actions?: string | number | undefined; alert_counts?: Readonly<{ recovered?: string | number | undefined; active?: string | number | undefined; new?: string | number | undefined; } & {}> | undefined; number_of_searches?: string | number | undefined; total_indexing_duration_ms?: string | number | undefined; es_search_duration_ms?: string | number | undefined; total_search_duration_ms?: string | number | undefined; execution_gap_duration_s?: string | number | undefined; rule_type_run_duration_ms?: string | number | undefined; process_alerts_duration_ms?: string | number | undefined; trigger_actions_duration_ms?: string | number | undefined; process_rule_duration_ms?: string | number | undefined; claim_to_start_duration_ms?: string | number | undefined; prepare_rule_duration_ms?: string | number | undefined; total_run_duration_ms?: string | number | undefined; total_enrichment_duration_ms?: string | number | undefined; } & {}> | undefined; status?: string | undefined; status_order?: string | number | undefined; } & {}> | undefined; rule_type_id?: string | undefined; } & {}> | undefined; uuid?: string | undefined; flapping?: boolean | undefined; } & {}> | undefined; version?: string | undefined; server_uuid?: string | undefined; task?: Readonly<{ id?: string | undefined; schedule_delay?: string | number | undefined; scheduled?: string | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; namespace?: string | undefined; rel?: string | undefined; type_id?: string | undefined; space_agnostic?: boolean | undefined; } & {}>[] | undefined; space_ids?: string[] | undefined; } & {}> | undefined; event?: Readonly<{ type?: string[] | undefined; reason?: string | undefined; action?: string | undefined; id?: string | undefined; start?: string | undefined; end?: string | undefined; category?: string[] | undefined; outcome?: string | undefined; code?: string | undefined; url?: string | undefined; severity?: string | number | undefined; duration?: string | number | undefined; created?: string | undefined; original?: string | undefined; dataset?: string | undefined; hash?: string | undefined; ingested?: string | undefined; kind?: string | undefined; module?: string | undefined; provider?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: string | number | undefined; timezone?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; } & {}> | undefined)[]"
+              "(Readonly<{ log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; message?: string | undefined; tags?: string[] | undefined; rule?: Readonly<{ id?: string | undefined; name?: string | undefined; description?: string | undefined; category?: string | undefined; uuid?: string | undefined; version?: string | undefined; license?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; } & {}> | undefined; kibana?: Readonly<{ action?: Readonly<{ id?: string | undefined; name?: string | undefined; execution?: Readonly<{ source?: string | undefined; uuid?: string | undefined; } & {}> | undefined; } & {}> | undefined; alerting?: Readonly<{ outcome?: string | undefined; summary?: Readonly<{ recovered?: Readonly<{ count?: string | number | undefined; } & {}> | undefined; new?: Readonly<{ count?: string | number | undefined; } & {}> | undefined; ongoing?: Readonly<{ count?: string | number | undefined; } & {}> | undefined; } & {}> | undefined; status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; alert?: Readonly<{ rule?: Readonly<{ consumer?: string | undefined; execution?: Readonly<{ uuid?: string | undefined; metrics?: Readonly<{ number_of_triggered_actions?: string | number | undefined; number_of_generated_actions?: string | number | undefined; alert_counts?: Readonly<{ recovered?: string | number | undefined; active?: string | number | undefined; new?: string | number | undefined; } & {}> | undefined; number_of_searches?: string | number | undefined; total_indexing_duration_ms?: string | number | undefined; es_search_duration_ms?: string | number | undefined; total_search_duration_ms?: string | number | undefined; execution_gap_duration_s?: string | number | undefined; rule_type_run_duration_ms?: string | number | undefined; process_alerts_duration_ms?: string | number | undefined; trigger_actions_duration_ms?: string | number | undefined; process_rule_duration_ms?: string | number | undefined; claim_to_start_duration_ms?: string | number | undefined; prepare_rule_duration_ms?: string | number | undefined; total_run_duration_ms?: string | number | undefined; total_enrichment_duration_ms?: string | number | undefined; } & {}> | undefined; status?: string | undefined; status_order?: string | number | undefined; } & {}> | undefined; rule_type_id?: string | undefined; } & {}> | undefined; uuid?: string | undefined; flapping?: boolean | undefined; maintenance_window_ids?: string[] | undefined; } & {}> | undefined; version?: string | undefined; server_uuid?: string | undefined; task?: Readonly<{ id?: string | undefined; schedule_delay?: string | number | undefined; scheduled?: string | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; namespace?: string | undefined; rel?: string | undefined; type_id?: string | undefined; space_agnostic?: boolean | undefined; } & {}>[] | undefined; space_ids?: string[] | undefined; } & {}> | undefined; event?: Readonly<{ type?: string[] | undefined; reason?: string | undefined; action?: string | undefined; id?: string | undefined; start?: string | undefined; end?: string | undefined; category?: string[] | undefined; outcome?: string | undefined; code?: string | undefined; url?: string | undefined; severity?: string | number | undefined; duration?: string | number | undefined; created?: string | undefined; dataset?: string | undefined; hash?: string | undefined; ingested?: string | undefined; kind?: string | undefined; module?: string | undefined; original?: string | undefined; provider?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: string | number | undefined; timezone?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; } & {}> | undefined)[]"
             ],
             "path": "x-pack/plugins/event_log/server/es/cluster_client_adapter.ts",
             "deprecated": false,
@@ -1534,7 +1534,7 @@
         "label": "IEvent",
         "description": [],
         "signature": [
-          "DeepPartial<DeepWriteable<Readonly<{ log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; message?: string | undefined; tags?: string[] | undefined; rule?: Readonly<{ id?: string | undefined; name?: string | undefined; description?: string | undefined; category?: string | undefined; uuid?: string | undefined; version?: string | undefined; license?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; } & {}> | undefined; kibana?: Readonly<{ action?: Readonly<{ id?: string | undefined; name?: string | undefined; execution?: Readonly<{ source?: string | undefined; uuid?: string | undefined; } & {}> | undefined; } & {}> | undefined; alerting?: Readonly<{ outcome?: string | undefined; summary?: Readonly<{ recovered?: Readonly<{ count?: string | number | undefined; } & {}> | undefined; new?: Readonly<{ count?: string | number | undefined; } & {}> | undefined; ongoing?: Readonly<{ count?: string | number | undefined; } & {}> | undefined; } & {}> | undefined; status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; alert?: Readonly<{ rule?: Readonly<{ consumer?: string | undefined; execution?: Readonly<{ uuid?: string | undefined; metrics?: Readonly<{ number_of_triggered_actions?: string | number | undefined; number_of_generated_actions?: string | number | undefined; alert_counts?: Readonly<{ recovered?: string | number | undefined; active?: string | number | undefined; new?: string | number | undefined; } & {}> | undefined; number_of_searches?: string | number | undefined; total_indexing_duration_ms?: string | number | undefined; es_search_duration_ms?: string | number | undefined; total_search_duration_ms?: string | number | undefined; execution_gap_duration_s?: string | number | undefined; rule_type_run_duration_ms?: string | number | undefined; process_alerts_duration_ms?: string | number | undefined; trigger_actions_duration_ms?: string | number | undefined; process_rule_duration_ms?: string | number | undefined; claim_to_start_duration_ms?: string | number | undefined; prepare_rule_duration_ms?: string | number | undefined; total_run_duration_ms?: string | number | undefined; total_enrichment_duration_ms?: string | number | undefined; } & {}> | undefined; status?: string | undefined; status_order?: string | number | undefined; } & {}> | undefined; rule_type_id?: string | undefined; } & {}> | undefined; uuid?: string | undefined; flapping?: boolean | undefined; } & {}> | undefined; version?: string | undefined; server_uuid?: string | undefined; task?: Readonly<{ id?: string | undefined; schedule_delay?: string | number | undefined; scheduled?: string | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; namespace?: string | undefined; rel?: string | undefined; type_id?: string | undefined; space_agnostic?: boolean | undefined; } & {}>[] | undefined; space_ids?: string[] | undefined; } & {}> | undefined; event?: Readonly<{ type?: string[] | undefined; reason?: string | undefined; action?: string | undefined; id?: string | undefined; start?: string | undefined; end?: string | undefined; category?: string[] | undefined; outcome?: string | undefined; code?: string | undefined; url?: string | undefined; severity?: string | number | undefined; duration?: string | number | undefined; created?: string | undefined; original?: string | undefined; dataset?: string | undefined; hash?: string | undefined; ingested?: string | undefined; kind?: string | undefined; module?: string | undefined; provider?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: string | number | undefined; timezone?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; } & {}>>> | undefined"
+          "DeepPartial<DeepWriteable<Readonly<{ log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; message?: string | undefined; tags?: string[] | undefined; rule?: Readonly<{ id?: string | undefined; name?: string | undefined; description?: string | undefined; category?: string | undefined; uuid?: string | undefined; version?: string | undefined; license?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; } & {}> | undefined; kibana?: Readonly<{ action?: Readonly<{ id?: string | undefined; name?: string | undefined; execution?: Readonly<{ source?: string | undefined; uuid?: string | undefined; } & {}> | undefined; } & {}> | undefined; alerting?: Readonly<{ outcome?: string | undefined; summary?: Readonly<{ recovered?: Readonly<{ count?: string | number | undefined; } & {}> | undefined; new?: Readonly<{ count?: string | number | undefined; } & {}> | undefined; ongoing?: Readonly<{ count?: string | number | undefined; } & {}> | undefined; } & {}> | undefined; status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; alert?: Readonly<{ rule?: Readonly<{ consumer?: string | undefined; execution?: Readonly<{ uuid?: string | undefined; metrics?: Readonly<{ number_of_triggered_actions?: string | number | undefined; number_of_generated_actions?: string | number | undefined; alert_counts?: Readonly<{ recovered?: string | number | undefined; active?: string | number | undefined; new?: string | number | undefined; } & {}> | undefined; number_of_searches?: string | number | undefined; total_indexing_duration_ms?: string | number | undefined; es_search_duration_ms?: string | number | undefined; total_search_duration_ms?: string | number | undefined; execution_gap_duration_s?: string | number | undefined; rule_type_run_duration_ms?: string | number | undefined; process_alerts_duration_ms?: string | number | undefined; trigger_actions_duration_ms?: string | number | undefined; process_rule_duration_ms?: string | number | undefined; claim_to_start_duration_ms?: string | number | undefined; prepare_rule_duration_ms?: string | number | undefined; total_run_duration_ms?: string | number | undefined; total_enrichment_duration_ms?: string | number | undefined; } & {}> | undefined; status?: string | undefined; status_order?: string | number | undefined; } & {}> | undefined; rule_type_id?: string | undefined; } & {}> | undefined; uuid?: string | undefined; flapping?: boolean | undefined; maintenance_window_ids?: string[] | undefined; } & {}> | undefined; version?: string | undefined; server_uuid?: string | undefined; task?: Readonly<{ id?: string | undefined; schedule_delay?: string | number | undefined; scheduled?: string | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; namespace?: string | undefined; rel?: string | undefined; type_id?: string | undefined; space_agnostic?: boolean | undefined; } & {}>[] | undefined; space_ids?: string[] | undefined; } & {}> | undefined; event?: Readonly<{ type?: string[] | undefined; reason?: string | undefined; action?: string | undefined; id?: string | undefined; start?: string | undefined; end?: string | undefined; category?: string[] | undefined; outcome?: string | undefined; code?: string | undefined; url?: string | undefined; severity?: string | number | undefined; duration?: string | number | undefined; created?: string | undefined; dataset?: string | undefined; hash?: string | undefined; ingested?: string | undefined; kind?: string | undefined; module?: string | undefined; original?: string | undefined; provider?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: string | number | undefined; timezone?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; } & {}>>> | undefined"
         ],
         "path": "x-pack/plugins/event_log/generated/schemas.ts",
         "deprecated": false,
@@ -1549,7 +1549,7 @@
         "label": "IValidatedEvent",
         "description": [],
         "signature": [
-          "Readonly<{ log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; message?: string | undefined; tags?: string[] | undefined; rule?: Readonly<{ id?: string | undefined; name?: string | undefined; description?: string | undefined; category?: string | undefined; uuid?: string | undefined; version?: string | undefined; license?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; } & {}> | undefined; kibana?: Readonly<{ action?: Readonly<{ id?: string | undefined; name?: string | undefined; execution?: Readonly<{ source?: string | undefined; uuid?: string | undefined; } & {}> | undefined; } & {}> | undefined; alerting?: Readonly<{ outcome?: string | undefined; summary?: Readonly<{ recovered?: Readonly<{ count?: string | number | undefined; } & {}> | undefined; new?: Readonly<{ count?: string | number | undefined; } & {}> | undefined; ongoing?: Readonly<{ count?: string | number | undefined; } & {}> | undefined; } & {}> | undefined; status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; alert?: Readonly<{ rule?: Readonly<{ consumer?: string | undefined; execution?: Readonly<{ uuid?: string | undefined; metrics?: Readonly<{ number_of_triggered_actions?: string | number | undefined; number_of_generated_actions?: string | number | undefined; alert_counts?: Readonly<{ recovered?: string | number | undefined; active?: string | number | undefined; new?: string | number | undefined; } & {}> | undefined; number_of_searches?: string | number | undefined; total_indexing_duration_ms?: string | number | undefined; es_search_duration_ms?: string | number | undefined; total_search_duration_ms?: string | number | undefined; execution_gap_duration_s?: string | number | undefined; rule_type_run_duration_ms?: string | number | undefined; process_alerts_duration_ms?: string | number | undefined; trigger_actions_duration_ms?: string | number | undefined; process_rule_duration_ms?: string | number | undefined; claim_to_start_duration_ms?: string | number | undefined; prepare_rule_duration_ms?: string | number | undefined; total_run_duration_ms?: string | number | undefined; total_enrichment_duration_ms?: string | number | undefined; } & {}> | undefined; status?: string | undefined; status_order?: string | number | undefined; } & {}> | undefined; rule_type_id?: string | undefined; } & {}> | undefined; uuid?: string | undefined; flapping?: boolean | undefined; } & {}> | undefined; version?: string | undefined; server_uuid?: string | undefined; task?: Readonly<{ id?: string | undefined; schedule_delay?: string | number | undefined; scheduled?: string | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; namespace?: string | undefined; rel?: string | undefined; type_id?: string | undefined; space_agnostic?: boolean | undefined; } & {}>[] | undefined; space_ids?: string[] | undefined; } & {}> | undefined; event?: Readonly<{ type?: string[] | undefined; reason?: string | undefined; action?: string | undefined; id?: string | undefined; start?: string | undefined; end?: string | undefined; category?: string[] | undefined; outcome?: string | undefined; code?: string | undefined; url?: string | undefined; severity?: string | number | undefined; duration?: string | number | undefined; created?: string | undefined; original?: string | undefined; dataset?: string | undefined; hash?: string | undefined; ingested?: string | undefined; kind?: string | undefined; module?: string | undefined; provider?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: string | number | undefined; timezone?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; } & {}> | undefined"
+          "Readonly<{ log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; message?: string | undefined; tags?: string[] | undefined; rule?: Readonly<{ id?: string | undefined; name?: string | undefined; description?: string | undefined; category?: string | undefined; uuid?: string | undefined; version?: string | undefined; license?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; } & {}> | undefined; kibana?: Readonly<{ action?: Readonly<{ id?: string | undefined; name?: string | undefined; execution?: Readonly<{ source?: string | undefined; uuid?: string | undefined; } & {}> | undefined; } & {}> | undefined; alerting?: Readonly<{ outcome?: string | undefined; summary?: Readonly<{ recovered?: Readonly<{ count?: string | number | undefined; } & {}> | undefined; new?: Readonly<{ count?: string | number | undefined; } & {}> | undefined; ongoing?: Readonly<{ count?: string | number | undefined; } & {}> | undefined; } & {}> | undefined; status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; alert?: Readonly<{ rule?: Readonly<{ consumer?: string | undefined; execution?: Readonly<{ uuid?: string | undefined; metrics?: Readonly<{ number_of_triggered_actions?: string | number | undefined; number_of_generated_actions?: string | number | undefined; alert_counts?: Readonly<{ recovered?: string | number | undefined; active?: string | number | undefined; new?: string | number | undefined; } & {}> | undefined; number_of_searches?: string | number | undefined; total_indexing_duration_ms?: string | number | undefined; es_search_duration_ms?: string | number | undefined; total_search_duration_ms?: string | number | undefined; execution_gap_duration_s?: string | number | undefined; rule_type_run_duration_ms?: string | number | undefined; process_alerts_duration_ms?: string | number | undefined; trigger_actions_duration_ms?: string | number | undefined; process_rule_duration_ms?: string | number | undefined; claim_to_start_duration_ms?: string | number | undefined; prepare_rule_duration_ms?: string | number | undefined; total_run_duration_ms?: string | number | undefined; total_enrichment_duration_ms?: string | number | undefined; } & {}> | undefined; status?: string | undefined; status_order?: string | number | undefined; } & {}> | undefined; rule_type_id?: string | undefined; } & {}> | undefined; uuid?: string | undefined; flapping?: boolean | undefined; maintenance_window_ids?: string[] | undefined; } & {}> | undefined; version?: string | undefined; server_uuid?: string | undefined; task?: Readonly<{ id?: string | undefined; schedule_delay?: string | number | undefined; scheduled?: string | undefined; } & {}> | undefined; saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; namespace?: string | undefined; rel?: string | undefined; type_id?: string | undefined; space_agnostic?: boolean | undefined; } & {}>[] | undefined; space_ids?: string[] | undefined; } & {}> | undefined; event?: Readonly<{ type?: string[] | undefined; reason?: string | undefined; action?: string | undefined; id?: string | undefined; start?: string | undefined; end?: string | undefined; category?: string[] | undefined; outcome?: string | undefined; code?: string | undefined; url?: string | undefined; severity?: string | number | undefined; duration?: string | number | undefined; created?: string | undefined; dataset?: string | undefined; hash?: string | undefined; ingested?: string | undefined; kind?: string | undefined; module?: string | undefined; original?: string | undefined; provider?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: string | number | undefined; timezone?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; } & {}> | undefined"
         ],
         "path": "x-pack/plugins/event_log/generated/schemas.ts",
         "deprecated": false,
diff --git a/api_docs/event_log.mdx b/api_docs/event_log.mdx
index b56a56228963f..53dbd441018bb 100644
--- a/api_docs/event_log.mdx
+++ b/api_docs/event_log.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/eventLog
 title: "eventLog"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the eventLog plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'eventLog']
 ---
 import eventLogObj from './event_log.devdocs.json';
diff --git a/api_docs/exploratory_view.mdx b/api_docs/exploratory_view.mdx
index 849453338e010..7117de22a6fae 100644
--- a/api_docs/exploratory_view.mdx
+++ b/api_docs/exploratory_view.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/exploratoryView
 title: "exploratoryView"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the exploratoryView plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'exploratoryView']
 ---
 import exploratoryViewObj from './exploratory_view.devdocs.json';
diff --git a/api_docs/expression_error.mdx b/api_docs/expression_error.mdx
index 45f3eb5cbf61f..525b0efa9cfad 100644
--- a/api_docs/expression_error.mdx
+++ b/api_docs/expression_error.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionError
 title: "expressionError"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionError plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionError']
 ---
 import expressionErrorObj from './expression_error.devdocs.json';
diff --git a/api_docs/expression_gauge.mdx b/api_docs/expression_gauge.mdx
index c0bccdf35a0fe..f19fdf39642cf 100644
--- a/api_docs/expression_gauge.mdx
+++ b/api_docs/expression_gauge.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionGauge
 title: "expressionGauge"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionGauge plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionGauge']
 ---
 import expressionGaugeObj from './expression_gauge.devdocs.json';
diff --git a/api_docs/expression_heatmap.mdx b/api_docs/expression_heatmap.mdx
index d934e55b7f2c6..4eecb16c31f84 100644
--- a/api_docs/expression_heatmap.mdx
+++ b/api_docs/expression_heatmap.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionHeatmap
 title: "expressionHeatmap"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionHeatmap plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionHeatmap']
 ---
 import expressionHeatmapObj from './expression_heatmap.devdocs.json';
diff --git a/api_docs/expression_image.mdx b/api_docs/expression_image.mdx
index f64aa1581a3c5..fb6b79947615d 100644
--- a/api_docs/expression_image.mdx
+++ b/api_docs/expression_image.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionImage
 title: "expressionImage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionImage plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionImage']
 ---
 import expressionImageObj from './expression_image.devdocs.json';
diff --git a/api_docs/expression_legacy_metric_vis.mdx b/api_docs/expression_legacy_metric_vis.mdx
index 22e421096034b..b490005a0e4d0 100644
--- a/api_docs/expression_legacy_metric_vis.mdx
+++ b/api_docs/expression_legacy_metric_vis.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionLegacyMetricVis
 title: "expressionLegacyMetricVis"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionLegacyMetricVis plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionLegacyMetricVis']
 ---
 import expressionLegacyMetricVisObj from './expression_legacy_metric_vis.devdocs.json';
diff --git a/api_docs/expression_metric.mdx b/api_docs/expression_metric.mdx
index b5e8ad43772ee..85bded968098f 100644
--- a/api_docs/expression_metric.mdx
+++ b/api_docs/expression_metric.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionMetric
 title: "expressionMetric"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionMetric plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionMetric']
 ---
 import expressionMetricObj from './expression_metric.devdocs.json';
diff --git a/api_docs/expression_metric_vis.mdx b/api_docs/expression_metric_vis.mdx
index b83a4acedad45..4e56daabbec11 100644
--- a/api_docs/expression_metric_vis.mdx
+++ b/api_docs/expression_metric_vis.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionMetricVis
 title: "expressionMetricVis"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionMetricVis plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionMetricVis']
 ---
 import expressionMetricVisObj from './expression_metric_vis.devdocs.json';
diff --git a/api_docs/expression_partition_vis.mdx b/api_docs/expression_partition_vis.mdx
index 613f702138868..3910a33c754e2 100644
--- a/api_docs/expression_partition_vis.mdx
+++ b/api_docs/expression_partition_vis.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionPartitionVis
 title: "expressionPartitionVis"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionPartitionVis plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionPartitionVis']
 ---
 import expressionPartitionVisObj from './expression_partition_vis.devdocs.json';
diff --git a/api_docs/expression_repeat_image.mdx b/api_docs/expression_repeat_image.mdx
index 3f5cb2ac0f28b..b7ff5f80cbd45 100644
--- a/api_docs/expression_repeat_image.mdx
+++ b/api_docs/expression_repeat_image.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionRepeatImage
 title: "expressionRepeatImage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionRepeatImage plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionRepeatImage']
 ---
 import expressionRepeatImageObj from './expression_repeat_image.devdocs.json';
diff --git a/api_docs/expression_reveal_image.mdx b/api_docs/expression_reveal_image.mdx
index b3235f04d4e6d..57751d587dc89 100644
--- a/api_docs/expression_reveal_image.mdx
+++ b/api_docs/expression_reveal_image.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionRevealImage
 title: "expressionRevealImage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionRevealImage plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionRevealImage']
 ---
 import expressionRevealImageObj from './expression_reveal_image.devdocs.json';
diff --git a/api_docs/expression_shape.mdx b/api_docs/expression_shape.mdx
index dbb0961004d02..4147ab5952333 100644
--- a/api_docs/expression_shape.mdx
+++ b/api_docs/expression_shape.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionShape
 title: "expressionShape"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionShape plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionShape']
 ---
 import expressionShapeObj from './expression_shape.devdocs.json';
diff --git a/api_docs/expression_tagcloud.mdx b/api_docs/expression_tagcloud.mdx
index f10426042f970..703ea27cf3818 100644
--- a/api_docs/expression_tagcloud.mdx
+++ b/api_docs/expression_tagcloud.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionTagcloud
 title: "expressionTagcloud"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionTagcloud plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionTagcloud']
 ---
 import expressionTagcloudObj from './expression_tagcloud.devdocs.json';
diff --git a/api_docs/expression_x_y.mdx b/api_docs/expression_x_y.mdx
index 1fb52cf6c77eb..605a8a4b3bef5 100644
--- a/api_docs/expression_x_y.mdx
+++ b/api_docs/expression_x_y.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionXY
 title: "expressionXY"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionXY plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionXY']
 ---
 import expressionXYObj from './expression_x_y.devdocs.json';
diff --git a/api_docs/expressions.mdx b/api_docs/expressions.mdx
index 1bd11ec87fad7..ad1ab82fa4842 100644
--- a/api_docs/expressions.mdx
+++ b/api_docs/expressions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressions
 title: "expressions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressions plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressions']
 ---
 import expressionsObj from './expressions.devdocs.json';
diff --git a/api_docs/features.mdx b/api_docs/features.mdx
index 21867f9dcb7c3..9151874067f58 100644
--- a/api_docs/features.mdx
+++ b/api_docs/features.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/features
 title: "features"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the features plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'features']
 ---
 import featuresObj from './features.devdocs.json';
diff --git a/api_docs/field_formats.mdx b/api_docs/field_formats.mdx
index 03df4c3fcfb44..1cd315e9ca353 100644
--- a/api_docs/field_formats.mdx
+++ b/api_docs/field_formats.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/fieldFormats
 title: "fieldFormats"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the fieldFormats plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'fieldFormats']
 ---
 import fieldFormatsObj from './field_formats.devdocs.json';
diff --git a/api_docs/file_upload.mdx b/api_docs/file_upload.mdx
index cef26e17b6d33..7657a53cabc3f 100644
--- a/api_docs/file_upload.mdx
+++ b/api_docs/file_upload.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/fileUpload
 title: "fileUpload"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the fileUpload plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'fileUpload']
 ---
 import fileUploadObj from './file_upload.devdocs.json';
diff --git a/api_docs/files.mdx b/api_docs/files.mdx
index 9a81f60a70ba5..ae68c060bd5d0 100644
--- a/api_docs/files.mdx
+++ b/api_docs/files.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/files
 title: "files"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the files plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'files']
 ---
 import filesObj from './files.devdocs.json';
diff --git a/api_docs/files_management.mdx b/api_docs/files_management.mdx
index e25bf2cf7fee0..d9d3b812cd8eb 100644
--- a/api_docs/files_management.mdx
+++ b/api_docs/files_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/filesManagement
 title: "filesManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the filesManagement plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'filesManagement']
 ---
 import filesManagementObj from './files_management.devdocs.json';
diff --git a/api_docs/fleet.devdocs.json b/api_docs/fleet.devdocs.json
index c8b3355a17f38..66e49033cc9df 100644
--- a/api_docs/fleet.devdocs.json
+++ b/api_docs/fleet.devdocs.json
@@ -6003,6 +6003,60 @@
             ],
             "returnComment": []
           },
+          {
+            "parentPluginId": "fleet",
+            "id": "def-server.PackageClient.readBundledPackage",
+            "type": "Function",
+            "tags": [],
+            "label": "readBundledPackage",
+            "description": [],
+            "signature": [
+              "(bundledPackage: ",
+              {
+                "pluginId": "fleet",
+                "scope": "common",
+                "docId": "kibFleetPluginApi",
+                "section": "def-common.BundledPackage",
+                "text": "BundledPackage"
+              },
+              ") => Promise<{ packageInfo: ",
+              {
+                "pluginId": "fleet",
+                "scope": "common",
+                "docId": "kibFleetPluginApi",
+                "section": "def-common.ArchivePackage",
+                "text": "ArchivePackage"
+              },
+              "; paths: string[]; }>"
+            ],
+            "path": "x-pack/plugins/fleet/server/services/epm/package_service.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "fleet",
+                "id": "def-server.PackageClient.readBundledPackage.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "bundledPackage",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "fleet",
+                    "scope": "common",
+                    "docId": "kibFleetPluginApi",
+                    "section": "def-common.BundledPackage",
+                    "text": "BundledPackage"
+                  }
+                ],
+                "path": "x-pack/plugins/fleet/server/services/epm/package_service.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
           {
             "parentPluginId": "fleet",
             "id": "def-server.PackageClient.getPackage",
diff --git a/api_docs/fleet.mdx b/api_docs/fleet.mdx
index 765d621169bd4..c2886bd1024a5 100644
--- a/api_docs/fleet.mdx
+++ b/api_docs/fleet.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/fleet
 title: "fleet"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the fleet plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'fleet']
 ---
 import fleetObj from './fleet.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/fleet](https://github.com/orgs/elastic/teams/fleet) for questi
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 1101 | 3 | 996 | 27 |
+| 1103 | 3 | 998 | 27 |
 
 ## Client
 
diff --git a/api_docs/global_search.mdx b/api_docs/global_search.mdx
index 0b55b1f3091c7..f940b4fcf495f 100644
--- a/api_docs/global_search.mdx
+++ b/api_docs/global_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/globalSearch
 title: "globalSearch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the globalSearch plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'globalSearch']
 ---
 import globalSearchObj from './global_search.devdocs.json';
diff --git a/api_docs/guided_onboarding.mdx b/api_docs/guided_onboarding.mdx
index 4ae55190ce38e..ab829887b23a1 100644
--- a/api_docs/guided_onboarding.mdx
+++ b/api_docs/guided_onboarding.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/guidedOnboarding
 title: "guidedOnboarding"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the guidedOnboarding plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'guidedOnboarding']
 ---
 import guidedOnboardingObj from './guided_onboarding.devdocs.json';
diff --git a/api_docs/home.mdx b/api_docs/home.mdx
index bc635db196102..371b6ec28b3db 100644
--- a/api_docs/home.mdx
+++ b/api_docs/home.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/home
 title: "home"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the home plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'home']
 ---
 import homeObj from './home.devdocs.json';
diff --git a/api_docs/image_embeddable.mdx b/api_docs/image_embeddable.mdx
index dda6824fbe32f..4027dd7e65936 100644
--- a/api_docs/image_embeddable.mdx
+++ b/api_docs/image_embeddable.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/imageEmbeddable
 title: "imageEmbeddable"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the imageEmbeddable plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'imageEmbeddable']
 ---
 import imageEmbeddableObj from './image_embeddable.devdocs.json';
diff --git a/api_docs/index_lifecycle_management.mdx b/api_docs/index_lifecycle_management.mdx
index d7eb6a2fdad96..0aee4872f24ed 100644
--- a/api_docs/index_lifecycle_management.mdx
+++ b/api_docs/index_lifecycle_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/indexLifecycleManagement
 title: "indexLifecycleManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the indexLifecycleManagement plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'indexLifecycleManagement']
 ---
 import indexLifecycleManagementObj from './index_lifecycle_management.devdocs.json';
diff --git a/api_docs/index_management.mdx b/api_docs/index_management.mdx
index 089c8288851a9..afe5428691d92 100644
--- a/api_docs/index_management.mdx
+++ b/api_docs/index_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/indexManagement
 title: "indexManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the indexManagement plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'indexManagement']
 ---
 import indexManagementObj from './index_management.devdocs.json';
diff --git a/api_docs/infra.devdocs.json b/api_docs/infra.devdocs.json
index a72f1be0fe334..c9e30b7cf0fed 100644
--- a/api_docs/infra.devdocs.json
+++ b/api_docs/infra.devdocs.json
@@ -516,6 +516,20 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "infra",
+            "id": "def-server.InfraConfig.logs",
+            "type": "Object",
+            "tags": [],
+            "label": "logs",
+            "description": [],
+            "signature": [
+              "{ app_target: \"discover\" | \"logs-ui\"; }"
+            ],
+            "path": "x-pack/plugins/infra/common/plugin_config_types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "infra",
             "id": "def-server.InfraConfig.sources",
diff --git a/api_docs/infra.mdx b/api_docs/infra.mdx
index 9bd4b9bb764dd..286d3290ad0e4 100644
--- a/api_docs/infra.mdx
+++ b/api_docs/infra.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/infra
 title: "infra"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the infra plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'infra']
 ---
 import infraObj from './infra.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/infra-monitoring-ui](https://github.com/orgs/elastic/teams/inf
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 43 | 0 | 40 | 9 |
+| 44 | 0 | 41 | 9 |
 
 ## Client
 
diff --git a/api_docs/inspector.mdx b/api_docs/inspector.mdx
index 42ee86d841d19..42016b66daf73 100644
--- a/api_docs/inspector.mdx
+++ b/api_docs/inspector.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/inspector
 title: "inspector"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the inspector plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'inspector']
 ---
 import inspectorObj from './inspector.devdocs.json';
diff --git a/api_docs/interactive_setup.mdx b/api_docs/interactive_setup.mdx
index 2759a7bf7be21..501e179a1c099 100644
--- a/api_docs/interactive_setup.mdx
+++ b/api_docs/interactive_setup.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/interactiveSetup
 title: "interactiveSetup"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the interactiveSetup plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'interactiveSetup']
 ---
 import interactiveSetupObj from './interactive_setup.devdocs.json';
diff --git a/api_docs/kbn_ace.mdx b/api_docs/kbn_ace.mdx
index e4d2390ade27b..053175863af1a 100644
--- a/api_docs/kbn_ace.mdx
+++ b/api_docs/kbn_ace.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ace
 title: "@kbn/ace"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ace plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ace']
 ---
 import kbnAceObj from './kbn_ace.devdocs.json';
diff --git a/api_docs/kbn_aiops_components.mdx b/api_docs/kbn_aiops_components.mdx
index f4e8bc70d1518..4bdb843dc3269 100644
--- a/api_docs/kbn_aiops_components.mdx
+++ b/api_docs/kbn_aiops_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-aiops-components
 title: "@kbn/aiops-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/aiops-components plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/aiops-components']
 ---
 import kbnAiopsComponentsObj from './kbn_aiops_components.devdocs.json';
diff --git a/api_docs/kbn_aiops_utils.mdx b/api_docs/kbn_aiops_utils.mdx
index c73719f74b85f..3d0026198d905 100644
--- a/api_docs/kbn_aiops_utils.mdx
+++ b/api_docs/kbn_aiops_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-aiops-utils
 title: "@kbn/aiops-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/aiops-utils plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/aiops-utils']
 ---
 import kbnAiopsUtilsObj from './kbn_aiops_utils.devdocs.json';
diff --git a/api_docs/kbn_alerting_state_types.mdx b/api_docs/kbn_alerting_state_types.mdx
index a7333dbad536a..a1340ac35ecfa 100644
--- a/api_docs/kbn_alerting_state_types.mdx
+++ b/api_docs/kbn_alerting_state_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerting-state-types
 title: "@kbn/alerting-state-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerting-state-types plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerting-state-types']
 ---
 import kbnAlertingStateTypesObj from './kbn_alerting_state_types.devdocs.json';
diff --git a/api_docs/kbn_alerts.mdx b/api_docs/kbn_alerts.mdx
index c15074ba938bf..3a40615c08a29 100644
--- a/api_docs/kbn_alerts.mdx
+++ b/api_docs/kbn_alerts.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerts
 title: "@kbn/alerts"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerts plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerts']
 ---
 import kbnAlertsObj from './kbn_alerts.devdocs.json';
diff --git a/api_docs/kbn_alerts_as_data_utils.devdocs.json b/api_docs/kbn_alerts_as_data_utils.devdocs.json
index ea06121f4eb48..8c980bb4a392a 100644
--- a/api_docs/kbn_alerts_as_data_utils.devdocs.json
+++ b/api_docs/kbn_alerts_as_data_utils.devdocs.json
@@ -114,7 +114,7 @@
         "label": "AlertFieldMap",
         "description": [],
         "signature": [
-          "{ readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }"
+          "{ readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.maintenance_window_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }"
         ],
         "path": "packages/kbn-alerts-as-data-utils/src/field_maps/alert_field_map.ts",
         "deprecated": false,
@@ -182,7 +182,7 @@
         "label": "alertFieldMap",
         "description": [],
         "signature": [
-          "{ readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }"
+          "{ readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.maintenance_window_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }"
         ],
         "path": "packages/kbn-alerts-as-data-utils/src/field_maps/alert_field_map.ts",
         "deprecated": false,
diff --git a/api_docs/kbn_alerts_as_data_utils.mdx b/api_docs/kbn_alerts_as_data_utils.mdx
index 41cbc25fe19e0..07fa1da2c3fdc 100644
--- a/api_docs/kbn_alerts_as_data_utils.mdx
+++ b/api_docs/kbn_alerts_as_data_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerts-as-data-utils
 title: "@kbn/alerts-as-data-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerts-as-data-utils plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerts-as-data-utils']
 ---
 import kbnAlertsAsDataUtilsObj from './kbn_alerts_as_data_utils.devdocs.json';
diff --git a/api_docs/kbn_alerts_ui_shared.mdx b/api_docs/kbn_alerts_ui_shared.mdx
index f0910f5fc35a6..f5021476e5f49 100644
--- a/api_docs/kbn_alerts_ui_shared.mdx
+++ b/api_docs/kbn_alerts_ui_shared.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerts-ui-shared
 title: "@kbn/alerts-ui-shared"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerts-ui-shared plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerts-ui-shared']
 ---
 import kbnAlertsUiSharedObj from './kbn_alerts_ui_shared.devdocs.json';
diff --git a/api_docs/kbn_analytics.mdx b/api_docs/kbn_analytics.mdx
index ac5cff2d62a3b..e94e40097f032 100644
--- a/api_docs/kbn_analytics.mdx
+++ b/api_docs/kbn_analytics.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics
 title: "@kbn/analytics"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics']
 ---
 import kbnAnalyticsObj from './kbn_analytics.devdocs.json';
diff --git a/api_docs/kbn_analytics_client.mdx b/api_docs/kbn_analytics_client.mdx
index 8f9f6554e4150..abc54380532ba 100644
--- a/api_docs/kbn_analytics_client.mdx
+++ b/api_docs/kbn_analytics_client.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-client
 title: "@kbn/analytics-client"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics-client plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-client']
 ---
 import kbnAnalyticsClientObj from './kbn_analytics_client.devdocs.json';
diff --git a/api_docs/kbn_analytics_shippers_elastic_v3_browser.mdx b/api_docs/kbn_analytics_shippers_elastic_v3_browser.mdx
index f4161c633a6c0..baed09c3e5ccf 100644
--- a/api_docs/kbn_analytics_shippers_elastic_v3_browser.mdx
+++ b/api_docs/kbn_analytics_shippers_elastic_v3_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-shippers-elastic-v3-browser
 title: "@kbn/analytics-shippers-elastic-v3-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics-shippers-elastic-v3-browser plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-shippers-elastic-v3-browser']
 ---
 import kbnAnalyticsShippersElasticV3BrowserObj from './kbn_analytics_shippers_elastic_v3_browser.devdocs.json';
diff --git a/api_docs/kbn_analytics_shippers_elastic_v3_common.mdx b/api_docs/kbn_analytics_shippers_elastic_v3_common.mdx
index 974386ed1b8e4..7ce6fa5d7469c 100644
--- a/api_docs/kbn_analytics_shippers_elastic_v3_common.mdx
+++ b/api_docs/kbn_analytics_shippers_elastic_v3_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-shippers-elastic-v3-common
 title: "@kbn/analytics-shippers-elastic-v3-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics-shippers-elastic-v3-common plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-shippers-elastic-v3-common']
 ---
 import kbnAnalyticsShippersElasticV3CommonObj from './kbn_analytics_shippers_elastic_v3_common.devdocs.json';
diff --git a/api_docs/kbn_analytics_shippers_elastic_v3_server.mdx b/api_docs/kbn_analytics_shippers_elastic_v3_server.mdx
index 5fc1dc2f5919a..8ecbc7e49d01f 100644
--- a/api_docs/kbn_analytics_shippers_elastic_v3_server.mdx
+++ b/api_docs/kbn_analytics_shippers_elastic_v3_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-shippers-elastic-v3-server
 title: "@kbn/analytics-shippers-elastic-v3-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics-shippers-elastic-v3-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-shippers-elastic-v3-server']
 ---
 import kbnAnalyticsShippersElasticV3ServerObj from './kbn_analytics_shippers_elastic_v3_server.devdocs.json';
diff --git a/api_docs/kbn_analytics_shippers_fullstory.mdx b/api_docs/kbn_analytics_shippers_fullstory.mdx
index 79b0ae9090ca8..6c27ce5db8cfb 100644
--- a/api_docs/kbn_analytics_shippers_fullstory.mdx
+++ b/api_docs/kbn_analytics_shippers_fullstory.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-shippers-fullstory
 title: "@kbn/analytics-shippers-fullstory"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics-shippers-fullstory plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-shippers-fullstory']
 ---
 import kbnAnalyticsShippersFullstoryObj from './kbn_analytics_shippers_fullstory.devdocs.json';
diff --git a/api_docs/kbn_analytics_shippers_gainsight.mdx b/api_docs/kbn_analytics_shippers_gainsight.mdx
index 9867bcd91ff48..3a5cf3a361d46 100644
--- a/api_docs/kbn_analytics_shippers_gainsight.mdx
+++ b/api_docs/kbn_analytics_shippers_gainsight.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-shippers-gainsight
 title: "@kbn/analytics-shippers-gainsight"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics-shippers-gainsight plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-shippers-gainsight']
 ---
 import kbnAnalyticsShippersGainsightObj from './kbn_analytics_shippers_gainsight.devdocs.json';
diff --git a/api_docs/kbn_apm_config_loader.mdx b/api_docs/kbn_apm_config_loader.mdx
index eeda8b4391283..c285567ce864a 100644
--- a/api_docs/kbn_apm_config_loader.mdx
+++ b/api_docs/kbn_apm_config_loader.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-config-loader
 title: "@kbn/apm-config-loader"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/apm-config-loader plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-config-loader']
 ---
 import kbnApmConfigLoaderObj from './kbn_apm_config_loader.devdocs.json';
diff --git a/api_docs/kbn_apm_synthtrace.mdx b/api_docs/kbn_apm_synthtrace.mdx
index 1f768ab557e33..063b1740f59b5 100644
--- a/api_docs/kbn_apm_synthtrace.mdx
+++ b/api_docs/kbn_apm_synthtrace.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-synthtrace
 title: "@kbn/apm-synthtrace"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/apm-synthtrace plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-synthtrace']
 ---
 import kbnApmSynthtraceObj from './kbn_apm_synthtrace.devdocs.json';
diff --git a/api_docs/kbn_apm_synthtrace_client.mdx b/api_docs/kbn_apm_synthtrace_client.mdx
index ef2fe4abe9747..aa86b1d04d774 100644
--- a/api_docs/kbn_apm_synthtrace_client.mdx
+++ b/api_docs/kbn_apm_synthtrace_client.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-synthtrace-client
 title: "@kbn/apm-synthtrace-client"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/apm-synthtrace-client plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-synthtrace-client']
 ---
 import kbnApmSynthtraceClientObj from './kbn_apm_synthtrace_client.devdocs.json';
diff --git a/api_docs/kbn_apm_utils.mdx b/api_docs/kbn_apm_utils.mdx
index 2d1f6245bdf03..91662b2f085a5 100644
--- a/api_docs/kbn_apm_utils.mdx
+++ b/api_docs/kbn_apm_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-utils
 title: "@kbn/apm-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/apm-utils plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-utils']
 ---
 import kbnApmUtilsObj from './kbn_apm_utils.devdocs.json';
diff --git a/api_docs/kbn_axe_config.mdx b/api_docs/kbn_axe_config.mdx
index a43abcdbeded7..e5ae1486ae348 100644
--- a/api_docs/kbn_axe_config.mdx
+++ b/api_docs/kbn_axe_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-axe-config
 title: "@kbn/axe-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/axe-config plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/axe-config']
 ---
 import kbnAxeConfigObj from './kbn_axe_config.devdocs.json';
diff --git a/api_docs/kbn_cases_components.mdx b/api_docs/kbn_cases_components.mdx
index 802c542ff1d9d..a19320ccda226 100644
--- a/api_docs/kbn_cases_components.mdx
+++ b/api_docs/kbn_cases_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cases-components
 title: "@kbn/cases-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/cases-components plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/cases-components']
 ---
 import kbnCasesComponentsObj from './kbn_cases_components.devdocs.json';
diff --git a/api_docs/kbn_cell_actions.mdx b/api_docs/kbn_cell_actions.mdx
index d14cdd10cb5cd..071e47698abee 100644
--- a/api_docs/kbn_cell_actions.mdx
+++ b/api_docs/kbn_cell_actions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cell-actions
 title: "@kbn/cell-actions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/cell-actions plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/cell-actions']
 ---
 import kbnCellActionsObj from './kbn_cell_actions.devdocs.json';
diff --git a/api_docs/kbn_chart_expressions_common.mdx b/api_docs/kbn_chart_expressions_common.mdx
index c2d0094e972d7..6cbfa7316cd70 100644
--- a/api_docs/kbn_chart_expressions_common.mdx
+++ b/api_docs/kbn_chart_expressions_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-chart-expressions-common
 title: "@kbn/chart-expressions-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/chart-expressions-common plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/chart-expressions-common']
 ---
 import kbnChartExpressionsCommonObj from './kbn_chart_expressions_common.devdocs.json';
diff --git a/api_docs/kbn_chart_icons.mdx b/api_docs/kbn_chart_icons.mdx
index 1d3086cc5fa5a..b0958df1d649f 100644
--- a/api_docs/kbn_chart_icons.mdx
+++ b/api_docs/kbn_chart_icons.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-chart-icons
 title: "@kbn/chart-icons"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/chart-icons plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/chart-icons']
 ---
 import kbnChartIconsObj from './kbn_chart_icons.devdocs.json';
diff --git a/api_docs/kbn_ci_stats_core.mdx b/api_docs/kbn_ci_stats_core.mdx
index d4fe8d7090728..3331edc3f96d5 100644
--- a/api_docs/kbn_ci_stats_core.mdx
+++ b/api_docs/kbn_ci_stats_core.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ci-stats-core
 title: "@kbn/ci-stats-core"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ci-stats-core plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ci-stats-core']
 ---
 import kbnCiStatsCoreObj from './kbn_ci_stats_core.devdocs.json';
diff --git a/api_docs/kbn_ci_stats_performance_metrics.mdx b/api_docs/kbn_ci_stats_performance_metrics.mdx
index eb4a00a5ef79f..49fee67f64c43 100644
--- a/api_docs/kbn_ci_stats_performance_metrics.mdx
+++ b/api_docs/kbn_ci_stats_performance_metrics.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ci-stats-performance-metrics
 title: "@kbn/ci-stats-performance-metrics"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ci-stats-performance-metrics plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ci-stats-performance-metrics']
 ---
 import kbnCiStatsPerformanceMetricsObj from './kbn_ci_stats_performance_metrics.devdocs.json';
diff --git a/api_docs/kbn_ci_stats_reporter.mdx b/api_docs/kbn_ci_stats_reporter.mdx
index abe5feff261ca..a28a0769f6d79 100644
--- a/api_docs/kbn_ci_stats_reporter.mdx
+++ b/api_docs/kbn_ci_stats_reporter.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ci-stats-reporter
 title: "@kbn/ci-stats-reporter"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ci-stats-reporter plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ci-stats-reporter']
 ---
 import kbnCiStatsReporterObj from './kbn_ci_stats_reporter.devdocs.json';
diff --git a/api_docs/kbn_cli_dev_mode.mdx b/api_docs/kbn_cli_dev_mode.mdx
index 273214fcd1e9c..cd9b9e5c6d1ee 100644
--- a/api_docs/kbn_cli_dev_mode.mdx
+++ b/api_docs/kbn_cli_dev_mode.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cli-dev-mode
 title: "@kbn/cli-dev-mode"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/cli-dev-mode plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/cli-dev-mode']
 ---
 import kbnCliDevModeObj from './kbn_cli_dev_mode.devdocs.json';
diff --git a/api_docs/kbn_code_editor.mdx b/api_docs/kbn_code_editor.mdx
index a2ca9df0c6105..0f1fb1fb71d8f 100644
--- a/api_docs/kbn_code_editor.mdx
+++ b/api_docs/kbn_code_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-code-editor
 title: "@kbn/code-editor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/code-editor plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/code-editor']
 ---
 import kbnCodeEditorObj from './kbn_code_editor.devdocs.json';
diff --git a/api_docs/kbn_code_editor_mocks.mdx b/api_docs/kbn_code_editor_mocks.mdx
index 5e946e9d7a68b..714ef2b878fcd 100644
--- a/api_docs/kbn_code_editor_mocks.mdx
+++ b/api_docs/kbn_code_editor_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-code-editor-mocks
 title: "@kbn/code-editor-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/code-editor-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/code-editor-mocks']
 ---
 import kbnCodeEditorMocksObj from './kbn_code_editor_mocks.devdocs.json';
diff --git a/api_docs/kbn_coloring.mdx b/api_docs/kbn_coloring.mdx
index 119058d250f7f..df1eb43f8c67d 100644
--- a/api_docs/kbn_coloring.mdx
+++ b/api_docs/kbn_coloring.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-coloring
 title: "@kbn/coloring"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/coloring plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/coloring']
 ---
 import kbnColoringObj from './kbn_coloring.devdocs.json';
diff --git a/api_docs/kbn_config.mdx b/api_docs/kbn_config.mdx
index 5056c3647e515..f311f1eee5a27 100644
--- a/api_docs/kbn_config.mdx
+++ b/api_docs/kbn_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-config
 title: "@kbn/config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/config plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/config']
 ---
 import kbnConfigObj from './kbn_config.devdocs.json';
diff --git a/api_docs/kbn_config_mocks.mdx b/api_docs/kbn_config_mocks.mdx
index 4dec3e2cd3f5d..470968d50d845 100644
--- a/api_docs/kbn_config_mocks.mdx
+++ b/api_docs/kbn_config_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-config-mocks
 title: "@kbn/config-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/config-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/config-mocks']
 ---
 import kbnConfigMocksObj from './kbn_config_mocks.devdocs.json';
diff --git a/api_docs/kbn_config_schema.mdx b/api_docs/kbn_config_schema.mdx
index 368b3abc63350..1f493df2129f4 100644
--- a/api_docs/kbn_config_schema.mdx
+++ b/api_docs/kbn_config_schema.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-config-schema
 title: "@kbn/config-schema"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/config-schema plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/config-schema']
 ---
 import kbnConfigSchemaObj from './kbn_config_schema.devdocs.json';
diff --git a/api_docs/kbn_content_management_content_editor.mdx b/api_docs/kbn_content_management_content_editor.mdx
index b0ab27ae78600..9860b8335ea58 100644
--- a/api_docs/kbn_content_management_content_editor.mdx
+++ b/api_docs/kbn_content_management_content_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-content-editor
 title: "@kbn/content-management-content-editor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-content-editor plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-content-editor']
 ---
 import kbnContentManagementContentEditorObj from './kbn_content_management_content_editor.devdocs.json';
diff --git a/api_docs/kbn_content_management_table_list.mdx b/api_docs/kbn_content_management_table_list.mdx
index 3ecf51fd33244..b934f826eee2d 100644
--- a/api_docs/kbn_content_management_table_list.mdx
+++ b/api_docs/kbn_content_management_table_list.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-table-list
 title: "@kbn/content-management-table-list"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-table-list plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-table-list']
 ---
 import kbnContentManagementTableListObj from './kbn_content_management_table_list.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_browser.mdx b/api_docs/kbn_core_analytics_browser.mdx
index f30b5bae17d46..bbf4f05364882 100644
--- a/api_docs/kbn_core_analytics_browser.mdx
+++ b/api_docs/kbn_core_analytics_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-browser
 title: "@kbn/core-analytics-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-browser plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-browser']
 ---
 import kbnCoreAnalyticsBrowserObj from './kbn_core_analytics_browser.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_browser_internal.mdx b/api_docs/kbn_core_analytics_browser_internal.mdx
index 28e92d54f0efb..7f3708168936b 100644
--- a/api_docs/kbn_core_analytics_browser_internal.mdx
+++ b/api_docs/kbn_core_analytics_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-browser-internal
 title: "@kbn/core-analytics-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-browser-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-browser-internal']
 ---
 import kbnCoreAnalyticsBrowserInternalObj from './kbn_core_analytics_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_browser_mocks.mdx b/api_docs/kbn_core_analytics_browser_mocks.mdx
index 67b75e7d10057..d66e54be71a08 100644
--- a/api_docs/kbn_core_analytics_browser_mocks.mdx
+++ b/api_docs/kbn_core_analytics_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-browser-mocks
 title: "@kbn/core-analytics-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-browser-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-browser-mocks']
 ---
 import kbnCoreAnalyticsBrowserMocksObj from './kbn_core_analytics_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_server.mdx b/api_docs/kbn_core_analytics_server.mdx
index 8189da0441012..8408c9e4e4fdf 100644
--- a/api_docs/kbn_core_analytics_server.mdx
+++ b/api_docs/kbn_core_analytics_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-server
 title: "@kbn/core-analytics-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-server']
 ---
 import kbnCoreAnalyticsServerObj from './kbn_core_analytics_server.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_server_internal.mdx b/api_docs/kbn_core_analytics_server_internal.mdx
index 58893459be1ef..61f4f5b6c3051 100644
--- a/api_docs/kbn_core_analytics_server_internal.mdx
+++ b/api_docs/kbn_core_analytics_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-server-internal
 title: "@kbn/core-analytics-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-server-internal']
 ---
 import kbnCoreAnalyticsServerInternalObj from './kbn_core_analytics_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_server_mocks.mdx b/api_docs/kbn_core_analytics_server_mocks.mdx
index aca802c739677..83100905f5ef4 100644
--- a/api_docs/kbn_core_analytics_server_mocks.mdx
+++ b/api_docs/kbn_core_analytics_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-server-mocks
 title: "@kbn/core-analytics-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-server-mocks']
 ---
 import kbnCoreAnalyticsServerMocksObj from './kbn_core_analytics_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_application_browser.mdx b/api_docs/kbn_core_application_browser.mdx
index d8ff0064c33a3..90225469bdbf8 100644
--- a/api_docs/kbn_core_application_browser.mdx
+++ b/api_docs/kbn_core_application_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-browser
 title: "@kbn/core-application-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-application-browser plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-application-browser']
 ---
 import kbnCoreApplicationBrowserObj from './kbn_core_application_browser.devdocs.json';
diff --git a/api_docs/kbn_core_application_browser_internal.mdx b/api_docs/kbn_core_application_browser_internal.mdx
index 48946a11b73d9..57a2dc2c514a7 100644
--- a/api_docs/kbn_core_application_browser_internal.mdx
+++ b/api_docs/kbn_core_application_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-browser-internal
 title: "@kbn/core-application-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-application-browser-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-application-browser-internal']
 ---
 import kbnCoreApplicationBrowserInternalObj from './kbn_core_application_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_application_browser_mocks.mdx b/api_docs/kbn_core_application_browser_mocks.mdx
index b7d1bd73c2ad6..16bd5773b95e7 100644
--- a/api_docs/kbn_core_application_browser_mocks.mdx
+++ b/api_docs/kbn_core_application_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-browser-mocks
 title: "@kbn/core-application-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-application-browser-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-application-browser-mocks']
 ---
 import kbnCoreApplicationBrowserMocksObj from './kbn_core_application_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_application_common.mdx b/api_docs/kbn_core_application_common.mdx
index 7c641e8a33eab..2f6e98f38515e 100644
--- a/api_docs/kbn_core_application_common.mdx
+++ b/api_docs/kbn_core_application_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-common
 title: "@kbn/core-application-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-application-common plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-application-common']
 ---
 import kbnCoreApplicationCommonObj from './kbn_core_application_common.devdocs.json';
diff --git a/api_docs/kbn_core_apps_browser_internal.mdx b/api_docs/kbn_core_apps_browser_internal.mdx
index 67c181dbe353c..97d35ded06253 100644
--- a/api_docs/kbn_core_apps_browser_internal.mdx
+++ b/api_docs/kbn_core_apps_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-apps-browser-internal
 title: "@kbn/core-apps-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-apps-browser-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-apps-browser-internal']
 ---
 import kbnCoreAppsBrowserInternalObj from './kbn_core_apps_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_apps_browser_mocks.mdx b/api_docs/kbn_core_apps_browser_mocks.mdx
index 3e937416907f7..71d8df1a5b108 100644
--- a/api_docs/kbn_core_apps_browser_mocks.mdx
+++ b/api_docs/kbn_core_apps_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-apps-browser-mocks
 title: "@kbn/core-apps-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-apps-browser-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-apps-browser-mocks']
 ---
 import kbnCoreAppsBrowserMocksObj from './kbn_core_apps_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_apps_server_internal.mdx b/api_docs/kbn_core_apps_server_internal.mdx
index 0fb69311a41d3..321850ff7277d 100644
--- a/api_docs/kbn_core_apps_server_internal.mdx
+++ b/api_docs/kbn_core_apps_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-apps-server-internal
 title: "@kbn/core-apps-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-apps-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-apps-server-internal']
 ---
 import kbnCoreAppsServerInternalObj from './kbn_core_apps_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_base_browser_mocks.mdx b/api_docs/kbn_core_base_browser_mocks.mdx
index 723403c04a56b..83f9a87825afd 100644
--- a/api_docs/kbn_core_base_browser_mocks.mdx
+++ b/api_docs/kbn_core_base_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-browser-mocks
 title: "@kbn/core-base-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-base-browser-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-base-browser-mocks']
 ---
 import kbnCoreBaseBrowserMocksObj from './kbn_core_base_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_base_common.mdx b/api_docs/kbn_core_base_common.mdx
index 38c200dd4fc4e..28e8e2c3d4bba 100644
--- a/api_docs/kbn_core_base_common.mdx
+++ b/api_docs/kbn_core_base_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-common
 title: "@kbn/core-base-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-base-common plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-base-common']
 ---
 import kbnCoreBaseCommonObj from './kbn_core_base_common.devdocs.json';
diff --git a/api_docs/kbn_core_base_server_internal.mdx b/api_docs/kbn_core_base_server_internal.mdx
index 2822cebc8f2b6..9ee1cd2fa496d 100644
--- a/api_docs/kbn_core_base_server_internal.mdx
+++ b/api_docs/kbn_core_base_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-server-internal
 title: "@kbn/core-base-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-base-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-base-server-internal']
 ---
 import kbnCoreBaseServerInternalObj from './kbn_core_base_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_base_server_mocks.mdx b/api_docs/kbn_core_base_server_mocks.mdx
index 85f67738b5127..1356483a8d97b 100644
--- a/api_docs/kbn_core_base_server_mocks.mdx
+++ b/api_docs/kbn_core_base_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-server-mocks
 title: "@kbn/core-base-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-base-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-base-server-mocks']
 ---
 import kbnCoreBaseServerMocksObj from './kbn_core_base_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_capabilities_browser_mocks.mdx b/api_docs/kbn_core_capabilities_browser_mocks.mdx
index a195e14f8eb08..1f98113a927d0 100644
--- a/api_docs/kbn_core_capabilities_browser_mocks.mdx
+++ b/api_docs/kbn_core_capabilities_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-browser-mocks
 title: "@kbn/core-capabilities-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-capabilities-browser-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-capabilities-browser-mocks']
 ---
 import kbnCoreCapabilitiesBrowserMocksObj from './kbn_core_capabilities_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_capabilities_common.mdx b/api_docs/kbn_core_capabilities_common.mdx
index dee08ccafaa3b..968a690b339ec 100644
--- a/api_docs/kbn_core_capabilities_common.mdx
+++ b/api_docs/kbn_core_capabilities_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-common
 title: "@kbn/core-capabilities-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-capabilities-common plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-capabilities-common']
 ---
 import kbnCoreCapabilitiesCommonObj from './kbn_core_capabilities_common.devdocs.json';
diff --git a/api_docs/kbn_core_capabilities_server.mdx b/api_docs/kbn_core_capabilities_server.mdx
index 0500817634ff9..7cda44c53af75 100644
--- a/api_docs/kbn_core_capabilities_server.mdx
+++ b/api_docs/kbn_core_capabilities_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-server
 title: "@kbn/core-capabilities-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-capabilities-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-capabilities-server']
 ---
 import kbnCoreCapabilitiesServerObj from './kbn_core_capabilities_server.devdocs.json';
diff --git a/api_docs/kbn_core_capabilities_server_mocks.mdx b/api_docs/kbn_core_capabilities_server_mocks.mdx
index 69b03a9701053..afa9a31cd9487 100644
--- a/api_docs/kbn_core_capabilities_server_mocks.mdx
+++ b/api_docs/kbn_core_capabilities_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-server-mocks
 title: "@kbn/core-capabilities-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-capabilities-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-capabilities-server-mocks']
 ---
 import kbnCoreCapabilitiesServerMocksObj from './kbn_core_capabilities_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_chrome_browser.mdx b/api_docs/kbn_core_chrome_browser.mdx
index 5d39c7f82fc91..0f5a69dee73ed 100644
--- a/api_docs/kbn_core_chrome_browser.mdx
+++ b/api_docs/kbn_core_chrome_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-chrome-browser
 title: "@kbn/core-chrome-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-chrome-browser plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-chrome-browser']
 ---
 import kbnCoreChromeBrowserObj from './kbn_core_chrome_browser.devdocs.json';
diff --git a/api_docs/kbn_core_chrome_browser_mocks.mdx b/api_docs/kbn_core_chrome_browser_mocks.mdx
index a7455a3d124fe..46dcf88a3c197 100644
--- a/api_docs/kbn_core_chrome_browser_mocks.mdx
+++ b/api_docs/kbn_core_chrome_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-chrome-browser-mocks
 title: "@kbn/core-chrome-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-chrome-browser-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-chrome-browser-mocks']
 ---
 import kbnCoreChromeBrowserMocksObj from './kbn_core_chrome_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_config_server_internal.mdx b/api_docs/kbn_core_config_server_internal.mdx
index f148b51bf4f79..fc131c1460d8c 100644
--- a/api_docs/kbn_core_config_server_internal.mdx
+++ b/api_docs/kbn_core_config_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-config-server-internal
 title: "@kbn/core-config-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-config-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-config-server-internal']
 ---
 import kbnCoreConfigServerInternalObj from './kbn_core_config_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_browser.mdx b/api_docs/kbn_core_custom_branding_browser.mdx
index a8931e398dba4..97fcf979018f8 100644
--- a/api_docs/kbn_core_custom_branding_browser.mdx
+++ b/api_docs/kbn_core_custom_branding_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-browser
 title: "@kbn/core-custom-branding-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-browser plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-browser']
 ---
 import kbnCoreCustomBrandingBrowserObj from './kbn_core_custom_branding_browser.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_browser_internal.mdx b/api_docs/kbn_core_custom_branding_browser_internal.mdx
index 7e42f2af72f22..7f9f083c57ea6 100644
--- a/api_docs/kbn_core_custom_branding_browser_internal.mdx
+++ b/api_docs/kbn_core_custom_branding_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-browser-internal
 title: "@kbn/core-custom-branding-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-browser-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-browser-internal']
 ---
 import kbnCoreCustomBrandingBrowserInternalObj from './kbn_core_custom_branding_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_browser_mocks.mdx b/api_docs/kbn_core_custom_branding_browser_mocks.mdx
index 6e16eb883e32b..e613abbf44659 100644
--- a/api_docs/kbn_core_custom_branding_browser_mocks.mdx
+++ b/api_docs/kbn_core_custom_branding_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-browser-mocks
 title: "@kbn/core-custom-branding-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-browser-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-browser-mocks']
 ---
 import kbnCoreCustomBrandingBrowserMocksObj from './kbn_core_custom_branding_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_common.mdx b/api_docs/kbn_core_custom_branding_common.mdx
index fd22accfa2fd9..c1563f5a7eeca 100644
--- a/api_docs/kbn_core_custom_branding_common.mdx
+++ b/api_docs/kbn_core_custom_branding_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-common
 title: "@kbn/core-custom-branding-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-common plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-common']
 ---
 import kbnCoreCustomBrandingCommonObj from './kbn_core_custom_branding_common.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_server.mdx b/api_docs/kbn_core_custom_branding_server.mdx
index 69a6b20efc1f4..8237aab764b3f 100644
--- a/api_docs/kbn_core_custom_branding_server.mdx
+++ b/api_docs/kbn_core_custom_branding_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-server
 title: "@kbn/core-custom-branding-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-server']
 ---
 import kbnCoreCustomBrandingServerObj from './kbn_core_custom_branding_server.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_server_internal.mdx b/api_docs/kbn_core_custom_branding_server_internal.mdx
index 096bf2db5c03c..98d95c6d37b9f 100644
--- a/api_docs/kbn_core_custom_branding_server_internal.mdx
+++ b/api_docs/kbn_core_custom_branding_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-server-internal
 title: "@kbn/core-custom-branding-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-server-internal']
 ---
 import kbnCoreCustomBrandingServerInternalObj from './kbn_core_custom_branding_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_server_mocks.mdx b/api_docs/kbn_core_custom_branding_server_mocks.mdx
index 06faf0dd23001..d75725b7899a2 100644
--- a/api_docs/kbn_core_custom_branding_server_mocks.mdx
+++ b/api_docs/kbn_core_custom_branding_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-server-mocks
 title: "@kbn/core-custom-branding-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-server-mocks']
 ---
 import kbnCoreCustomBrandingServerMocksObj from './kbn_core_custom_branding_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_browser.mdx b/api_docs/kbn_core_deprecations_browser.mdx
index 903e4f01a2028..dd774a0f77817 100644
--- a/api_docs/kbn_core_deprecations_browser.mdx
+++ b/api_docs/kbn_core_deprecations_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-browser
 title: "@kbn/core-deprecations-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-browser plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-browser']
 ---
 import kbnCoreDeprecationsBrowserObj from './kbn_core_deprecations_browser.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_browser_internal.mdx b/api_docs/kbn_core_deprecations_browser_internal.mdx
index 4a90ce31147d8..d2fe1cbc14966 100644
--- a/api_docs/kbn_core_deprecations_browser_internal.mdx
+++ b/api_docs/kbn_core_deprecations_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-browser-internal
 title: "@kbn/core-deprecations-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-browser-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-browser-internal']
 ---
 import kbnCoreDeprecationsBrowserInternalObj from './kbn_core_deprecations_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_browser_mocks.mdx b/api_docs/kbn_core_deprecations_browser_mocks.mdx
index f0c9aff947736..d3884371a3db5 100644
--- a/api_docs/kbn_core_deprecations_browser_mocks.mdx
+++ b/api_docs/kbn_core_deprecations_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-browser-mocks
 title: "@kbn/core-deprecations-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-browser-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-browser-mocks']
 ---
 import kbnCoreDeprecationsBrowserMocksObj from './kbn_core_deprecations_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_common.mdx b/api_docs/kbn_core_deprecations_common.mdx
index 11e72887b3c3c..6cdd897d99633 100644
--- a/api_docs/kbn_core_deprecations_common.mdx
+++ b/api_docs/kbn_core_deprecations_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-common
 title: "@kbn/core-deprecations-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-common plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-common']
 ---
 import kbnCoreDeprecationsCommonObj from './kbn_core_deprecations_common.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_server.mdx b/api_docs/kbn_core_deprecations_server.mdx
index 832893355aa18..b00ea4077cf20 100644
--- a/api_docs/kbn_core_deprecations_server.mdx
+++ b/api_docs/kbn_core_deprecations_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-server
 title: "@kbn/core-deprecations-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-server']
 ---
 import kbnCoreDeprecationsServerObj from './kbn_core_deprecations_server.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_server_internal.mdx b/api_docs/kbn_core_deprecations_server_internal.mdx
index e13e0e5865ab0..6353e802e27db 100644
--- a/api_docs/kbn_core_deprecations_server_internal.mdx
+++ b/api_docs/kbn_core_deprecations_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-server-internal
 title: "@kbn/core-deprecations-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-server-internal']
 ---
 import kbnCoreDeprecationsServerInternalObj from './kbn_core_deprecations_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_server_mocks.mdx b/api_docs/kbn_core_deprecations_server_mocks.mdx
index 5155aeece5ccc..f6acd36cc38c2 100644
--- a/api_docs/kbn_core_deprecations_server_mocks.mdx
+++ b/api_docs/kbn_core_deprecations_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-server-mocks
 title: "@kbn/core-deprecations-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-server-mocks']
 ---
 import kbnCoreDeprecationsServerMocksObj from './kbn_core_deprecations_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_doc_links_browser.mdx b/api_docs/kbn_core_doc_links_browser.mdx
index e75e82dadd7b5..cea09f8427c74 100644
--- a/api_docs/kbn_core_doc_links_browser.mdx
+++ b/api_docs/kbn_core_doc_links_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-browser
 title: "@kbn/core-doc-links-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-doc-links-browser plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-doc-links-browser']
 ---
 import kbnCoreDocLinksBrowserObj from './kbn_core_doc_links_browser.devdocs.json';
diff --git a/api_docs/kbn_core_doc_links_browser_mocks.mdx b/api_docs/kbn_core_doc_links_browser_mocks.mdx
index 270978b9a289b..fcfa359e065ff 100644
--- a/api_docs/kbn_core_doc_links_browser_mocks.mdx
+++ b/api_docs/kbn_core_doc_links_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-browser-mocks
 title: "@kbn/core-doc-links-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-doc-links-browser-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-doc-links-browser-mocks']
 ---
 import kbnCoreDocLinksBrowserMocksObj from './kbn_core_doc_links_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_doc_links_server.mdx b/api_docs/kbn_core_doc_links_server.mdx
index eb15cc5893e3a..c47f6b0ab3f79 100644
--- a/api_docs/kbn_core_doc_links_server.mdx
+++ b/api_docs/kbn_core_doc_links_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-server
 title: "@kbn/core-doc-links-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-doc-links-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-doc-links-server']
 ---
 import kbnCoreDocLinksServerObj from './kbn_core_doc_links_server.devdocs.json';
diff --git a/api_docs/kbn_core_doc_links_server_mocks.mdx b/api_docs/kbn_core_doc_links_server_mocks.mdx
index 38a2642f3ca7f..f1df3fa970252 100644
--- a/api_docs/kbn_core_doc_links_server_mocks.mdx
+++ b/api_docs/kbn_core_doc_links_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-server-mocks
 title: "@kbn/core-doc-links-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-doc-links-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-doc-links-server-mocks']
 ---
 import kbnCoreDocLinksServerMocksObj from './kbn_core_doc_links_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_elasticsearch_client_server_internal.mdx b/api_docs/kbn_core_elasticsearch_client_server_internal.mdx
index c06dbb2c4cabf..30f75c6f0d0d8 100644
--- a/api_docs/kbn_core_elasticsearch_client_server_internal.mdx
+++ b/api_docs/kbn_core_elasticsearch_client_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-client-server-internal
 title: "@kbn/core-elasticsearch-client-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-client-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-client-server-internal']
 ---
 import kbnCoreElasticsearchClientServerInternalObj from './kbn_core_elasticsearch_client_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx b/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx
index 855c92977a56a..e8a6a5bd9d974 100644
--- a/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx
+++ b/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-client-server-mocks
 title: "@kbn/core-elasticsearch-client-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-client-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-client-server-mocks']
 ---
 import kbnCoreElasticsearchClientServerMocksObj from './kbn_core_elasticsearch_client_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_elasticsearch_server.mdx b/api_docs/kbn_core_elasticsearch_server.mdx
index 72e01b8ab8af3..452434e7f7028 100644
--- a/api_docs/kbn_core_elasticsearch_server.mdx
+++ b/api_docs/kbn_core_elasticsearch_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-server
 title: "@kbn/core-elasticsearch-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-server']
 ---
 import kbnCoreElasticsearchServerObj from './kbn_core_elasticsearch_server.devdocs.json';
diff --git a/api_docs/kbn_core_elasticsearch_server_internal.mdx b/api_docs/kbn_core_elasticsearch_server_internal.mdx
index 34f856af0a5b0..55602e77c39ac 100644
--- a/api_docs/kbn_core_elasticsearch_server_internal.mdx
+++ b/api_docs/kbn_core_elasticsearch_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-server-internal
 title: "@kbn/core-elasticsearch-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-server-internal']
 ---
 import kbnCoreElasticsearchServerInternalObj from './kbn_core_elasticsearch_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_elasticsearch_server_mocks.mdx b/api_docs/kbn_core_elasticsearch_server_mocks.mdx
index 6525743a6df56..bbc421518eacc 100644
--- a/api_docs/kbn_core_elasticsearch_server_mocks.mdx
+++ b/api_docs/kbn_core_elasticsearch_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-server-mocks
 title: "@kbn/core-elasticsearch-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-server-mocks']
 ---
 import kbnCoreElasticsearchServerMocksObj from './kbn_core_elasticsearch_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_environment_server_internal.mdx b/api_docs/kbn_core_environment_server_internal.mdx
index e947629304916..8a1e25f226672 100644
--- a/api_docs/kbn_core_environment_server_internal.mdx
+++ b/api_docs/kbn_core_environment_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-environment-server-internal
 title: "@kbn/core-environment-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-environment-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-environment-server-internal']
 ---
 import kbnCoreEnvironmentServerInternalObj from './kbn_core_environment_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_environment_server_mocks.mdx b/api_docs/kbn_core_environment_server_mocks.mdx
index 6dbf86aff88ba..5950a6f4e28a4 100644
--- a/api_docs/kbn_core_environment_server_mocks.mdx
+++ b/api_docs/kbn_core_environment_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-environment-server-mocks
 title: "@kbn/core-environment-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-environment-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-environment-server-mocks']
 ---
 import kbnCoreEnvironmentServerMocksObj from './kbn_core_environment_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_browser.mdx b/api_docs/kbn_core_execution_context_browser.mdx
index 3d31ac3c5a93f..7530cdb8b9f88 100644
--- a/api_docs/kbn_core_execution_context_browser.mdx
+++ b/api_docs/kbn_core_execution_context_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-browser
 title: "@kbn/core-execution-context-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-browser plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-browser']
 ---
 import kbnCoreExecutionContextBrowserObj from './kbn_core_execution_context_browser.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_browser_internal.mdx b/api_docs/kbn_core_execution_context_browser_internal.mdx
index 14668296fd09b..44c4f6b1d8356 100644
--- a/api_docs/kbn_core_execution_context_browser_internal.mdx
+++ b/api_docs/kbn_core_execution_context_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-browser-internal
 title: "@kbn/core-execution-context-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-browser-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-browser-internal']
 ---
 import kbnCoreExecutionContextBrowserInternalObj from './kbn_core_execution_context_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_browser_mocks.mdx b/api_docs/kbn_core_execution_context_browser_mocks.mdx
index bac6725f95815..9d0d0c727bb07 100644
--- a/api_docs/kbn_core_execution_context_browser_mocks.mdx
+++ b/api_docs/kbn_core_execution_context_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-browser-mocks
 title: "@kbn/core-execution-context-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-browser-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-browser-mocks']
 ---
 import kbnCoreExecutionContextBrowserMocksObj from './kbn_core_execution_context_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_common.mdx b/api_docs/kbn_core_execution_context_common.mdx
index 3a75e07c2d942..4213ef4dd473f 100644
--- a/api_docs/kbn_core_execution_context_common.mdx
+++ b/api_docs/kbn_core_execution_context_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-common
 title: "@kbn/core-execution-context-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-common plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-common']
 ---
 import kbnCoreExecutionContextCommonObj from './kbn_core_execution_context_common.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_server.mdx b/api_docs/kbn_core_execution_context_server.mdx
index d647820be221a..582d77767ebac 100644
--- a/api_docs/kbn_core_execution_context_server.mdx
+++ b/api_docs/kbn_core_execution_context_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-server
 title: "@kbn/core-execution-context-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-server']
 ---
 import kbnCoreExecutionContextServerObj from './kbn_core_execution_context_server.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_server_internal.mdx b/api_docs/kbn_core_execution_context_server_internal.mdx
index e6599896f5008..3fdd7e0a3958a 100644
--- a/api_docs/kbn_core_execution_context_server_internal.mdx
+++ b/api_docs/kbn_core_execution_context_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-server-internal
 title: "@kbn/core-execution-context-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-server-internal']
 ---
 import kbnCoreExecutionContextServerInternalObj from './kbn_core_execution_context_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_server_mocks.mdx b/api_docs/kbn_core_execution_context_server_mocks.mdx
index 78898bec9c262..d637f492ceff4 100644
--- a/api_docs/kbn_core_execution_context_server_mocks.mdx
+++ b/api_docs/kbn_core_execution_context_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-server-mocks
 title: "@kbn/core-execution-context-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-server-mocks']
 ---
 import kbnCoreExecutionContextServerMocksObj from './kbn_core_execution_context_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_fatal_errors_browser.mdx b/api_docs/kbn_core_fatal_errors_browser.mdx
index 2cdc139e6a958..2d47d49cf0f54 100644
--- a/api_docs/kbn_core_fatal_errors_browser.mdx
+++ b/api_docs/kbn_core_fatal_errors_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-fatal-errors-browser
 title: "@kbn/core-fatal-errors-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-fatal-errors-browser plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-fatal-errors-browser']
 ---
 import kbnCoreFatalErrorsBrowserObj from './kbn_core_fatal_errors_browser.devdocs.json';
diff --git a/api_docs/kbn_core_fatal_errors_browser_mocks.mdx b/api_docs/kbn_core_fatal_errors_browser_mocks.mdx
index 71ad5cf9a4746..d750c317ac6a7 100644
--- a/api_docs/kbn_core_fatal_errors_browser_mocks.mdx
+++ b/api_docs/kbn_core_fatal_errors_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-fatal-errors-browser-mocks
 title: "@kbn/core-fatal-errors-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-fatal-errors-browser-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-fatal-errors-browser-mocks']
 ---
 import kbnCoreFatalErrorsBrowserMocksObj from './kbn_core_fatal_errors_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_http_browser.mdx b/api_docs/kbn_core_http_browser.mdx
index f46e20977cc14..8ddc42521054a 100644
--- a/api_docs/kbn_core_http_browser.mdx
+++ b/api_docs/kbn_core_http_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-browser
 title: "@kbn/core-http-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-browser plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-browser']
 ---
 import kbnCoreHttpBrowserObj from './kbn_core_http_browser.devdocs.json';
diff --git a/api_docs/kbn_core_http_browser_internal.mdx b/api_docs/kbn_core_http_browser_internal.mdx
index 2c2a798a89c6c..33f9e5d9bccaa 100644
--- a/api_docs/kbn_core_http_browser_internal.mdx
+++ b/api_docs/kbn_core_http_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-browser-internal
 title: "@kbn/core-http-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-browser-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-browser-internal']
 ---
 import kbnCoreHttpBrowserInternalObj from './kbn_core_http_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_http_browser_mocks.mdx b/api_docs/kbn_core_http_browser_mocks.mdx
index dc84030777a3f..c771d7b51b6b2 100644
--- a/api_docs/kbn_core_http_browser_mocks.mdx
+++ b/api_docs/kbn_core_http_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-browser-mocks
 title: "@kbn/core-http-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-browser-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-browser-mocks']
 ---
 import kbnCoreHttpBrowserMocksObj from './kbn_core_http_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_http_common.mdx b/api_docs/kbn_core_http_common.mdx
index f46f80f157990..61a0e48cfdeb8 100644
--- a/api_docs/kbn_core_http_common.mdx
+++ b/api_docs/kbn_core_http_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-common
 title: "@kbn/core-http-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-common plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-common']
 ---
 import kbnCoreHttpCommonObj from './kbn_core_http_common.devdocs.json';
diff --git a/api_docs/kbn_core_http_context_server_mocks.mdx b/api_docs/kbn_core_http_context_server_mocks.mdx
index 2bcecde44aae2..b662fe75b1955 100644
--- a/api_docs/kbn_core_http_context_server_mocks.mdx
+++ b/api_docs/kbn_core_http_context_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-context-server-mocks
 title: "@kbn/core-http-context-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-context-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-context-server-mocks']
 ---
 import kbnCoreHttpContextServerMocksObj from './kbn_core_http_context_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_http_request_handler_context_server.mdx b/api_docs/kbn_core_http_request_handler_context_server.mdx
index 728e77b24337f..f189aa1a55351 100644
--- a/api_docs/kbn_core_http_request_handler_context_server.mdx
+++ b/api_docs/kbn_core_http_request_handler_context_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-request-handler-context-server
 title: "@kbn/core-http-request-handler-context-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-request-handler-context-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-request-handler-context-server']
 ---
 import kbnCoreHttpRequestHandlerContextServerObj from './kbn_core_http_request_handler_context_server.devdocs.json';
diff --git a/api_docs/kbn_core_http_resources_server.mdx b/api_docs/kbn_core_http_resources_server.mdx
index 15d62f1afa04a..47a782b2d28d8 100644
--- a/api_docs/kbn_core_http_resources_server.mdx
+++ b/api_docs/kbn_core_http_resources_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-resources-server
 title: "@kbn/core-http-resources-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-resources-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-resources-server']
 ---
 import kbnCoreHttpResourcesServerObj from './kbn_core_http_resources_server.devdocs.json';
diff --git a/api_docs/kbn_core_http_resources_server_internal.mdx b/api_docs/kbn_core_http_resources_server_internal.mdx
index 753a64b907940..9cc4ba8ad2475 100644
--- a/api_docs/kbn_core_http_resources_server_internal.mdx
+++ b/api_docs/kbn_core_http_resources_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-resources-server-internal
 title: "@kbn/core-http-resources-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-resources-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-resources-server-internal']
 ---
 import kbnCoreHttpResourcesServerInternalObj from './kbn_core_http_resources_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_http_resources_server_mocks.mdx b/api_docs/kbn_core_http_resources_server_mocks.mdx
index af0d51dc7dcb2..26de4dde620bb 100644
--- a/api_docs/kbn_core_http_resources_server_mocks.mdx
+++ b/api_docs/kbn_core_http_resources_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-resources-server-mocks
 title: "@kbn/core-http-resources-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-resources-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-resources-server-mocks']
 ---
 import kbnCoreHttpResourcesServerMocksObj from './kbn_core_http_resources_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_http_router_server_internal.mdx b/api_docs/kbn_core_http_router_server_internal.mdx
index b18c188eb87ba..96c131b566386 100644
--- a/api_docs/kbn_core_http_router_server_internal.mdx
+++ b/api_docs/kbn_core_http_router_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-router-server-internal
 title: "@kbn/core-http-router-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-router-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-router-server-internal']
 ---
 import kbnCoreHttpRouterServerInternalObj from './kbn_core_http_router_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_http_router_server_mocks.mdx b/api_docs/kbn_core_http_router_server_mocks.mdx
index ce5cbd31fa38c..04cdaf7a0c296 100644
--- a/api_docs/kbn_core_http_router_server_mocks.mdx
+++ b/api_docs/kbn_core_http_router_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-router-server-mocks
 title: "@kbn/core-http-router-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-router-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-router-server-mocks']
 ---
 import kbnCoreHttpRouterServerMocksObj from './kbn_core_http_router_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_http_server.mdx b/api_docs/kbn_core_http_server.mdx
index edea32f36d0a3..ae3de1a53b6bf 100644
--- a/api_docs/kbn_core_http_server.mdx
+++ b/api_docs/kbn_core_http_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-server
 title: "@kbn/core-http-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-server']
 ---
 import kbnCoreHttpServerObj from './kbn_core_http_server.devdocs.json';
diff --git a/api_docs/kbn_core_http_server_internal.mdx b/api_docs/kbn_core_http_server_internal.mdx
index 7f9c6838f648f..32a24eb6c8a59 100644
--- a/api_docs/kbn_core_http_server_internal.mdx
+++ b/api_docs/kbn_core_http_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-server-internal
 title: "@kbn/core-http-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-server-internal']
 ---
 import kbnCoreHttpServerInternalObj from './kbn_core_http_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_http_server_mocks.mdx b/api_docs/kbn_core_http_server_mocks.mdx
index 8f98589ac9bb2..cc73fbc025f7d 100644
--- a/api_docs/kbn_core_http_server_mocks.mdx
+++ b/api_docs/kbn_core_http_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-server-mocks
 title: "@kbn/core-http-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-server-mocks']
 ---
 import kbnCoreHttpServerMocksObj from './kbn_core_http_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_i18n_browser.mdx b/api_docs/kbn_core_i18n_browser.mdx
index 48717a4928ceb..5b4c019df0b30 100644
--- a/api_docs/kbn_core_i18n_browser.mdx
+++ b/api_docs/kbn_core_i18n_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-browser
 title: "@kbn/core-i18n-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-browser plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-browser']
 ---
 import kbnCoreI18nBrowserObj from './kbn_core_i18n_browser.devdocs.json';
diff --git a/api_docs/kbn_core_i18n_browser_mocks.mdx b/api_docs/kbn_core_i18n_browser_mocks.mdx
index 91c88b93b9899..49579be05fecd 100644
--- a/api_docs/kbn_core_i18n_browser_mocks.mdx
+++ b/api_docs/kbn_core_i18n_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-browser-mocks
 title: "@kbn/core-i18n-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-browser-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-browser-mocks']
 ---
 import kbnCoreI18nBrowserMocksObj from './kbn_core_i18n_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_i18n_server.mdx b/api_docs/kbn_core_i18n_server.mdx
index dfd6759f82c3e..f89c8bd6d88c8 100644
--- a/api_docs/kbn_core_i18n_server.mdx
+++ b/api_docs/kbn_core_i18n_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-server
 title: "@kbn/core-i18n-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-server']
 ---
 import kbnCoreI18nServerObj from './kbn_core_i18n_server.devdocs.json';
diff --git a/api_docs/kbn_core_i18n_server_internal.mdx b/api_docs/kbn_core_i18n_server_internal.mdx
index 2fb875c29aedb..1d072e4d63ed9 100644
--- a/api_docs/kbn_core_i18n_server_internal.mdx
+++ b/api_docs/kbn_core_i18n_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-server-internal
 title: "@kbn/core-i18n-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-server-internal']
 ---
 import kbnCoreI18nServerInternalObj from './kbn_core_i18n_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_i18n_server_mocks.mdx b/api_docs/kbn_core_i18n_server_mocks.mdx
index d7374f1d2ea55..1ca1b4a931e7f 100644
--- a/api_docs/kbn_core_i18n_server_mocks.mdx
+++ b/api_docs/kbn_core_i18n_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-server-mocks
 title: "@kbn/core-i18n-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-server-mocks']
 ---
 import kbnCoreI18nServerMocksObj from './kbn_core_i18n_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_injected_metadata_browser_mocks.mdx b/api_docs/kbn_core_injected_metadata_browser_mocks.mdx
index 106e6b27d00fb..bc405aa9920a6 100644
--- a/api_docs/kbn_core_injected_metadata_browser_mocks.mdx
+++ b/api_docs/kbn_core_injected_metadata_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-injected-metadata-browser-mocks
 title: "@kbn/core-injected-metadata-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-injected-metadata-browser-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-injected-metadata-browser-mocks']
 ---
 import kbnCoreInjectedMetadataBrowserMocksObj from './kbn_core_injected_metadata_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_integrations_browser_internal.mdx b/api_docs/kbn_core_integrations_browser_internal.mdx
index 6c8f8c341950d..75255e3e34bfd 100644
--- a/api_docs/kbn_core_integrations_browser_internal.mdx
+++ b/api_docs/kbn_core_integrations_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-integrations-browser-internal
 title: "@kbn/core-integrations-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-integrations-browser-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-integrations-browser-internal']
 ---
 import kbnCoreIntegrationsBrowserInternalObj from './kbn_core_integrations_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_integrations_browser_mocks.mdx b/api_docs/kbn_core_integrations_browser_mocks.mdx
index b753450d5d6ce..086837c33ee81 100644
--- a/api_docs/kbn_core_integrations_browser_mocks.mdx
+++ b/api_docs/kbn_core_integrations_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-integrations-browser-mocks
 title: "@kbn/core-integrations-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-integrations-browser-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-integrations-browser-mocks']
 ---
 import kbnCoreIntegrationsBrowserMocksObj from './kbn_core_integrations_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_lifecycle_browser.mdx b/api_docs/kbn_core_lifecycle_browser.mdx
index 3a36ca3942e7a..735b927f7d9ab 100644
--- a/api_docs/kbn_core_lifecycle_browser.mdx
+++ b/api_docs/kbn_core_lifecycle_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-lifecycle-browser
 title: "@kbn/core-lifecycle-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-lifecycle-browser plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-lifecycle-browser']
 ---
 import kbnCoreLifecycleBrowserObj from './kbn_core_lifecycle_browser.devdocs.json';
diff --git a/api_docs/kbn_core_lifecycle_browser_mocks.mdx b/api_docs/kbn_core_lifecycle_browser_mocks.mdx
index 475eb48ccbccb..bf4a1ead3d536 100644
--- a/api_docs/kbn_core_lifecycle_browser_mocks.mdx
+++ b/api_docs/kbn_core_lifecycle_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-lifecycle-browser-mocks
 title: "@kbn/core-lifecycle-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-lifecycle-browser-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-lifecycle-browser-mocks']
 ---
 import kbnCoreLifecycleBrowserMocksObj from './kbn_core_lifecycle_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_lifecycle_server.mdx b/api_docs/kbn_core_lifecycle_server.mdx
index 0ef4bf8d43a32..3a4b5ed5dddea 100644
--- a/api_docs/kbn_core_lifecycle_server.mdx
+++ b/api_docs/kbn_core_lifecycle_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-lifecycle-server
 title: "@kbn/core-lifecycle-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-lifecycle-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-lifecycle-server']
 ---
 import kbnCoreLifecycleServerObj from './kbn_core_lifecycle_server.devdocs.json';
diff --git a/api_docs/kbn_core_lifecycle_server_mocks.mdx b/api_docs/kbn_core_lifecycle_server_mocks.mdx
index 3649461b7c5a6..448715c87a21f 100644
--- a/api_docs/kbn_core_lifecycle_server_mocks.mdx
+++ b/api_docs/kbn_core_lifecycle_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-lifecycle-server-mocks
 title: "@kbn/core-lifecycle-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-lifecycle-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-lifecycle-server-mocks']
 ---
 import kbnCoreLifecycleServerMocksObj from './kbn_core_lifecycle_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_logging_browser_mocks.mdx b/api_docs/kbn_core_logging_browser_mocks.mdx
index 052bf0ba74258..ac96262b9c76b 100644
--- a/api_docs/kbn_core_logging_browser_mocks.mdx
+++ b/api_docs/kbn_core_logging_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-browser-mocks
 title: "@kbn/core-logging-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-browser-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-browser-mocks']
 ---
 import kbnCoreLoggingBrowserMocksObj from './kbn_core_logging_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_logging_common_internal.mdx b/api_docs/kbn_core_logging_common_internal.mdx
index 07e96d1422f6a..630a94dfbb8f3 100644
--- a/api_docs/kbn_core_logging_common_internal.mdx
+++ b/api_docs/kbn_core_logging_common_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-common-internal
 title: "@kbn/core-logging-common-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-common-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-common-internal']
 ---
 import kbnCoreLoggingCommonInternalObj from './kbn_core_logging_common_internal.devdocs.json';
diff --git a/api_docs/kbn_core_logging_server.mdx b/api_docs/kbn_core_logging_server.mdx
index ce0ac13ded0d6..ab67e69ef94eb 100644
--- a/api_docs/kbn_core_logging_server.mdx
+++ b/api_docs/kbn_core_logging_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-server
 title: "@kbn/core-logging-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-server']
 ---
 import kbnCoreLoggingServerObj from './kbn_core_logging_server.devdocs.json';
diff --git a/api_docs/kbn_core_logging_server_internal.mdx b/api_docs/kbn_core_logging_server_internal.mdx
index 55bed0b817434..f69a9bfa85c75 100644
--- a/api_docs/kbn_core_logging_server_internal.mdx
+++ b/api_docs/kbn_core_logging_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-server-internal
 title: "@kbn/core-logging-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-server-internal']
 ---
 import kbnCoreLoggingServerInternalObj from './kbn_core_logging_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_logging_server_mocks.mdx b/api_docs/kbn_core_logging_server_mocks.mdx
index 1425aa6b5cd5d..dc3d5d6f6a377 100644
--- a/api_docs/kbn_core_logging_server_mocks.mdx
+++ b/api_docs/kbn_core_logging_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-server-mocks
 title: "@kbn/core-logging-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-server-mocks']
 ---
 import kbnCoreLoggingServerMocksObj from './kbn_core_logging_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_metrics_collectors_server_internal.mdx b/api_docs/kbn_core_metrics_collectors_server_internal.mdx
index 6e0c42f2ccb83..fb713ae5250ef 100644
--- a/api_docs/kbn_core_metrics_collectors_server_internal.mdx
+++ b/api_docs/kbn_core_metrics_collectors_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-collectors-server-internal
 title: "@kbn/core-metrics-collectors-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-collectors-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-collectors-server-internal']
 ---
 import kbnCoreMetricsCollectorsServerInternalObj from './kbn_core_metrics_collectors_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_metrics_collectors_server_mocks.mdx b/api_docs/kbn_core_metrics_collectors_server_mocks.mdx
index 5cac745fb95e6..e310f4f18e0bf 100644
--- a/api_docs/kbn_core_metrics_collectors_server_mocks.mdx
+++ b/api_docs/kbn_core_metrics_collectors_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-collectors-server-mocks
 title: "@kbn/core-metrics-collectors-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-collectors-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-collectors-server-mocks']
 ---
 import kbnCoreMetricsCollectorsServerMocksObj from './kbn_core_metrics_collectors_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_metrics_server.mdx b/api_docs/kbn_core_metrics_server.mdx
index 8b0e0e1d6c1ca..7c1524c5080fb 100644
--- a/api_docs/kbn_core_metrics_server.mdx
+++ b/api_docs/kbn_core_metrics_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-server
 title: "@kbn/core-metrics-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-server']
 ---
 import kbnCoreMetricsServerObj from './kbn_core_metrics_server.devdocs.json';
diff --git a/api_docs/kbn_core_metrics_server_internal.mdx b/api_docs/kbn_core_metrics_server_internal.mdx
index 1c31017866648..751f7e9aa7a09 100644
--- a/api_docs/kbn_core_metrics_server_internal.mdx
+++ b/api_docs/kbn_core_metrics_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-server-internal
 title: "@kbn/core-metrics-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-server-internal']
 ---
 import kbnCoreMetricsServerInternalObj from './kbn_core_metrics_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_metrics_server_mocks.mdx b/api_docs/kbn_core_metrics_server_mocks.mdx
index 768a293980d04..38f7647c57437 100644
--- a/api_docs/kbn_core_metrics_server_mocks.mdx
+++ b/api_docs/kbn_core_metrics_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-server-mocks
 title: "@kbn/core-metrics-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-server-mocks']
 ---
 import kbnCoreMetricsServerMocksObj from './kbn_core_metrics_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_mount_utils_browser.mdx b/api_docs/kbn_core_mount_utils_browser.mdx
index 48dc25bf2cf39..2bacd959896e9 100644
--- a/api_docs/kbn_core_mount_utils_browser.mdx
+++ b/api_docs/kbn_core_mount_utils_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-mount-utils-browser
 title: "@kbn/core-mount-utils-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-mount-utils-browser plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-mount-utils-browser']
 ---
 import kbnCoreMountUtilsBrowserObj from './kbn_core_mount_utils_browser.devdocs.json';
diff --git a/api_docs/kbn_core_node_server.mdx b/api_docs/kbn_core_node_server.mdx
index 9fb1afd0b61fb..79767c900f656 100644
--- a/api_docs/kbn_core_node_server.mdx
+++ b/api_docs/kbn_core_node_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-node-server
 title: "@kbn/core-node-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-node-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-node-server']
 ---
 import kbnCoreNodeServerObj from './kbn_core_node_server.devdocs.json';
diff --git a/api_docs/kbn_core_node_server_internal.mdx b/api_docs/kbn_core_node_server_internal.mdx
index 55ae8a712881b..3d60a557b515f 100644
--- a/api_docs/kbn_core_node_server_internal.mdx
+++ b/api_docs/kbn_core_node_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-node-server-internal
 title: "@kbn/core-node-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-node-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-node-server-internal']
 ---
 import kbnCoreNodeServerInternalObj from './kbn_core_node_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_node_server_mocks.mdx b/api_docs/kbn_core_node_server_mocks.mdx
index 63681b4273d7a..c11cd5a44f85e 100644
--- a/api_docs/kbn_core_node_server_mocks.mdx
+++ b/api_docs/kbn_core_node_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-node-server-mocks
 title: "@kbn/core-node-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-node-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-node-server-mocks']
 ---
 import kbnCoreNodeServerMocksObj from './kbn_core_node_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_notifications_browser.mdx b/api_docs/kbn_core_notifications_browser.mdx
index 20ab26c0bc749..98f962cda1366 100644
--- a/api_docs/kbn_core_notifications_browser.mdx
+++ b/api_docs/kbn_core_notifications_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-notifications-browser
 title: "@kbn/core-notifications-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-notifications-browser plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-notifications-browser']
 ---
 import kbnCoreNotificationsBrowserObj from './kbn_core_notifications_browser.devdocs.json';
diff --git a/api_docs/kbn_core_notifications_browser_internal.mdx b/api_docs/kbn_core_notifications_browser_internal.mdx
index d824c45cc7aac..e6dbdc9b96f76 100644
--- a/api_docs/kbn_core_notifications_browser_internal.mdx
+++ b/api_docs/kbn_core_notifications_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-notifications-browser-internal
 title: "@kbn/core-notifications-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-notifications-browser-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-notifications-browser-internal']
 ---
 import kbnCoreNotificationsBrowserInternalObj from './kbn_core_notifications_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_notifications_browser_mocks.mdx b/api_docs/kbn_core_notifications_browser_mocks.mdx
index 82241455ede13..19758a5e79d5e 100644
--- a/api_docs/kbn_core_notifications_browser_mocks.mdx
+++ b/api_docs/kbn_core_notifications_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-notifications-browser-mocks
 title: "@kbn/core-notifications-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-notifications-browser-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-notifications-browser-mocks']
 ---
 import kbnCoreNotificationsBrowserMocksObj from './kbn_core_notifications_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_overlays_browser.mdx b/api_docs/kbn_core_overlays_browser.mdx
index bd6e525f0fb93..4a45c849bcc96 100644
--- a/api_docs/kbn_core_overlays_browser.mdx
+++ b/api_docs/kbn_core_overlays_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-overlays-browser
 title: "@kbn/core-overlays-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-overlays-browser plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-overlays-browser']
 ---
 import kbnCoreOverlaysBrowserObj from './kbn_core_overlays_browser.devdocs.json';
diff --git a/api_docs/kbn_core_overlays_browser_internal.mdx b/api_docs/kbn_core_overlays_browser_internal.mdx
index 023c363df1f90..b92e689e4ef1e 100644
--- a/api_docs/kbn_core_overlays_browser_internal.mdx
+++ b/api_docs/kbn_core_overlays_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-overlays-browser-internal
 title: "@kbn/core-overlays-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-overlays-browser-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-overlays-browser-internal']
 ---
 import kbnCoreOverlaysBrowserInternalObj from './kbn_core_overlays_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_overlays_browser_mocks.mdx b/api_docs/kbn_core_overlays_browser_mocks.mdx
index 82863e8d7c246..7cb6c9dda7a39 100644
--- a/api_docs/kbn_core_overlays_browser_mocks.mdx
+++ b/api_docs/kbn_core_overlays_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-overlays-browser-mocks
 title: "@kbn/core-overlays-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-overlays-browser-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-overlays-browser-mocks']
 ---
 import kbnCoreOverlaysBrowserMocksObj from './kbn_core_overlays_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_plugins_browser.mdx b/api_docs/kbn_core_plugins_browser.mdx
index 79c15731be923..5bdceb6b6984c 100644
--- a/api_docs/kbn_core_plugins_browser.mdx
+++ b/api_docs/kbn_core_plugins_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-browser
 title: "@kbn/core-plugins-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-browser plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-browser']
 ---
 import kbnCorePluginsBrowserObj from './kbn_core_plugins_browser.devdocs.json';
diff --git a/api_docs/kbn_core_plugins_browser_mocks.mdx b/api_docs/kbn_core_plugins_browser_mocks.mdx
index 98c3abd58f3a3..799ca27985b43 100644
--- a/api_docs/kbn_core_plugins_browser_mocks.mdx
+++ b/api_docs/kbn_core_plugins_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-browser-mocks
 title: "@kbn/core-plugins-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-browser-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-browser-mocks']
 ---
 import kbnCorePluginsBrowserMocksObj from './kbn_core_plugins_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_plugins_server.mdx b/api_docs/kbn_core_plugins_server.mdx
index 186767ae5b0ca..eed2f8d932755 100644
--- a/api_docs/kbn_core_plugins_server.mdx
+++ b/api_docs/kbn_core_plugins_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-server
 title: "@kbn/core-plugins-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-server']
 ---
 import kbnCorePluginsServerObj from './kbn_core_plugins_server.devdocs.json';
diff --git a/api_docs/kbn_core_plugins_server_mocks.mdx b/api_docs/kbn_core_plugins_server_mocks.mdx
index 5c1c91d0d9180..f0153c6d49f71 100644
--- a/api_docs/kbn_core_plugins_server_mocks.mdx
+++ b/api_docs/kbn_core_plugins_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-server-mocks
 title: "@kbn/core-plugins-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-server-mocks']
 ---
 import kbnCorePluginsServerMocksObj from './kbn_core_plugins_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_preboot_server.mdx b/api_docs/kbn_core_preboot_server.mdx
index 3fccd50f19133..ff9fe03bb5113 100644
--- a/api_docs/kbn_core_preboot_server.mdx
+++ b/api_docs/kbn_core_preboot_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-preboot-server
 title: "@kbn/core-preboot-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-preboot-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-preboot-server']
 ---
 import kbnCorePrebootServerObj from './kbn_core_preboot_server.devdocs.json';
diff --git a/api_docs/kbn_core_preboot_server_mocks.mdx b/api_docs/kbn_core_preboot_server_mocks.mdx
index 5fa6b166396df..bf57e6bd4ee7a 100644
--- a/api_docs/kbn_core_preboot_server_mocks.mdx
+++ b/api_docs/kbn_core_preboot_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-preboot-server-mocks
 title: "@kbn/core-preboot-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-preboot-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-preboot-server-mocks']
 ---
 import kbnCorePrebootServerMocksObj from './kbn_core_preboot_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_rendering_browser_mocks.mdx b/api_docs/kbn_core_rendering_browser_mocks.mdx
index 91c5d2eaf7349..40b41d802ac0b 100644
--- a/api_docs/kbn_core_rendering_browser_mocks.mdx
+++ b/api_docs/kbn_core_rendering_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-rendering-browser-mocks
 title: "@kbn/core-rendering-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-rendering-browser-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-rendering-browser-mocks']
 ---
 import kbnCoreRenderingBrowserMocksObj from './kbn_core_rendering_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_rendering_server_internal.mdx b/api_docs/kbn_core_rendering_server_internal.mdx
index 1181c8e829960..f4db0194802b1 100644
--- a/api_docs/kbn_core_rendering_server_internal.mdx
+++ b/api_docs/kbn_core_rendering_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-rendering-server-internal
 title: "@kbn/core-rendering-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-rendering-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-rendering-server-internal']
 ---
 import kbnCoreRenderingServerInternalObj from './kbn_core_rendering_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_rendering_server_mocks.mdx b/api_docs/kbn_core_rendering_server_mocks.mdx
index 541950376bd3a..b4d73ea88a6ac 100644
--- a/api_docs/kbn_core_rendering_server_mocks.mdx
+++ b/api_docs/kbn_core_rendering_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-rendering-server-mocks
 title: "@kbn/core-rendering-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-rendering-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-rendering-server-mocks']
 ---
 import kbnCoreRenderingServerMocksObj from './kbn_core_rendering_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_root_server_internal.mdx b/api_docs/kbn_core_root_server_internal.mdx
index 515e475f7ea60..2646c889d696b 100644
--- a/api_docs/kbn_core_root_server_internal.mdx
+++ b/api_docs/kbn_core_root_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-root-server-internal
 title: "@kbn/core-root-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-root-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-root-server-internal']
 ---
 import kbnCoreRootServerInternalObj from './kbn_core_root_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_api_browser.mdx b/api_docs/kbn_core_saved_objects_api_browser.mdx
index bbb5648505e86..cc97c9bc44726 100644
--- a/api_docs/kbn_core_saved_objects_api_browser.mdx
+++ b/api_docs/kbn_core_saved_objects_api_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-browser
 title: "@kbn/core-saved-objects-api-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-api-browser plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-api-browser']
 ---
 import kbnCoreSavedObjectsApiBrowserObj from './kbn_core_saved_objects_api_browser.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_api_server.devdocs.json b/api_docs/kbn_core_saved_objects_api_server.devdocs.json
index 34b6a5eec8838..ccbc23a7ac04a 100644
--- a/api_docs/kbn_core_saved_objects_api_server.devdocs.json
+++ b/api_docs/kbn_core_saved_objects_api_server.devdocs.json
@@ -2467,44 +2467,44 @@
                 "path": "x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/user_risk_score_dashboards.ts"
               },
               {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/usage/detections/rules/get_metrics.mocks.ts"
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock.ts"
               },
               {
-                "plugin": "fleet",
-                "path": "x-pack/plugins/fleet/server/services/epm/packages/get.test.ts"
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock.ts"
               },
               {
-                "plugin": "fleet",
-                "path": "x-pack/plugins/fleet/server/services/epm/packages/get.test.ts"
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock.ts"
               },
               {
-                "plugin": "fleet",
-                "path": "x-pack/plugins/fleet/server/services/epm/packages/get.test.ts"
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock.ts"
               },
               {
-                "plugin": "fleet",
-                "path": "x-pack/plugins/fleet/server/services/epm/packages/get.test.ts"
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock.ts"
               },
               {
                 "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts"
+                "path": "x-pack/plugins/security_solution/server/usage/detections/rules/get_metrics.mocks.ts"
               },
               {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts"
+                "plugin": "fleet",
+                "path": "x-pack/plugins/fleet/server/services/epm/packages/get.test.ts"
               },
               {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts"
+                "plugin": "fleet",
+                "path": "x-pack/plugins/fleet/server/services/epm/packages/get.test.ts"
               },
               {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts"
+                "plugin": "fleet",
+                "path": "x-pack/plugins/fleet/server/services/epm/packages/get.test.ts"
               },
               {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts"
+                "plugin": "fleet",
+                "path": "x-pack/plugins/fleet/server/services/epm/packages/get.test.ts"
               }
             ]
           },
diff --git a/api_docs/kbn_core_saved_objects_api_server.mdx b/api_docs/kbn_core_saved_objects_api_server.mdx
index 80723a578e801..74d79efb220eb 100644
--- a/api_docs/kbn_core_saved_objects_api_server.mdx
+++ b/api_docs/kbn_core_saved_objects_api_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-server
 title: "@kbn/core-saved-objects-api-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-api-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-api-server']
 ---
 import kbnCoreSavedObjectsApiServerObj from './kbn_core_saved_objects_api_server.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_api_server_internal.mdx b/api_docs/kbn_core_saved_objects_api_server_internal.mdx
index 364e3d6c2e0d0..ddf6fb2bed3cf 100644
--- a/api_docs/kbn_core_saved_objects_api_server_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_api_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-server-internal
 title: "@kbn/core-saved-objects-api-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-api-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-api-server-internal']
 ---
 import kbnCoreSavedObjectsApiServerInternalObj from './kbn_core_saved_objects_api_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_api_server_mocks.mdx b/api_docs/kbn_core_saved_objects_api_server_mocks.mdx
index 9b2c6c049793a..46159abcb32a5 100644
--- a/api_docs/kbn_core_saved_objects_api_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_api_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-server-mocks
 title: "@kbn/core-saved-objects-api-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-api-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-api-server-mocks']
 ---
 import kbnCoreSavedObjectsApiServerMocksObj from './kbn_core_saved_objects_api_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_base_server_internal.mdx b/api_docs/kbn_core_saved_objects_base_server_internal.mdx
index 2dbf03e97e737..a8b49b8d681e1 100644
--- a/api_docs/kbn_core_saved_objects_base_server_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_base_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-base-server-internal
 title: "@kbn/core-saved-objects-base-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-base-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-base-server-internal']
 ---
 import kbnCoreSavedObjectsBaseServerInternalObj from './kbn_core_saved_objects_base_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_base_server_mocks.mdx b/api_docs/kbn_core_saved_objects_base_server_mocks.mdx
index 784bad9b0340a..335aa6b5510a5 100644
--- a/api_docs/kbn_core_saved_objects_base_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_base_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-base-server-mocks
 title: "@kbn/core-saved-objects-base-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-base-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-base-server-mocks']
 ---
 import kbnCoreSavedObjectsBaseServerMocksObj from './kbn_core_saved_objects_base_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_browser.mdx b/api_docs/kbn_core_saved_objects_browser.mdx
index ac17cc0f50ddc..bba9a0fe3f2b3 100644
--- a/api_docs/kbn_core_saved_objects_browser.mdx
+++ b/api_docs/kbn_core_saved_objects_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-browser
 title: "@kbn/core-saved-objects-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-browser plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-browser']
 ---
 import kbnCoreSavedObjectsBrowserObj from './kbn_core_saved_objects_browser.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_browser_internal.mdx b/api_docs/kbn_core_saved_objects_browser_internal.mdx
index 35eb402d34bad..c78ce88a69f12 100644
--- a/api_docs/kbn_core_saved_objects_browser_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-browser-internal
 title: "@kbn/core-saved-objects-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-browser-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-browser-internal']
 ---
 import kbnCoreSavedObjectsBrowserInternalObj from './kbn_core_saved_objects_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_browser_mocks.mdx b/api_docs/kbn_core_saved_objects_browser_mocks.mdx
index 655b42e41a076..5a6fb2c44b372 100644
--- a/api_docs/kbn_core_saved_objects_browser_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-browser-mocks
 title: "@kbn/core-saved-objects-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-browser-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-browser-mocks']
 ---
 import kbnCoreSavedObjectsBrowserMocksObj from './kbn_core_saved_objects_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_common.devdocs.json b/api_docs/kbn_core_saved_objects_common.devdocs.json
index 7b868ee8aa205..f6d51fc124d6e 100644
--- a/api_docs/kbn_core_saved_objects_common.devdocs.json
+++ b/api_docs/kbn_core_saved_objects_common.devdocs.json
@@ -2844,30 +2844,6 @@
             "plugin": "visualizations",
             "path": "src/plugins/visualizations/public/utils/saved_visualization_references/timeseries_references.ts"
           },
-          {
-            "plugin": "dashboard",
-            "path": "src/plugins/dashboard/common/dashboard_saved_object/persistable_state/dashboard_saved_object_references.ts"
-          },
-          {
-            "plugin": "dashboard",
-            "path": "src/plugins/dashboard/common/dashboard_saved_object/persistable_state/dashboard_saved_object_references.ts"
-          },
-          {
-            "plugin": "dashboard",
-            "path": "src/plugins/dashboard/common/dashboard_saved_object/persistable_state/dashboard_saved_object_references.ts"
-          },
-          {
-            "plugin": "dashboard",
-            "path": "src/plugins/dashboard/common/dashboard_container/persistable_state/dashboard_container_references.ts"
-          },
-          {
-            "plugin": "dashboard",
-            "path": "src/plugins/dashboard/common/dashboard_container/persistable_state/dashboard_container_references.ts"
-          },
-          {
-            "plugin": "dashboard",
-            "path": "src/plugins/dashboard/common/dashboard_container/persistable_state/dashboard_container_references.ts"
-          },
           {
             "plugin": "controls",
             "path": "src/plugins/controls/common/options_list/options_list_persistable_state.ts"
@@ -2916,6 +2892,30 @@
             "plugin": "controls",
             "path": "src/plugins/controls/common/control_group/control_group_persistable_state.ts"
           },
+          {
+            "plugin": "dashboard",
+            "path": "src/plugins/dashboard/common/dashboard_saved_object/persistable_state/dashboard_saved_object_references.ts"
+          },
+          {
+            "plugin": "dashboard",
+            "path": "src/plugins/dashboard/common/dashboard_saved_object/persistable_state/dashboard_saved_object_references.ts"
+          },
+          {
+            "plugin": "dashboard",
+            "path": "src/plugins/dashboard/common/dashboard_saved_object/persistable_state/dashboard_saved_object_references.ts"
+          },
+          {
+            "plugin": "dashboard",
+            "path": "src/plugins/dashboard/common/dashboard_container/persistable_state/dashboard_container_references.ts"
+          },
+          {
+            "plugin": "dashboard",
+            "path": "src/plugins/dashboard/common/dashboard_container/persistable_state/dashboard_container_references.ts"
+          },
+          {
+            "plugin": "dashboard",
+            "path": "src/plugins/dashboard/common/dashboard_container/persistable_state/dashboard_container_references.ts"
+          },
           {
             "plugin": "savedObjectsTagging",
             "path": "x-pack/plugins/saved_objects_tagging/common/references.ts"
@@ -3238,19 +3238,27 @@
           },
           {
             "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/common/visualizations/lens/types.ts"
+            "path": "x-pack/plugins/infra/public/common/visualizations/lens/visualization_types/line_chart.ts"
+          },
+          {
+            "plugin": "infra",
+            "path": "x-pack/plugins/infra/public/common/visualizations/lens/visualization_types/line_chart.ts"
+          },
+          {
+            "plugin": "infra",
+            "path": "x-pack/plugins/infra/public/common/visualizations/lens/visualization_types/metric_chart.ts"
           },
           {
             "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/common/visualizations/lens/types.ts"
+            "path": "x-pack/plugins/infra/public/common/visualizations/lens/visualization_types/metric_chart.ts"
           },
           {
             "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/common/visualizations/lens/hosts/load.ts"
+            "path": "x-pack/plugins/infra/public/common/visualizations/types.ts"
           },
           {
             "plugin": "infra",
-            "path": "x-pack/plugins/infra/public/common/visualizations/lens/hosts/load.ts"
+            "path": "x-pack/plugins/infra/public/common/visualizations/types.ts"
           },
           {
             "plugin": "cases",
diff --git a/api_docs/kbn_core_saved_objects_common.mdx b/api_docs/kbn_core_saved_objects_common.mdx
index 6aa791f02b305..7e86e3ad14112 100644
--- a/api_docs/kbn_core_saved_objects_common.mdx
+++ b/api_docs/kbn_core_saved_objects_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-common
 title: "@kbn/core-saved-objects-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-common plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-common']
 ---
 import kbnCoreSavedObjectsCommonObj from './kbn_core_saved_objects_common.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx b/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx
index ef9c2eee7dda8..ceb95fa4e2395 100644
--- a/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-import-export-server-internal
 title: "@kbn/core-saved-objects-import-export-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-import-export-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-import-export-server-internal']
 ---
 import kbnCoreSavedObjectsImportExportServerInternalObj from './kbn_core_saved_objects_import_export_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx b/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx
index 9c2ac13d123a4..46f276fa9a5fe 100644
--- a/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-import-export-server-mocks
 title: "@kbn/core-saved-objects-import-export-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-import-export-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-import-export-server-mocks']
 ---
 import kbnCoreSavedObjectsImportExportServerMocksObj from './kbn_core_saved_objects_import_export_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_migration_server_internal.mdx b/api_docs/kbn_core_saved_objects_migration_server_internal.mdx
index 9211f55ae686f..5e8bd70323aa0 100644
--- a/api_docs/kbn_core_saved_objects_migration_server_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_migration_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-migration-server-internal
 title: "@kbn/core-saved-objects-migration-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-migration-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-migration-server-internal']
 ---
 import kbnCoreSavedObjectsMigrationServerInternalObj from './kbn_core_saved_objects_migration_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx b/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx
index 6ab358dddacee..df63883550aa3 100644
--- a/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-migration-server-mocks
 title: "@kbn/core-saved-objects-migration-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-migration-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-migration-server-mocks']
 ---
 import kbnCoreSavedObjectsMigrationServerMocksObj from './kbn_core_saved_objects_migration_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_server.devdocs.json b/api_docs/kbn_core_saved_objects_server.devdocs.json
index 04e306480463a..64c296dff415d 100644
--- a/api_docs/kbn_core_saved_objects_server.devdocs.json
+++ b/api_docs/kbn_core_saved_objects_server.devdocs.json
@@ -5932,44 +5932,44 @@
                 "path": "x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/user_risk_score_dashboards.ts"
               },
               {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/usage/detections/rules/get_metrics.mocks.ts"
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock.ts"
               },
               {
-                "plugin": "fleet",
-                "path": "x-pack/plugins/fleet/server/services/epm/packages/get.test.ts"
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock.ts"
               },
               {
-                "plugin": "fleet",
-                "path": "x-pack/plugins/fleet/server/services/epm/packages/get.test.ts"
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock.ts"
               },
               {
-                "plugin": "fleet",
-                "path": "x-pack/plugins/fleet/server/services/epm/packages/get.test.ts"
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock.ts"
               },
               {
-                "plugin": "fleet",
-                "path": "x-pack/plugins/fleet/server/services/epm/packages/get.test.ts"
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/rules_client/lib/siem_legacy_actions/retrieve_migrated_legacy_actions.mock.ts"
               },
               {
                 "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts"
+                "path": "x-pack/plugins/security_solution/server/usage/detections/rules/get_metrics.mocks.ts"
               },
               {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts"
+                "plugin": "fleet",
+                "path": "x-pack/plugins/fleet/server/services/epm/packages/get.test.ts"
               },
               {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts"
+                "plugin": "fleet",
+                "path": "x-pack/plugins/fleet/server/services/epm/packages/get.test.ts"
               },
               {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts"
+                "plugin": "fleet",
+                "path": "x-pack/plugins/fleet/server/services/epm/packages/get.test.ts"
               },
               {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts"
+                "plugin": "fleet",
+                "path": "x-pack/plugins/fleet/server/services/epm/packages/get.test.ts"
               }
             ]
           },
diff --git a/api_docs/kbn_core_saved_objects_server.mdx b/api_docs/kbn_core_saved_objects_server.mdx
index 0ab1681109f8b..7308525d17c4a 100644
--- a/api_docs/kbn_core_saved_objects_server.mdx
+++ b/api_docs/kbn_core_saved_objects_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-server
 title: "@kbn/core-saved-objects-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-server']
 ---
 import kbnCoreSavedObjectsServerObj from './kbn_core_saved_objects_server.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_server_internal.mdx b/api_docs/kbn_core_saved_objects_server_internal.mdx
index 2bfef7896ed9e..9bbcba68753f9 100644
--- a/api_docs/kbn_core_saved_objects_server_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-server-internal
 title: "@kbn/core-saved-objects-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-server-internal']
 ---
 import kbnCoreSavedObjectsServerInternalObj from './kbn_core_saved_objects_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_server_mocks.mdx b/api_docs/kbn_core_saved_objects_server_mocks.mdx
index 5969fa3fec42b..39bcf94ad1517 100644
--- a/api_docs/kbn_core_saved_objects_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-server-mocks
 title: "@kbn/core-saved-objects-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-server-mocks']
 ---
 import kbnCoreSavedObjectsServerMocksObj from './kbn_core_saved_objects_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_utils_server.mdx b/api_docs/kbn_core_saved_objects_utils_server.mdx
index f03b52f175605..2176df6e1f627 100644
--- a/api_docs/kbn_core_saved_objects_utils_server.mdx
+++ b/api_docs/kbn_core_saved_objects_utils_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-utils-server
 title: "@kbn/core-saved-objects-utils-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-utils-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-utils-server']
 ---
 import kbnCoreSavedObjectsUtilsServerObj from './kbn_core_saved_objects_utils_server.devdocs.json';
diff --git a/api_docs/kbn_core_status_common.mdx b/api_docs/kbn_core_status_common.mdx
index 98e14db6a9771..ee5f2f06c798c 100644
--- a/api_docs/kbn_core_status_common.mdx
+++ b/api_docs/kbn_core_status_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-common
 title: "@kbn/core-status-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-common plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-common']
 ---
 import kbnCoreStatusCommonObj from './kbn_core_status_common.devdocs.json';
diff --git a/api_docs/kbn_core_status_common_internal.mdx b/api_docs/kbn_core_status_common_internal.mdx
index 138054ebf6074..cfef8384a8358 100644
--- a/api_docs/kbn_core_status_common_internal.mdx
+++ b/api_docs/kbn_core_status_common_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-common-internal
 title: "@kbn/core-status-common-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-common-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-common-internal']
 ---
 import kbnCoreStatusCommonInternalObj from './kbn_core_status_common_internal.devdocs.json';
diff --git a/api_docs/kbn_core_status_server.mdx b/api_docs/kbn_core_status_server.mdx
index cec848d089f1a..0077e0166e34f 100644
--- a/api_docs/kbn_core_status_server.mdx
+++ b/api_docs/kbn_core_status_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-server
 title: "@kbn/core-status-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-server']
 ---
 import kbnCoreStatusServerObj from './kbn_core_status_server.devdocs.json';
diff --git a/api_docs/kbn_core_status_server_internal.mdx b/api_docs/kbn_core_status_server_internal.mdx
index 6dd568e68595b..702c012e25f88 100644
--- a/api_docs/kbn_core_status_server_internal.mdx
+++ b/api_docs/kbn_core_status_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-server-internal
 title: "@kbn/core-status-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-server-internal']
 ---
 import kbnCoreStatusServerInternalObj from './kbn_core_status_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_status_server_mocks.mdx b/api_docs/kbn_core_status_server_mocks.mdx
index b1b3f3c84cf7f..1346f773d4326 100644
--- a/api_docs/kbn_core_status_server_mocks.mdx
+++ b/api_docs/kbn_core_status_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-server-mocks
 title: "@kbn/core-status-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-server-mocks']
 ---
 import kbnCoreStatusServerMocksObj from './kbn_core_status_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_test_helpers_deprecations_getters.mdx b/api_docs/kbn_core_test_helpers_deprecations_getters.mdx
index b9e2efa25823f..bc0cff6212ae7 100644
--- a/api_docs/kbn_core_test_helpers_deprecations_getters.mdx
+++ b/api_docs/kbn_core_test_helpers_deprecations_getters.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-deprecations-getters
 title: "@kbn/core-test-helpers-deprecations-getters"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-deprecations-getters plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-deprecations-getters']
 ---
 import kbnCoreTestHelpersDeprecationsGettersObj from './kbn_core_test_helpers_deprecations_getters.devdocs.json';
diff --git a/api_docs/kbn_core_test_helpers_http_setup_browser.mdx b/api_docs/kbn_core_test_helpers_http_setup_browser.mdx
index d89c14bb7d6f3..2e84b6ef2d794 100644
--- a/api_docs/kbn_core_test_helpers_http_setup_browser.mdx
+++ b/api_docs/kbn_core_test_helpers_http_setup_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-http-setup-browser
 title: "@kbn/core-test-helpers-http-setup-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-http-setup-browser plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-http-setup-browser']
 ---
 import kbnCoreTestHelpersHttpSetupBrowserObj from './kbn_core_test_helpers_http_setup_browser.devdocs.json';
diff --git a/api_docs/kbn_core_test_helpers_kbn_server.mdx b/api_docs/kbn_core_test_helpers_kbn_server.mdx
index 8bba1c8faaadd..acb33a14cf28d 100644
--- a/api_docs/kbn_core_test_helpers_kbn_server.mdx
+++ b/api_docs/kbn_core_test_helpers_kbn_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-kbn-server
 title: "@kbn/core-test-helpers-kbn-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-kbn-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-kbn-server']
 ---
 import kbnCoreTestHelpersKbnServerObj from './kbn_core_test_helpers_kbn_server.devdocs.json';
diff --git a/api_docs/kbn_core_test_helpers_so_type_serializer.mdx b/api_docs/kbn_core_test_helpers_so_type_serializer.mdx
index 9e3173f339a99..bc4c85f76f85c 100644
--- a/api_docs/kbn_core_test_helpers_so_type_serializer.mdx
+++ b/api_docs/kbn_core_test_helpers_so_type_serializer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-so-type-serializer
 title: "@kbn/core-test-helpers-so-type-serializer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-so-type-serializer plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-so-type-serializer']
 ---
 import kbnCoreTestHelpersSoTypeSerializerObj from './kbn_core_test_helpers_so_type_serializer.devdocs.json';
diff --git a/api_docs/kbn_core_test_helpers_test_utils.mdx b/api_docs/kbn_core_test_helpers_test_utils.mdx
index 737f37c0f6807..f5d8e8e4b8a8e 100644
--- a/api_docs/kbn_core_test_helpers_test_utils.mdx
+++ b/api_docs/kbn_core_test_helpers_test_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-test-utils
 title: "@kbn/core-test-helpers-test-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-test-utils plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-test-utils']
 ---
 import kbnCoreTestHelpersTestUtilsObj from './kbn_core_test_helpers_test_utils.devdocs.json';
diff --git a/api_docs/kbn_core_theme_browser.mdx b/api_docs/kbn_core_theme_browser.mdx
index 8af892b1926aa..1900793efb403 100644
--- a/api_docs/kbn_core_theme_browser.mdx
+++ b/api_docs/kbn_core_theme_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-theme-browser
 title: "@kbn/core-theme-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-theme-browser plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-theme-browser']
 ---
 import kbnCoreThemeBrowserObj from './kbn_core_theme_browser.devdocs.json';
diff --git a/api_docs/kbn_core_theme_browser_internal.mdx b/api_docs/kbn_core_theme_browser_internal.mdx
index ec571030356a6..1f118ad62feaa 100644
--- a/api_docs/kbn_core_theme_browser_internal.mdx
+++ b/api_docs/kbn_core_theme_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-theme-browser-internal
 title: "@kbn/core-theme-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-theme-browser-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-theme-browser-internal']
 ---
 import kbnCoreThemeBrowserInternalObj from './kbn_core_theme_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_theme_browser_mocks.mdx b/api_docs/kbn_core_theme_browser_mocks.mdx
index 2334b44813bba..334b5611b5be3 100644
--- a/api_docs/kbn_core_theme_browser_mocks.mdx
+++ b/api_docs/kbn_core_theme_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-theme-browser-mocks
 title: "@kbn/core-theme-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-theme-browser-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-theme-browser-mocks']
 ---
 import kbnCoreThemeBrowserMocksObj from './kbn_core_theme_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_browser.mdx b/api_docs/kbn_core_ui_settings_browser.mdx
index cdb58a7f10ff6..ff8d60d9cd031 100644
--- a/api_docs/kbn_core_ui_settings_browser.mdx
+++ b/api_docs/kbn_core_ui_settings_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-browser
 title: "@kbn/core-ui-settings-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-browser plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-browser']
 ---
 import kbnCoreUiSettingsBrowserObj from './kbn_core_ui_settings_browser.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_browser_internal.mdx b/api_docs/kbn_core_ui_settings_browser_internal.mdx
index 40806c06351df..bb8c17a6dd7ec 100644
--- a/api_docs/kbn_core_ui_settings_browser_internal.mdx
+++ b/api_docs/kbn_core_ui_settings_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-browser-internal
 title: "@kbn/core-ui-settings-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-browser-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-browser-internal']
 ---
 import kbnCoreUiSettingsBrowserInternalObj from './kbn_core_ui_settings_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_browser_mocks.mdx b/api_docs/kbn_core_ui_settings_browser_mocks.mdx
index d917f1e1aad65..2ab598732c667 100644
--- a/api_docs/kbn_core_ui_settings_browser_mocks.mdx
+++ b/api_docs/kbn_core_ui_settings_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-browser-mocks
 title: "@kbn/core-ui-settings-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-browser-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-browser-mocks']
 ---
 import kbnCoreUiSettingsBrowserMocksObj from './kbn_core_ui_settings_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_common.mdx b/api_docs/kbn_core_ui_settings_common.mdx
index e018d2c0411e5..0203ee7cbd037 100644
--- a/api_docs/kbn_core_ui_settings_common.mdx
+++ b/api_docs/kbn_core_ui_settings_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-common
 title: "@kbn/core-ui-settings-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-common plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-common']
 ---
 import kbnCoreUiSettingsCommonObj from './kbn_core_ui_settings_common.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_server.mdx b/api_docs/kbn_core_ui_settings_server.mdx
index b7ea799469138..c0e47a9ce8832 100644
--- a/api_docs/kbn_core_ui_settings_server.mdx
+++ b/api_docs/kbn_core_ui_settings_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-server
 title: "@kbn/core-ui-settings-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-server']
 ---
 import kbnCoreUiSettingsServerObj from './kbn_core_ui_settings_server.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_server_internal.mdx b/api_docs/kbn_core_ui_settings_server_internal.mdx
index 6f49e6af8e8cc..6bc188e6d6442 100644
--- a/api_docs/kbn_core_ui_settings_server_internal.mdx
+++ b/api_docs/kbn_core_ui_settings_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-server-internal
 title: "@kbn/core-ui-settings-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-server-internal']
 ---
 import kbnCoreUiSettingsServerInternalObj from './kbn_core_ui_settings_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_server_mocks.mdx b/api_docs/kbn_core_ui_settings_server_mocks.mdx
index fbb82389c6e58..63929de47b247 100644
--- a/api_docs/kbn_core_ui_settings_server_mocks.mdx
+++ b/api_docs/kbn_core_ui_settings_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-server-mocks
 title: "@kbn/core-ui-settings-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-server-mocks']
 ---
 import kbnCoreUiSettingsServerMocksObj from './kbn_core_ui_settings_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_usage_data_server.mdx b/api_docs/kbn_core_usage_data_server.mdx
index 40ce42a44cf15..47ec2ccf93dab 100644
--- a/api_docs/kbn_core_usage_data_server.mdx
+++ b/api_docs/kbn_core_usage_data_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-usage-data-server
 title: "@kbn/core-usage-data-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-usage-data-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-usage-data-server']
 ---
 import kbnCoreUsageDataServerObj from './kbn_core_usage_data_server.devdocs.json';
diff --git a/api_docs/kbn_core_usage_data_server_internal.mdx b/api_docs/kbn_core_usage_data_server_internal.mdx
index f53a1d696836e..5540930ed5fec 100644
--- a/api_docs/kbn_core_usage_data_server_internal.mdx
+++ b/api_docs/kbn_core_usage_data_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-usage-data-server-internal
 title: "@kbn/core-usage-data-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-usage-data-server-internal plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-usage-data-server-internal']
 ---
 import kbnCoreUsageDataServerInternalObj from './kbn_core_usage_data_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_usage_data_server_mocks.mdx b/api_docs/kbn_core_usage_data_server_mocks.mdx
index 63c67653c704c..40a8e634fbf38 100644
--- a/api_docs/kbn_core_usage_data_server_mocks.mdx
+++ b/api_docs/kbn_core_usage_data_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-usage-data-server-mocks
 title: "@kbn/core-usage-data-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-usage-data-server-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-usage-data-server-mocks']
 ---
 import kbnCoreUsageDataServerMocksObj from './kbn_core_usage_data_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_crypto.mdx b/api_docs/kbn_crypto.mdx
index e579c0b88b82b..2855b17a3bbde 100644
--- a/api_docs/kbn_crypto.mdx
+++ b/api_docs/kbn_crypto.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-crypto
 title: "@kbn/crypto"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/crypto plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/crypto']
 ---
 import kbnCryptoObj from './kbn_crypto.devdocs.json';
diff --git a/api_docs/kbn_crypto_browser.mdx b/api_docs/kbn_crypto_browser.mdx
index c6ac7c1e36a6f..f5aa87a327f2a 100644
--- a/api_docs/kbn_crypto_browser.mdx
+++ b/api_docs/kbn_crypto_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-crypto-browser
 title: "@kbn/crypto-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/crypto-browser plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/crypto-browser']
 ---
 import kbnCryptoBrowserObj from './kbn_crypto_browser.devdocs.json';
diff --git a/api_docs/kbn_cypress_config.mdx b/api_docs/kbn_cypress_config.mdx
index 425ea8f8ebd24..a5eade6a0eeb8 100644
--- a/api_docs/kbn_cypress_config.mdx
+++ b/api_docs/kbn_cypress_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cypress-config
 title: "@kbn/cypress-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/cypress-config plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/cypress-config']
 ---
 import kbnCypressConfigObj from './kbn_cypress_config.devdocs.json';
diff --git a/api_docs/kbn_datemath.mdx b/api_docs/kbn_datemath.mdx
index 63d561e44cf27..760812b3d9de3 100644
--- a/api_docs/kbn_datemath.mdx
+++ b/api_docs/kbn_datemath.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-datemath
 title: "@kbn/datemath"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/datemath plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/datemath']
 ---
 import kbnDatemathObj from './kbn_datemath.devdocs.json';
diff --git a/api_docs/kbn_dev_cli_errors.mdx b/api_docs/kbn_dev_cli_errors.mdx
index 0d605704eab6e..3ff9e4d7e3e71 100644
--- a/api_docs/kbn_dev_cli_errors.mdx
+++ b/api_docs/kbn_dev_cli_errors.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-cli-errors
 title: "@kbn/dev-cli-errors"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dev-cli-errors plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-cli-errors']
 ---
 import kbnDevCliErrorsObj from './kbn_dev_cli_errors.devdocs.json';
diff --git a/api_docs/kbn_dev_cli_runner.mdx b/api_docs/kbn_dev_cli_runner.mdx
index a14f794d444e4..9aac93e14f30c 100644
--- a/api_docs/kbn_dev_cli_runner.mdx
+++ b/api_docs/kbn_dev_cli_runner.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-cli-runner
 title: "@kbn/dev-cli-runner"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dev-cli-runner plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-cli-runner']
 ---
 import kbnDevCliRunnerObj from './kbn_dev_cli_runner.devdocs.json';
diff --git a/api_docs/kbn_dev_proc_runner.mdx b/api_docs/kbn_dev_proc_runner.mdx
index 6c434f94f2b97..228133ab7d29d 100644
--- a/api_docs/kbn_dev_proc_runner.mdx
+++ b/api_docs/kbn_dev_proc_runner.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-proc-runner
 title: "@kbn/dev-proc-runner"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dev-proc-runner plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-proc-runner']
 ---
 import kbnDevProcRunnerObj from './kbn_dev_proc_runner.devdocs.json';
diff --git a/api_docs/kbn_dev_utils.mdx b/api_docs/kbn_dev_utils.mdx
index a74d64dd14608..91524933ec5d0 100644
--- a/api_docs/kbn_dev_utils.mdx
+++ b/api_docs/kbn_dev_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-utils
 title: "@kbn/dev-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dev-utils plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-utils']
 ---
 import kbnDevUtilsObj from './kbn_dev_utils.devdocs.json';
diff --git a/api_docs/kbn_doc_links.mdx b/api_docs/kbn_doc_links.mdx
index 022b4c600076b..5323199ab5690 100644
--- a/api_docs/kbn_doc_links.mdx
+++ b/api_docs/kbn_doc_links.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-doc-links
 title: "@kbn/doc-links"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/doc-links plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/doc-links']
 ---
 import kbnDocLinksObj from './kbn_doc_links.devdocs.json';
diff --git a/api_docs/kbn_docs_utils.mdx b/api_docs/kbn_docs_utils.mdx
index dd54a131f03c0..078dcb629fdbe 100644
--- a/api_docs/kbn_docs_utils.mdx
+++ b/api_docs/kbn_docs_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-docs-utils
 title: "@kbn/docs-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/docs-utils plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/docs-utils']
 ---
 import kbnDocsUtilsObj from './kbn_docs_utils.devdocs.json';
diff --git a/api_docs/kbn_dom_drag_drop.devdocs.json b/api_docs/kbn_dom_drag_drop.devdocs.json
index 743e79bec0f81..d02552cab9614 100644
--- a/api_docs/kbn_dom_drag_drop.devdocs.json
+++ b/api_docs/kbn_dom_drag_drop.devdocs.json
@@ -77,6 +77,59 @@
         "returnComment": [],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "@kbn/dom-drag-drop",
+        "id": "def-public.DropOverlayWrapper",
+        "type": "Function",
+        "tags": [
+          "constructor"
+        ],
+        "label": "DropOverlayWrapper",
+        "description": [
+          "\nThis prevents the in-place droppable styles (under children) and allows to rather show an overlay with droppable styles (on top of children)"
+        ],
+        "signature": [
+          "({ isVisible, children, overlayProps, className, ...otherProps }: React.PropsWithChildren<",
+          {
+            "pluginId": "@kbn/dom-drag-drop",
+            "scope": "public",
+            "docId": "kibKbnDomDragDropPluginApi",
+            "section": "def-public.DropOverlayWrapperProps",
+            "text": "DropOverlayWrapperProps"
+          },
+          ">) => JSX.Element"
+        ],
+        "path": "packages/kbn-dom-drag-drop/src/drop_overlay_wrapper.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/dom-drag-drop",
+            "id": "def-public.DropOverlayWrapper.$1",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "{\n  isVisible,\n  children,\n  overlayProps,\n  className,\n  ...otherProps\n}",
+            "description": [],
+            "signature": [
+              "React.PropsWithChildren<",
+              {
+                "pluginId": "@kbn/dom-drag-drop",
+                "scope": "public",
+                "docId": "kibKbnDomDragDropPluginApi",
+                "section": "def-public.DropOverlayWrapperProps",
+                "text": "DropOverlayWrapperProps"
+              },
+              ">"
+            ],
+            "path": "packages/kbn-dom-drag-drop/src/drop_overlay_wrapper.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/dom-drag-drop",
         "id": "def-public.ReorderProvider",
@@ -89,7 +142,7 @@
           "\nTo create a reordering group, surround the elements from the same group with a `ReorderProvider`"
         ],
         "signature": [
-          "({\n  id,\n  children,\n  className,\n  dataTestSubj = DEFAULT_DATA_TEST_SUBJ,\n}: { id: string; children: React.ReactNode; className?: string | undefined; dataTestSubj?: string | undefined; }) => JSX.Element"
+          "({\n  id,\n  children,\n  className,\n  draggingHeight = REORDER_ITEM_HEIGHT,\n  dataTestSubj = DEFAULT_DATA_TEST_SUBJ,\n}: { id: string; children: React.ReactNode; className?: string | undefined; draggingHeight?: number | undefined; dataTestSubj?: string | undefined; }) => JSX.Element"
         ],
         "path": "packages/kbn-dom-drag-drop/src/providers/reorder_provider.tsx",
         "deprecated": false,
@@ -100,7 +153,7 @@
             "id": "def-public.ReorderProvider.$1",
             "type": "Object",
             "tags": [],
-            "label": "{\n  id,\n  children,\n  className,\n  dataTestSubj = DEFAULT_DATA_TEST_SUBJ,\n}",
+            "label": "{\n  id,\n  children,\n  className,\n  draggingHeight = REORDER_ITEM_HEIGHT,\n  dataTestSubj = DEFAULT_DATA_TEST_SUBJ,\n}",
             "description": [],
             "path": "packages/kbn-dom-drag-drop/src/providers/reorder_provider.tsx",
             "deprecated": false,
@@ -145,6 +198,20 @@
                 "deprecated": false,
                 "trackAdoption": false
               },
+              {
+                "parentPluginId": "@kbn/dom-drag-drop",
+                "id": "def-public.ReorderProvider.$1.draggingHeight",
+                "type": "number",
+                "tags": [],
+                "label": "draggingHeight",
+                "description": [],
+                "signature": [
+                  "number | undefined"
+                ],
+                "path": "packages/kbn-dom-drag-drop/src/providers/reorder_provider.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
               {
                 "parentPluginId": "@kbn/dom-drag-drop",
                 "id": "def-public.ReorderProvider.$1.dataTestSubj",
@@ -571,6 +638,61 @@
           }
         ],
         "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/dom-drag-drop",
+        "id": "def-public.DropOverlayWrapperProps",
+        "type": "Interface",
+        "tags": [],
+        "label": "DropOverlayWrapperProps",
+        "description": [
+          "\nDropOverlayWrapper Props"
+        ],
+        "path": "packages/kbn-dom-drag-drop/src/drop_overlay_wrapper.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/dom-drag-drop",
+            "id": "def-public.DropOverlayWrapperProps.isVisible",
+            "type": "boolean",
+            "tags": [],
+            "label": "isVisible",
+            "description": [],
+            "path": "packages/kbn-dom-drag-drop/src/drop_overlay_wrapper.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/dom-drag-drop",
+            "id": "def-public.DropOverlayWrapperProps.className",
+            "type": "string",
+            "tags": [],
+            "label": "className",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/kbn-dom-drag-drop/src/drop_overlay_wrapper.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/dom-drag-drop",
+            "id": "def-public.DropOverlayWrapperProps.overlayProps",
+            "type": "Uncategorized",
+            "tags": [],
+            "label": "overlayProps",
+            "description": [],
+            "signature": [
+              "object | undefined"
+            ],
+            "path": "packages/kbn-dom-drag-drop/src/drop_overlay_wrapper.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
       }
     ],
     "enums": [],
diff --git a/api_docs/kbn_dom_drag_drop.mdx b/api_docs/kbn_dom_drag_drop.mdx
index d97372d79ebdd..b4b41943700a4 100644
--- a/api_docs/kbn_dom_drag_drop.mdx
+++ b/api_docs/kbn_dom_drag_drop.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dom-drag-drop
 title: "@kbn/dom-drag-drop"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dom-drag-drop plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dom-drag-drop']
 ---
 import kbnDomDragDropObj from './kbn_dom_drag_drop.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/k
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 45 | 0 | 29 | 4 |
+| 52 | 0 | 34 | 4 |
 
 ## Client
 
diff --git a/api_docs/kbn_ebt_tools.mdx b/api_docs/kbn_ebt_tools.mdx
index c4e26078f26c2..ce5fef552eaaf 100644
--- a/api_docs/kbn_ebt_tools.mdx
+++ b/api_docs/kbn_ebt_tools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ebt-tools
 title: "@kbn/ebt-tools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ebt-tools plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ebt-tools']
 ---
 import kbnEbtToolsObj from './kbn_ebt_tools.devdocs.json';
diff --git a/api_docs/kbn_ecs.mdx b/api_docs/kbn_ecs.mdx
index 589a982102229..e8ea18c35009b 100644
--- a/api_docs/kbn_ecs.mdx
+++ b/api_docs/kbn_ecs.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ecs
 title: "@kbn/ecs"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ecs plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ecs']
 ---
 import kbnEcsObj from './kbn_ecs.devdocs.json';
diff --git a/api_docs/kbn_ecs_data_quality_dashboard.mdx b/api_docs/kbn_ecs_data_quality_dashboard.mdx
index 11f7705253010..3584bd6954340 100644
--- a/api_docs/kbn_ecs_data_quality_dashboard.mdx
+++ b/api_docs/kbn_ecs_data_quality_dashboard.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ecs-data-quality-dashboard
 title: "@kbn/ecs-data-quality-dashboard"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ecs-data-quality-dashboard plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ecs-data-quality-dashboard']
 ---
 import kbnEcsDataQualityDashboardObj from './kbn_ecs_data_quality_dashboard.devdocs.json';
diff --git a/api_docs/kbn_es.mdx b/api_docs/kbn_es.mdx
index 19d33d2cc2bf6..dcda809c7b317 100644
--- a/api_docs/kbn_es.mdx
+++ b/api_docs/kbn_es.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es
 title: "@kbn/es"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es']
 ---
 import kbnEsObj from './kbn_es.devdocs.json';
diff --git a/api_docs/kbn_es_archiver.mdx b/api_docs/kbn_es_archiver.mdx
index ea829b18afe8c..981f921d0f381 100644
--- a/api_docs/kbn_es_archiver.mdx
+++ b/api_docs/kbn_es_archiver.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-archiver
 title: "@kbn/es-archiver"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es-archiver plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es-archiver']
 ---
 import kbnEsArchiverObj from './kbn_es_archiver.devdocs.json';
diff --git a/api_docs/kbn_es_errors.mdx b/api_docs/kbn_es_errors.mdx
index baedea81274c2..11d880247da77 100644
--- a/api_docs/kbn_es_errors.mdx
+++ b/api_docs/kbn_es_errors.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-errors
 title: "@kbn/es-errors"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es-errors plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es-errors']
 ---
 import kbnEsErrorsObj from './kbn_es_errors.devdocs.json';
diff --git a/api_docs/kbn_es_query.devdocs.json b/api_docs/kbn_es_query.devdocs.json
index 84a193f3eb7b8..4aac051beec95 100644
--- a/api_docs/kbn_es_query.devdocs.json
+++ b/api_docs/kbn_es_query.devdocs.json
@@ -4263,6 +4263,18 @@
           },
           "; } | { query: ",
           "FilterMetaParams",
+          " | undefined; alias?: string | null | undefined; disabled?: boolean | undefined; negate?: boolean | undefined; controlledBy?: string | undefined; group?: string | undefined; index?: string | undefined; isMultiIndex?: boolean | undefined; type: \"range\"; key?: string | undefined; params?: (",
+          "FilterMetaParams",
+          " & ",
+          {
+            "pluginId": "@kbn/es-query",
+            "scope": "common",
+            "docId": "kibKbnEsQueryPluginApi",
+            "section": "def-common.RangeFilterParams",
+            "text": "RangeFilterParams"
+          },
+          ") | undefined; value?: string | undefined; field?: string | undefined; formattedValue?: string | undefined; } | { query: ",
+          "FilterMetaParams",
           " | undefined; length: number; toString(): string; toLocaleString(): string; pop(): ",
           {
             "pluginId": "@kbn/es-query",
@@ -4905,18 +4917,6 @@
           },
           " | undefined; } | { query: ",
           "FilterMetaParams",
-          " | undefined; alias?: string | null | undefined; disabled?: boolean | undefined; negate?: boolean | undefined; controlledBy?: string | undefined; group?: string | undefined; index?: string | undefined; isMultiIndex?: boolean | undefined; type: \"range\"; key?: string | undefined; params?: (",
-          "FilterMetaParams",
-          " & ",
-          {
-            "pluginId": "@kbn/es-query",
-            "scope": "common",
-            "docId": "kibKbnEsQueryPluginApi",
-            "section": "def-common.RangeFilterParams",
-            "text": "RangeFilterParams"
-          },
-          ") | undefined; value?: string | undefined; field?: string | undefined; formattedValue?: string | undefined; } | { query: ",
-          "FilterMetaParams",
           " | undefined; alias?: string | null | undefined; disabled?: boolean | undefined; negate?: boolean | undefined; controlledBy?: string | undefined; group?: string | undefined; index?: string | undefined; isMultiIndex?: boolean | undefined; type?: string | undefined; key?: string | undefined; params?: (",
           "FilterMetaParams",
           " & ",
diff --git a/api_docs/kbn_es_query.mdx b/api_docs/kbn_es_query.mdx
index 98d2f9264c732..afc16a4d74ee2 100644
--- a/api_docs/kbn_es_query.mdx
+++ b/api_docs/kbn_es_query.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-query
 title: "@kbn/es-query"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es-query plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es-query']
 ---
 import kbnEsQueryObj from './kbn_es_query.devdocs.json';
diff --git a/api_docs/kbn_es_types.mdx b/api_docs/kbn_es_types.mdx
index 2c4e5b793efdd..59fb0c2e57049 100644
--- a/api_docs/kbn_es_types.mdx
+++ b/api_docs/kbn_es_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-types
 title: "@kbn/es-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es-types plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es-types']
 ---
 import kbnEsTypesObj from './kbn_es_types.devdocs.json';
diff --git a/api_docs/kbn_eslint_plugin_imports.mdx b/api_docs/kbn_eslint_plugin_imports.mdx
index b09632ba7c10f..88719e3c85f7e 100644
--- a/api_docs/kbn_eslint_plugin_imports.mdx
+++ b/api_docs/kbn_eslint_plugin_imports.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-eslint-plugin-imports
 title: "@kbn/eslint-plugin-imports"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/eslint-plugin-imports plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/eslint-plugin-imports']
 ---
 import kbnEslintPluginImportsObj from './kbn_eslint_plugin_imports.devdocs.json';
diff --git a/api_docs/kbn_expandable_flyout.mdx b/api_docs/kbn_expandable_flyout.mdx
index 1cb4678323b20..b5947a8295232 100644
--- a/api_docs/kbn_expandable_flyout.mdx
+++ b/api_docs/kbn_expandable_flyout.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-expandable-flyout
 title: "@kbn/expandable-flyout"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/expandable-flyout plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/expandable-flyout']
 ---
 import kbnExpandableFlyoutObj from './kbn_expandable_flyout.devdocs.json';
diff --git a/api_docs/kbn_field_types.mdx b/api_docs/kbn_field_types.mdx
index 33c796182f8d8..b487899d2b554 100644
--- a/api_docs/kbn_field_types.mdx
+++ b/api_docs/kbn_field_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-field-types
 title: "@kbn/field-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/field-types plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/field-types']
 ---
 import kbnFieldTypesObj from './kbn_field_types.devdocs.json';
diff --git a/api_docs/kbn_find_used_node_modules.mdx b/api_docs/kbn_find_used_node_modules.mdx
index 22e741bcea6c2..4fc7ad7580aa5 100644
--- a/api_docs/kbn_find_used_node_modules.mdx
+++ b/api_docs/kbn_find_used_node_modules.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-find-used-node-modules
 title: "@kbn/find-used-node-modules"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/find-used-node-modules plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/find-used-node-modules']
 ---
 import kbnFindUsedNodeModulesObj from './kbn_find_used_node_modules.devdocs.json';
diff --git a/api_docs/kbn_ftr_common_functional_services.mdx b/api_docs/kbn_ftr_common_functional_services.mdx
index e2b7a8557341b..3037e205cc6c1 100644
--- a/api_docs/kbn_ftr_common_functional_services.mdx
+++ b/api_docs/kbn_ftr_common_functional_services.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ftr-common-functional-services
 title: "@kbn/ftr-common-functional-services"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ftr-common-functional-services plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ftr-common-functional-services']
 ---
 import kbnFtrCommonFunctionalServicesObj from './kbn_ftr_common_functional_services.devdocs.json';
diff --git a/api_docs/kbn_generate.mdx b/api_docs/kbn_generate.mdx
index c367835ac3fe0..ac9cf890c741c 100644
--- a/api_docs/kbn_generate.mdx
+++ b/api_docs/kbn_generate.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-generate
 title: "@kbn/generate"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/generate plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/generate']
 ---
 import kbnGenerateObj from './kbn_generate.devdocs.json';
diff --git a/api_docs/kbn_generate_csv.mdx b/api_docs/kbn_generate_csv.mdx
index e61ee026319bb..034ee24b31adc 100644
--- a/api_docs/kbn_generate_csv.mdx
+++ b/api_docs/kbn_generate_csv.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-generate-csv
 title: "@kbn/generate-csv"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/generate-csv plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/generate-csv']
 ---
 import kbnGenerateCsvObj from './kbn_generate_csv.devdocs.json';
diff --git a/api_docs/kbn_generate_csv_types.mdx b/api_docs/kbn_generate_csv_types.mdx
index bc547e035a7c9..2e87800016af5 100644
--- a/api_docs/kbn_generate_csv_types.mdx
+++ b/api_docs/kbn_generate_csv_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-generate-csv-types
 title: "@kbn/generate-csv-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/generate-csv-types plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/generate-csv-types']
 ---
 import kbnGenerateCsvTypesObj from './kbn_generate_csv_types.devdocs.json';
diff --git a/api_docs/kbn_guided_onboarding.mdx b/api_docs/kbn_guided_onboarding.mdx
index 6c1f189614fab..454b6ec5c6172 100644
--- a/api_docs/kbn_guided_onboarding.mdx
+++ b/api_docs/kbn_guided_onboarding.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-guided-onboarding
 title: "@kbn/guided-onboarding"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/guided-onboarding plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/guided-onboarding']
 ---
 import kbnGuidedOnboardingObj from './kbn_guided_onboarding.devdocs.json';
diff --git a/api_docs/kbn_handlebars.mdx b/api_docs/kbn_handlebars.mdx
index ebddb3c829bea..87aaec89cc979 100644
--- a/api_docs/kbn_handlebars.mdx
+++ b/api_docs/kbn_handlebars.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-handlebars
 title: "@kbn/handlebars"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/handlebars plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/handlebars']
 ---
 import kbnHandlebarsObj from './kbn_handlebars.devdocs.json';
diff --git a/api_docs/kbn_hapi_mocks.mdx b/api_docs/kbn_hapi_mocks.mdx
index 7e931a6919a3c..bffe3c1cf4e3d 100644
--- a/api_docs/kbn_hapi_mocks.mdx
+++ b/api_docs/kbn_hapi_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-hapi-mocks
 title: "@kbn/hapi-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/hapi-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/hapi-mocks']
 ---
 import kbnHapiMocksObj from './kbn_hapi_mocks.devdocs.json';
diff --git a/api_docs/kbn_health_gateway_server.mdx b/api_docs/kbn_health_gateway_server.mdx
index 09cda43a18ac0..42af824e4c2cc 100644
--- a/api_docs/kbn_health_gateway_server.mdx
+++ b/api_docs/kbn_health_gateway_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-health-gateway-server
 title: "@kbn/health-gateway-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/health-gateway-server plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/health-gateway-server']
 ---
 import kbnHealthGatewayServerObj from './kbn_health_gateway_server.devdocs.json';
diff --git a/api_docs/kbn_home_sample_data_card.mdx b/api_docs/kbn_home_sample_data_card.mdx
index 3b51d62c6a7a5..732c8f5562d4b 100644
--- a/api_docs/kbn_home_sample_data_card.mdx
+++ b/api_docs/kbn_home_sample_data_card.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-home-sample-data-card
 title: "@kbn/home-sample-data-card"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/home-sample-data-card plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/home-sample-data-card']
 ---
 import kbnHomeSampleDataCardObj from './kbn_home_sample_data_card.devdocs.json';
diff --git a/api_docs/kbn_home_sample_data_tab.mdx b/api_docs/kbn_home_sample_data_tab.mdx
index 54626a8c45b6f..eb4fe7a1d62c8 100644
--- a/api_docs/kbn_home_sample_data_tab.mdx
+++ b/api_docs/kbn_home_sample_data_tab.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-home-sample-data-tab
 title: "@kbn/home-sample-data-tab"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/home-sample-data-tab plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/home-sample-data-tab']
 ---
 import kbnHomeSampleDataTabObj from './kbn_home_sample_data_tab.devdocs.json';
diff --git a/api_docs/kbn_i18n.mdx b/api_docs/kbn_i18n.mdx
index 85a07c8287f09..4ace6960d3795 100644
--- a/api_docs/kbn_i18n.mdx
+++ b/api_docs/kbn_i18n.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-i18n
 title: "@kbn/i18n"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/i18n plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/i18n']
 ---
 import kbnI18nObj from './kbn_i18n.devdocs.json';
diff --git a/api_docs/kbn_i18n_react.mdx b/api_docs/kbn_i18n_react.mdx
index 7159df8ea8c7c..4d88cd19ac9b5 100644
--- a/api_docs/kbn_i18n_react.mdx
+++ b/api_docs/kbn_i18n_react.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-i18n-react
 title: "@kbn/i18n-react"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/i18n-react plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/i18n-react']
 ---
 import kbnI18nReactObj from './kbn_i18n_react.devdocs.json';
diff --git a/api_docs/kbn_import_resolver.mdx b/api_docs/kbn_import_resolver.mdx
index ce0e9d0f943da..2c6154c92b9fb 100644
--- a/api_docs/kbn_import_resolver.mdx
+++ b/api_docs/kbn_import_resolver.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-import-resolver
 title: "@kbn/import-resolver"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/import-resolver plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/import-resolver']
 ---
 import kbnImportResolverObj from './kbn_import_resolver.devdocs.json';
diff --git a/api_docs/kbn_interpreter.mdx b/api_docs/kbn_interpreter.mdx
index ff307710d9591..1baddb05cda74 100644
--- a/api_docs/kbn_interpreter.mdx
+++ b/api_docs/kbn_interpreter.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-interpreter
 title: "@kbn/interpreter"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/interpreter plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/interpreter']
 ---
 import kbnInterpreterObj from './kbn_interpreter.devdocs.json';
diff --git a/api_docs/kbn_io_ts_utils.mdx b/api_docs/kbn_io_ts_utils.mdx
index 5513baf02af0f..e2d533cf83e6a 100644
--- a/api_docs/kbn_io_ts_utils.mdx
+++ b/api_docs/kbn_io_ts_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-io-ts-utils
 title: "@kbn/io-ts-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/io-ts-utils plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/io-ts-utils']
 ---
 import kbnIoTsUtilsObj from './kbn_io_ts_utils.devdocs.json';
diff --git a/api_docs/kbn_jest_serializers.mdx b/api_docs/kbn_jest_serializers.mdx
index 01f83e2645e3c..369df25ee21ab 100644
--- a/api_docs/kbn_jest_serializers.mdx
+++ b/api_docs/kbn_jest_serializers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-jest-serializers
 title: "@kbn/jest-serializers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/jest-serializers plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/jest-serializers']
 ---
 import kbnJestSerializersObj from './kbn_jest_serializers.devdocs.json';
diff --git a/api_docs/kbn_journeys.mdx b/api_docs/kbn_journeys.mdx
index 7bb8caca77b03..4743bf78090c5 100644
--- a/api_docs/kbn_journeys.mdx
+++ b/api_docs/kbn_journeys.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-journeys
 title: "@kbn/journeys"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/journeys plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/journeys']
 ---
 import kbnJourneysObj from './kbn_journeys.devdocs.json';
diff --git a/api_docs/kbn_json_ast.mdx b/api_docs/kbn_json_ast.mdx
index df2ecccb26274..1465c519c26d7 100644
--- a/api_docs/kbn_json_ast.mdx
+++ b/api_docs/kbn_json_ast.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-json-ast
 title: "@kbn/json-ast"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/json-ast plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/json-ast']
 ---
 import kbnJsonAstObj from './kbn_json_ast.devdocs.json';
diff --git a/api_docs/kbn_kibana_manifest_schema.mdx b/api_docs/kbn_kibana_manifest_schema.mdx
index b370b7075838f..8a4d83213f446 100644
--- a/api_docs/kbn_kibana_manifest_schema.mdx
+++ b/api_docs/kbn_kibana_manifest_schema.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-kibana-manifest-schema
 title: "@kbn/kibana-manifest-schema"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/kibana-manifest-schema plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/kibana-manifest-schema']
 ---
 import kbnKibanaManifestSchemaObj from './kbn_kibana_manifest_schema.devdocs.json';
diff --git a/api_docs/kbn_language_documentation_popover.mdx b/api_docs/kbn_language_documentation_popover.mdx
index f71c8943b6932..844fb261a31e7 100644
--- a/api_docs/kbn_language_documentation_popover.mdx
+++ b/api_docs/kbn_language_documentation_popover.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-language-documentation-popover
 title: "@kbn/language-documentation-popover"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/language-documentation-popover plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/language-documentation-popover']
 ---
 import kbnLanguageDocumentationPopoverObj from './kbn_language_documentation_popover.devdocs.json';
diff --git a/api_docs/kbn_logging.mdx b/api_docs/kbn_logging.mdx
index 6ccc85fc8b17d..d0e4eb4f68007 100644
--- a/api_docs/kbn_logging.mdx
+++ b/api_docs/kbn_logging.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-logging
 title: "@kbn/logging"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/logging plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/logging']
 ---
 import kbnLoggingObj from './kbn_logging.devdocs.json';
diff --git a/api_docs/kbn_logging_mocks.mdx b/api_docs/kbn_logging_mocks.mdx
index be471478b0784..cd50f940078d3 100644
--- a/api_docs/kbn_logging_mocks.mdx
+++ b/api_docs/kbn_logging_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-logging-mocks
 title: "@kbn/logging-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/logging-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/logging-mocks']
 ---
 import kbnLoggingMocksObj from './kbn_logging_mocks.devdocs.json';
diff --git a/api_docs/kbn_managed_vscode_config.mdx b/api_docs/kbn_managed_vscode_config.mdx
index 62bfc0653e309..dd624c01ccd27 100644
--- a/api_docs/kbn_managed_vscode_config.mdx
+++ b/api_docs/kbn_managed_vscode_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-managed-vscode-config
 title: "@kbn/managed-vscode-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/managed-vscode-config plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/managed-vscode-config']
 ---
 import kbnManagedVscodeConfigObj from './kbn_managed_vscode_config.devdocs.json';
diff --git a/api_docs/kbn_mapbox_gl.mdx b/api_docs/kbn_mapbox_gl.mdx
index 59d73c4659fc7..feb285c25a65d 100644
--- a/api_docs/kbn_mapbox_gl.mdx
+++ b/api_docs/kbn_mapbox_gl.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-mapbox-gl
 title: "@kbn/mapbox-gl"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/mapbox-gl plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/mapbox-gl']
 ---
 import kbnMapboxGlObj from './kbn_mapbox_gl.devdocs.json';
diff --git a/api_docs/kbn_ml_agg_utils.mdx b/api_docs/kbn_ml_agg_utils.mdx
index e044be4e2d738..0aec9863bfd9c 100644
--- a/api_docs/kbn_ml_agg_utils.mdx
+++ b/api_docs/kbn_ml_agg_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-agg-utils
 title: "@kbn/ml-agg-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-agg-utils plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-agg-utils']
 ---
 import kbnMlAggUtilsObj from './kbn_ml_agg_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_date_picker.devdocs.json b/api_docs/kbn_ml_date_picker.devdocs.json
index 164c1d688fba4..83b689f7e7183 100644
--- a/api_docs/kbn_ml_date_picker.devdocs.json
+++ b/api_docs/kbn_ml_date_picker.devdocs.json
@@ -750,15 +750,7 @@
               "\ntimefilter service."
             ],
             "signature": [
-              "{ setRefreshInterval: (refreshInterval: Partial<",
-              {
-                "pluginId": "data",
-                "scope": "common",
-                "docId": "kibDataQueryPluginApi",
-                "section": "def-common.RefreshInterval",
-                "text": "RefreshInterval"
-              },
-              ">) => void; isTimeRangeSelectorEnabled: () => boolean; isAutoRefreshSelectorEnabled: () => boolean; isTimeTouched: () => boolean; isRefreshIntervalTouched: () => boolean; getEnabledUpdated$: () => ",
+              "{ isTimeRangeSelectorEnabled: () => boolean; isAutoRefreshSelectorEnabled: () => boolean; isTimeTouched: () => boolean; isRefreshIntervalTouched: () => boolean; getEnabledUpdated$: () => ",
               "Observable",
               "<boolean>; getTimeUpdate$: () => ",
               "Observable",
@@ -802,7 +794,15 @@
                 "section": "def-common.RefreshInterval",
                 "text": "RefreshInterval"
               },
-              "; createFilter: (indexPattern: ",
+              "; setRefreshInterval: (refreshInterval: Partial<",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataQueryPluginApi",
+                "section": "def-common.RefreshInterval",
+                "text": "RefreshInterval"
+              },
+              ">) => void; createFilter: (indexPattern: ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
diff --git a/api_docs/kbn_ml_date_picker.mdx b/api_docs/kbn_ml_date_picker.mdx
index c8f1b2857f741..61d5a9dffeedf 100644
--- a/api_docs/kbn_ml_date_picker.mdx
+++ b/api_docs/kbn_ml_date_picker.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-date-picker
 title: "@kbn/ml-date-picker"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-date-picker plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-date-picker']
 ---
 import kbnMlDatePickerObj from './kbn_ml_date_picker.devdocs.json';
diff --git a/api_docs/kbn_ml_is_defined.mdx b/api_docs/kbn_ml_is_defined.mdx
index c882708c87d62..bc004392a5d41 100644
--- a/api_docs/kbn_ml_is_defined.mdx
+++ b/api_docs/kbn_ml_is_defined.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-is-defined
 title: "@kbn/ml-is-defined"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-is-defined plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-is-defined']
 ---
 import kbnMlIsDefinedObj from './kbn_ml_is_defined.devdocs.json';
diff --git a/api_docs/kbn_ml_is_populated_object.mdx b/api_docs/kbn_ml_is_populated_object.mdx
index 35cac8263fb52..6f6ea69767650 100644
--- a/api_docs/kbn_ml_is_populated_object.mdx
+++ b/api_docs/kbn_ml_is_populated_object.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-is-populated-object
 title: "@kbn/ml-is-populated-object"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-is-populated-object plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-is-populated-object']
 ---
 import kbnMlIsPopulatedObjectObj from './kbn_ml_is_populated_object.devdocs.json';
diff --git a/api_docs/kbn_ml_local_storage.mdx b/api_docs/kbn_ml_local_storage.mdx
index bfc1083f66c9a..90bbe3247bcea 100644
--- a/api_docs/kbn_ml_local_storage.mdx
+++ b/api_docs/kbn_ml_local_storage.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-local-storage
 title: "@kbn/ml-local-storage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-local-storage plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-local-storage']
 ---
 import kbnMlLocalStorageObj from './kbn_ml_local_storage.devdocs.json';
diff --git a/api_docs/kbn_ml_nested_property.mdx b/api_docs/kbn_ml_nested_property.mdx
index 7a96b5d544120..8ff972997e11f 100644
--- a/api_docs/kbn_ml_nested_property.mdx
+++ b/api_docs/kbn_ml_nested_property.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-nested-property
 title: "@kbn/ml-nested-property"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-nested-property plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-nested-property']
 ---
 import kbnMlNestedPropertyObj from './kbn_ml_nested_property.devdocs.json';
diff --git a/api_docs/kbn_ml_number_utils.mdx b/api_docs/kbn_ml_number_utils.mdx
index b9b82f44e2f05..cf4903244b7a5 100644
--- a/api_docs/kbn_ml_number_utils.mdx
+++ b/api_docs/kbn_ml_number_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-number-utils
 title: "@kbn/ml-number-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-number-utils plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-number-utils']
 ---
 import kbnMlNumberUtilsObj from './kbn_ml_number_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_query_utils.mdx b/api_docs/kbn_ml_query_utils.mdx
index 65b228df42293..ef93af3bf8f2b 100644
--- a/api_docs/kbn_ml_query_utils.mdx
+++ b/api_docs/kbn_ml_query_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-query-utils
 title: "@kbn/ml-query-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-query-utils plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-query-utils']
 ---
 import kbnMlQueryUtilsObj from './kbn_ml_query_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_random_sampler_utils.mdx b/api_docs/kbn_ml_random_sampler_utils.mdx
index c01e9794722c5..87e7104b919c0 100644
--- a/api_docs/kbn_ml_random_sampler_utils.mdx
+++ b/api_docs/kbn_ml_random_sampler_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-random-sampler-utils
 title: "@kbn/ml-random-sampler-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-random-sampler-utils plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-random-sampler-utils']
 ---
 import kbnMlRandomSamplerUtilsObj from './kbn_ml_random_sampler_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_route_utils.devdocs.json b/api_docs/kbn_ml_route_utils.devdocs.json
index e8700e21c91db..772e811fd9f77 100644
--- a/api_docs/kbn_ml_route_utils.devdocs.json
+++ b/api_docs/kbn_ml_route_utils.devdocs.json
@@ -37,7 +37,14 @@
             "section": "def-common.CoreStart",
             "text": "CoreStart"
           },
-          ", name: string, id: string | undefined, type: string) => { type: string; name: string; id: string; page: string; }"
+          ", name: string, id: string | undefined, type: string) => ",
+          {
+            "pluginId": "@kbn/core-execution-context-common",
+            "scope": "common",
+            "docId": "kibKbnCoreExecutionContextCommonPluginApi",
+            "section": "def-common.KibanaExecutionContext",
+            "text": "KibanaExecutionContext"
+          }
         ],
         "path": "x-pack/packages/ml/route_utils/src/create_execution_context.ts",
         "deprecated": false,
diff --git a/api_docs/kbn_ml_route_utils.mdx b/api_docs/kbn_ml_route_utils.mdx
index 849f20fba0795..0746d44eb914b 100644
--- a/api_docs/kbn_ml_route_utils.mdx
+++ b/api_docs/kbn_ml_route_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-route-utils
 title: "@kbn/ml-route-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-route-utils plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-route-utils']
 ---
 import kbnMlRouteUtilsObj from './kbn_ml_route_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_string_hash.mdx b/api_docs/kbn_ml_string_hash.mdx
index 7e786976d78b9..486008f7f2eef 100644
--- a/api_docs/kbn_ml_string_hash.mdx
+++ b/api_docs/kbn_ml_string_hash.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-string-hash
 title: "@kbn/ml-string-hash"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-string-hash plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-string-hash']
 ---
 import kbnMlStringHashObj from './kbn_ml_string_hash.devdocs.json';
diff --git a/api_docs/kbn_ml_trained_models_utils.mdx b/api_docs/kbn_ml_trained_models_utils.mdx
index 51dec0f93ddeb..12066d5a19cbe 100644
--- a/api_docs/kbn_ml_trained_models_utils.mdx
+++ b/api_docs/kbn_ml_trained_models_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-trained-models-utils
 title: "@kbn/ml-trained-models-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-trained-models-utils plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-trained-models-utils']
 ---
 import kbnMlTrainedModelsUtilsObj from './kbn_ml_trained_models_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_url_state.mdx b/api_docs/kbn_ml_url_state.mdx
index 0b1bf48cd584b..0c35cbec039fe 100644
--- a/api_docs/kbn_ml_url_state.mdx
+++ b/api_docs/kbn_ml_url_state.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-url-state
 title: "@kbn/ml-url-state"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-url-state plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-url-state']
 ---
 import kbnMlUrlStateObj from './kbn_ml_url_state.devdocs.json';
diff --git a/api_docs/kbn_monaco.mdx b/api_docs/kbn_monaco.mdx
index f753592a95739..021a996c1af06 100644
--- a/api_docs/kbn_monaco.mdx
+++ b/api_docs/kbn_monaco.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-monaco
 title: "@kbn/monaco"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/monaco plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/monaco']
 ---
 import kbnMonacoObj from './kbn_monaco.devdocs.json';
diff --git a/api_docs/kbn_object_versioning.mdx b/api_docs/kbn_object_versioning.mdx
index a70891f0e72f4..b216580e3fe0a 100644
--- a/api_docs/kbn_object_versioning.mdx
+++ b/api_docs/kbn_object_versioning.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-object-versioning
 title: "@kbn/object-versioning"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/object-versioning plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/object-versioning']
 ---
 import kbnObjectVersioningObj from './kbn_object_versioning.devdocs.json';
diff --git a/api_docs/kbn_observability_alert_details.mdx b/api_docs/kbn_observability_alert_details.mdx
index 6d25386de3158..cfd788aa1c5e1 100644
--- a/api_docs/kbn_observability_alert_details.mdx
+++ b/api_docs/kbn_observability_alert_details.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-observability-alert-details
 title: "@kbn/observability-alert-details"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/observability-alert-details plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/observability-alert-details']
 ---
 import kbnObservabilityAlertDetailsObj from './kbn_observability_alert_details.devdocs.json';
diff --git a/api_docs/kbn_optimizer.mdx b/api_docs/kbn_optimizer.mdx
index 2a345e6b1aabd..e1e6b75d349eb 100644
--- a/api_docs/kbn_optimizer.mdx
+++ b/api_docs/kbn_optimizer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-optimizer
 title: "@kbn/optimizer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/optimizer plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/optimizer']
 ---
 import kbnOptimizerObj from './kbn_optimizer.devdocs.json';
diff --git a/api_docs/kbn_optimizer_webpack_helpers.mdx b/api_docs/kbn_optimizer_webpack_helpers.mdx
index 1255de26b275f..cc2783a01db33 100644
--- a/api_docs/kbn_optimizer_webpack_helpers.mdx
+++ b/api_docs/kbn_optimizer_webpack_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-optimizer-webpack-helpers
 title: "@kbn/optimizer-webpack-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/optimizer-webpack-helpers plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/optimizer-webpack-helpers']
 ---
 import kbnOptimizerWebpackHelpersObj from './kbn_optimizer_webpack_helpers.devdocs.json';
diff --git a/api_docs/kbn_osquery_io_ts_types.mdx b/api_docs/kbn_osquery_io_ts_types.mdx
index e8886fb80a281..095f3df1b23cd 100644
--- a/api_docs/kbn_osquery_io_ts_types.mdx
+++ b/api_docs/kbn_osquery_io_ts_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-osquery-io-ts-types
 title: "@kbn/osquery-io-ts-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/osquery-io-ts-types plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/osquery-io-ts-types']
 ---
 import kbnOsqueryIoTsTypesObj from './kbn_osquery_io_ts_types.devdocs.json';
diff --git a/api_docs/kbn_performance_testing_dataset_extractor.mdx b/api_docs/kbn_performance_testing_dataset_extractor.mdx
index be186b8aefbf7..5680dde71dbf6 100644
--- a/api_docs/kbn_performance_testing_dataset_extractor.mdx
+++ b/api_docs/kbn_performance_testing_dataset_extractor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-performance-testing-dataset-extractor
 title: "@kbn/performance-testing-dataset-extractor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/performance-testing-dataset-extractor plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/performance-testing-dataset-extractor']
 ---
 import kbnPerformanceTestingDatasetExtractorObj from './kbn_performance_testing_dataset_extractor.devdocs.json';
diff --git a/api_docs/kbn_plugin_generator.mdx b/api_docs/kbn_plugin_generator.mdx
index 1c2bd87c3a2fb..ce8b983886c6b 100644
--- a/api_docs/kbn_plugin_generator.mdx
+++ b/api_docs/kbn_plugin_generator.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-plugin-generator
 title: "@kbn/plugin-generator"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/plugin-generator plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/plugin-generator']
 ---
 import kbnPluginGeneratorObj from './kbn_plugin_generator.devdocs.json';
diff --git a/api_docs/kbn_plugin_helpers.mdx b/api_docs/kbn_plugin_helpers.mdx
index 6957d39392ab0..80e9be96710ea 100644
--- a/api_docs/kbn_plugin_helpers.mdx
+++ b/api_docs/kbn_plugin_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-plugin-helpers
 title: "@kbn/plugin-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/plugin-helpers plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/plugin-helpers']
 ---
 import kbnPluginHelpersObj from './kbn_plugin_helpers.devdocs.json';
diff --git a/api_docs/kbn_react_field.devdocs.json b/api_docs/kbn_react_field.devdocs.json
index 8b9492765c275..6f4f8b23736e2 100644
--- a/api_docs/kbn_react_field.devdocs.json
+++ b/api_docs/kbn_react_field.devdocs.json
@@ -27,7 +27,7 @@
         "label": "FieldButton",
         "description": [],
         "signature": [
-          "({\n  size = 'm',\n  isActive = false,\n  fieldIcon,\n  fieldName,\n  fieldInfoIcon,\n  fieldAction,\n  className,\n  isDraggable = false,\n  onClick,\n  dataTestSubj,\n  buttonProps,\n  ...rest\n}: ",
+          "({\n  size,\n  isActive = false,\n  fieldIcon,\n  fieldName,\n  fieldInfoIcon,\n  fieldAction,\n  flush,\n  className,\n  dragHandle,\n  onClick,\n  dataTestSubj,\n  buttonProps,\n  ...rest\n}: ",
           {
             "pluginId": "@kbn/react-field",
             "scope": "common",
@@ -46,7 +46,7 @@
             "id": "def-common.FieldButton.$1",
             "type": "Object",
             "tags": [],
-            "label": "{\n  size = 'm',\n  isActive = false,\n  fieldIcon,\n  fieldName,\n  fieldInfoIcon,\n  fieldAction,\n  className,\n  isDraggable = false,\n  onClick,\n  dataTestSubj,\n  buttonProps,\n  ...rest\n}",
+            "label": "{\n  size,\n  isActive = false,\n  fieldIcon,\n  fieldName,\n  fieldInfoIcon,\n  fieldAction,\n  flush,\n  className,\n  dragHandle,\n  onClick,\n  dataTestSubj,\n  buttonProps,\n  ...rest\n}",
             "description": [],
             "signature": [
               {
@@ -220,15 +220,15 @@
           },
           {
             "parentPluginId": "@kbn/react-field",
-            "id": "def-common.FieldButtonProps.isDraggable",
-            "type": "CompoundType",
+            "id": "def-common.FieldButtonProps.dragHandle",
+            "type": "Object",
             "tags": [],
-            "label": "isDraggable",
+            "label": "dragHandle",
             "description": [
-              "\nStyles the component differently to indicate it is draggable"
+              "\nCustom drag handle element"
             ],
             "signature": [
-              "boolean | undefined"
+              "React.ReactElement<any, string | React.JSXElementConstructor<any>> | undefined"
             ],
             "path": "packages/kbn-react-field/src/field_button/field_button.tsx",
             "deprecated": false,
@@ -241,10 +241,26 @@
             "tags": [],
             "label": "size",
             "description": [
-              "\nUse the small size in condensed areas"
+              "\nUse the xs size in condensed areas"
+            ],
+            "signature": [
+              "\"s\" | \"xs\""
+            ],
+            "path": "packages/kbn-react-field/src/field_button/field_button.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/react-field",
+            "id": "def-common.FieldButtonProps.flush",
+            "type": "string",
+            "tags": [],
+            "label": "flush",
+            "description": [
+              "\nWhether to skip side paddings"
             ],
             "signature": [
-              "\"m\" | \"s\" | undefined"
+              "\"both\" | undefined"
             ],
             "path": "packages/kbn-react-field/src/field_button/field_button.tsx",
             "deprecated": false,
@@ -256,7 +272,9 @@
             "type": "string",
             "tags": [],
             "label": "className",
-            "description": [],
+            "description": [
+              "\nCustom class name"
+            ],
             "signature": [
               "string | undefined"
             ],
@@ -395,7 +413,7 @@
         "label": "ButtonSize",
         "description": [],
         "signature": [
-          "\"m\" | \"s\""
+          "\"s\" | \"xs\""
         ],
         "path": "packages/kbn-react-field/src/field_button/field_button.tsx",
         "deprecated": false,
diff --git a/api_docs/kbn_react_field.mdx b/api_docs/kbn_react_field.mdx
index 3f9c876bec28d..fa435bb113264 100644
--- a/api_docs/kbn_react_field.mdx
+++ b/api_docs/kbn_react_field.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-field
 title: "@kbn/react-field"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-field plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-field']
 ---
 import kbnReactFieldObj from './kbn_react_field.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/k
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 21 | 0 | 10 | 0 |
+| 22 | 0 | 9 | 0 |
 
 ## Common
 
diff --git a/api_docs/kbn_repo_file_maps.mdx b/api_docs/kbn_repo_file_maps.mdx
index 50ffb132d5ee4..d9b61d068bb73 100644
--- a/api_docs/kbn_repo_file_maps.mdx
+++ b/api_docs/kbn_repo_file_maps.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-repo-file-maps
 title: "@kbn/repo-file-maps"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/repo-file-maps plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/repo-file-maps']
 ---
 import kbnRepoFileMapsObj from './kbn_repo_file_maps.devdocs.json';
diff --git a/api_docs/kbn_repo_linter.mdx b/api_docs/kbn_repo_linter.mdx
index 64d76681a94c2..fe9e0b7464406 100644
--- a/api_docs/kbn_repo_linter.mdx
+++ b/api_docs/kbn_repo_linter.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-repo-linter
 title: "@kbn/repo-linter"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/repo-linter plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/repo-linter']
 ---
 import kbnRepoLinterObj from './kbn_repo_linter.devdocs.json';
diff --git a/api_docs/kbn_repo_path.mdx b/api_docs/kbn_repo_path.mdx
index 726d4775a7541..cbaada4cbfd67 100644
--- a/api_docs/kbn_repo_path.mdx
+++ b/api_docs/kbn_repo_path.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-repo-path
 title: "@kbn/repo-path"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/repo-path plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/repo-path']
 ---
 import kbnRepoPathObj from './kbn_repo_path.devdocs.json';
diff --git a/api_docs/kbn_repo_source_classifier.mdx b/api_docs/kbn_repo_source_classifier.mdx
index ebc905fe80095..7180c39d48d22 100644
--- a/api_docs/kbn_repo_source_classifier.mdx
+++ b/api_docs/kbn_repo_source_classifier.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-repo-source-classifier
 title: "@kbn/repo-source-classifier"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/repo-source-classifier plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/repo-source-classifier']
 ---
 import kbnRepoSourceClassifierObj from './kbn_repo_source_classifier.devdocs.json';
diff --git a/api_docs/kbn_reporting_common.mdx b/api_docs/kbn_reporting_common.mdx
index f16d5d346aa8f..18f4023702c94 100644
--- a/api_docs/kbn_reporting_common.mdx
+++ b/api_docs/kbn_reporting_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-common
 title: "@kbn/reporting-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-common plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-common']
 ---
 import kbnReportingCommonObj from './kbn_reporting_common.devdocs.json';
diff --git a/api_docs/kbn_rison.mdx b/api_docs/kbn_rison.mdx
index ffabeef0c0662..0e3cc9b286422 100644
--- a/api_docs/kbn_rison.mdx
+++ b/api_docs/kbn_rison.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-rison
 title: "@kbn/rison"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/rison plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/rison']
 ---
 import kbnRisonObj from './kbn_rison.devdocs.json';
diff --git a/api_docs/kbn_rule_data_utils.devdocs.json b/api_docs/kbn_rule_data_utils.devdocs.json
index a19fc613d8dad..efe81b0b3e925 100644
--- a/api_docs/kbn_rule_data_utils.devdocs.json
+++ b/api_docs/kbn_rule_data_utils.devdocs.json
@@ -343,6 +343,21 @@
         "trackAdoption": false,
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "@kbn/rule-data-utils",
+        "id": "def-common.ALERT_MAINTENANCE_WINDOW_IDS",
+        "type": "string",
+        "tags": [],
+        "label": "ALERT_MAINTENANCE_WINDOW_IDS",
+        "description": [],
+        "signature": [
+          "\"kibana.alert.maintenance_window_ids\""
+        ],
+        "path": "packages/kbn-rule-data-utils/src/default_alerts_as_data.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/rule-data-utils",
         "id": "def-common.ALERT_NAMESPACE",
@@ -1326,7 +1341,7 @@
         "label": "DefaultAlertFieldName",
         "description": [],
         "signature": [
-          "\"@timestamp\" | \"kibana\" | \"kibana.alert.rule.rule_type_id\" | \"kibana.alert.rule.consumer\" | \"kibana.alert.rule.execution.uuid\" | \"kibana.alert\" | \"kibana.alert.action_group\" | \"kibana.alert.case_ids\" | \"kibana.alert.duration.us\" | \"kibana.alert.end\" | \"kibana.alert.flapping\" | \"kibana.alert.flapping_history\" | \"kibana.alert.instance.id\" | \"kibana.alert.last_detected\" | \"kibana.alert.reason\" | \"kibana.alert.rule\" | \"kibana.alert.rule.category\" | \"kibana.alert.rule.name\" | \"kibana.alert.rule.parameters\" | \"kibana.alert.rule.producer\" | \"kibana.alert.rule.revision\" | \"kibana.alert.rule.tags\" | \"kibana.alert.rule.uuid\" | \"kibana.alert.start\" | \"kibana.alert.status\" | \"kibana.alert.time_range\" | \"kibana.alert.uuid\" | \"kibana.alert.workflow_status\" | \"kibana.space_ids\" | \"kibana.version\""
+          "\"@timestamp\" | \"kibana\" | \"kibana.alert.rule.rule_type_id\" | \"kibana.alert.rule.consumer\" | \"kibana.alert.rule.execution.uuid\" | \"kibana.alert\" | \"kibana.alert.action_group\" | \"kibana.alert.case_ids\" | \"kibana.alert.duration.us\" | \"kibana.alert.end\" | \"kibana.alert.flapping\" | \"kibana.alert.flapping_history\" | \"kibana.alert.maintenance_window_ids\" | \"kibana.alert.instance.id\" | \"kibana.alert.last_detected\" | \"kibana.alert.reason\" | \"kibana.alert.rule\" | \"kibana.alert.rule.category\" | \"kibana.alert.rule.name\" | \"kibana.alert.rule.parameters\" | \"kibana.alert.rule.producer\" | \"kibana.alert.rule.revision\" | \"kibana.alert.rule.tags\" | \"kibana.alert.rule.uuid\" | \"kibana.alert.start\" | \"kibana.alert.status\" | \"kibana.alert.time_range\" | \"kibana.alert.uuid\" | \"kibana.alert.workflow_status\" | \"kibana.space_ids\" | \"kibana.version\""
         ],
         "path": "packages/kbn-rule-data-utils/src/default_alerts_as_data.ts",
         "deprecated": false,
@@ -1491,7 +1506,7 @@
         "label": "TechnicalRuleDataFieldName",
         "description": [],
         "signature": [
-          "\"@timestamp\" | \"event.action\" | \"tags\" | \"kibana\" | \"kibana.alert.rule.rule_type_id\" | \"kibana.alert.rule.consumer\" | \"kibana.alert.rule.execution.uuid\" | \"kibana.alert\" | \"kibana.alert.action_group\" | \"kibana.alert.case_ids\" | \"kibana.alert.duration.us\" | \"kibana.alert.end\" | \"kibana.alert.flapping\" | \"kibana.alert.instance.id\" | \"kibana.alert.reason\" | \"kibana.alert.rule\" | \"kibana.alert.rule.category\" | \"kibana.alert.rule.name\" | \"kibana.alert.rule.parameters\" | \"kibana.alert.rule.producer\" | \"kibana.alert.rule.tags\" | \"kibana.alert.rule.uuid\" | \"kibana.alert.start\" | \"kibana.alert.status\" | \"kibana.alert.time_range\" | \"kibana.alert.uuid\" | \"kibana.alert.workflow_status\" | \"kibana.space_ids\" | \"kibana.version\" | \"kibana.alert.risk_score\" | \"kibana.alert.rule.author\" | \"kibana.alert.rule.created_at\" | \"kibana.alert.rule.created_by\" | \"kibana.alert.rule.description\" | \"kibana.alert.rule.enabled\" | \"kibana.alert.rule.from\" | \"kibana.alert.rule.interval\" | \"kibana.alert.rule.license\" | \"kibana.alert.rule.note\" | \"kibana.alert.rule.references\" | \"kibana.alert.rule.rule_id\" | \"kibana.alert.rule.rule_name_override\" | \"kibana.alert.rule.to\" | \"kibana.alert.rule.type\" | \"kibana.alert.rule.updated_at\" | \"kibana.alert.rule.updated_by\" | \"kibana.alert.rule.version\" | \"kibana.alert.severity\" | \"kibana.alert.suppression.docs_count\" | \"kibana.alert.suppression.end\" | \"kibana.alert.suppression.terms\" | \"kibana.alert.suppression.terms.field\" | \"kibana.alert.suppression.start\" | \"kibana.alert.suppression.terms.value\" | \"kibana.alert.system_status\" | \"kibana.alert.workflow_reason\" | \"kibana.alert.workflow_user\" | \"ecs.version\" | \"event.kind\" | \"kibana.alert.evaluation.threshold\" | \"kibana.alert.evaluation.value\" | \"event.module\" | \"kibana.alert.building_block_type\" | \"kibana.alert.rule.exceptions_list\" | \"kibana.alert.rule.namespace\" | \"kibana.alert.rule.threat.framework\" | \"kibana.alert.rule.threat.tactic.id\" | \"kibana.alert.rule.threat.tactic.name\" | \"kibana.alert.rule.threat.tactic.reference\" | \"kibana.alert.rule.threat.technique.id\" | \"kibana.alert.rule.threat.technique.name\" | \"kibana.alert.rule.threat.technique.reference\" | \"kibana.alert.rule.threat.technique.subtechnique.id\" | \"kibana.alert.rule.threat.technique.subtechnique.name\" | \"kibana.alert.rule.threat.technique.subtechnique.reference\""
+          "\"@timestamp\" | \"event.action\" | \"tags\" | \"kibana\" | \"kibana.alert.rule.rule_type_id\" | \"kibana.alert.rule.consumer\" | \"kibana.alert.rule.execution.uuid\" | \"kibana.alert\" | \"kibana.alert.action_group\" | \"kibana.alert.case_ids\" | \"kibana.alert.duration.us\" | \"kibana.alert.end\" | \"kibana.alert.flapping\" | \"kibana.alert.maintenance_window_ids\" | \"kibana.alert.instance.id\" | \"kibana.alert.reason\" | \"kibana.alert.rule\" | \"kibana.alert.rule.category\" | \"kibana.alert.rule.name\" | \"kibana.alert.rule.parameters\" | \"kibana.alert.rule.producer\" | \"kibana.alert.rule.tags\" | \"kibana.alert.rule.uuid\" | \"kibana.alert.start\" | \"kibana.alert.status\" | \"kibana.alert.time_range\" | \"kibana.alert.uuid\" | \"kibana.alert.workflow_status\" | \"kibana.space_ids\" | \"kibana.version\" | \"kibana.alert.risk_score\" | \"kibana.alert.rule.author\" | \"kibana.alert.rule.created_at\" | \"kibana.alert.rule.created_by\" | \"kibana.alert.rule.description\" | \"kibana.alert.rule.enabled\" | \"kibana.alert.rule.from\" | \"kibana.alert.rule.interval\" | \"kibana.alert.rule.license\" | \"kibana.alert.rule.note\" | \"kibana.alert.rule.references\" | \"kibana.alert.rule.rule_id\" | \"kibana.alert.rule.rule_name_override\" | \"kibana.alert.rule.to\" | \"kibana.alert.rule.type\" | \"kibana.alert.rule.updated_at\" | \"kibana.alert.rule.updated_by\" | \"kibana.alert.rule.version\" | \"kibana.alert.severity\" | \"kibana.alert.suppression.docs_count\" | \"kibana.alert.suppression.end\" | \"kibana.alert.suppression.terms\" | \"kibana.alert.suppression.terms.field\" | \"kibana.alert.suppression.start\" | \"kibana.alert.suppression.terms.value\" | \"kibana.alert.system_status\" | \"kibana.alert.workflow_reason\" | \"kibana.alert.workflow_user\" | \"ecs.version\" | \"event.kind\" | \"kibana.alert.evaluation.threshold\" | \"kibana.alert.evaluation.value\" | \"event.module\" | \"kibana.alert.building_block_type\" | \"kibana.alert.rule.exceptions_list\" | \"kibana.alert.rule.namespace\" | \"kibana.alert.rule.threat.framework\" | \"kibana.alert.rule.threat.tactic.id\" | \"kibana.alert.rule.threat.tactic.name\" | \"kibana.alert.rule.threat.tactic.reference\" | \"kibana.alert.rule.threat.technique.id\" | \"kibana.alert.rule.threat.technique.name\" | \"kibana.alert.rule.threat.technique.reference\" | \"kibana.alert.rule.threat.technique.subtechnique.id\" | \"kibana.alert.rule.threat.technique.subtechnique.name\" | \"kibana.alert.rule.threat.technique.subtechnique.reference\""
         ],
         "path": "packages/kbn-rule-data-utils/src/technical_field_names.ts",
         "deprecated": false,
diff --git a/api_docs/kbn_rule_data_utils.mdx b/api_docs/kbn_rule_data_utils.mdx
index d9d1a037f64b1..3345d55d51c5a 100644
--- a/api_docs/kbn_rule_data_utils.mdx
+++ b/api_docs/kbn_rule_data_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-rule-data-utils
 title: "@kbn/rule-data-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/rule-data-utils plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/rule-data-utils']
 ---
 import kbnRuleDataUtilsObj from './kbn_rule_data_utils.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/security-detections-response](https://github.com/orgs/elastic/
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 102 | 0 | 99 | 0 |
+| 103 | 0 | 100 | 0 |
 
 ## Common
 
diff --git a/api_docs/kbn_saved_objects_settings.mdx b/api_docs/kbn_saved_objects_settings.mdx
index 6a8a7b7b45d2f..5c3e19f8e60f7 100644
--- a/api_docs/kbn_saved_objects_settings.mdx
+++ b/api_docs/kbn_saved_objects_settings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-saved-objects-settings
 title: "@kbn/saved-objects-settings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/saved-objects-settings plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/saved-objects-settings']
 ---
 import kbnSavedObjectsSettingsObj from './kbn_saved_objects_settings.devdocs.json';
diff --git a/api_docs/kbn_security_solution_side_nav.mdx b/api_docs/kbn_security_solution_side_nav.mdx
index 6c4e47f1a4351..edded7c0db0d7 100644
--- a/api_docs/kbn_security_solution_side_nav.mdx
+++ b/api_docs/kbn_security_solution_side_nav.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-solution-side-nav
 title: "@kbn/security-solution-side-nav"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-solution-side-nav plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-solution-side-nav']
 ---
 import kbnSecuritySolutionSideNavObj from './kbn_security_solution_side_nav.devdocs.json';
diff --git a/api_docs/kbn_security_solution_storybook_config.mdx b/api_docs/kbn_security_solution_storybook_config.mdx
index 0003d9f974b86..25f6bc6bb8464 100644
--- a/api_docs/kbn_security_solution_storybook_config.mdx
+++ b/api_docs/kbn_security_solution_storybook_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-solution-storybook-config
 title: "@kbn/security-solution-storybook-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-solution-storybook-config plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-solution-storybook-config']
 ---
 import kbnSecuritySolutionStorybookConfigObj from './kbn_security_solution_storybook_config.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_autocomplete.mdx b/api_docs/kbn_securitysolution_autocomplete.mdx
index 30b6726407b20..5e67b3e73ac18 100644
--- a/api_docs/kbn_securitysolution_autocomplete.mdx
+++ b/api_docs/kbn_securitysolution_autocomplete.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-autocomplete
 title: "@kbn/securitysolution-autocomplete"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-autocomplete plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-autocomplete']
 ---
 import kbnSecuritysolutionAutocompleteObj from './kbn_securitysolution_autocomplete.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_data_table.mdx b/api_docs/kbn_securitysolution_data_table.mdx
index 93f74959bb28e..b898eba5046ed 100644
--- a/api_docs/kbn_securitysolution_data_table.mdx
+++ b/api_docs/kbn_securitysolution_data_table.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-data-table
 title: "@kbn/securitysolution-data-table"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-data-table plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-data-table']
 ---
 import kbnSecuritysolutionDataTableObj from './kbn_securitysolution_data_table.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_ecs.mdx b/api_docs/kbn_securitysolution_ecs.mdx
index c6864d53f5987..7174d233543b9 100644
--- a/api_docs/kbn_securitysolution_ecs.mdx
+++ b/api_docs/kbn_securitysolution_ecs.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-ecs
 title: "@kbn/securitysolution-ecs"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-ecs plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-ecs']
 ---
 import kbnSecuritysolutionEcsObj from './kbn_securitysolution_ecs.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_es_utils.mdx b/api_docs/kbn_securitysolution_es_utils.mdx
index 0683ce18f1779..35409a3131925 100644
--- a/api_docs/kbn_securitysolution_es_utils.mdx
+++ b/api_docs/kbn_securitysolution_es_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-es-utils
 title: "@kbn/securitysolution-es-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-es-utils plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-es-utils']
 ---
 import kbnSecuritysolutionEsUtilsObj from './kbn_securitysolution_es_utils.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_exception_list_components.mdx b/api_docs/kbn_securitysolution_exception_list_components.mdx
index fa2c635cb5987..edbcef383a9e4 100644
--- a/api_docs/kbn_securitysolution_exception_list_components.mdx
+++ b/api_docs/kbn_securitysolution_exception_list_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-exception-list-components
 title: "@kbn/securitysolution-exception-list-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-exception-list-components plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-exception-list-components']
 ---
 import kbnSecuritysolutionExceptionListComponentsObj from './kbn_securitysolution_exception_list_components.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_grouping.mdx b/api_docs/kbn_securitysolution_grouping.mdx
index 6f5cade1143a6..dd6a09d571f3c 100644
--- a/api_docs/kbn_securitysolution_grouping.mdx
+++ b/api_docs/kbn_securitysolution_grouping.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-grouping
 title: "@kbn/securitysolution-grouping"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-grouping plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-grouping']
 ---
 import kbnSecuritysolutionGroupingObj from './kbn_securitysolution_grouping.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_hook_utils.mdx b/api_docs/kbn_securitysolution_hook_utils.mdx
index 144d4664cd8d2..1d835702cbe21 100644
--- a/api_docs/kbn_securitysolution_hook_utils.mdx
+++ b/api_docs/kbn_securitysolution_hook_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-hook-utils
 title: "@kbn/securitysolution-hook-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-hook-utils plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-hook-utils']
 ---
 import kbnSecuritysolutionHookUtilsObj from './kbn_securitysolution_hook_utils.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx b/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx
index 2fb1367fc08ad..4a4889a2246b2 100644
--- a/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx
+++ b/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-alerting-types
 title: "@kbn/securitysolution-io-ts-alerting-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-io-ts-alerting-types plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-io-ts-alerting-types']
 ---
 import kbnSecuritysolutionIoTsAlertingTypesObj from './kbn_securitysolution_io_ts_alerting_types.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_io_ts_list_types.mdx b/api_docs/kbn_securitysolution_io_ts_list_types.mdx
index b5109765d9b12..8a32466a3abbc 100644
--- a/api_docs/kbn_securitysolution_io_ts_list_types.mdx
+++ b/api_docs/kbn_securitysolution_io_ts_list_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-list-types
 title: "@kbn/securitysolution-io-ts-list-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-io-ts-list-types plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-io-ts-list-types']
 ---
 import kbnSecuritysolutionIoTsListTypesObj from './kbn_securitysolution_io_ts_list_types.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_io_ts_types.mdx b/api_docs/kbn_securitysolution_io_ts_types.mdx
index 24a04a2bd93b6..ae143cab8a343 100644
--- a/api_docs/kbn_securitysolution_io_ts_types.mdx
+++ b/api_docs/kbn_securitysolution_io_ts_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-types
 title: "@kbn/securitysolution-io-ts-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-io-ts-types plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-io-ts-types']
 ---
 import kbnSecuritysolutionIoTsTypesObj from './kbn_securitysolution_io_ts_types.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_io_ts_utils.mdx b/api_docs/kbn_securitysolution_io_ts_utils.mdx
index 47c3625cc4e59..6fce7b36a3dfa 100644
--- a/api_docs/kbn_securitysolution_io_ts_utils.mdx
+++ b/api_docs/kbn_securitysolution_io_ts_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-utils
 title: "@kbn/securitysolution-io-ts-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-io-ts-utils plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-io-ts-utils']
 ---
 import kbnSecuritysolutionIoTsUtilsObj from './kbn_securitysolution_io_ts_utils.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_list_api.mdx b/api_docs/kbn_securitysolution_list_api.mdx
index 04b3393bdfa7f..40bf897b06c2c 100644
--- a/api_docs/kbn_securitysolution_list_api.mdx
+++ b/api_docs/kbn_securitysolution_list_api.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-api
 title: "@kbn/securitysolution-list-api"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-list-api plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-list-api']
 ---
 import kbnSecuritysolutionListApiObj from './kbn_securitysolution_list_api.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_list_constants.mdx b/api_docs/kbn_securitysolution_list_constants.mdx
index 9e574e3409680..3b1ecaf1f6e66 100644
--- a/api_docs/kbn_securitysolution_list_constants.mdx
+++ b/api_docs/kbn_securitysolution_list_constants.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-constants
 title: "@kbn/securitysolution-list-constants"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-list-constants plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-list-constants']
 ---
 import kbnSecuritysolutionListConstantsObj from './kbn_securitysolution_list_constants.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_list_hooks.mdx b/api_docs/kbn_securitysolution_list_hooks.mdx
index b674110dcacb4..fbed8ffd2680c 100644
--- a/api_docs/kbn_securitysolution_list_hooks.mdx
+++ b/api_docs/kbn_securitysolution_list_hooks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-hooks
 title: "@kbn/securitysolution-list-hooks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-list-hooks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-list-hooks']
 ---
 import kbnSecuritysolutionListHooksObj from './kbn_securitysolution_list_hooks.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_list_utils.mdx b/api_docs/kbn_securitysolution_list_utils.mdx
index c2aa79d1226d9..a7cfff43d2cd5 100644
--- a/api_docs/kbn_securitysolution_list_utils.mdx
+++ b/api_docs/kbn_securitysolution_list_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-utils
 title: "@kbn/securitysolution-list-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-list-utils plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-list-utils']
 ---
 import kbnSecuritysolutionListUtilsObj from './kbn_securitysolution_list_utils.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_rules.mdx b/api_docs/kbn_securitysolution_rules.mdx
index 0477dce73217b..e6ac27bba005c 100644
--- a/api_docs/kbn_securitysolution_rules.mdx
+++ b/api_docs/kbn_securitysolution_rules.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-rules
 title: "@kbn/securitysolution-rules"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-rules plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-rules']
 ---
 import kbnSecuritysolutionRulesObj from './kbn_securitysolution_rules.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_t_grid.mdx b/api_docs/kbn_securitysolution_t_grid.mdx
index 2f9f9263ae18e..75c35043958c2 100644
--- a/api_docs/kbn_securitysolution_t_grid.mdx
+++ b/api_docs/kbn_securitysolution_t_grid.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-t-grid
 title: "@kbn/securitysolution-t-grid"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-t-grid plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-t-grid']
 ---
 import kbnSecuritysolutionTGridObj from './kbn_securitysolution_t_grid.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_utils.mdx b/api_docs/kbn_securitysolution_utils.mdx
index bf30718757312..d813903659c73 100644
--- a/api_docs/kbn_securitysolution_utils.mdx
+++ b/api_docs/kbn_securitysolution_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-utils
 title: "@kbn/securitysolution-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-utils plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-utils']
 ---
 import kbnSecuritysolutionUtilsObj from './kbn_securitysolution_utils.devdocs.json';
diff --git a/api_docs/kbn_server_http_tools.mdx b/api_docs/kbn_server_http_tools.mdx
index f05a9f838751d..5789cd2a5ce90 100644
--- a/api_docs/kbn_server_http_tools.mdx
+++ b/api_docs/kbn_server_http_tools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-server-http-tools
 title: "@kbn/server-http-tools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/server-http-tools plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/server-http-tools']
 ---
 import kbnServerHttpToolsObj from './kbn_server_http_tools.devdocs.json';
diff --git a/api_docs/kbn_server_route_repository.mdx b/api_docs/kbn_server_route_repository.mdx
index 33001595efbb3..70c5530f94e71 100644
--- a/api_docs/kbn_server_route_repository.mdx
+++ b/api_docs/kbn_server_route_repository.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-server-route-repository
 title: "@kbn/server-route-repository"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/server-route-repository plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/server-route-repository']
 ---
 import kbnServerRouteRepositoryObj from './kbn_server_route_repository.devdocs.json';
diff --git a/api_docs/kbn_shared_svg.mdx b/api_docs/kbn_shared_svg.mdx
index b2aae28dfd413..2f8fe6b3aa803 100644
--- a/api_docs/kbn_shared_svg.mdx
+++ b/api_docs/kbn_shared_svg.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-svg
 title: "@kbn/shared-svg"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-svg plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-svg']
 ---
 import kbnSharedSvgObj from './kbn_shared_svg.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_avatar_solution.mdx b/api_docs/kbn_shared_ux_avatar_solution.mdx
index 8d727e343ce46..beaa98374a383 100644
--- a/api_docs/kbn_shared_ux_avatar_solution.mdx
+++ b/api_docs/kbn_shared_ux_avatar_solution.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-avatar-solution
 title: "@kbn/shared-ux-avatar-solution"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-avatar-solution plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-avatar-solution']
 ---
 import kbnSharedUxAvatarSolutionObj from './kbn_shared_ux_avatar_solution.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_avatar_user_profile_components.mdx b/api_docs/kbn_shared_ux_avatar_user_profile_components.mdx
index 1d96f50090471..df39cf2bfac2d 100644
--- a/api_docs/kbn_shared_ux_avatar_user_profile_components.mdx
+++ b/api_docs/kbn_shared_ux_avatar_user_profile_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-avatar-user-profile-components
 title: "@kbn/shared-ux-avatar-user-profile-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-avatar-user-profile-components plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-avatar-user-profile-components']
 ---
 import kbnSharedUxAvatarUserProfileComponentsObj from './kbn_shared_ux_avatar_user_profile_components.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_button_exit_full_screen.mdx b/api_docs/kbn_shared_ux_button_exit_full_screen.mdx
index c238eebf30ce3..ef64bc2379a7e 100644
--- a/api_docs/kbn_shared_ux_button_exit_full_screen.mdx
+++ b/api_docs/kbn_shared_ux_button_exit_full_screen.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-button-exit-full-screen
 title: "@kbn/shared-ux-button-exit-full-screen"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-button-exit-full-screen plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-button-exit-full-screen']
 ---
 import kbnSharedUxButtonExitFullScreenObj from './kbn_shared_ux_button_exit_full_screen.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_button_exit_full_screen_mocks.mdx b/api_docs/kbn_shared_ux_button_exit_full_screen_mocks.mdx
index e571e864814a7..7c23015601b7a 100644
--- a/api_docs/kbn_shared_ux_button_exit_full_screen_mocks.mdx
+++ b/api_docs/kbn_shared_ux_button_exit_full_screen_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-button-exit-full-screen-mocks
 title: "@kbn/shared-ux-button-exit-full-screen-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-button-exit-full-screen-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-button-exit-full-screen-mocks']
 ---
 import kbnSharedUxButtonExitFullScreenMocksObj from './kbn_shared_ux_button_exit_full_screen_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_button_toolbar.mdx b/api_docs/kbn_shared_ux_button_toolbar.mdx
index 17d863ad15b80..108257adf5838 100644
--- a/api_docs/kbn_shared_ux_button_toolbar.mdx
+++ b/api_docs/kbn_shared_ux_button_toolbar.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-button-toolbar
 title: "@kbn/shared-ux-button-toolbar"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-button-toolbar plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-button-toolbar']
 ---
 import kbnSharedUxButtonToolbarObj from './kbn_shared_ux_button_toolbar.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_card_no_data.mdx b/api_docs/kbn_shared_ux_card_no_data.mdx
index c7560cd21c835..c68ef789fbdbb 100644
--- a/api_docs/kbn_shared_ux_card_no_data.mdx
+++ b/api_docs/kbn_shared_ux_card_no_data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-card-no-data
 title: "@kbn/shared-ux-card-no-data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-card-no-data plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-card-no-data']
 ---
 import kbnSharedUxCardNoDataObj from './kbn_shared_ux_card_no_data.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_card_no_data_mocks.mdx b/api_docs/kbn_shared_ux_card_no_data_mocks.mdx
index 7c3cbca6bfa65..695f2cff79895 100644
--- a/api_docs/kbn_shared_ux_card_no_data_mocks.mdx
+++ b/api_docs/kbn_shared_ux_card_no_data_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-card-no-data-mocks
 title: "@kbn/shared-ux-card-no-data-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-card-no-data-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-card-no-data-mocks']
 ---
 import kbnSharedUxCardNoDataMocksObj from './kbn_shared_ux_card_no_data_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_context.mdx b/api_docs/kbn_shared_ux_file_context.mdx
index 3458dd32b4b5c..36ca2b6012f1a 100644
--- a/api_docs/kbn_shared_ux_file_context.mdx
+++ b/api_docs/kbn_shared_ux_file_context.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-context
 title: "@kbn/shared-ux-file-context"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-context plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-context']
 ---
 import kbnSharedUxFileContextObj from './kbn_shared_ux_file_context.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_image.mdx b/api_docs/kbn_shared_ux_file_image.mdx
index c5b10b3e93361..2353fe64e7fa5 100644
--- a/api_docs/kbn_shared_ux_file_image.mdx
+++ b/api_docs/kbn_shared_ux_file_image.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-image
 title: "@kbn/shared-ux-file-image"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-image plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-image']
 ---
 import kbnSharedUxFileImageObj from './kbn_shared_ux_file_image.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_image_mocks.mdx b/api_docs/kbn_shared_ux_file_image_mocks.mdx
index 03765102bad1c..41369b47d7695 100644
--- a/api_docs/kbn_shared_ux_file_image_mocks.mdx
+++ b/api_docs/kbn_shared_ux_file_image_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-image-mocks
 title: "@kbn/shared-ux-file-image-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-image-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-image-mocks']
 ---
 import kbnSharedUxFileImageMocksObj from './kbn_shared_ux_file_image_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_mocks.mdx b/api_docs/kbn_shared_ux_file_mocks.mdx
index c2a6b2898f267..7a2a7cd63a069 100644
--- a/api_docs/kbn_shared_ux_file_mocks.mdx
+++ b/api_docs/kbn_shared_ux_file_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-mocks
 title: "@kbn/shared-ux-file-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-mocks']
 ---
 import kbnSharedUxFileMocksObj from './kbn_shared_ux_file_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_picker.mdx b/api_docs/kbn_shared_ux_file_picker.mdx
index a3072335000dd..e38116a4c51f8 100644
--- a/api_docs/kbn_shared_ux_file_picker.mdx
+++ b/api_docs/kbn_shared_ux_file_picker.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-picker
 title: "@kbn/shared-ux-file-picker"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-picker plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-picker']
 ---
 import kbnSharedUxFilePickerObj from './kbn_shared_ux_file_picker.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_types.mdx b/api_docs/kbn_shared_ux_file_types.mdx
index 73dffa9666505..42a15ee900a51 100644
--- a/api_docs/kbn_shared_ux_file_types.mdx
+++ b/api_docs/kbn_shared_ux_file_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-types
 title: "@kbn/shared-ux-file-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-types plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-types']
 ---
 import kbnSharedUxFileTypesObj from './kbn_shared_ux_file_types.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_upload.mdx b/api_docs/kbn_shared_ux_file_upload.mdx
index b44a3ebd0cf57..b26284ac14961 100644
--- a/api_docs/kbn_shared_ux_file_upload.mdx
+++ b/api_docs/kbn_shared_ux_file_upload.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-upload
 title: "@kbn/shared-ux-file-upload"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-upload plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-upload']
 ---
 import kbnSharedUxFileUploadObj from './kbn_shared_ux_file_upload.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_util.mdx b/api_docs/kbn_shared_ux_file_util.mdx
index 29f8177f6a683..14ad06eaae562 100644
--- a/api_docs/kbn_shared_ux_file_util.mdx
+++ b/api_docs/kbn_shared_ux_file_util.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-util
 title: "@kbn/shared-ux-file-util"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-util plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-util']
 ---
 import kbnSharedUxFileUtilObj from './kbn_shared_ux_file_util.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_link_redirect_app.mdx b/api_docs/kbn_shared_ux_link_redirect_app.mdx
index bfeb8a5123374..d92a08bcb9832 100644
--- a/api_docs/kbn_shared_ux_link_redirect_app.mdx
+++ b/api_docs/kbn_shared_ux_link_redirect_app.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-link-redirect-app
 title: "@kbn/shared-ux-link-redirect-app"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-link-redirect-app plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-link-redirect-app']
 ---
 import kbnSharedUxLinkRedirectAppObj from './kbn_shared_ux_link_redirect_app.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx b/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx
index 124de09fbb6b2..22627650e89bc 100644
--- a/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx
+++ b/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-link-redirect-app-mocks
 title: "@kbn/shared-ux-link-redirect-app-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-link-redirect-app-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-link-redirect-app-mocks']
 ---
 import kbnSharedUxLinkRedirectAppMocksObj from './kbn_shared_ux_link_redirect_app_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_markdown.mdx b/api_docs/kbn_shared_ux_markdown.mdx
index ffef3842a8f49..321cd32d3a8d1 100644
--- a/api_docs/kbn_shared_ux_markdown.mdx
+++ b/api_docs/kbn_shared_ux_markdown.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-markdown
 title: "@kbn/shared-ux-markdown"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-markdown plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-markdown']
 ---
 import kbnSharedUxMarkdownObj from './kbn_shared_ux_markdown.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_markdown_mocks.mdx b/api_docs/kbn_shared_ux_markdown_mocks.mdx
index 12253c541138d..4d9ba562a688a 100644
--- a/api_docs/kbn_shared_ux_markdown_mocks.mdx
+++ b/api_docs/kbn_shared_ux_markdown_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-markdown-mocks
 title: "@kbn/shared-ux-markdown-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-markdown-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-markdown-mocks']
 ---
 import kbnSharedUxMarkdownMocksObj from './kbn_shared_ux_markdown_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_analytics_no_data.mdx b/api_docs/kbn_shared_ux_page_analytics_no_data.mdx
index 521e7afeffc28..f31c06cdcefe1 100644
--- a/api_docs/kbn_shared_ux_page_analytics_no_data.mdx
+++ b/api_docs/kbn_shared_ux_page_analytics_no_data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-analytics-no-data
 title: "@kbn/shared-ux-page-analytics-no-data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-analytics-no-data plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-analytics-no-data']
 ---
 import kbnSharedUxPageAnalyticsNoDataObj from './kbn_shared_ux_page_analytics_no_data.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx b/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx
index d94f87f474a06..4be5cf0a56ee1 100644
--- a/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-analytics-no-data-mocks
 title: "@kbn/shared-ux-page-analytics-no-data-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-analytics-no-data-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-analytics-no-data-mocks']
 ---
 import kbnSharedUxPageAnalyticsNoDataMocksObj from './kbn_shared_ux_page_analytics_no_data_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_kibana_no_data.mdx b/api_docs/kbn_shared_ux_page_kibana_no_data.mdx
index 9256b249ddec3..168413e262671 100644
--- a/api_docs/kbn_shared_ux_page_kibana_no_data.mdx
+++ b/api_docs/kbn_shared_ux_page_kibana_no_data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-no-data
 title: "@kbn/shared-ux-page-kibana-no-data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-kibana-no-data plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-kibana-no-data']
 ---
 import kbnSharedUxPageKibanaNoDataObj from './kbn_shared_ux_page_kibana_no_data.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx b/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx
index 98c666dc7ac30..524c1ff746967 100644
--- a/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-no-data-mocks
 title: "@kbn/shared-ux-page-kibana-no-data-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-kibana-no-data-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-kibana-no-data-mocks']
 ---
 import kbnSharedUxPageKibanaNoDataMocksObj from './kbn_shared_ux_page_kibana_no_data_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_kibana_template.mdx b/api_docs/kbn_shared_ux_page_kibana_template.mdx
index c7e445662d405..55fa2b0ae3b15 100644
--- a/api_docs/kbn_shared_ux_page_kibana_template.mdx
+++ b/api_docs/kbn_shared_ux_page_kibana_template.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-template
 title: "@kbn/shared-ux-page-kibana-template"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-kibana-template plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-kibana-template']
 ---
 import kbnSharedUxPageKibanaTemplateObj from './kbn_shared_ux_page_kibana_template.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx b/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx
index 16e2e693823a6..ed670cabe25e8 100644
--- a/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-template-mocks
 title: "@kbn/shared-ux-page-kibana-template-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-kibana-template-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-kibana-template-mocks']
 ---
 import kbnSharedUxPageKibanaTemplateMocksObj from './kbn_shared_ux_page_kibana_template_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_no_data.mdx b/api_docs/kbn_shared_ux_page_no_data.mdx
index dd303a55b92d1..96243a193177f 100644
--- a/api_docs/kbn_shared_ux_page_no_data.mdx
+++ b/api_docs/kbn_shared_ux_page_no_data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data
 title: "@kbn/shared-ux-page-no-data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-no-data plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-no-data']
 ---
 import kbnSharedUxPageNoDataObj from './kbn_shared_ux_page_no_data.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_no_data_config.mdx b/api_docs/kbn_shared_ux_page_no_data_config.mdx
index 730c8b3b4a670..044721d260078 100644
--- a/api_docs/kbn_shared_ux_page_no_data_config.mdx
+++ b/api_docs/kbn_shared_ux_page_no_data_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data-config
 title: "@kbn/shared-ux-page-no-data-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-no-data-config plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-no-data-config']
 ---
 import kbnSharedUxPageNoDataConfigObj from './kbn_shared_ux_page_no_data_config.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx b/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx
index b9a5faef6e24d..74808ff365570 100644
--- a/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data-config-mocks
 title: "@kbn/shared-ux-page-no-data-config-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-no-data-config-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-no-data-config-mocks']
 ---
 import kbnSharedUxPageNoDataConfigMocksObj from './kbn_shared_ux_page_no_data_config_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_no_data_mocks.mdx b/api_docs/kbn_shared_ux_page_no_data_mocks.mdx
index eb3cdb4b62c34..83e1e1473ce12 100644
--- a/api_docs/kbn_shared_ux_page_no_data_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_no_data_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data-mocks
 title: "@kbn/shared-ux-page-no-data-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-no-data-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-no-data-mocks']
 ---
 import kbnSharedUxPageNoDataMocksObj from './kbn_shared_ux_page_no_data_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_solution_nav.mdx b/api_docs/kbn_shared_ux_page_solution_nav.mdx
index 50643295597d3..aaa935152d277 100644
--- a/api_docs/kbn_shared_ux_page_solution_nav.mdx
+++ b/api_docs/kbn_shared_ux_page_solution_nav.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-solution-nav
 title: "@kbn/shared-ux-page-solution-nav"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-solution-nav plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-solution-nav']
 ---
 import kbnSharedUxPageSolutionNavObj from './kbn_shared_ux_page_solution_nav.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_prompt_no_data_views.mdx b/api_docs/kbn_shared_ux_prompt_no_data_views.mdx
index a3b0893d962cc..26de1039527e6 100644
--- a/api_docs/kbn_shared_ux_prompt_no_data_views.mdx
+++ b/api_docs/kbn_shared_ux_prompt_no_data_views.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-prompt-no-data-views
 title: "@kbn/shared-ux-prompt-no-data-views"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-prompt-no-data-views plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-prompt-no-data-views']
 ---
 import kbnSharedUxPromptNoDataViewsObj from './kbn_shared_ux_prompt_no_data_views.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx b/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx
index 0419eea5c2561..f3e00b73a9714 100644
--- a/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx
+++ b/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-prompt-no-data-views-mocks
 title: "@kbn/shared-ux-prompt-no-data-views-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-prompt-no-data-views-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-prompt-no-data-views-mocks']
 ---
 import kbnSharedUxPromptNoDataViewsMocksObj from './kbn_shared_ux_prompt_no_data_views_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_prompt_not_found.mdx b/api_docs/kbn_shared_ux_prompt_not_found.mdx
index 8d93e65e58a7a..b11967841a90e 100644
--- a/api_docs/kbn_shared_ux_prompt_not_found.mdx
+++ b/api_docs/kbn_shared_ux_prompt_not_found.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-prompt-not-found
 title: "@kbn/shared-ux-prompt-not-found"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-prompt-not-found plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-prompt-not-found']
 ---
 import kbnSharedUxPromptNotFoundObj from './kbn_shared_ux_prompt_not_found.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_router.mdx b/api_docs/kbn_shared_ux_router.mdx
index 7b06d8fedf3bc..434c920814f46 100644
--- a/api_docs/kbn_shared_ux_router.mdx
+++ b/api_docs/kbn_shared_ux_router.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-router
 title: "@kbn/shared-ux-router"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-router plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-router']
 ---
 import kbnSharedUxRouterObj from './kbn_shared_ux_router.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_router_mocks.mdx b/api_docs/kbn_shared_ux_router_mocks.mdx
index ba35535d9c82d..a5a61a8c5c9fe 100644
--- a/api_docs/kbn_shared_ux_router_mocks.mdx
+++ b/api_docs/kbn_shared_ux_router_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-router-mocks
 title: "@kbn/shared-ux-router-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-router-mocks plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-router-mocks']
 ---
 import kbnSharedUxRouterMocksObj from './kbn_shared_ux_router_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_storybook_config.mdx b/api_docs/kbn_shared_ux_storybook_config.mdx
index b80a811065383..5157cc5fa9273 100644
--- a/api_docs/kbn_shared_ux_storybook_config.mdx
+++ b/api_docs/kbn_shared_ux_storybook_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-storybook-config
 title: "@kbn/shared-ux-storybook-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-storybook-config plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-storybook-config']
 ---
 import kbnSharedUxStorybookConfigObj from './kbn_shared_ux_storybook_config.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_storybook_mock.mdx b/api_docs/kbn_shared_ux_storybook_mock.mdx
index fdd01db6e7893..399a594d4755b 100644
--- a/api_docs/kbn_shared_ux_storybook_mock.mdx
+++ b/api_docs/kbn_shared_ux_storybook_mock.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-storybook-mock
 title: "@kbn/shared-ux-storybook-mock"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-storybook-mock plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-storybook-mock']
 ---
 import kbnSharedUxStorybookMockObj from './kbn_shared_ux_storybook_mock.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_utility.mdx b/api_docs/kbn_shared_ux_utility.mdx
index 002e032035f2d..b4fe6a2f4e57d 100644
--- a/api_docs/kbn_shared_ux_utility.mdx
+++ b/api_docs/kbn_shared_ux_utility.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-utility
 title: "@kbn/shared-ux-utility"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-utility plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-utility']
 ---
 import kbnSharedUxUtilityObj from './kbn_shared_ux_utility.devdocs.json';
diff --git a/api_docs/kbn_slo_schema.mdx b/api_docs/kbn_slo_schema.mdx
index 909cbc86dbb9a..e2f98d7df5a53 100644
--- a/api_docs/kbn_slo_schema.mdx
+++ b/api_docs/kbn_slo_schema.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-slo-schema
 title: "@kbn/slo-schema"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/slo-schema plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/slo-schema']
 ---
 import kbnSloSchemaObj from './kbn_slo_schema.devdocs.json';
diff --git a/api_docs/kbn_some_dev_log.mdx b/api_docs/kbn_some_dev_log.mdx
index 32a0175b0ae11..ca0b3b3b89180 100644
--- a/api_docs/kbn_some_dev_log.mdx
+++ b/api_docs/kbn_some_dev_log.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-some-dev-log
 title: "@kbn/some-dev-log"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/some-dev-log plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/some-dev-log']
 ---
 import kbnSomeDevLogObj from './kbn_some_dev_log.devdocs.json';
diff --git a/api_docs/kbn_std.mdx b/api_docs/kbn_std.mdx
index 760fb637dca1f..797a5224e6422 100644
--- a/api_docs/kbn_std.mdx
+++ b/api_docs/kbn_std.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-std
 title: "@kbn/std"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/std plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/std']
 ---
 import kbnStdObj from './kbn_std.devdocs.json';
diff --git a/api_docs/kbn_stdio_dev_helpers.mdx b/api_docs/kbn_stdio_dev_helpers.mdx
index c7c0f0be1c9a8..e3b72f32afd1c 100644
--- a/api_docs/kbn_stdio_dev_helpers.mdx
+++ b/api_docs/kbn_stdio_dev_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-stdio-dev-helpers
 title: "@kbn/stdio-dev-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/stdio-dev-helpers plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/stdio-dev-helpers']
 ---
 import kbnStdioDevHelpersObj from './kbn_stdio_dev_helpers.devdocs.json';
diff --git a/api_docs/kbn_storybook.mdx b/api_docs/kbn_storybook.mdx
index a8aaf772dfbeb..69ca75f1b1a7b 100644
--- a/api_docs/kbn_storybook.mdx
+++ b/api_docs/kbn_storybook.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-storybook
 title: "@kbn/storybook"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/storybook plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/storybook']
 ---
 import kbnStorybookObj from './kbn_storybook.devdocs.json';
diff --git a/api_docs/kbn_telemetry_tools.mdx b/api_docs/kbn_telemetry_tools.mdx
index e6fb061b3c4e2..c22a72bacd8e7 100644
--- a/api_docs/kbn_telemetry_tools.mdx
+++ b/api_docs/kbn_telemetry_tools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-telemetry-tools
 title: "@kbn/telemetry-tools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/telemetry-tools plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/telemetry-tools']
 ---
 import kbnTelemetryToolsObj from './kbn_telemetry_tools.devdocs.json';
diff --git a/api_docs/kbn_test.mdx b/api_docs/kbn_test.mdx
index 9bc5f62ac0fb9..cb320fb09998e 100644
--- a/api_docs/kbn_test.mdx
+++ b/api_docs/kbn_test.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-test
 title: "@kbn/test"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/test plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/test']
 ---
 import kbnTestObj from './kbn_test.devdocs.json';
diff --git a/api_docs/kbn_test_jest_helpers.mdx b/api_docs/kbn_test_jest_helpers.mdx
index 7cdb7653f1365..4d7893ebac23c 100644
--- a/api_docs/kbn_test_jest_helpers.mdx
+++ b/api_docs/kbn_test_jest_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-test-jest-helpers
 title: "@kbn/test-jest-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/test-jest-helpers plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/test-jest-helpers']
 ---
 import kbnTestJestHelpersObj from './kbn_test_jest_helpers.devdocs.json';
diff --git a/api_docs/kbn_test_subj_selector.mdx b/api_docs/kbn_test_subj_selector.mdx
index fa0e562873fca..0438a884bb668 100644
--- a/api_docs/kbn_test_subj_selector.mdx
+++ b/api_docs/kbn_test_subj_selector.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-test-subj-selector
 title: "@kbn/test-subj-selector"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/test-subj-selector plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/test-subj-selector']
 ---
 import kbnTestSubjSelectorObj from './kbn_test_subj_selector.devdocs.json';
diff --git a/api_docs/kbn_tooling_log.mdx b/api_docs/kbn_tooling_log.mdx
index 06c7351858830..601a95786408a 100644
--- a/api_docs/kbn_tooling_log.mdx
+++ b/api_docs/kbn_tooling_log.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-tooling-log
 title: "@kbn/tooling-log"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/tooling-log plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/tooling-log']
 ---
 import kbnToolingLogObj from './kbn_tooling_log.devdocs.json';
diff --git a/api_docs/kbn_ts_projects.mdx b/api_docs/kbn_ts_projects.mdx
index 2b501f8c55bdb..96c4e09406920 100644
--- a/api_docs/kbn_ts_projects.mdx
+++ b/api_docs/kbn_ts_projects.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ts-projects
 title: "@kbn/ts-projects"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ts-projects plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ts-projects']
 ---
 import kbnTsProjectsObj from './kbn_ts_projects.devdocs.json';
diff --git a/api_docs/kbn_typed_react_router_config.mdx b/api_docs/kbn_typed_react_router_config.mdx
index 1d9e624fb0ea9..414ac3451f9d8 100644
--- a/api_docs/kbn_typed_react_router_config.mdx
+++ b/api_docs/kbn_typed_react_router_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-typed-react-router-config
 title: "@kbn/typed-react-router-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/typed-react-router-config plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/typed-react-router-config']
 ---
 import kbnTypedReactRouterConfigObj from './kbn_typed_react_router_config.devdocs.json';
diff --git a/api_docs/kbn_ui_actions_browser.mdx b/api_docs/kbn_ui_actions_browser.mdx
index 2b2bdd60e4ce7..00176fb3bf00e 100644
--- a/api_docs/kbn_ui_actions_browser.mdx
+++ b/api_docs/kbn_ui_actions_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ui-actions-browser
 title: "@kbn/ui-actions-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ui-actions-browser plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ui-actions-browser']
 ---
 import kbnUiActionsBrowserObj from './kbn_ui_actions_browser.devdocs.json';
diff --git a/api_docs/kbn_ui_shared_deps_src.mdx b/api_docs/kbn_ui_shared_deps_src.mdx
index 2461a2ae517a5..bf12be46d108e 100644
--- a/api_docs/kbn_ui_shared_deps_src.mdx
+++ b/api_docs/kbn_ui_shared_deps_src.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ui-shared-deps-src
 title: "@kbn/ui-shared-deps-src"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ui-shared-deps-src plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ui-shared-deps-src']
 ---
 import kbnUiSharedDepsSrcObj from './kbn_ui_shared_deps_src.devdocs.json';
diff --git a/api_docs/kbn_ui_theme.mdx b/api_docs/kbn_ui_theme.mdx
index 889b19937ba67..ad80982ad1262 100644
--- a/api_docs/kbn_ui_theme.mdx
+++ b/api_docs/kbn_ui_theme.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ui-theme
 title: "@kbn/ui-theme"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ui-theme plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ui-theme']
 ---
 import kbnUiThemeObj from './kbn_ui_theme.devdocs.json';
diff --git a/api_docs/kbn_user_profile_components.mdx b/api_docs/kbn_user_profile_components.mdx
index c68316050f7c4..a3cc7e2a3af32 100644
--- a/api_docs/kbn_user_profile_components.mdx
+++ b/api_docs/kbn_user_profile_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-user-profile-components
 title: "@kbn/user-profile-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/user-profile-components plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/user-profile-components']
 ---
 import kbnUserProfileComponentsObj from './kbn_user_profile_components.devdocs.json';
diff --git a/api_docs/kbn_utility_types.mdx b/api_docs/kbn_utility_types.mdx
index 27d8eed321f38..ce6d926839e48 100644
--- a/api_docs/kbn_utility_types.mdx
+++ b/api_docs/kbn_utility_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-utility-types
 title: "@kbn/utility-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/utility-types plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/utility-types']
 ---
 import kbnUtilityTypesObj from './kbn_utility_types.devdocs.json';
diff --git a/api_docs/kbn_utility_types_jest.mdx b/api_docs/kbn_utility_types_jest.mdx
index 23117d51a44f0..528df3e0ed110 100644
--- a/api_docs/kbn_utility_types_jest.mdx
+++ b/api_docs/kbn_utility_types_jest.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-utility-types-jest
 title: "@kbn/utility-types-jest"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/utility-types-jest plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/utility-types-jest']
 ---
 import kbnUtilityTypesJestObj from './kbn_utility_types_jest.devdocs.json';
diff --git a/api_docs/kbn_utils.mdx b/api_docs/kbn_utils.mdx
index dd420e4509c04..11f9ba4e7806d 100644
--- a/api_docs/kbn_utils.mdx
+++ b/api_docs/kbn_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-utils
 title: "@kbn/utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/utils plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/utils']
 ---
 import kbnUtilsObj from './kbn_utils.devdocs.json';
diff --git a/api_docs/kbn_yarn_lock_validator.mdx b/api_docs/kbn_yarn_lock_validator.mdx
index eb3b59e92004e..d9e07efc98793 100644
--- a/api_docs/kbn_yarn_lock_validator.mdx
+++ b/api_docs/kbn_yarn_lock_validator.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-yarn-lock-validator
 title: "@kbn/yarn-lock-validator"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/yarn-lock-validator plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/yarn-lock-validator']
 ---
 import kbnYarnLockValidatorObj from './kbn_yarn_lock_validator.devdocs.json';
diff --git a/api_docs/kibana_overview.mdx b/api_docs/kibana_overview.mdx
index 92633990126eb..6f60ef29c0cca 100644
--- a/api_docs/kibana_overview.mdx
+++ b/api_docs/kibana_overview.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kibanaOverview
 title: "kibanaOverview"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the kibanaOverview plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kibanaOverview']
 ---
 import kibanaOverviewObj from './kibana_overview.devdocs.json';
diff --git a/api_docs/kibana_react.devdocs.json b/api_docs/kibana_react.devdocs.json
index 1dbaea8a030f5..cb0277faaa5f8 100644
--- a/api_docs/kibana_react.devdocs.json
+++ b/api_docs/kibana_react.devdocs.json
@@ -1376,18 +1376,6 @@
             "plugin": "apm",
             "path": "x-pack/plugins/apm/public/components/routing/app_root/index.tsx"
           },
-          {
-            "plugin": "enterpriseSearch",
-            "path": "x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_toolbar/analytics_collection_toolbar.tsx"
-          },
-          {
-            "plugin": "enterpriseSearch",
-            "path": "x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_toolbar/analytics_collection_toolbar.tsx"
-          },
-          {
-            "plugin": "enterpriseSearch",
-            "path": "x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_toolbar/analytics_collection_toolbar.tsx"
-          },
           {
             "plugin": "indexLifecycleManagement",
             "path": "x-pack/plugins/index_lifecycle_management/public/shared_imports.ts"
diff --git a/api_docs/kibana_react.mdx b/api_docs/kibana_react.mdx
index b521c0367a597..c876ad751f75f 100644
--- a/api_docs/kibana_react.mdx
+++ b/api_docs/kibana_react.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kibanaReact
 title: "kibanaReact"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the kibanaReact plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kibanaReact']
 ---
 import kibanaReactObj from './kibana_react.devdocs.json';
diff --git a/api_docs/kibana_utils.mdx b/api_docs/kibana_utils.mdx
index 8dd98ee82cd67..eaa755c20e4a6 100644
--- a/api_docs/kibana_utils.mdx
+++ b/api_docs/kibana_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kibanaUtils
 title: "kibanaUtils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the kibanaUtils plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kibanaUtils']
 ---
 import kibanaUtilsObj from './kibana_utils.devdocs.json';
diff --git a/api_docs/kubernetes_security.mdx b/api_docs/kubernetes_security.mdx
index edea19a333163..417c425a13077 100644
--- a/api_docs/kubernetes_security.mdx
+++ b/api_docs/kubernetes_security.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kubernetesSecurity
 title: "kubernetesSecurity"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the kubernetesSecurity plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kubernetesSecurity']
 ---
 import kubernetesSecurityObj from './kubernetes_security.devdocs.json';
diff --git a/api_docs/lens.mdx b/api_docs/lens.mdx
index 67003127c5a66..a0f3dd0a17dc0 100644
--- a/api_docs/lens.mdx
+++ b/api_docs/lens.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/lens
 title: "lens"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the lens plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'lens']
 ---
 import lensObj from './lens.devdocs.json';
diff --git a/api_docs/license_api_guard.mdx b/api_docs/license_api_guard.mdx
index 523a22146062a..e7d71966703c3 100644
--- a/api_docs/license_api_guard.mdx
+++ b/api_docs/license_api_guard.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/licenseApiGuard
 title: "licenseApiGuard"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the licenseApiGuard plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'licenseApiGuard']
 ---
 import licenseApiGuardObj from './license_api_guard.devdocs.json';
diff --git a/api_docs/license_management.mdx b/api_docs/license_management.mdx
index f8f04c8ea317a..ee2417e0dd499 100644
--- a/api_docs/license_management.mdx
+++ b/api_docs/license_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/licenseManagement
 title: "licenseManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the licenseManagement plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'licenseManagement']
 ---
 import licenseManagementObj from './license_management.devdocs.json';
diff --git a/api_docs/licensing.mdx b/api_docs/licensing.mdx
index 5d218b97477d5..c5d3f4d1653f8 100644
--- a/api_docs/licensing.mdx
+++ b/api_docs/licensing.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/licensing
 title: "licensing"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the licensing plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'licensing']
 ---
 import licensingObj from './licensing.devdocs.json';
diff --git a/api_docs/lists.mdx b/api_docs/lists.mdx
index 3fa35bd4fee29..2fed1049d0569 100644
--- a/api_docs/lists.mdx
+++ b/api_docs/lists.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/lists
 title: "lists"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the lists plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'lists']
 ---
 import listsObj from './lists.devdocs.json';
diff --git a/api_docs/management.mdx b/api_docs/management.mdx
index 869b213005de0..2d5013ce50043 100644
--- a/api_docs/management.mdx
+++ b/api_docs/management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/management
 title: "management"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the management plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'management']
 ---
 import managementObj from './management.devdocs.json';
diff --git a/api_docs/maps.mdx b/api_docs/maps.mdx
index c61e46893d581..2ede831b995f7 100644
--- a/api_docs/maps.mdx
+++ b/api_docs/maps.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/maps
 title: "maps"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the maps plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'maps']
 ---
 import mapsObj from './maps.devdocs.json';
diff --git a/api_docs/maps_ems.mdx b/api_docs/maps_ems.mdx
index 880d15fc8021b..6fcbcca8c2a38 100644
--- a/api_docs/maps_ems.mdx
+++ b/api_docs/maps_ems.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/mapsEms
 title: "mapsEms"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the mapsEms plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'mapsEms']
 ---
 import mapsEmsObj from './maps_ems.devdocs.json';
diff --git a/api_docs/ml.mdx b/api_docs/ml.mdx
index 3f870e60e045f..0b41ea9fb21eb 100644
--- a/api_docs/ml.mdx
+++ b/api_docs/ml.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ml
 title: "ml"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the ml plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ml']
 ---
 import mlObj from './ml.devdocs.json';
diff --git a/api_docs/monitoring.mdx b/api_docs/monitoring.mdx
index 52cfc7d67cff5..6d97adffd51a0 100644
--- a/api_docs/monitoring.mdx
+++ b/api_docs/monitoring.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/monitoring
 title: "monitoring"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the monitoring plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'monitoring']
 ---
 import monitoringObj from './monitoring.devdocs.json';
diff --git a/api_docs/monitoring_collection.mdx b/api_docs/monitoring_collection.mdx
index 0dd111f72ef78..f6d373fbcdb01 100644
--- a/api_docs/monitoring_collection.mdx
+++ b/api_docs/monitoring_collection.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/monitoringCollection
 title: "monitoringCollection"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the monitoringCollection plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'monitoringCollection']
 ---
 import monitoringCollectionObj from './monitoring_collection.devdocs.json';
diff --git a/api_docs/navigation.mdx b/api_docs/navigation.mdx
index 3121830a9f2a7..9c85e036d8e1e 100644
--- a/api_docs/navigation.mdx
+++ b/api_docs/navigation.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/navigation
 title: "navigation"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the navigation plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'navigation']
 ---
 import navigationObj from './navigation.devdocs.json';
diff --git a/api_docs/newsfeed.mdx b/api_docs/newsfeed.mdx
index 37887d4843b4c..02513718c0a99 100644
--- a/api_docs/newsfeed.mdx
+++ b/api_docs/newsfeed.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/newsfeed
 title: "newsfeed"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the newsfeed plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'newsfeed']
 ---
 import newsfeedObj from './newsfeed.devdocs.json';
diff --git a/api_docs/notifications.mdx b/api_docs/notifications.mdx
index f9bde1b340e02..0cd8d06e02ede 100644
--- a/api_docs/notifications.mdx
+++ b/api_docs/notifications.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/notifications
 title: "notifications"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the notifications plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'notifications']
 ---
 import notificationsObj from './notifications.devdocs.json';
diff --git a/api_docs/observability.devdocs.json b/api_docs/observability.devdocs.json
index 7a97a26b790af..92346e23cb156 100644
--- a/api_docs/observability.devdocs.json
+++ b/api_docs/observability.devdocs.json
@@ -4922,7 +4922,7 @@
             "label": "format",
             "description": [],
             "signature": [
-              "(options: { fields: OutputOf<SetOptional<{ readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>> & Record<string, any>; formatters: { asDuration: (value: ",
+              "(options: { fields: OutputOf<SetOptional<{ readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.maintenance_window_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>> & Record<string, any>; formatters: { asDuration: (value: ",
               "Maybe",
               "<number>, { defaultValue, extended }?: FormatterOptions) => string; asPercent: (numerator: ",
               "Maybe",
@@ -4941,7 +4941,7 @@
                 "label": "options",
                 "description": [],
                 "signature": [
-                  "{ fields: OutputOf<SetOptional<{ readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>> & Record<string, any>; formatters: { asDuration: (value: ",
+                  "{ fields: OutputOf<SetOptional<{ readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.maintenance_window_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>> & Record<string, any>; formatters: { asDuration: (value: ",
                   "Maybe",
                   "<number>, { defaultValue, extended }?: FormatterOptions) => string; asPercent: (numerator: ",
                   "Maybe",
@@ -5653,7 +5653,7 @@
             "label": "fields",
             "description": [],
             "signature": [
-              "OutputOf<SetOptional<{ readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>> & OutputOf<SetOptional<{ readonly \"kibana.alert.evaluation.threshold\": { readonly type: \"scaled_float\"; readonly scaling_factor: 100; readonly required: false; }; readonly \"kibana.alert.evaluation.value\": { readonly type: \"scaled_float\"; readonly scaling_factor: 100; readonly required: false; }; }>> & TAdditionalMetaFields"
+              "OutputOf<SetOptional<{ readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.maintenance_window_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>> & OutputOf<SetOptional<{ readonly \"kibana.alert.evaluation.threshold\": { readonly type: \"scaled_float\"; readonly scaling_factor: 100; readonly required: false; }; readonly \"kibana.alert.evaluation.value\": { readonly type: \"scaled_float\"; readonly scaling_factor: 100; readonly required: false; }; }>> & TAdditionalMetaFields"
             ],
             "path": "x-pack/plugins/observability/public/typings/alerts.ts",
             "deprecated": false,
@@ -6574,7 +6574,7 @@
         "label": "ObservabilityRuleTypeFormatter",
         "description": [],
         "signature": [
-          "(options: { fields: OutputOf<SetOptional<{ readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>> & Record<string, any>; formatters: { asDuration: (value: ",
+          "(options: { fields: OutputOf<SetOptional<{ readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.maintenance_window_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>> & Record<string, any>; formatters: { asDuration: (value: ",
           "Maybe",
           "<number>, { defaultValue, extended }?: FormatterOptions) => string; asPercent: (numerator: ",
           "Maybe",
@@ -6593,7 +6593,7 @@
             "label": "options",
             "description": [],
             "signature": [
-              "{ fields: OutputOf<SetOptional<{ readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>> & Record<string, any>; formatters: { asDuration: (value: ",
+              "{ fields: OutputOf<SetOptional<{ readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.maintenance_window_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>> & Record<string, any>; formatters: { asDuration: (value: ",
               "Maybe",
               "<number>, { defaultValue, extended }?: FormatterOptions) => string; asPercent: (numerator: ",
               "Maybe",
diff --git a/api_docs/observability.mdx b/api_docs/observability.mdx
index 3e7b223414a79..3157f54465992 100644
--- a/api_docs/observability.mdx
+++ b/api_docs/observability.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observability
 title: "observability"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observability plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observability']
 ---
 import observabilityObj from './observability.devdocs.json';
diff --git a/api_docs/observability_shared.mdx b/api_docs/observability_shared.mdx
index 4056665de1ed6..8d278718a8f3c 100644
--- a/api_docs/observability_shared.mdx
+++ b/api_docs/observability_shared.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observabilityShared
 title: "observabilityShared"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observabilityShared plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observabilityShared']
 ---
 import observabilitySharedObj from './observability_shared.devdocs.json';
diff --git a/api_docs/osquery.devdocs.json b/api_docs/osquery.devdocs.json
index 98ebc834aa39c..00c21209a9fd2 100644
--- a/api_docs/osquery.devdocs.json
+++ b/api_docs/osquery.devdocs.json
@@ -268,7 +268,7 @@
           "label": "osqueryCreateAction",
           "description": [],
           "signature": [
-            "(payload: { agent_ids?: string[] | undefined; agent_all?: boolean | undefined; agent_platforms?: string[] | undefined; agent_policy_ids?: string[] | undefined; query?: string | undefined; queries?: { id: string; query: string; ecs_mapping: { [x: string]: { field?: string | undefined; value?: string | string[] | undefined; }; } | undefined; version: string | undefined; platform: string | undefined; removed: boolean | undefined; snapshot: boolean | undefined; }[] | undefined; saved_query_id?: string | undefined; ecs_mapping?: { [x: string]: { field?: string | undefined; value?: string | string[] | undefined; }; } | undefined; pack_id?: string | undefined; alert_ids?: string[] | undefined; case_ids?: string[] | undefined; event_ids?: string[] | undefined; metadata?: object | undefined; }, alertData?: OutputOf<SetOptional<{ readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>> | undefined) => void"
+            "(payload: { agent_ids?: string[] | undefined; agent_all?: boolean | undefined; agent_platforms?: string[] | undefined; agent_policy_ids?: string[] | undefined; query?: string | undefined; queries?: { id: string; query: string; ecs_mapping: { [x: string]: { field?: string | undefined; value?: string | string[] | undefined; }; } | undefined; version: string | undefined; platform: string | undefined; removed: boolean | undefined; snapshot: boolean | undefined; }[] | undefined; saved_query_id?: string | undefined; ecs_mapping?: { [x: string]: { field?: string | undefined; value?: string | string[] | undefined; }; } | undefined; pack_id?: string | undefined; alert_ids?: string[] | undefined; case_ids?: string[] | undefined; event_ids?: string[] | undefined; metadata?: object | undefined; }, alertData?: OutputOf<SetOptional<{ readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.maintenance_window_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>> | undefined) => void"
           ],
           "path": "x-pack/plugins/osquery/server/types.ts",
           "deprecated": false,
@@ -297,7 +297,7 @@
               "label": "alertData",
               "description": [],
               "signature": [
-                "OutputOf<SetOptional<{ readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>> | undefined"
+                "OutputOf<SetOptional<{ readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.maintenance_window_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>> | undefined"
               ],
               "path": "x-pack/plugins/osquery/server/types.ts",
               "deprecated": false,
diff --git a/api_docs/osquery.mdx b/api_docs/osquery.mdx
index 4663fb00ad3f8..7322159ebb60c 100644
--- a/api_docs/osquery.mdx
+++ b/api_docs/osquery.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/osquery
 title: "osquery"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the osquery plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'osquery']
 ---
 import osqueryObj from './osquery.devdocs.json';
diff --git a/api_docs/plugin_directory.mdx b/api_docs/plugin_directory.mdx
index 9c0fa8d2d15ae..562cd9cbbd38e 100644
--- a/api_docs/plugin_directory.mdx
+++ b/api_docs/plugin_directory.mdx
@@ -7,7 +7,7 @@ id: kibDevDocsPluginDirectory
 slug: /kibana-dev-docs/api-meta/plugin-api-directory
 title: Directory
 description: Directory of public APIs available through plugins or packages.
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana']
 ---
 
@@ -21,7 +21,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 
 | API Count | Any Count | Missing comments | Missing exports |
 |--------------|----------|-----------------|--------|
-| 68995 | 526 | 59590 | 1337 |
+| 69009 | 526 | 59602 | 1332 |
 
 ## Plugin Directory
 
@@ -29,8 +29,8 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 |--------------|----------------|-----------|--------------|----------|---------------|--------|
 | <DocLink id="kibActionsPluginApi" text="actions"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 259 | 8 | 254 | 26 |
 | <DocLink id="kibAdvancedSettingsPluginApi" text="advancedSettings"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 36 | 1 | 32 | 2 |
-| <DocLink id="kibAiopsPluginApi" text="aiops"/> | [@elastic/ml-ui](https://github.com/orgs/elastic/teams/ml-ui) | AIOps plugin maintained by ML team. | 37 | 0 | 22 | 0 |
-| <DocLink id="kibAlertingPluginApi" text="alerting"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 601 | 1 | 580 | 42 |
+| <DocLink id="kibAiopsPluginApi" text="aiops"/> | [@elastic/ml-ui](https://github.com/orgs/elastic/teams/ml-ui) | AIOps plugin maintained by ML team. | 38 | 0 | 23 | 0 |
+| <DocLink id="kibAlertingPluginApi" text="alerting"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 602 | 1 | 581 | 42 |
 | <DocLink id="kibApmPluginApi" text="apm"/> | [@elastic/apm-ui](https://github.com/orgs/elastic/teams/apm-ui) | The user interface for Elastic APM | 43 | 0 | 43 | 109 |
 | <DocLink id="kibAssetManagerPluginApi" text="assetManager"/> | [@elastic/infra-monitoring-ui](https://github.com/orgs/elastic/teams/infra-monitoring-ui) | Asset manager plugin for entity assets (inventory, topology, etc) | 3 | 0 | 3 | 0 |
 | <DocLink id="kibBannersPluginApi" text="banners"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 9 | 0 | 9 | 0 |
@@ -49,11 +49,11 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibCloudSecurityPosturePluginApi" text="cloudSecurityPosture"/> | [@elastic/kibana-cloud-security-posture](https://github.com/orgs/elastic/teams/kibana-cloud-security-posture) | The cloud security posture plugin | 17 | 0 | 2 | 2 |
 | <DocLink id="kibConsolePluginApi" text="console"/> | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 13 | 0 | 13 | 1 |
 | <DocLink id="kibContentManagementPluginApi" text="contentManagement"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | Content management app | 143 | 0 | 124 | 7 |
-| <DocLink id="kibControlsPluginApi" text="controls"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | The Controls Plugin contains embeddable components intended to create a simple query interface for end users, and a powerful editing suite that allows dashboard authors to build controls | 273 | 0 | 269 | 10 |
+| <DocLink id="kibControlsPluginApi" text="controls"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | The Controls Plugin contains embeddable components intended to create a simple query interface for end users, and a powerful editing suite that allows dashboard authors to build controls | 301 | 0 | 294 | 13 |
 | crossClusterReplication | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 0 | 0 | 0 | 0 |
 | customBranding | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) |  Enables customization of Kibana | 0 | 0 | 0 | 0 |
 | <DocLink id="kibCustomIntegrationsPluginApi" text="customIntegrations"/> | [@elastic/fleet](https://github.com/orgs/elastic/teams/fleet) | Add custom data integrations so they can be displayed in the Fleet integrations app | 271 | 0 | 252 | 1 |
-| <DocLink id="kibDashboardPluginApi" text="dashboard"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds the Dashboard app to Kibana | 190 | 0 | 181 | 14 |
+| <DocLink id="kibDashboardPluginApi" text="dashboard"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds the Dashboard app to Kibana | 130 | 0 | 125 | 7 |
 | <DocLink id="kibDashboardEnhancedPluginApi" text="dashboardEnhanced"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | - | 54 | 0 | 51 | 0 |
 | <DocLink id="kibDataPluginApi" text="data"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | Data services are useful for searching and querying data from Elasticsearch. Helpful utilities include: a re-usable react query bar, KQL autocomplete, async search, Data Views (Index Patterns) and field formatters. | 3271 | 119 | 2577 | 27 |
 | <DocLink id="kibDataViewEditorPluginApi" text="dataViewEditor"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | This plugin provides the ability to create data views via a modal flyout inside Kibana apps | 16 | 0 | 7 | 0 |
@@ -65,7 +65,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibDiscoverPluginApi" text="discover"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | This plugin contains the Discover application and the saved search embeddable. | 97 | 0 | 78 | 7 |
 | <DocLink id="kibDiscoverEnhancedPluginApi" text="discoverEnhanced"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 37 | 0 | 35 | 2 |
 | <DocLink id="kibEcsDataQualityDashboardPluginApi" text="ecsDataQualityDashboard"/> | [@elastic/security-threat-hunting-investigations](https://github.com/orgs/elastic/teams/security-threat-hunting-investigations) | APIs used to assess the quality of data in Elasticsearch indexes | 2 | 0 | 0 | 0 |
-| <DocLink id="kibEmbeddablePluginApi" text="embeddable"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds embeddables service to Kibana | 545 | 11 | 442 | 4 |
+| <DocLink id="kibEmbeddablePluginApi" text="embeddable"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds embeddables service to Kibana | 544 | 11 | 442 | 4 |
 | <DocLink id="kibEmbeddableEnhancedPluginApi" text="embeddableEnhanced"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Extends embeddable plugin with more functionality | 14 | 0 | 14 | 0 |
 | <DocLink id="kibEncryptedSavedObjectsPluginApi" text="encryptedSavedObjects"/> | [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-security) | This plugin provides encryption and decryption utilities for saved objects containing sensitive information. | 51 | 0 | 44 | 0 |
 | <DocLink id="kibEnterpriseSearchPluginApi" text="enterpriseSearch"/> | [@elastic/enterprise-search-frontend](https://github.com/orgs/elastic/teams/enterprise-search-frontend) | Adds dashboards for discovering and managing Enterprise Search products. | 7 | 0 | 7 | 0 |
@@ -92,7 +92,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibFileUploadPluginApi" text="fileUpload"/> | [@elastic/kibana-gis](https://github.com/orgs/elastic/teams/kibana-gis) | The file upload plugin contains components and services for uploading a file, analyzing its data, and then importing the data into an Elasticsearch index. Supported file types include CSV, TSV, newline-delimited JSON and GeoJSON. | 62 | 0 | 62 | 2 |
 | <DocLink id="kibFilesPluginApi" text="files"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | File upload, download, sharing, and serving over HTTP implementation in Kibana. | 215 | 0 | 10 | 5 |
 | <DocLink id="kibFilesManagementPluginApi" text="filesManagement"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | Simple UI for managing files in Kibana | 2 | 1 | 2 | 0 |
-| <DocLink id="kibFleetPluginApi" text="fleet"/> | [@elastic/fleet](https://github.com/orgs/elastic/teams/fleet) | - | 1101 | 3 | 996 | 27 |
+| <DocLink id="kibFleetPluginApi" text="fleet"/> | [@elastic/fleet](https://github.com/orgs/elastic/teams/fleet) | - | 1103 | 3 | 998 | 27 |
 | ftrApis | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 0 | 0 | 0 | 0 |
 | <DocLink id="kibGlobalSearchPluginApi" text="globalSearch"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 68 | 0 | 14 | 5 |
 | globalSearchBar | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 0 | 0 | 0 | 0 |
@@ -104,7 +104,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibImageEmbeddablePluginApi" text="imageEmbeddable"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | Image embeddable | 3 | 0 | 3 | 1 |
 | <DocLink id="kibIndexLifecycleManagementPluginApi" text="indexLifecycleManagement"/> | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 4 | 0 | 4 | 0 |
 | <DocLink id="kibIndexManagementPluginApi" text="indexManagement"/> | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 177 | 0 | 172 | 3 |
-| <DocLink id="kibInfraPluginApi" text="infra"/> | [@elastic/infra-monitoring-ui](https://github.com/orgs/elastic/teams/infra-monitoring-ui) | This plugin visualizes data from Filebeat and Metricbeat, and integrates with other Observability solutions | 43 | 0 | 40 | 9 |
+| <DocLink id="kibInfraPluginApi" text="infra"/> | [@elastic/infra-monitoring-ui](https://github.com/orgs/elastic/teams/infra-monitoring-ui) | This plugin visualizes data from Filebeat and Metricbeat, and integrates with other Observability solutions | 44 | 0 | 41 | 9 |
 | ingestPipelines | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 0 | 0 | 0 | 0 |
 | inputControlVis | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds Input Control visualization to Kibana | 0 | 0 | 0 | 0 |
 | <DocLink id="kibInspectorPluginApi" text="inspector"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | - | 123 | 2 | 96 | 4 |
@@ -133,7 +133,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibObservabilitySharedPluginApi" text="observabilityShared"/> | [@elastic/actionable-observability](https://github.com/orgs/elastic/teams/actionable-observability) | - | 32 | 0 | 32 | 5 |
 | <DocLink id="kibOsqueryPluginApi" text="osquery"/> | [@elastic/security-defend-workflows](https://github.com/orgs/elastic/teams/security-defend-workflows) | - | 24 | 0 | 24 | 6 |
 | painlessLab | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 0 | 0 | 0 | 0 |
-| <DocLink id="kibPresentationUtilPluginApi" text="presentationUtil"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | The Presentation Utility Plugin is a set of common, shared components and toolkits for solutions within the Presentation space, (e.g. Dashboards, Canvas). | 207 | 8 | 151 | 12 |
+| <DocLink id="kibPresentationUtilPluginApi" text="presentationUtil"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | The Presentation Utility Plugin is a set of common, shared components and toolkits for solutions within the Presentation space, (e.g. Dashboards, Canvas). | 218 | 8 | 164 | 11 |
 | <DocLink id="kibProfilingPluginApi" text="profiling"/> | [@elastic/profiling-ui](https://github.com/orgs/elastic/teams/profiling-ui) | - | 15 | 2 | 15 | 0 |
 | <DocLink id="kibRemoteClustersPluginApi" text="remoteClusters"/> | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 4 | 0 | 4 | 0 |
 | <DocLink id="kibReportingPluginApi" text="reporting"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | Reporting Services enables applications to feature reports that the user can automate with Watcher and download later. | 36 | 0 | 16 | 0 |
@@ -149,7 +149,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibScreenshotModePluginApi" text="screenshotMode"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 32 | 0 | 13 | 0 |
 | <DocLink id="kibScreenshottingPluginApi" text="screenshotting"/> | [@elastic/kibana-reporting-services](https://github.com/orgs/elastic/teams/kibana-reporting-services) | Kibana Screenshotting Plugin | 27 | 0 | 8 | 5 |
 | searchprofiler | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 0 | 0 | 0 | 0 |
-| <DocLink id="kibSecurityPluginApi" text="security"/> | [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-security) | This plugin provides authentication and authorization features, and exposes functionality to understand the capabilities of the currently authenticated user. | 280 | 0 | 94 | 0 |
+| <DocLink id="kibSecurityPluginApi" text="security"/> | [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-security) | This plugin provides authentication and authorization features, and exposes functionality to understand the capabilities of the currently authenticated user. | 282 | 0 | 94 | 1 |
 | <DocLink id="kibSecuritySolutionPluginApi" text="securitySolution"/> | [@elastic/security-solution](https://github.com/orgs/elastic/teams/security-solution) | - | 117 | 0 | 76 | 27 |
 | <DocLink id="kibSessionViewPluginApi" text="sessionView"/> | [@elastic/sec-cloudnative-integrations](https://github.com/orgs/elastic/teams/sec-cloudnative-integrations) | - | 7 | 0 | 7 | 1 |
 | <DocLink id="kibSharePluginApi" text="share"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | Adds URL Service and sharing capabilities to Kibana | 118 | 0 | 59 | 10 |
@@ -170,7 +170,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibTriggersActionsUiPluginApi" text="triggersActionsUi"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 540 | 10 | 511 | 49 |
 | <DocLink id="kibUiActionsPluginApi" text="uiActions"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | Adds UI Actions service to Kibana | 134 | 2 | 92 | 9 |
 | <DocLink id="kibUiActionsEnhancedPluginApi" text="uiActionsEnhanced"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | Extends UI Actions plugin with more functionality | 206 | 0 | 140 | 9 |
-| <DocLink id="kibUnifiedFieldListPluginApi" text="unifiedFieldList"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | Contains functionality for the field list which can be integrated into apps | 276 | 0 | 250 | 7 |
+| <DocLink id="kibUnifiedFieldListPluginApi" text="unifiedFieldList"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | Contains functionality for the field list which can be integrated into apps | 296 | 0 | 270 | 6 |
 | <DocLink id="kibUnifiedHistogramPluginApi" text="unifiedHistogram"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | The `unifiedHistogram` plugin provides UI components to create a layout including a resizable histogram and a main display. | 52 | 0 | 23 | 2 |
 | <DocLink id="kibUnifiedSearchPluginApi" text="unifiedSearch"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | Contains all the key functionality of Kibana's unified search experience.Contains all the key functionality of Kibana's unified search experience. | 137 | 2 | 100 | 20 |
 | upgradeAssistant | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 0 | 0 | 0 | 0 |
@@ -398,7 +398,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnDevUtilsPluginApi" text="@kbn/dev-utils"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 27 | 2 | 24 | 0 |
 | <DocLink id="kibKbnDocLinksPluginApi" text="@kbn/doc-links"/> | [@elastic/kibana-docs](https://github.com/orgs/elastic/teams/kibana-docs) | - | 68 | 0 | 68 | 2 |
 | <DocLink id="kibKbnDocsUtilsPluginApi" text="@kbn/docs-utils"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 1 | 0 | 1 | 0 |
-| <DocLink id="kibKbnDomDragDropPluginApi" text="@kbn/dom-drag-drop"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | - | 45 | 0 | 29 | 4 |
+| <DocLink id="kibKbnDomDragDropPluginApi" text="@kbn/dom-drag-drop"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | - | 52 | 0 | 34 | 4 |
 | <DocLink id="kibKbnEbtToolsPluginApi" text="@kbn/ebt-tools"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 19 | 0 | 11 | 0 |
 | <DocLink id="kibKbnEcsPluginApi" text="@kbn/ecs"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 35125 | 0 | 34718 | 0 |
 | <DocLink id="kibKbnEcsDataQualityDashboardPluginApi" text="@kbn/ecs-data-quality-dashboard"/> | [@elastic/security-threat-hunting-investigations](https://github.com/orgs/elastic/teams/security-threat-hunting-investigations) | - | 9 | 0 | 1 | 0 |
@@ -457,14 +457,14 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnPerformanceTestingDatasetExtractorPluginApi" text="@kbn/performance-testing-dataset-extractor"/> | [@elastic/kibana-performance-testing](https://github.com/orgs/elastic/teams/kibana-performance-testing) | - | 3 | 0 | 3 | 1 |
 | <DocLink id="kibKbnPluginGeneratorPluginApi" text="@kbn/plugin-generator"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 1 | 0 | 1 | 0 |
 | <DocLink id="kibKbnPluginHelpersPluginApi" text="@kbn/plugin-helpers"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 1 | 0 | 1 | 0 |
-| <DocLink id="kibKbnReactFieldPluginApi" text="@kbn/react-field"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 21 | 0 | 10 | 0 |
+| <DocLink id="kibKbnReactFieldPluginApi" text="@kbn/react-field"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 22 | 0 | 9 | 0 |
 | <DocLink id="kibKbnRepoFileMapsPluginApi" text="@kbn/repo-file-maps"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 18 | 0 | 18 | 0 |
 | <DocLink id="kibKbnRepoLinterPluginApi" text="@kbn/repo-linter"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 40 | 0 | 38 | 5 |
 | <DocLink id="kibKbnRepoPathPluginApi" text="@kbn/repo-path"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 13 | 0 | 9 | 0 |
 | <DocLink id="kibKbnRepoSourceClassifierPluginApi" text="@kbn/repo-source-classifier"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 6 | 0 | 6 | 1 |
 | <DocLink id="kibKbnReportingCommonPluginApi" text="@kbn/reporting-common"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 73 | 0 | 65 | 0 |
 | <DocLink id="kibKbnRisonPluginApi" text="@kbn/rison"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 13 | 2 | 8 | 0 |
-| <DocLink id="kibKbnRuleDataUtilsPluginApi" text="@kbn/rule-data-utils"/> | [@elastic/security-detections-response](https://github.com/orgs/elastic/teams/security-detections-response) | - | 102 | 0 | 99 | 0 |
+| <DocLink id="kibKbnRuleDataUtilsPluginApi" text="@kbn/rule-data-utils"/> | [@elastic/security-detections-response](https://github.com/orgs/elastic/teams/security-detections-response) | - | 103 | 0 | 100 | 0 |
 | <DocLink id="kibKbnSavedObjectsSettingsPluginApi" text="@kbn/saved-objects-settings"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 2 | 0 | 2 | 0 |
 | <DocLink id="kibKbnSecuritySolutionSideNavPluginApi" text="@kbn/security-solution-side-nav"/> | [@elastic/security-threat-hunting-explore](https://github.com/orgs/elastic/teams/security-threat-hunting-explore) | - | 30 | 0 | 30 | 0 |
 | <DocLink id="kibKbnSecuritySolutionStorybookConfigPluginApi" text="@kbn/security-solution-storybook-config"/> | [@elastic/security-threat-hunting-explore](https://github.com/orgs/elastic/teams/security-threat-hunting-explore) | - | 2 | 0 | 0 | 0 |
diff --git a/api_docs/presentation_util.devdocs.json b/api_docs/presentation_util.devdocs.json
index f042a9523bd8d..fba58565804b3 100644
--- a/api_docs/presentation_util.devdocs.json
+++ b/api_docs/presentation_util.devdocs.json
@@ -576,7 +576,7 @@
         "label": "cleanFiltersForSerialize",
         "description": [],
         "signature": [
-          "(filters: ",
+          "(filters?: ",
           {
             "pluginId": "@kbn/es-query",
             "scope": "common",
@@ -584,7 +584,7 @@
             "section": "def-common.Filter",
             "text": "Filter"
           },
-          "[]) => ",
+          "[] | undefined) => ",
           {
             "pluginId": "@kbn/es-query",
             "scope": "common",
@@ -594,7 +594,7 @@
           },
           "[]"
         ],
-        "path": "src/plugins/presentation_util/public/redux_embeddables/clean_redux_embeddable_state.ts",
+        "path": "src/plugins/presentation_util/public/redux_tools/redux_embeddables/clean_redux_embeddable_state.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -613,12 +613,12 @@
                 "section": "def-common.Filter",
                 "text": "Filter"
               },
-              "[]"
+              "[] | undefined"
             ],
-            "path": "src/plugins/presentation_util/public/redux_embeddables/clean_redux_embeddable_state.ts",
+            "path": "src/plugins/presentation_util/public/redux_tools/redux_embeddables/clean_redux_embeddable_state.ts",
             "deprecated": false,
             "trackAdoption": false,
-            "isRequired": true
+            "isRequired": false
           }
         ],
         "returnComment": [],
@@ -932,10 +932,10 @@
       },
       {
         "parentPluginId": "presentationUtil",
-        "id": "def-public.lazyLoadReduxEmbeddablePackage",
+        "id": "def-public.lazyLoadReduxToolsPackage",
         "type": "Function",
         "tags": [],
-        "label": "lazyLoadReduxEmbeddablePackage",
+        "label": "lazyLoadReduxToolsPackage",
         "description": [],
         "signature": [
           "() => Promise<",
@@ -943,12 +943,12 @@
             "pluginId": "presentationUtil",
             "scope": "public",
             "docId": "kibPresentationUtilPluginApi",
-            "section": "def-public.ReduxEmbeddablePackage",
-            "text": "ReduxEmbeddablePackage"
+            "section": "def-public.ReduxToolsPackage",
+            "text": "ReduxToolsPackage"
           },
           ">"
         ],
-        "path": "src/plugins/presentation_util/public/redux_embeddables/index.ts",
+        "path": "src/plugins/presentation_util/public/redux_tools/index.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [],
@@ -1079,95 +1079,6 @@
         "returnComment": [],
         "initialIsOpen": false
       },
-      {
-        "parentPluginId": "presentationUtil",
-        "id": "def-public.useReduxEmbeddableContext",
-        "type": "Function",
-        "tags": [],
-        "label": "useReduxEmbeddableContext",
-        "description": [
-          "\nA typed use context hook for embeddables that are not containers. it @returns an\nReduxEmbeddableContextServices object typed to the generic inputTypes and ReducerTypes you pass in.\nNote that the reducer type is optional, but will be required to correctly infer the keys and payload\ntypes of your reducers. use `typeof MyReducers` here to retain them."
-        ],
-        "signature": [
-          "<ReduxEmbeddableStateType extends ",
-          {
-            "pluginId": "presentationUtil",
-            "scope": "public",
-            "docId": "kibPresentationUtilPluginApi",
-            "section": "def-public.ReduxEmbeddableState",
-            "text": "ReduxEmbeddableState"
-          },
-          "<",
-          {
-            "pluginId": "embeddable",
-            "scope": "common",
-            "docId": "kibEmbeddablePluginApi",
-            "section": "def-common.EmbeddableInput",
-            "text": "EmbeddableInput"
-          },
-          ", ",
-          {
-            "pluginId": "embeddable",
-            "scope": "public",
-            "docId": "kibEmbeddablePluginApi",
-            "section": "def-public.EmbeddableOutput",
-            "text": "EmbeddableOutput"
-          },
-          ", unknown> = ",
-          {
-            "pluginId": "presentationUtil",
-            "scope": "public",
-            "docId": "kibPresentationUtilPluginApi",
-            "section": "def-public.ReduxEmbeddableState",
-            "text": "ReduxEmbeddableState"
-          },
-          "<",
-          {
-            "pluginId": "embeddable",
-            "scope": "common",
-            "docId": "kibEmbeddablePluginApi",
-            "section": "def-common.EmbeddableInput",
-            "text": "EmbeddableInput"
-          },
-          ", ",
-          {
-            "pluginId": "embeddable",
-            "scope": "public",
-            "docId": "kibEmbeddablePluginApi",
-            "section": "def-public.EmbeddableOutput",
-            "text": "EmbeddableOutput"
-          },
-          ", unknown>, ReducerType extends ",
-          "EmbeddableReducers",
-          "<ReduxEmbeddableStateType> = ",
-          "EmbeddableReducers",
-          "<ReduxEmbeddableStateType>, EmbeddableType extends ",
-          {
-            "pluginId": "embeddable",
-            "scope": "public",
-            "docId": "kibEmbeddablePluginApi",
-            "section": "def-public.Embeddable",
-            "text": "Embeddable"
-          },
-          "<any, any, any> = ",
-          {
-            "pluginId": "embeddable",
-            "scope": "public",
-            "docId": "kibEmbeddablePluginApi",
-            "section": "def-public.Embeddable",
-            "text": "Embeddable"
-          },
-          "<ReduxEmbeddableStateType[\"explicitInput\"], ReduxEmbeddableStateType[\"output\"], any>>() => ",
-          "ReduxEmbeddableContext",
-          "<ReduxEmbeddableStateType, ReducerType, EmbeddableType>"
-        ],
-        "path": "src/plugins/presentation_util/public/redux_embeddables/use_redux_embeddable_context.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [],
-        "returnComment": [],
-        "initialIsOpen": false
-      },
       {
         "parentPluginId": "presentationUtil",
         "id": "def-public.withSuspense",
@@ -1911,197 +1822,6 @@
         ],
         "initialIsOpen": false
       },
-      {
-        "parentPluginId": "presentationUtil",
-        "id": "def-public.ReduxEmbeddablePackage",
-        "type": "Interface",
-        "tags": [],
-        "label": "ReduxEmbeddablePackage",
-        "description": [
-          "\nThe package type is lazily exported from presentation_util and should contain all methods needed to use the redux embeddable tools."
-        ],
-        "path": "src/plugins/presentation_util/public/redux_embeddables/types.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
-          {
-            "parentPluginId": "presentationUtil",
-            "id": "def-public.ReduxEmbeddablePackage.createTools",
-            "type": "Function",
-            "tags": [],
-            "label": "createTools",
-            "description": [],
-            "signature": [
-              "<ReduxEmbeddableStateType extends ",
-              {
-                "pluginId": "presentationUtil",
-                "scope": "public",
-                "docId": "kibPresentationUtilPluginApi",
-                "section": "def-public.ReduxEmbeddableState",
-                "text": "ReduxEmbeddableState"
-              },
-              "<",
-              {
-                "pluginId": "embeddable",
-                "scope": "common",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-common.EmbeddableInput",
-                "text": "EmbeddableInput"
-              },
-              ", ",
-              {
-                "pluginId": "embeddable",
-                "scope": "public",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-public.EmbeddableOutput",
-                "text": "EmbeddableOutput"
-              },
-              ", unknown> = ",
-              {
-                "pluginId": "presentationUtil",
-                "scope": "public",
-                "docId": "kibPresentationUtilPluginApi",
-                "section": "def-public.ReduxEmbeddableState",
-                "text": "ReduxEmbeddableState"
-              },
-              "<",
-              {
-                "pluginId": "embeddable",
-                "scope": "common",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-common.EmbeddableInput",
-                "text": "EmbeddableInput"
-              },
-              ", ",
-              {
-                "pluginId": "embeddable",
-                "scope": "public",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-public.EmbeddableOutput",
-                "text": "EmbeddableOutput"
-              },
-              ", unknown>, ReducerType extends ",
-              "EmbeddableReducers",
-              "<ReduxEmbeddableStateType> = ",
-              "EmbeddableReducers",
-              "<ReduxEmbeddableStateType>>({ reducers, embeddable, syncSettings, additionalMiddleware, initialComponentState, }: { embeddable: ",
-              {
-                "pluginId": "embeddable",
-                "scope": "public",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-public.Embeddable",
-                "text": "Embeddable"
-              },
-              "<ReduxEmbeddableStateType[\"explicitInput\"], ReduxEmbeddableStateType[\"output\"], any>; additionalMiddleware?: ",
-              "Middleware",
-              "<",
-              "AnyAction",
-              ", any, ",
-              "Dispatch",
-              "<",
-              "AnyAction",
-              ">>[] | undefined; initialComponentState?: ReduxEmbeddableStateType[\"componentState\"] | undefined; syncSettings?: ",
-              "ReduxEmbeddableSyncSettings",
-              "<",
-              {
-                "pluginId": "presentationUtil",
-                "scope": "public",
-                "docId": "kibPresentationUtilPluginApi",
-                "section": "def-public.ReduxEmbeddableState",
-                "text": "ReduxEmbeddableState"
-              },
-              "<",
-              {
-                "pluginId": "embeddable",
-                "scope": "common",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-common.EmbeddableInput",
-                "text": "EmbeddableInput"
-              },
-              ", ",
-              {
-                "pluginId": "embeddable",
-                "scope": "public",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-public.EmbeddableOutput",
-                "text": "EmbeddableOutput"
-              },
-              ", unknown>> | undefined; reducers: ReducerType; }) => ",
-              {
-                "pluginId": "presentationUtil",
-                "scope": "public",
-                "docId": "kibPresentationUtilPluginApi",
-                "section": "def-public.ReduxEmbeddableTools",
-                "text": "ReduxEmbeddableTools"
-              },
-              "<ReduxEmbeddableStateType, ReducerType>"
-            ],
-            "path": "src/plugins/presentation_util/public/redux_embeddables/types.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "returnComment": [],
-            "children": [
-              {
-                "parentPluginId": "presentationUtil",
-                "id": "def-public.ReduxEmbeddablePackage.createTools.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "__0",
-                "description": [],
-                "signature": [
-                  "{ embeddable: ",
-                  {
-                    "pluginId": "embeddable",
-                    "scope": "public",
-                    "docId": "kibEmbeddablePluginApi",
-                    "section": "def-public.Embeddable",
-                    "text": "Embeddable"
-                  },
-                  "<ReduxEmbeddableStateType[\"explicitInput\"], ReduxEmbeddableStateType[\"output\"], any>; additionalMiddleware?: ",
-                  "Middleware",
-                  "<",
-                  "AnyAction",
-                  ", any, ",
-                  "Dispatch",
-                  "<",
-                  "AnyAction",
-                  ">>[] | undefined; initialComponentState?: ReduxEmbeddableStateType[\"componentState\"] | undefined; syncSettings?: ",
-                  "ReduxEmbeddableSyncSettings",
-                  "<",
-                  {
-                    "pluginId": "presentationUtil",
-                    "scope": "public",
-                    "docId": "kibPresentationUtilPluginApi",
-                    "section": "def-public.ReduxEmbeddableState",
-                    "text": "ReduxEmbeddableState"
-                  },
-                  "<",
-                  {
-                    "pluginId": "embeddable",
-                    "scope": "common",
-                    "docId": "kibEmbeddablePluginApi",
-                    "section": "def-common.EmbeddableInput",
-                    "text": "EmbeddableInput"
-                  },
-                  ", ",
-                  {
-                    "pluginId": "embeddable",
-                    "scope": "public",
-                    "docId": "kibEmbeddablePluginApi",
-                    "section": "def-public.EmbeddableOutput",
-                    "text": "EmbeddableOutput"
-                  },
-                  ", unknown>> | undefined; reducers: ReducerType; }"
-                ],
-                "path": "src/plugins/presentation_util/public/redux_embeddables/create_redux_embeddable_tools.tsx",
-                "deprecated": false,
-                "trackAdoption": false
-              }
-            ]
-          }
-        ],
-        "initialIsOpen": false
-      },
       {
         "parentPluginId": "presentationUtil",
         "id": "def-public.ReduxEmbeddableState",
@@ -2121,7 +1841,7 @@
           },
           "<InputType, OutputType, StateType>"
         ],
-        "path": "src/plugins/presentation_util/public/redux_embeddables/types.ts",
+        "path": "src/plugins/presentation_util/public/redux_tools/redux_embeddables/types.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -2135,7 +1855,7 @@
             "signature": [
               "InputType"
             ],
-            "path": "src/plugins/presentation_util/public/redux_embeddables/types.ts",
+            "path": "src/plugins/presentation_util/public/redux_tools/redux_embeddables/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -2149,7 +1869,7 @@
             "signature": [
               "OutputType"
             ],
-            "path": "src/plugins/presentation_util/public/redux_embeddables/types.ts",
+            "path": "src/plugins/presentation_util/public/redux_tools/redux_embeddables/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -2163,7 +1883,7 @@
             "signature": [
               "StateType"
             ],
-            "path": "src/plugins/presentation_util/public/redux_embeddables/types.ts",
+            "path": "src/plugins/presentation_util/public/redux_tools/redux_embeddables/types.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -2177,7 +1897,7 @@
         "tags": [],
         "label": "ReduxEmbeddableTools",
         "description": [
-          "\nThe return type from setupReduxEmbeddable. Contains a wrapper which comes with the store provider and provides the context to react components,\nbut also returns the context object to allow the embeddable class to interact with the redux store."
+          "\nThe return type from createReduxEmbeddableTools. Contains tools to get state, select state for react components,\nset state, and react to state changes."
         ],
         "signature": [
           {
@@ -2189,7 +1909,7 @@
           },
           "<ReduxEmbeddableStateType, ReducerType>"
         ],
-        "path": "src/plugins/presentation_util/public/redux_embeddables/types.ts",
+        "path": "src/plugins/presentation_util/public/redux_tools/redux_embeddables/types.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -2203,7 +1923,7 @@
             "signature": [
               "() => void"
             ],
-            "path": "src/plugins/presentation_util/public/redux_embeddables/types.ts",
+            "path": "src/plugins/presentation_util/public/redux_tools/redux_embeddables/types.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [],
@@ -2211,44 +1931,78 @@
           },
           {
             "parentPluginId": "presentationUtil",
-            "id": "def-public.ReduxEmbeddableTools.Wrapper",
+            "id": "def-public.ReduxEmbeddableTools.store",
+            "type": "Object",
+            "tags": [],
+            "label": "store",
+            "description": [],
+            "signature": [
+              "EnhancedStore",
+              "<ReduxEmbeddableStateType, ",
+              "AnyAction",
+              ", Middlewares<ReduxEmbeddableStateType>>"
+            ],
+            "path": "src/plugins/presentation_util/public/redux_tools/redux_embeddables/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "presentationUtil",
+            "id": "def-public.ReduxEmbeddableTools.select",
             "type": "Function",
             "tags": [],
-            "label": "Wrapper",
+            "label": "select",
             "description": [],
             "signature": [
-              "React.FunctionComponent<{ children?: React.ReactNode; }>"
+              "<Selected extends unknown>(selector: (state: ReduxEmbeddableStateType) => Selected, equalityFn?: ((previous: Selected, next: Selected) => boolean) | undefined) => Selected"
             ],
-            "path": "src/plugins/presentation_util/public/redux_embeddables/types.ts",
+            "path": "src/plugins/presentation_util/public/redux_tools/redux_embeddables/types.ts",
             "deprecated": false,
             "trackAdoption": false,
             "returnComment": [],
             "children": [
               {
                 "parentPluginId": "presentationUtil",
-                "id": "def-public.ReduxEmbeddableTools.Wrapper.$1",
-                "type": "CompoundType",
+                "id": "def-public.ReduxEmbeddableTools.select.$1",
+                "type": "Function",
                 "tags": [],
-                "label": "props",
+                "label": "selector",
                 "description": [],
                 "signature": [
-                  "P & { children?: React.ReactNode; }"
+                  "(state: ReduxStateType) => Selected"
                 ],
-                "path": "node_modules/@types/react/index.d.ts",
+                "path": "src/plugins/presentation_util/public/redux_tools/types.ts",
                 "deprecated": false,
-                "trackAdoption": false
+                "trackAdoption": false,
+                "returnComment": [],
+                "children": [
+                  {
+                    "parentPluginId": "presentationUtil",
+                    "id": "def-public.ReduxEmbeddableTools.select.$1.$1",
+                    "type": "Uncategorized",
+                    "tags": [],
+                    "label": "state",
+                    "description": [],
+                    "signature": [
+                      "ReduxStateType"
+                    ],
+                    "path": "src/plugins/presentation_util/public/redux_tools/types.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  }
+                ]
               },
               {
                 "parentPluginId": "presentationUtil",
-                "id": "def-public.ReduxEmbeddableTools.Wrapper.$2",
-                "type": "Any",
+                "id": "def-public.ReduxEmbeddableTools.select.$2",
+                "type": "Function",
                 "tags": [],
-                "label": "context",
+                "label": "equalityFn",
                 "description": [],
                 "signature": [
-                  "any"
+                  "((previous: Selected, next: Selected) => boolean) | undefined"
                 ],
-                "path": "node_modules/@types/react/index.d.ts",
+                "path": "src/plugins/presentation_util/public/redux_tools/types.ts",
                 "deprecated": false,
                 "trackAdoption": false
               }
@@ -2256,49 +2010,184 @@
           },
           {
             "parentPluginId": "presentationUtil",
-            "id": "def-public.ReduxEmbeddableTools.dispatch",
+            "id": "def-public.ReduxEmbeddableTools.getState",
             "type": "Function",
             "tags": [],
-            "label": "dispatch",
+            "label": "getState",
             "description": [],
             "signature": [
-              "Dispatch",
-              "<",
-              "AnyAction",
-              ">"
+              "() => ReduxEmbeddableStateType"
             ],
-            "path": "src/plugins/presentation_util/public/redux_embeddables/types.ts",
+            "path": "src/plugins/presentation_util/public/redux_tools/redux_embeddables/types.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "returnComment": [],
+            "children": []
+          },
+          {
+            "parentPluginId": "presentationUtil",
+            "id": "def-public.ReduxEmbeddableTools.dispatch",
+            "type": "Object",
+            "tags": [],
+            "label": "dispatch",
+            "description": [],
+            "signature": [
+              "{ [ReducerKey in keyof ReducerType]: (payload: Parameters<ReducerType[ReducerKey]>[1][\"payload\"]) => void; }"
+            ],
+            "path": "src/plugins/presentation_util/public/redux_tools/redux_embeddables/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "presentationUtil",
+            "id": "def-public.ReduxEmbeddableTools.onStateChange",
+            "type": "Function",
+            "tags": [],
+            "label": "onStateChange",
+            "description": [],
+            "signature": [
+              "(listener: () => void) => ",
+              "Unsubscribe"
+            ],
+            "path": "src/plugins/presentation_util/public/redux_tools/redux_embeddables/types.ts",
             "deprecated": false,
             "trackAdoption": false,
             "returnComment": [],
             "children": [
               {
                 "parentPluginId": "presentationUtil",
-                "id": "def-public.ReduxEmbeddableTools.dispatch.$1",
-                "type": "Uncategorized",
+                "id": "def-public.ReduxEmbeddableTools.onStateChange.$1",
+                "type": "Function",
                 "tags": [],
-                "label": "action",
+                "label": "listener",
                 "description": [],
                 "signature": [
-                  "T"
+                  "() => void"
                 ],
                 "path": "node_modules/redux/index.d.ts",
                 "deprecated": false,
+                "trackAdoption": false,
+                "returnComment": [],
+                "children": []
+              }
+            ]
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "presentationUtil",
+        "id": "def-public.ReduxTools",
+        "type": "Interface",
+        "tags": [],
+        "label": "ReduxTools",
+        "description": [
+          "\nThe return type from createReduxTools. Contains tools to get state, select state for react components,\nset state, and react to state changes."
+        ],
+        "signature": [
+          {
+            "pluginId": "presentationUtil",
+            "scope": "public",
+            "docId": "kibPresentationUtilPluginApi",
+            "section": "def-public.ReduxTools",
+            "text": "ReduxTools"
+          },
+          "<ReduxStateType, ReducerType>"
+        ],
+        "path": "src/plugins/presentation_util/public/redux_tools/types.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "presentationUtil",
+            "id": "def-public.ReduxTools.store",
+            "type": "Object",
+            "tags": [],
+            "label": "store",
+            "description": [],
+            "signature": [
+              "EnhancedStore",
+              "<ReduxStateType, ",
+              "AnyAction",
+              ", Middlewares<ReduxStateType>>"
+            ],
+            "path": "src/plugins/presentation_util/public/redux_tools/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "presentationUtil",
+            "id": "def-public.ReduxTools.select",
+            "type": "Function",
+            "tags": [],
+            "label": "select",
+            "description": [],
+            "signature": [
+              "<Selected extends unknown>(selector: (state: ReduxStateType) => Selected, equalityFn?: ((previous: Selected, next: Selected) => boolean) | undefined) => Selected"
+            ],
+            "path": "src/plugins/presentation_util/public/redux_tools/types.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "returnComment": [],
+            "children": [
+              {
+                "parentPluginId": "presentationUtil",
+                "id": "def-public.ReduxTools.select.$1",
+                "type": "Function",
+                "tags": [],
+                "label": "selector",
+                "description": [],
+                "signature": [
+                  "(state: ReduxStateType) => Selected"
+                ],
+                "path": "src/plugins/presentation_util/public/redux_tools/types.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "returnComment": [],
+                "children": [
+                  {
+                    "parentPluginId": "presentationUtil",
+                    "id": "def-public.ReduxTools.select.$1.$1",
+                    "type": "Uncategorized",
+                    "tags": [],
+                    "label": "state",
+                    "description": [],
+                    "signature": [
+                      "ReduxStateType"
+                    ],
+                    "path": "src/plugins/presentation_util/public/redux_tools/types.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  }
+                ]
+              },
+              {
+                "parentPluginId": "presentationUtil",
+                "id": "def-public.ReduxTools.select.$2",
+                "type": "Function",
+                "tags": [],
+                "label": "equalityFn",
+                "description": [],
+                "signature": [
+                  "((previous: Selected, next: Selected) => boolean) | undefined"
+                ],
+                "path": "src/plugins/presentation_util/public/redux_tools/types.ts",
+                "deprecated": false,
                 "trackAdoption": false
               }
             ]
           },
           {
             "parentPluginId": "presentationUtil",
-            "id": "def-public.ReduxEmbeddableTools.getState",
+            "id": "def-public.ReduxTools.getState",
             "type": "Function",
             "tags": [],
             "label": "getState",
             "description": [],
             "signature": [
-              "() => ReduxEmbeddableStateType"
+              "() => ReduxStateType"
             ],
-            "path": "src/plugins/presentation_util/public/redux_embeddables/types.ts",
+            "path": "src/plugins/presentation_util/public/redux_tools/types.ts",
             "deprecated": false,
             "trackAdoption": false,
             "returnComment": [],
@@ -2306,7 +2195,7 @@
           },
           {
             "parentPluginId": "presentationUtil",
-            "id": "def-public.ReduxEmbeddableTools.onStateChange",
+            "id": "def-public.ReduxTools.onStateChange",
             "type": "Function",
             "tags": [],
             "label": "onStateChange",
@@ -2315,14 +2204,14 @@
               "(listener: () => void) => ",
               "Unsubscribe"
             ],
-            "path": "src/plugins/presentation_util/public/redux_embeddables/types.ts",
+            "path": "src/plugins/presentation_util/public/redux_tools/types.ts",
             "deprecated": false,
             "trackAdoption": false,
             "returnComment": [],
             "children": [
               {
                 "parentPluginId": "presentationUtil",
-                "id": "def-public.ReduxEmbeddableTools.onStateChange.$1",
+                "id": "def-public.ReduxTools.onStateChange.$1",
                 "type": "Function",
                 "tags": [],
                 "label": "listener",
@@ -2340,27 +2229,271 @@
           },
           {
             "parentPluginId": "presentationUtil",
-            "id": "def-public.ReduxEmbeddableTools.actions",
-            "type": "CompoundType",
+            "id": "def-public.ReduxTools.dispatch",
+            "type": "Object",
             "tags": [],
-            "label": "actions",
+            "label": "dispatch",
             "description": [],
             "signature": [
-              "{ [Property in keyof ReducerType]: ",
-              "ActionCreatorWithPayload",
-              "<Parameters<ReducerType[Property]>[1][\"payload\"], string>; } & { updateEmbeddableReduxInput: ",
-              "ActionCreatorWithPayload",
-              "<Partial<ReduxEmbeddableStateType[\"explicitInput\"]>, string>; updateEmbeddableReduxOutput: ",
-              "ActionCreatorWithPayload",
-              "<Partial<ReduxEmbeddableStateType[\"output\"]>, string>; }"
+              "{ [ReducerKey in keyof ReducerType]: (payload: Parameters<ReducerType[ReducerKey]>[1][\"payload\"]) => void; }"
             ],
-            "path": "src/plugins/presentation_util/public/redux_embeddables/types.ts",
+            "path": "src/plugins/presentation_util/public/redux_tools/types.ts",
             "deprecated": false,
             "trackAdoption": false
           }
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "presentationUtil",
+        "id": "def-public.ReduxToolsPackage",
+        "type": "Interface",
+        "tags": [],
+        "label": "ReduxToolsPackage",
+        "description": [
+          "\nThe package type is lazily exported from presentation_util and should contain all methods needed to use the redux embeddable tools."
+        ],
+        "path": "src/plugins/presentation_util/public/redux_tools/types.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "presentationUtil",
+            "id": "def-public.ReduxToolsPackage.createReduxTools",
+            "type": "Function",
+            "tags": [],
+            "label": "createReduxTools",
+            "description": [],
+            "signature": [
+              "<ReduxStateType extends unknown, ReducerType extends ",
+              "ReduxToolsReducers",
+              "<ReduxStateType> = ",
+              "ReduxToolsReducers",
+              "<ReduxStateType>>({ reducers, additionalMiddleware, initialState, }: { additionalMiddleware?: ",
+              "Middleware",
+              "<",
+              "AnyAction",
+              ", any, ",
+              "Dispatch",
+              "<",
+              "AnyAction",
+              ">>[] | undefined; initialState: ReduxStateType; reducers: ReducerType; }) => ",
+              {
+                "pluginId": "presentationUtil",
+                "scope": "public",
+                "docId": "kibPresentationUtilPluginApi",
+                "section": "def-public.ReduxTools",
+                "text": "ReduxTools"
+              },
+              "<ReduxStateType, ReducerType>"
+            ],
+            "path": "src/plugins/presentation_util/public/redux_tools/types.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "returnComment": [],
+            "children": [
+              {
+                "parentPluginId": "presentationUtil",
+                "id": "def-public.ReduxToolsPackage.createReduxTools.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "__0",
+                "description": [],
+                "signature": [
+                  "{ additionalMiddleware?: ",
+                  "Middleware",
+                  "<",
+                  "AnyAction",
+                  ", any, ",
+                  "Dispatch",
+                  "<",
+                  "AnyAction",
+                  ">>[] | undefined; initialState: ReduxStateType; reducers: ReducerType; }"
+                ],
+                "path": "src/plugins/presentation_util/public/redux_tools/create_redux_tools.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
+          },
+          {
+            "parentPluginId": "presentationUtil",
+            "id": "def-public.ReduxToolsPackage.createReduxEmbeddableTools",
+            "type": "Function",
+            "tags": [],
+            "label": "createReduxEmbeddableTools",
+            "description": [],
+            "signature": [
+              "<ReduxEmbeddableStateType extends ",
+              {
+                "pluginId": "presentationUtil",
+                "scope": "public",
+                "docId": "kibPresentationUtilPluginApi",
+                "section": "def-public.ReduxEmbeddableState",
+                "text": "ReduxEmbeddableState"
+              },
+              "<",
+              {
+                "pluginId": "embeddable",
+                "scope": "common",
+                "docId": "kibEmbeddablePluginApi",
+                "section": "def-common.EmbeddableInput",
+                "text": "EmbeddableInput"
+              },
+              ", ",
+              {
+                "pluginId": "embeddable",
+                "scope": "public",
+                "docId": "kibEmbeddablePluginApi",
+                "section": "def-public.EmbeddableOutput",
+                "text": "EmbeddableOutput"
+              },
+              ", unknown> = ",
+              {
+                "pluginId": "presentationUtil",
+                "scope": "public",
+                "docId": "kibPresentationUtilPluginApi",
+                "section": "def-public.ReduxEmbeddableState",
+                "text": "ReduxEmbeddableState"
+              },
+              "<",
+              {
+                "pluginId": "embeddable",
+                "scope": "common",
+                "docId": "kibEmbeddablePluginApi",
+                "section": "def-common.EmbeddableInput",
+                "text": "EmbeddableInput"
+              },
+              ", ",
+              {
+                "pluginId": "embeddable",
+                "scope": "public",
+                "docId": "kibEmbeddablePluginApi",
+                "section": "def-public.EmbeddableOutput",
+                "text": "EmbeddableOutput"
+              },
+              ", unknown>, ReducerType extends ",
+              "ReduxToolsReducers",
+              "<ReduxEmbeddableStateType> = ",
+              "ReduxToolsReducers",
+              "<ReduxEmbeddableStateType>>({ reducers, embeddable, syncSettings, additionalMiddleware, initialComponentState, }: { embeddable: ",
+              {
+                "pluginId": "embeddable",
+                "scope": "public",
+                "docId": "kibEmbeddablePluginApi",
+                "section": "def-public.Embeddable",
+                "text": "Embeddable"
+              },
+              "<ReduxEmbeddableStateType[\"explicitInput\"], ReduxEmbeddableStateType[\"output\"], any>; additionalMiddleware?: ",
+              "Middleware",
+              "<",
+              "AnyAction",
+              ", any, ",
+              "Dispatch",
+              "<",
+              "AnyAction",
+              ">>[] | undefined; initialComponentState?: ReduxEmbeddableStateType[\"componentState\"] | undefined; syncSettings?: ",
+              "ReduxEmbeddableSyncSettings",
+              "<",
+              {
+                "pluginId": "presentationUtil",
+                "scope": "public",
+                "docId": "kibPresentationUtilPluginApi",
+                "section": "def-public.ReduxEmbeddableState",
+                "text": "ReduxEmbeddableState"
+              },
+              "<",
+              {
+                "pluginId": "embeddable",
+                "scope": "common",
+                "docId": "kibEmbeddablePluginApi",
+                "section": "def-common.EmbeddableInput",
+                "text": "EmbeddableInput"
+              },
+              ", ",
+              {
+                "pluginId": "embeddable",
+                "scope": "public",
+                "docId": "kibEmbeddablePluginApi",
+                "section": "def-public.EmbeddableOutput",
+                "text": "EmbeddableOutput"
+              },
+              ", unknown>> | undefined; reducers: ReducerType; }) => ",
+              {
+                "pluginId": "presentationUtil",
+                "scope": "public",
+                "docId": "kibPresentationUtilPluginApi",
+                "section": "def-public.ReduxEmbeddableTools",
+                "text": "ReduxEmbeddableTools"
+              },
+              "<ReduxEmbeddableStateType, ReducerType>"
+            ],
+            "path": "src/plugins/presentation_util/public/redux_tools/types.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "returnComment": [],
+            "children": [
+              {
+                "parentPluginId": "presentationUtil",
+                "id": "def-public.ReduxToolsPackage.createReduxEmbeddableTools.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "__0",
+                "description": [],
+                "signature": [
+                  "{ embeddable: ",
+                  {
+                    "pluginId": "embeddable",
+                    "scope": "public",
+                    "docId": "kibEmbeddablePluginApi",
+                    "section": "def-public.Embeddable",
+                    "text": "Embeddable"
+                  },
+                  "<ReduxEmbeddableStateType[\"explicitInput\"], ReduxEmbeddableStateType[\"output\"], any>; additionalMiddleware?: ",
+                  "Middleware",
+                  "<",
+                  "AnyAction",
+                  ", any, ",
+                  "Dispatch",
+                  "<",
+                  "AnyAction",
+                  ">>[] | undefined; initialComponentState?: ReduxEmbeddableStateType[\"componentState\"] | undefined; syncSettings?: ",
+                  "ReduxEmbeddableSyncSettings",
+                  "<",
+                  {
+                    "pluginId": "presentationUtil",
+                    "scope": "public",
+                    "docId": "kibPresentationUtilPluginApi",
+                    "section": "def-public.ReduxEmbeddableState",
+                    "text": "ReduxEmbeddableState"
+                  },
+                  "<",
+                  {
+                    "pluginId": "embeddable",
+                    "scope": "common",
+                    "docId": "kibEmbeddablePluginApi",
+                    "section": "def-common.EmbeddableInput",
+                    "text": "EmbeddableInput"
+                  },
+                  ", ",
+                  {
+                    "pluginId": "embeddable",
+                    "scope": "public",
+                    "docId": "kibEmbeddablePluginApi",
+                    "section": "def-public.EmbeddableOutput",
+                    "text": "EmbeddableOutput"
+                  },
+                  ", unknown>> | undefined; reducers: ReducerType; }"
+                ],
+                "path": "src/plugins/presentation_util/public/redux_tools/redux_embeddables/create_redux_embeddable_tools.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "presentationUtil",
         "id": "def-public.SaveModalDashboardProps",
diff --git a/api_docs/presentation_util.mdx b/api_docs/presentation_util.mdx
index 63d78b82deb52..b14aa9ef478a4 100644
--- a/api_docs/presentation_util.mdx
+++ b/api_docs/presentation_util.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/presentationUtil
 title: "presentationUtil"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the presentationUtil plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'presentationUtil']
 ---
 import presentationUtilObj from './presentation_util.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kib
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 207 | 8 | 151 | 12 |
+| 218 | 8 | 164 | 11 |
 
 ## Client
 
diff --git a/api_docs/profiling.mdx b/api_docs/profiling.mdx
index 3c12612495706..e4f91cc568e2b 100644
--- a/api_docs/profiling.mdx
+++ b/api_docs/profiling.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/profiling
 title: "profiling"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the profiling plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'profiling']
 ---
 import profilingObj from './profiling.devdocs.json';
diff --git a/api_docs/remote_clusters.mdx b/api_docs/remote_clusters.mdx
index a33d94e833ade..b02836b0b4d78 100644
--- a/api_docs/remote_clusters.mdx
+++ b/api_docs/remote_clusters.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/remoteClusters
 title: "remoteClusters"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the remoteClusters plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'remoteClusters']
 ---
 import remoteClustersObj from './remote_clusters.devdocs.json';
diff --git a/api_docs/reporting.mdx b/api_docs/reporting.mdx
index f38277af4ee88..84dcbc5828953 100644
--- a/api_docs/reporting.mdx
+++ b/api_docs/reporting.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/reporting
 title: "reporting"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the reporting plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'reporting']
 ---
 import reportingObj from './reporting.devdocs.json';
diff --git a/api_docs/rollup.mdx b/api_docs/rollup.mdx
index 90c95d189b35b..7b282239d863b 100644
--- a/api_docs/rollup.mdx
+++ b/api_docs/rollup.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/rollup
 title: "rollup"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the rollup plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'rollup']
 ---
 import rollupObj from './rollup.devdocs.json';
diff --git a/api_docs/rule_registry.devdocs.json b/api_docs/rule_registry.devdocs.json
index a7c14ef74b66d..5a12502fb426b 100644
--- a/api_docs/rule_registry.devdocs.json
+++ b/api_docs/rule_registry.devdocs.json
@@ -107,7 +107,7 @@
             "label": "get",
             "description": [],
             "signature": [
-              "({ id, index }: GetAlertParams) => Promise<OutputOf<SetOptional<{ readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>> | undefined>"
+              "({ id, index }: GetAlertParams) => Promise<OutputOf<SetOptional<{ readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.maintenance_window_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>> | undefined>"
             ],
             "path": "x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts",
             "deprecated": false,
@@ -403,7 +403,7 @@
               "SortOptions",
               "[] | undefined; track_total_hits?: boolean | undefined; _source?: string[] | undefined; }) => Promise<",
               "SearchResponse",
-              "<OutputOf<SetOptional<{ readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>>, Record<string, ",
+              "<OutputOf<SetOptional<{ readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.maintenance_window_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>>, Record<string, ",
               "AggregationsAggregate",
               ">>>"
             ],
@@ -2669,7 +2669,7 @@
             "signature": [
               "<TSearchRequest extends ",
               "SearchRequest",
-              ", TAlertDoc = Partial<OutputOf<SetOptional<{ readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>> & OutputOf<SetOptional<{ readonly \"kibana.alert.evaluation.threshold\": { readonly type: \"scaled_float\"; readonly scaling_factor: 100; readonly required: false; }; readonly \"kibana.alert.evaluation.value\": { readonly type: \"scaled_float\"; readonly scaling_factor: 100; readonly required: false; }; }>>>>(request: TSearchRequest) => Promise<",
+              ", TAlertDoc = Partial<OutputOf<SetOptional<{ readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.maintenance_window_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>> & OutputOf<SetOptional<{ readonly \"kibana.alert.evaluation.threshold\": { readonly type: \"scaled_float\"; readonly scaling_factor: 100; readonly required: false; }; readonly \"kibana.alert.evaluation.value\": { readonly type: \"scaled_float\"; readonly scaling_factor: 100; readonly required: false; }; }>>>>(request: TSearchRequest) => Promise<",
               {
                 "pluginId": "@kbn/es-types",
                 "scope": "common",
@@ -3306,7 +3306,7 @@
             "label": "getAlertByAlertUuid",
             "description": [],
             "signature": [
-              "(alertUuid: string) => Promise<Partial<OutputOf<SetOptional<{ readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>> & OutputOf<SetOptional<{ readonly \"kibana.alert.evaluation.threshold\": { readonly type: \"scaled_float\"; readonly scaling_factor: 100; readonly required: false; }; readonly \"kibana.alert.evaluation.value\": { readonly type: \"scaled_float\"; readonly scaling_factor: 100; readonly required: false; }; }>>> | null> | null"
+              "(alertUuid: string) => Promise<Partial<OutputOf<SetOptional<{ readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.maintenance_window_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>> & OutputOf<SetOptional<{ readonly \"kibana.alert.evaluation.threshold\": { readonly type: \"scaled_float\"; readonly scaling_factor: 100; readonly required: false; }; readonly \"kibana.alert.evaluation.value\": { readonly type: \"scaled_float\"; readonly scaling_factor: 100; readonly required: false; }; }>>> | null> | null"
             ],
             "path": "x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.ts",
             "deprecated": false,
@@ -4701,7 +4701,7 @@
         "label": "parseTechnicalFields",
         "description": [],
         "signature": [
-          "(input: unknown, partial?: boolean) => OutputOf<SetOptional<{ readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>>"
+          "(input: unknown, partial?: boolean) => OutputOf<SetOptional<{ readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.maintenance_window_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>>"
         ],
         "path": "x-pack/plugins/rule_registry/common/parse_technical_fields.ts",
         "deprecated": false,
@@ -5077,7 +5077,7 @@
         "label": "ParsedTechnicalFields",
         "description": [],
         "signature": [
-          "{ readonly \"@timestamp\": string; readonly \"kibana.alert.rule.rule_type_id\": string; readonly \"kibana.alert.rule.consumer\": string; readonly \"kibana.alert.instance.id\": string; readonly \"kibana.alert.rule.category\": string; readonly \"kibana.alert.rule.name\": string; readonly \"kibana.alert.rule.producer\": string; readonly \"kibana.alert.rule.revision\": number; readonly \"kibana.alert.rule.uuid\": string; readonly \"kibana.alert.status\": string; readonly \"kibana.alert.uuid\": string; readonly \"kibana.space_ids\": string[]; readonly \"event.action\"?: string | undefined; readonly tags?: string[] | undefined; readonly \"kibana.alert.rule.execution.uuid\"?: string | undefined; readonly \"kibana.alert.action_group\"?: string | undefined; readonly \"kibana.alert.case_ids\"?: string[] | undefined; readonly \"kibana.alert.duration.us\"?: number | undefined; readonly \"kibana.alert.end\"?: string | undefined; readonly \"kibana.alert.flapping\"?: boolean | undefined; readonly \"kibana.alert.flapping_history\"?: boolean[] | undefined; readonly \"kibana.alert.last_detected\"?: string | undefined; readonly \"kibana.alert.reason\"?: string | undefined; readonly \"kibana.alert.rule.parameters\"?: { [key: string]: unknown; } | undefined; readonly \"kibana.alert.rule.tags\"?: string[] | undefined; readonly \"kibana.alert.start\"?: string | undefined; readonly \"kibana.alert.time_range\"?: unknown; readonly \"kibana.alert.workflow_status\"?: string | undefined; readonly \"kibana.version\"?: string | undefined; readonly \"kibana.alert.risk_score\"?: number | undefined; readonly \"kibana.alert.rule.author\"?: string | undefined; readonly \"kibana.alert.rule.created_at\"?: string | undefined; readonly \"kibana.alert.rule.created_by\"?: string | undefined; readonly \"kibana.alert.rule.description\"?: string | undefined; readonly \"kibana.alert.rule.enabled\"?: string | undefined; readonly \"kibana.alert.rule.from\"?: string | undefined; readonly \"kibana.alert.rule.interval\"?: string | undefined; readonly \"kibana.alert.rule.license\"?: string | undefined; readonly \"kibana.alert.rule.note\"?: string | undefined; readonly \"kibana.alert.rule.references\"?: string[] | undefined; readonly \"kibana.alert.rule.rule_id\"?: string | undefined; readonly \"kibana.alert.rule.rule_name_override\"?: string | undefined; readonly \"kibana.alert.rule.to\"?: string | undefined; readonly \"kibana.alert.rule.type\"?: string | undefined; readonly \"kibana.alert.rule.updated_at\"?: string | undefined; readonly \"kibana.alert.rule.updated_by\"?: string | undefined; readonly \"kibana.alert.rule.version\"?: string | undefined; readonly \"kibana.alert.severity\"?: string | undefined; readonly \"kibana.alert.suppression.docs_count\"?: number | undefined; readonly \"kibana.alert.suppression.end\"?: string | undefined; readonly \"kibana.alert.suppression.terms.field\"?: string[] | undefined; readonly \"kibana.alert.suppression.start\"?: string | undefined; readonly \"kibana.alert.suppression.terms.value\"?: string[] | undefined; readonly \"kibana.alert.system_status\"?: string | undefined; readonly \"kibana.alert.workflow_reason\"?: string | undefined; readonly \"kibana.alert.workflow_user\"?: string | undefined; readonly \"ecs.version\"?: string | undefined; readonly \"event.kind\"?: string | undefined; }"
+          "{ readonly \"@timestamp\": string; readonly \"kibana.alert.rule.rule_type_id\": string; readonly \"kibana.alert.rule.consumer\": string; readonly \"kibana.alert.instance.id\": string; readonly \"kibana.alert.rule.category\": string; readonly \"kibana.alert.rule.name\": string; readonly \"kibana.alert.rule.producer\": string; readonly \"kibana.alert.rule.revision\": number; readonly \"kibana.alert.rule.uuid\": string; readonly \"kibana.alert.status\": string; readonly \"kibana.alert.uuid\": string; readonly \"kibana.space_ids\": string[]; readonly \"event.action\"?: string | undefined; readonly tags?: string[] | undefined; readonly \"kibana.alert.rule.execution.uuid\"?: string | undefined; readonly \"kibana.alert.action_group\"?: string | undefined; readonly \"kibana.alert.case_ids\"?: string[] | undefined; readonly \"kibana.alert.duration.us\"?: number | undefined; readonly \"kibana.alert.end\"?: string | undefined; readonly \"kibana.alert.flapping\"?: boolean | undefined; readonly \"kibana.alert.flapping_history\"?: boolean[] | undefined; readonly \"kibana.alert.maintenance_window_ids\"?: string[] | undefined; readonly \"kibana.alert.last_detected\"?: string | undefined; readonly \"kibana.alert.reason\"?: string | undefined; readonly \"kibana.alert.rule.parameters\"?: { [key: string]: unknown; } | undefined; readonly \"kibana.alert.rule.tags\"?: string[] | undefined; readonly \"kibana.alert.start\"?: string | undefined; readonly \"kibana.alert.time_range\"?: unknown; readonly \"kibana.alert.workflow_status\"?: string | undefined; readonly \"kibana.version\"?: string | undefined; readonly \"kibana.alert.risk_score\"?: number | undefined; readonly \"kibana.alert.rule.author\"?: string | undefined; readonly \"kibana.alert.rule.created_at\"?: string | undefined; readonly \"kibana.alert.rule.created_by\"?: string | undefined; readonly \"kibana.alert.rule.description\"?: string | undefined; readonly \"kibana.alert.rule.enabled\"?: string | undefined; readonly \"kibana.alert.rule.from\"?: string | undefined; readonly \"kibana.alert.rule.interval\"?: string | undefined; readonly \"kibana.alert.rule.license\"?: string | undefined; readonly \"kibana.alert.rule.note\"?: string | undefined; readonly \"kibana.alert.rule.references\"?: string[] | undefined; readonly \"kibana.alert.rule.rule_id\"?: string | undefined; readonly \"kibana.alert.rule.rule_name_override\"?: string | undefined; readonly \"kibana.alert.rule.to\"?: string | undefined; readonly \"kibana.alert.rule.type\"?: string | undefined; readonly \"kibana.alert.rule.updated_at\"?: string | undefined; readonly \"kibana.alert.rule.updated_by\"?: string | undefined; readonly \"kibana.alert.rule.version\"?: string | undefined; readonly \"kibana.alert.severity\"?: string | undefined; readonly \"kibana.alert.suppression.docs_count\"?: number | undefined; readonly \"kibana.alert.suppression.end\"?: string | undefined; readonly \"kibana.alert.suppression.terms.field\"?: string[] | undefined; readonly \"kibana.alert.suppression.start\"?: string | undefined; readonly \"kibana.alert.suppression.terms.value\"?: string[] | undefined; readonly \"kibana.alert.system_status\"?: string | undefined; readonly \"kibana.alert.workflow_reason\"?: string | undefined; readonly \"kibana.alert.workflow_user\"?: string | undefined; readonly \"ecs.version\"?: string | undefined; readonly \"event.kind\"?: string | undefined; }"
         ],
         "path": "x-pack/plugins/rule_registry/common/parse_technical_fields.ts",
         "deprecated": false,
diff --git a/api_docs/rule_registry.mdx b/api_docs/rule_registry.mdx
index 03e511b5dd320..b84161d5d6470 100644
--- a/api_docs/rule_registry.mdx
+++ b/api_docs/rule_registry.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ruleRegistry
 title: "ruleRegistry"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the ruleRegistry plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ruleRegistry']
 ---
 import ruleRegistryObj from './rule_registry.devdocs.json';
diff --git a/api_docs/runtime_fields.mdx b/api_docs/runtime_fields.mdx
index abc334737e1d2..4424013ff572b 100644
--- a/api_docs/runtime_fields.mdx
+++ b/api_docs/runtime_fields.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/runtimeFields
 title: "runtimeFields"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the runtimeFields plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'runtimeFields']
 ---
 import runtimeFieldsObj from './runtime_fields.devdocs.json';
diff --git a/api_docs/saved_objects.mdx b/api_docs/saved_objects.mdx
index 1f7640d60a3e5..f757755ea05bb 100644
--- a/api_docs/saved_objects.mdx
+++ b/api_docs/saved_objects.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjects
 title: "savedObjects"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjects plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjects']
 ---
 import savedObjectsObj from './saved_objects.devdocs.json';
diff --git a/api_docs/saved_objects_finder.mdx b/api_docs/saved_objects_finder.mdx
index 9f9007d746036..aa9f4c4e78c66 100644
--- a/api_docs/saved_objects_finder.mdx
+++ b/api_docs/saved_objects_finder.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsFinder
 title: "savedObjectsFinder"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjectsFinder plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsFinder']
 ---
 import savedObjectsFinderObj from './saved_objects_finder.devdocs.json';
diff --git a/api_docs/saved_objects_management.mdx b/api_docs/saved_objects_management.mdx
index cafcf387064c8..46b79ca86c55d 100644
--- a/api_docs/saved_objects_management.mdx
+++ b/api_docs/saved_objects_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsManagement
 title: "savedObjectsManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjectsManagement plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsManagement']
 ---
 import savedObjectsManagementObj from './saved_objects_management.devdocs.json';
diff --git a/api_docs/saved_objects_tagging.mdx b/api_docs/saved_objects_tagging.mdx
index 73795b54fde91..e0e71710e00ac 100644
--- a/api_docs/saved_objects_tagging.mdx
+++ b/api_docs/saved_objects_tagging.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsTagging
 title: "savedObjectsTagging"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjectsTagging plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsTagging']
 ---
 import savedObjectsTaggingObj from './saved_objects_tagging.devdocs.json';
diff --git a/api_docs/saved_objects_tagging_oss.mdx b/api_docs/saved_objects_tagging_oss.mdx
index 8fe115ad61b6b..7236d3680d585 100644
--- a/api_docs/saved_objects_tagging_oss.mdx
+++ b/api_docs/saved_objects_tagging_oss.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsTaggingOss
 title: "savedObjectsTaggingOss"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjectsTaggingOss plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsTaggingOss']
 ---
 import savedObjectsTaggingOssObj from './saved_objects_tagging_oss.devdocs.json';
diff --git a/api_docs/saved_search.devdocs.json b/api_docs/saved_search.devdocs.json
index 8599dfd744e06..e70e50a945a94 100644
--- a/api_docs/saved_search.devdocs.json
+++ b/api_docs/saved_search.devdocs.json
@@ -682,9 +682,7 @@
               "SearchResponse",
               "<unknown, Record<string, ",
               "AggregationsAggregate",
-              ">>>; history: ",
-              "SearchRequest",
-              "[]; setOverwriteDataViewType: (overwriteType: string | false | undefined) => void; setField: <K extends keyof ",
+              ">>>; setField: <K extends keyof ",
               {
                 "pluginId": "data",
                 "scope": "common",
@@ -708,7 +706,9 @@
                 "section": "def-common.SearchSource",
                 "text": "SearchSource"
               },
-              "; removeField: <K extends keyof ",
+              "; history: ",
+              "SearchRequest",
+              "[]; setOverwriteDataViewType: (overwriteType: string | false | undefined) => void; removeField: <K extends keyof ",
               {
                 "pluginId": "data",
                 "scope": "common",
diff --git a/api_docs/saved_search.mdx b/api_docs/saved_search.mdx
index b20decae874f6..dfb3d5a93c308 100644
--- a/api_docs/saved_search.mdx
+++ b/api_docs/saved_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedSearch
 title: "savedSearch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedSearch plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedSearch']
 ---
 import savedSearchObj from './saved_search.devdocs.json';
diff --git a/api_docs/screenshot_mode.mdx b/api_docs/screenshot_mode.mdx
index 5d6890995a537..36db49e11d93d 100644
--- a/api_docs/screenshot_mode.mdx
+++ b/api_docs/screenshot_mode.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/screenshotMode
 title: "screenshotMode"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the screenshotMode plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'screenshotMode']
 ---
 import screenshotModeObj from './screenshot_mode.devdocs.json';
diff --git a/api_docs/screenshotting.mdx b/api_docs/screenshotting.mdx
index 1a81510cb27e3..85e70ce6c39c1 100644
--- a/api_docs/screenshotting.mdx
+++ b/api_docs/screenshotting.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/screenshotting
 title: "screenshotting"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the screenshotting plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'screenshotting']
 ---
 import screenshottingObj from './screenshotting.devdocs.json';
diff --git a/api_docs/security.devdocs.json b/api_docs/security.devdocs.json
index 3c47006b075ed..61a6e77effa7c 100644
--- a/api_docs/security.devdocs.json
+++ b/api_docs/security.devdocs.json
@@ -512,6 +512,19 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "security",
+            "id": "def-public.SecurityLicenseFeatures.allowRoleRemoteIndexPrivileges",
+            "type": "boolean",
+            "tags": [],
+            "label": "allowRoleRemoteIndexPrivileges",
+            "description": [
+              "\nIndicates whether we allow users to define remote index privileges in roles."
+            ],
+            "path": "x-pack/plugins/security/common/licensing/license_features.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "security",
             "id": "def-public.SecurityLicenseFeatures.allowRbac",
@@ -4148,7 +4161,9 @@
                 "section": "def-common.RoleIndexPrivilege",
                 "text": "RoleIndexPrivilege"
               },
-              "[]; run_as: string[]; }"
+              "[]; remote_indices?: ",
+              "RoleRemoteIndexPrivilege",
+              "[] | undefined; run_as: string[]; }"
             ],
             "path": "x-pack/plugins/security/common/model/role.ts",
             "deprecated": false,
@@ -4621,6 +4636,19 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "security",
+            "id": "def-common.SecurityLicenseFeatures.allowRoleRemoteIndexPrivileges",
+            "type": "boolean",
+            "tags": [],
+            "label": "allowRoleRemoteIndexPrivileges",
+            "description": [
+              "\nIndicates whether we allow users to define remote index privileges in roles."
+            ],
+            "path": "x-pack/plugins/security/common/licensing/license_features.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "security",
             "id": "def-common.SecurityLicenseFeatures.allowRbac",
diff --git a/api_docs/security.mdx b/api_docs/security.mdx
index dad65436a8394..a4e2f39a021a4 100644
--- a/api_docs/security.mdx
+++ b/api_docs/security.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/security
 title: "security"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the security plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'security']
 ---
 import securityObj from './security.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 280 | 0 | 94 | 0 |
+| 282 | 0 | 94 | 1 |
 
 ## Client
 
diff --git a/api_docs/security_solution.mdx b/api_docs/security_solution.mdx
index 8ad48aa527f9a..5c8953bebbc1e 100644
--- a/api_docs/security_solution.mdx
+++ b/api_docs/security_solution.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/securitySolution
 title: "securitySolution"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the securitySolution plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'securitySolution']
 ---
 import securitySolutionObj from './security_solution.devdocs.json';
diff --git a/api_docs/session_view.mdx b/api_docs/session_view.mdx
index a9735544749f3..89710df378f7b 100644
--- a/api_docs/session_view.mdx
+++ b/api_docs/session_view.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/sessionView
 title: "sessionView"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the sessionView plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'sessionView']
 ---
 import sessionViewObj from './session_view.devdocs.json';
diff --git a/api_docs/share.mdx b/api_docs/share.mdx
index b747319f1e8dc..33616371bdde7 100644
--- a/api_docs/share.mdx
+++ b/api_docs/share.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/share
 title: "share"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the share plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'share']
 ---
 import shareObj from './share.devdocs.json';
diff --git a/api_docs/snapshot_restore.mdx b/api_docs/snapshot_restore.mdx
index 6db34a3fb6340..f784e999d91c5 100644
--- a/api_docs/snapshot_restore.mdx
+++ b/api_docs/snapshot_restore.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/snapshotRestore
 title: "snapshotRestore"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the snapshotRestore plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'snapshotRestore']
 ---
 import snapshotRestoreObj from './snapshot_restore.devdocs.json';
diff --git a/api_docs/spaces.mdx b/api_docs/spaces.mdx
index a0abb5235fc22..edceb17aecbc9 100644
--- a/api_docs/spaces.mdx
+++ b/api_docs/spaces.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/spaces
 title: "spaces"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the spaces plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'spaces']
 ---
 import spacesObj from './spaces.devdocs.json';
diff --git a/api_docs/stack_alerts.mdx b/api_docs/stack_alerts.mdx
index 54ceca2baa1ac..dae1dcc89df12 100644
--- a/api_docs/stack_alerts.mdx
+++ b/api_docs/stack_alerts.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/stackAlerts
 title: "stackAlerts"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the stackAlerts plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'stackAlerts']
 ---
 import stackAlertsObj from './stack_alerts.devdocs.json';
diff --git a/api_docs/stack_connectors.mdx b/api_docs/stack_connectors.mdx
index f253101036027..a03165ec1210c 100644
--- a/api_docs/stack_connectors.mdx
+++ b/api_docs/stack_connectors.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/stackConnectors
 title: "stackConnectors"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the stackConnectors plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'stackConnectors']
 ---
 import stackConnectorsObj from './stack_connectors.devdocs.json';
diff --git a/api_docs/task_manager.mdx b/api_docs/task_manager.mdx
index fa4754530cfe1..0852713cbf34d 100644
--- a/api_docs/task_manager.mdx
+++ b/api_docs/task_manager.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/taskManager
 title: "taskManager"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the taskManager plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'taskManager']
 ---
 import taskManagerObj from './task_manager.devdocs.json';
diff --git a/api_docs/telemetry.mdx b/api_docs/telemetry.mdx
index 1129c23641775..b8cd7503ca732 100644
--- a/api_docs/telemetry.mdx
+++ b/api_docs/telemetry.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetry
 title: "telemetry"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the telemetry plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetry']
 ---
 import telemetryObj from './telemetry.devdocs.json';
diff --git a/api_docs/telemetry_collection_manager.mdx b/api_docs/telemetry_collection_manager.mdx
index 2bd33bd8db740..23fa239ec026d 100644
--- a/api_docs/telemetry_collection_manager.mdx
+++ b/api_docs/telemetry_collection_manager.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetryCollectionManager
 title: "telemetryCollectionManager"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the telemetryCollectionManager plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetryCollectionManager']
 ---
 import telemetryCollectionManagerObj from './telemetry_collection_manager.devdocs.json';
diff --git a/api_docs/telemetry_collection_xpack.mdx b/api_docs/telemetry_collection_xpack.mdx
index 3536a151b1b87..91d99fa9f3aeb 100644
--- a/api_docs/telemetry_collection_xpack.mdx
+++ b/api_docs/telemetry_collection_xpack.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetryCollectionXpack
 title: "telemetryCollectionXpack"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the telemetryCollectionXpack plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetryCollectionXpack']
 ---
 import telemetryCollectionXpackObj from './telemetry_collection_xpack.devdocs.json';
diff --git a/api_docs/telemetry_management_section.mdx b/api_docs/telemetry_management_section.mdx
index ffa3e18a9de78..ccd415f9218ba 100644
--- a/api_docs/telemetry_management_section.mdx
+++ b/api_docs/telemetry_management_section.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetryManagementSection
 title: "telemetryManagementSection"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the telemetryManagementSection plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetryManagementSection']
 ---
 import telemetryManagementSectionObj from './telemetry_management_section.devdocs.json';
diff --git a/api_docs/threat_intelligence.mdx b/api_docs/threat_intelligence.mdx
index 5dc2189325209..4cb8d56a6fe56 100644
--- a/api_docs/threat_intelligence.mdx
+++ b/api_docs/threat_intelligence.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/threatIntelligence
 title: "threatIntelligence"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the threatIntelligence plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'threatIntelligence']
 ---
 import threatIntelligenceObj from './threat_intelligence.devdocs.json';
diff --git a/api_docs/timelines.mdx b/api_docs/timelines.mdx
index f139696fae67d..a714564fc9471 100644
--- a/api_docs/timelines.mdx
+++ b/api_docs/timelines.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/timelines
 title: "timelines"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the timelines plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'timelines']
 ---
 import timelinesObj from './timelines.devdocs.json';
diff --git a/api_docs/transform.mdx b/api_docs/transform.mdx
index 3a23c501e9939..aeed2698e2031 100644
--- a/api_docs/transform.mdx
+++ b/api_docs/transform.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/transform
 title: "transform"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the transform plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'transform']
 ---
 import transformObj from './transform.devdocs.json';
diff --git a/api_docs/triggers_actions_ui.devdocs.json b/api_docs/triggers_actions_ui.devdocs.json
index 957f8e44345a9..8ead0678dae8c 100644
--- a/api_docs/triggers_actions_ui.devdocs.json
+++ b/api_docs/triggers_actions_ui.devdocs.json
@@ -2709,7 +2709,7 @@
             "description": [],
             "signature": [
               "BasicFields",
-              " & { \"@timestamp\"?: string[] | undefined; \"event.action\"?: string[] | undefined; tags?: string[] | undefined; kibana?: string[] | undefined; \"kibana.alert.rule.rule_type_id\"?: string[] | undefined; \"kibana.alert.rule.consumer\"?: string[] | undefined; \"kibana.alert.rule.execution.uuid\"?: string[] | undefined; \"kibana.alert\"?: string[] | undefined; \"kibana.alert.action_group\"?: string[] | undefined; \"kibana.alert.case_ids\"?: string[] | undefined; \"kibana.alert.duration.us\"?: string[] | undefined; \"kibana.alert.end\"?: string[] | undefined; \"kibana.alert.flapping\"?: string[] | undefined; \"kibana.alert.instance.id\"?: string[] | undefined; \"kibana.alert.reason\"?: string[] | undefined; \"kibana.alert.rule\"?: string[] | undefined; \"kibana.alert.rule.category\"?: string[] | undefined; \"kibana.alert.rule.name\"?: string[] | undefined; \"kibana.alert.rule.parameters\"?: string[] | undefined; \"kibana.alert.rule.producer\"?: string[] | undefined; \"kibana.alert.rule.tags\"?: string[] | undefined; \"kibana.alert.rule.uuid\"?: string[] | undefined; \"kibana.alert.start\"?: string[] | undefined; \"kibana.alert.status\"?: string[] | undefined; \"kibana.alert.time_range\"?: string[] | undefined; \"kibana.alert.uuid\"?: string[] | undefined; \"kibana.alert.workflow_status\"?: string[] | undefined; \"kibana.space_ids\"?: string[] | undefined; \"kibana.version\"?: string[] | undefined; \"kibana.alert.risk_score\"?: string[] | undefined; \"kibana.alert.rule.author\"?: string[] | undefined; \"kibana.alert.rule.created_at\"?: string[] | undefined; \"kibana.alert.rule.created_by\"?: string[] | undefined; \"kibana.alert.rule.description\"?: string[] | undefined; \"kibana.alert.rule.enabled\"?: string[] | undefined; \"kibana.alert.rule.from\"?: string[] | undefined; \"kibana.alert.rule.interval\"?: string[] | undefined; \"kibana.alert.rule.license\"?: string[] | undefined; \"kibana.alert.rule.note\"?: string[] | undefined; \"kibana.alert.rule.references\"?: string[] | undefined; \"kibana.alert.rule.rule_id\"?: string[] | undefined; \"kibana.alert.rule.rule_name_override\"?: string[] | undefined; \"kibana.alert.rule.to\"?: string[] | undefined; \"kibana.alert.rule.type\"?: string[] | undefined; \"kibana.alert.rule.updated_at\"?: string[] | undefined; \"kibana.alert.rule.updated_by\"?: string[] | undefined; \"kibana.alert.rule.version\"?: string[] | undefined; \"kibana.alert.severity\"?: string[] | undefined; \"kibana.alert.suppression.docs_count\"?: string[] | undefined; \"kibana.alert.suppression.end\"?: string[] | undefined; \"kibana.alert.suppression.terms\"?: string[] | undefined; \"kibana.alert.suppression.terms.field\"?: string[] | undefined; \"kibana.alert.suppression.start\"?: string[] | undefined; \"kibana.alert.suppression.terms.value\"?: string[] | undefined; \"kibana.alert.system_status\"?: string[] | undefined; \"kibana.alert.workflow_reason\"?: string[] | undefined; \"kibana.alert.workflow_user\"?: string[] | undefined; \"ecs.version\"?: string[] | undefined; \"event.kind\"?: string[] | undefined; \"kibana.alert.evaluation.threshold\"?: string[] | undefined; \"kibana.alert.evaluation.value\"?: string[] | undefined; \"event.module\"?: string[] | undefined; \"kibana.alert.building_block_type\"?: string[] | undefined; \"kibana.alert.rule.exceptions_list\"?: string[] | undefined; \"kibana.alert.rule.namespace\"?: string[] | undefined; \"kibana.alert.rule.threat.framework\"?: string[] | undefined; \"kibana.alert.rule.threat.tactic.id\"?: string[] | undefined; \"kibana.alert.rule.threat.tactic.name\"?: string[] | undefined; \"kibana.alert.rule.threat.tactic.reference\"?: string[] | undefined; \"kibana.alert.rule.threat.technique.id\"?: string[] | undefined; \"kibana.alert.rule.threat.technique.name\"?: string[] | undefined; \"kibana.alert.rule.threat.technique.reference\"?: string[] | undefined; \"kibana.alert.rule.threat.technique.subtechnique.id\"?: string[] | undefined; \"kibana.alert.rule.threat.technique.subtechnique.name\"?: string[] | undefined; \"kibana.alert.rule.threat.technique.subtechnique.reference\"?: string[] | undefined; } & { [x: string]: unknown[]; }"
+              " & { \"@timestamp\"?: string[] | undefined; \"event.action\"?: string[] | undefined; tags?: string[] | undefined; kibana?: string[] | undefined; \"kibana.alert.rule.rule_type_id\"?: string[] | undefined; \"kibana.alert.rule.consumer\"?: string[] | undefined; \"kibana.alert.rule.execution.uuid\"?: string[] | undefined; \"kibana.alert\"?: string[] | undefined; \"kibana.alert.action_group\"?: string[] | undefined; \"kibana.alert.case_ids\"?: string[] | undefined; \"kibana.alert.duration.us\"?: string[] | undefined; \"kibana.alert.end\"?: string[] | undefined; \"kibana.alert.flapping\"?: string[] | undefined; \"kibana.alert.maintenance_window_ids\"?: string[] | undefined; \"kibana.alert.instance.id\"?: string[] | undefined; \"kibana.alert.reason\"?: string[] | undefined; \"kibana.alert.rule\"?: string[] | undefined; \"kibana.alert.rule.category\"?: string[] | undefined; \"kibana.alert.rule.name\"?: string[] | undefined; \"kibana.alert.rule.parameters\"?: string[] | undefined; \"kibana.alert.rule.producer\"?: string[] | undefined; \"kibana.alert.rule.tags\"?: string[] | undefined; \"kibana.alert.rule.uuid\"?: string[] | undefined; \"kibana.alert.start\"?: string[] | undefined; \"kibana.alert.status\"?: string[] | undefined; \"kibana.alert.time_range\"?: string[] | undefined; \"kibana.alert.uuid\"?: string[] | undefined; \"kibana.alert.workflow_status\"?: string[] | undefined; \"kibana.space_ids\"?: string[] | undefined; \"kibana.version\"?: string[] | undefined; \"kibana.alert.risk_score\"?: string[] | undefined; \"kibana.alert.rule.author\"?: string[] | undefined; \"kibana.alert.rule.created_at\"?: string[] | undefined; \"kibana.alert.rule.created_by\"?: string[] | undefined; \"kibana.alert.rule.description\"?: string[] | undefined; \"kibana.alert.rule.enabled\"?: string[] | undefined; \"kibana.alert.rule.from\"?: string[] | undefined; \"kibana.alert.rule.interval\"?: string[] | undefined; \"kibana.alert.rule.license\"?: string[] | undefined; \"kibana.alert.rule.note\"?: string[] | undefined; \"kibana.alert.rule.references\"?: string[] | undefined; \"kibana.alert.rule.rule_id\"?: string[] | undefined; \"kibana.alert.rule.rule_name_override\"?: string[] | undefined; \"kibana.alert.rule.to\"?: string[] | undefined; \"kibana.alert.rule.type\"?: string[] | undefined; \"kibana.alert.rule.updated_at\"?: string[] | undefined; \"kibana.alert.rule.updated_by\"?: string[] | undefined; \"kibana.alert.rule.version\"?: string[] | undefined; \"kibana.alert.severity\"?: string[] | undefined; \"kibana.alert.suppression.docs_count\"?: string[] | undefined; \"kibana.alert.suppression.end\"?: string[] | undefined; \"kibana.alert.suppression.terms\"?: string[] | undefined; \"kibana.alert.suppression.terms.field\"?: string[] | undefined; \"kibana.alert.suppression.start\"?: string[] | undefined; \"kibana.alert.suppression.terms.value\"?: string[] | undefined; \"kibana.alert.system_status\"?: string[] | undefined; \"kibana.alert.workflow_reason\"?: string[] | undefined; \"kibana.alert.workflow_user\"?: string[] | undefined; \"ecs.version\"?: string[] | undefined; \"event.kind\"?: string[] | undefined; \"kibana.alert.evaluation.threshold\"?: string[] | undefined; \"kibana.alert.evaluation.value\"?: string[] | undefined; \"event.module\"?: string[] | undefined; \"kibana.alert.building_block_type\"?: string[] | undefined; \"kibana.alert.rule.exceptions_list\"?: string[] | undefined; \"kibana.alert.rule.namespace\"?: string[] | undefined; \"kibana.alert.rule.threat.framework\"?: string[] | undefined; \"kibana.alert.rule.threat.tactic.id\"?: string[] | undefined; \"kibana.alert.rule.threat.tactic.name\"?: string[] | undefined; \"kibana.alert.rule.threat.tactic.reference\"?: string[] | undefined; \"kibana.alert.rule.threat.technique.id\"?: string[] | undefined; \"kibana.alert.rule.threat.technique.name\"?: string[] | undefined; \"kibana.alert.rule.threat.technique.reference\"?: string[] | undefined; \"kibana.alert.rule.threat.technique.subtechnique.id\"?: string[] | undefined; \"kibana.alert.rule.threat.technique.subtechnique.name\"?: string[] | undefined; \"kibana.alert.rule.threat.technique.subtechnique.reference\"?: string[] | undefined; } & { [x: string]: unknown[]; }"
             ],
             "path": "x-pack/plugins/triggers_actions_ui/public/types.ts",
             "deprecated": false,
diff --git a/api_docs/triggers_actions_ui.mdx b/api_docs/triggers_actions_ui.mdx
index 8d2457325cc8f..03819af27855d 100644
--- a/api_docs/triggers_actions_ui.mdx
+++ b/api_docs/triggers_actions_ui.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/triggersActionsUi
 title: "triggersActionsUi"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the triggersActionsUi plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'triggersActionsUi']
 ---
 import triggersActionsUiObj from './triggers_actions_ui.devdocs.json';
diff --git a/api_docs/ui_actions.mdx b/api_docs/ui_actions.mdx
index d5cc70c49e339..2d01721be828b 100644
--- a/api_docs/ui_actions.mdx
+++ b/api_docs/ui_actions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/uiActions
 title: "uiActions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the uiActions plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'uiActions']
 ---
 import uiActionsObj from './ui_actions.devdocs.json';
diff --git a/api_docs/ui_actions_enhanced.mdx b/api_docs/ui_actions_enhanced.mdx
index 205ef372f2cf8..9918d61651c5c 100644
--- a/api_docs/ui_actions_enhanced.mdx
+++ b/api_docs/ui_actions_enhanced.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/uiActionsEnhanced
 title: "uiActionsEnhanced"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the uiActionsEnhanced plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'uiActionsEnhanced']
 ---
 import uiActionsEnhancedObj from './ui_actions_enhanced.devdocs.json';
diff --git a/api_docs/unified_field_list.devdocs.json b/api_docs/unified_field_list.devdocs.json
index c21a3c52f5e02..85b36fb927a7f 100644
--- a/api_docs/unified_field_list.devdocs.json
+++ b/api_docs/unified_field_list.devdocs.json
@@ -12,7 +12,13 @@
         "description": [],
         "signature": [
           "<T extends ",
-          "FieldListItem",
+          {
+            "pluginId": "unifiedFieldList",
+            "scope": "public",
+            "docId": "kibUnifiedFieldListPluginApi",
+            "section": "def-public.FieldListItem",
+            "text": "FieldListItem"
+          },
           " = ",
           {
             "pluginId": "dataViews",
@@ -68,10 +74,10 @@
         ],
         "label": "FieldItemButton",
         "description": [
-          "\nInner part of field list item"
+          "\nField list item component"
         ],
         "signature": [
-          "({\n  field,\n  fieldSearchHighlight,\n  isActive,\n  isEmpty,\n  infoIcon,\n  className,\n  getCustomFieldType,\n  onClick,\n  ...otherProps\n}: ",
+          "({\n  field,\n  fieldSearchHighlight,\n  isSelected,\n  isActive,\n  isEmpty,\n  infoIcon,\n  className,\n  getCustomFieldType,\n  dataTestSubj,\n  size,\n  onClick,\n  shouldAlwaysShowAction,\n  buttonAddFieldToWorkspaceProps,\n  buttonRemoveFieldFromWorkspaceProps,\n  onAddFieldToWorkspace,\n  onRemoveFieldFromWorkspace,\n  ...otherProps\n}: ",
           {
             "pluginId": "unifiedFieldList",
             "scope": "public",
@@ -90,7 +96,7 @@
             "id": "def-public.FieldItemButton.$1",
             "type": "Object",
             "tags": [],
-            "label": "{\n  field,\n  fieldSearchHighlight,\n  isActive,\n  isEmpty,\n  infoIcon,\n  className,\n  getCustomFieldType,\n  onClick,\n  ...otherProps\n}",
+            "label": "{\n  field,\n  fieldSearchHighlight,\n  isSelected,\n  isActive,\n  isEmpty,\n  infoIcon,\n  className,\n  getCustomFieldType,\n  dataTestSubj,\n  size,\n  onClick,\n  shouldAlwaysShowAction,\n  buttonAddFieldToWorkspaceProps,\n  buttonRemoveFieldFromWorkspaceProps,\n  onAddFieldToWorkspace,\n  onRemoveFieldFromWorkspace,\n  ...otherProps\n}",
             "description": [],
             "signature": [
               {
@@ -173,7 +179,13 @@
         "description": [],
         "signature": [
           "<T extends ",
-          "FieldListItem",
+          {
+            "pluginId": "unifiedFieldList",
+            "scope": "public",
+            "docId": "kibUnifiedFieldListPluginApi",
+            "section": "def-public.FieldListItem",
+            "text": "FieldListItem"
+          },
           " = ",
           {
             "pluginId": "dataViews",
@@ -230,7 +242,13 @@
         "description": [],
         "signature": [
           "<T extends ",
-          "FieldListItem",
+          {
+            "pluginId": "unifiedFieldList",
+            "scope": "public",
+            "docId": "kibUnifiedFieldListPluginApi",
+            "section": "def-public.FieldListItem",
+            "text": "FieldListItem"
+          },
           " = ",
           {
             "pluginId": "dataViews",
@@ -2389,6 +2407,17 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "unifiedFieldList",
+            "id": "def-public.FieldItemButtonProps.isSelected",
+            "type": "boolean",
+            "tags": [],
+            "label": "isSelected",
+            "description": [],
+            "path": "src/plugins/unified_field_list/public/components/field_item_button/field_item_button.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "unifiedFieldList",
             "id": "def-public.FieldItemButtonProps.isActive",
@@ -2406,13 +2435,10 @@
           {
             "parentPluginId": "unifiedFieldList",
             "id": "def-public.FieldItemButtonProps.isEmpty",
-            "type": "CompoundType",
+            "type": "boolean",
             "tags": [],
             "label": "isEmpty",
             "description": [],
-            "signature": [
-              "boolean | undefined"
-            ],
             "path": "src/plugins/unified_field_list/public/components/field_item_button/field_item_button.tsx",
             "deprecated": false,
             "trackAdoption": false
@@ -2445,6 +2471,34 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "unifiedFieldList",
+            "id": "def-public.FieldItemButtonProps.flush",
+            "type": "string",
+            "tags": [],
+            "label": "flush",
+            "description": [],
+            "signature": [
+              "\"both\" | undefined"
+            ],
+            "path": "src/plugins/unified_field_list/public/components/field_item_button/field_item_button.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "unifiedFieldList",
+            "id": "def-public.FieldItemButtonProps.dragHandle",
+            "type": "Object",
+            "tags": [],
+            "label": "dragHandle",
+            "description": [],
+            "signature": [
+              "React.ReactElement<any, string | React.JSXElementConstructor<any>> | undefined"
+            ],
+            "path": "src/plugins/unified_field_list/public/components/field_item_button/field_item_button.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "unifiedFieldList",
             "id": "def-public.FieldItemButtonProps.getCustomFieldType",
@@ -2466,6 +2520,34 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "unifiedFieldList",
+            "id": "def-public.FieldItemButtonProps.dataTestSubj",
+            "type": "string",
+            "tags": [],
+            "label": "dataTestSubj",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "src/plugins/unified_field_list/public/components/field_item_button/field_item_button.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "unifiedFieldList",
+            "id": "def-public.FieldItemButtonProps.size",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "size",
+            "description": [],
+            "signature": [
+              "\"s\" | \"xs\" | undefined"
+            ],
+            "path": "src/plugins/unified_field_list/public/components/field_item_button/field_item_button.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "unifiedFieldList",
             "id": "def-public.FieldItemButtonProps.onClick",
@@ -2479,6 +2561,116 @@
             "path": "src/plugins/unified_field_list/public/components/field_item_button/field_item_button.tsx",
             "deprecated": false,
             "trackAdoption": false
+          },
+          {
+            "parentPluginId": "unifiedFieldList",
+            "id": "def-public.FieldItemButtonProps.shouldAlwaysShowAction",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "shouldAlwaysShowAction",
+            "description": [],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "src/plugins/unified_field_list/public/components/field_item_button/field_item_button.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "unifiedFieldList",
+            "id": "def-public.FieldItemButtonProps.buttonAddFieldToWorkspaceProps",
+            "type": "Object",
+            "tags": [],
+            "label": "buttonAddFieldToWorkspaceProps",
+            "description": [],
+            "signature": [
+              "Partial<",
+              "EuiButtonIconProps",
+              "> | undefined"
+            ],
+            "path": "src/plugins/unified_field_list/public/components/field_item_button/field_item_button.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "unifiedFieldList",
+            "id": "def-public.FieldItemButtonProps.buttonRemoveFieldFromWorkspaceProps",
+            "type": "Object",
+            "tags": [],
+            "label": "buttonRemoveFieldFromWorkspaceProps",
+            "description": [],
+            "signature": [
+              "Partial<",
+              "EuiButtonIconProps",
+              "> | undefined"
+            ],
+            "path": "src/plugins/unified_field_list/public/components/field_item_button/field_item_button.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "unifiedFieldList",
+            "id": "def-public.FieldItemButtonProps.onAddFieldToWorkspace",
+            "type": "Function",
+            "tags": [],
+            "label": "onAddFieldToWorkspace",
+            "description": [],
+            "signature": [
+              "((field: T) => unknown) | undefined"
+            ],
+            "path": "src/plugins/unified_field_list/public/components/field_item_button/field_item_button.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "unifiedFieldList",
+                "id": "def-public.FieldItemButtonProps.onAddFieldToWorkspace.$1",
+                "type": "Uncategorized",
+                "tags": [],
+                "label": "field",
+                "description": [],
+                "signature": [
+                  "T"
+                ],
+                "path": "src/plugins/unified_field_list/public/components/field_item_button/field_item_button.tsx",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "unifiedFieldList",
+            "id": "def-public.FieldItemButtonProps.onRemoveFieldFromWorkspace",
+            "type": "Function",
+            "tags": [],
+            "label": "onRemoveFieldFromWorkspace",
+            "description": [],
+            "signature": [
+              "((field: T) => unknown) | undefined"
+            ],
+            "path": "src/plugins/unified_field_list/public/components/field_item_button/field_item_button.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "unifiedFieldList",
+                "id": "def-public.FieldItemButtonProps.onRemoveFieldFromWorkspace.$1",
+                "type": "Uncategorized",
+                "tags": [],
+                "label": "field",
+                "description": [],
+                "signature": [
+                  "T"
+                ],
+                "path": "src/plugins/unified_field_list/public/components/field_item_button/field_item_button.tsx",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
           }
         ],
         "initialIsOpen": false
@@ -2873,6 +3065,115 @@
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "unifiedFieldList",
+        "id": "def-public.FieldListItem",
+        "type": "Interface",
+        "tags": [],
+        "label": "FieldListItem",
+        "description": [],
+        "path": "src/plugins/unified_field_list/public/types.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "unifiedFieldList",
+            "id": "def-public.FieldListItem.name",
+            "type": "string",
+            "tags": [],
+            "label": "name",
+            "description": [],
+            "path": "src/plugins/unified_field_list/public/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "unifiedFieldList",
+            "id": "def-public.FieldListItem.type",
+            "type": "string",
+            "tags": [],
+            "label": "type",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "src/plugins/unified_field_list/public/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "unifiedFieldList",
+            "id": "def-public.FieldListItem.displayName",
+            "type": "string",
+            "tags": [],
+            "label": "displayName",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "src/plugins/unified_field_list/public/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "unifiedFieldList",
+            "id": "def-public.FieldListItem.count",
+            "type": "number",
+            "tags": [],
+            "label": "count",
+            "description": [],
+            "signature": [
+              "number | undefined"
+            ],
+            "path": "src/plugins/unified_field_list/public/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "unifiedFieldList",
+            "id": "def-public.FieldListItem.timeSeriesMetric",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "timeSeriesMetric",
+            "description": [],
+            "signature": [
+              "\"histogram\" | \"summary\" | \"gauge\" | \"counter\" | undefined"
+            ],
+            "path": "src/plugins/unified_field_list/public/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "unifiedFieldList",
+            "id": "def-public.FieldListItem.esTypes",
+            "type": "Array",
+            "tags": [],
+            "label": "esTypes",
+            "description": [],
+            "signature": [
+              "string[] | undefined"
+            ],
+            "path": "src/plugins/unified_field_list/public/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "unifiedFieldList",
+            "id": "def-public.FieldListItem.scripted",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "scripted",
+            "description": [],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "src/plugins/unified_field_list/public/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "unifiedFieldList",
         "id": "def-public.FieldListProps",
diff --git a/api_docs/unified_field_list.mdx b/api_docs/unified_field_list.mdx
index b87c428bf726f..0bfa9589612c0 100644
--- a/api_docs/unified_field_list.mdx
+++ b/api_docs/unified_field_list.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedFieldList
 title: "unifiedFieldList"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the unifiedFieldList plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedFieldList']
 ---
 import unifiedFieldListObj from './unified_field_list.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/k
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 276 | 0 | 250 | 7 |
+| 296 | 0 | 270 | 6 |
 
 ## Client
 
diff --git a/api_docs/unified_histogram.mdx b/api_docs/unified_histogram.mdx
index 78d219b601783..913e12fafa5cd 100644
--- a/api_docs/unified_histogram.mdx
+++ b/api_docs/unified_histogram.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedHistogram
 title: "unifiedHistogram"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the unifiedHistogram plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedHistogram']
 ---
 import unifiedHistogramObj from './unified_histogram.devdocs.json';
diff --git a/api_docs/unified_search.mdx b/api_docs/unified_search.mdx
index decb9376b9b01..a6183a041722e 100644
--- a/api_docs/unified_search.mdx
+++ b/api_docs/unified_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedSearch
 title: "unifiedSearch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the unifiedSearch plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedSearch']
 ---
 import unifiedSearchObj from './unified_search.devdocs.json';
diff --git a/api_docs/unified_search_autocomplete.mdx b/api_docs/unified_search_autocomplete.mdx
index 23dac2d6d06ae..4aa4fcaa869db 100644
--- a/api_docs/unified_search_autocomplete.mdx
+++ b/api_docs/unified_search_autocomplete.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedSearch-autocomplete
 title: "unifiedSearch.autocomplete"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the unifiedSearch.autocomplete plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedSearch.autocomplete']
 ---
 import unifiedSearchAutocompleteObj from './unified_search_autocomplete.devdocs.json';
diff --git a/api_docs/url_forwarding.mdx b/api_docs/url_forwarding.mdx
index a131918660baf..852b3c7fd58d9 100644
--- a/api_docs/url_forwarding.mdx
+++ b/api_docs/url_forwarding.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/urlForwarding
 title: "urlForwarding"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the urlForwarding plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'urlForwarding']
 ---
 import urlForwardingObj from './url_forwarding.devdocs.json';
diff --git a/api_docs/usage_collection.mdx b/api_docs/usage_collection.mdx
index 5323eb431a1db..188aafec70a9b 100644
--- a/api_docs/usage_collection.mdx
+++ b/api_docs/usage_collection.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/usageCollection
 title: "usageCollection"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the usageCollection plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'usageCollection']
 ---
 import usageCollectionObj from './usage_collection.devdocs.json';
diff --git a/api_docs/ux.mdx b/api_docs/ux.mdx
index 55579684c8294..a78cde1a1ac20 100644
--- a/api_docs/ux.mdx
+++ b/api_docs/ux.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ux
 title: "ux"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the ux plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ux']
 ---
 import uxObj from './ux.devdocs.json';
diff --git a/api_docs/vis_default_editor.mdx b/api_docs/vis_default_editor.mdx
index 19e4daeb84ec2..387040db5a2fd 100644
--- a/api_docs/vis_default_editor.mdx
+++ b/api_docs/vis_default_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visDefaultEditor
 title: "visDefaultEditor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visDefaultEditor plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visDefaultEditor']
 ---
 import visDefaultEditorObj from './vis_default_editor.devdocs.json';
diff --git a/api_docs/vis_type_gauge.mdx b/api_docs/vis_type_gauge.mdx
index 5cbc1fabc9bdf..ac502da1bac61 100644
--- a/api_docs/vis_type_gauge.mdx
+++ b/api_docs/vis_type_gauge.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeGauge
 title: "visTypeGauge"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeGauge plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeGauge']
 ---
 import visTypeGaugeObj from './vis_type_gauge.devdocs.json';
diff --git a/api_docs/vis_type_heatmap.mdx b/api_docs/vis_type_heatmap.mdx
index ede12c188e2e3..88bb743b1e1a3 100644
--- a/api_docs/vis_type_heatmap.mdx
+++ b/api_docs/vis_type_heatmap.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeHeatmap
 title: "visTypeHeatmap"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeHeatmap plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeHeatmap']
 ---
 import visTypeHeatmapObj from './vis_type_heatmap.devdocs.json';
diff --git a/api_docs/vis_type_pie.mdx b/api_docs/vis_type_pie.mdx
index d9697ae33c35d..803e7d329bf59 100644
--- a/api_docs/vis_type_pie.mdx
+++ b/api_docs/vis_type_pie.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypePie
 title: "visTypePie"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypePie plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypePie']
 ---
 import visTypePieObj from './vis_type_pie.devdocs.json';
diff --git a/api_docs/vis_type_table.mdx b/api_docs/vis_type_table.mdx
index 9177c2197fbb7..14ab24eba5d99 100644
--- a/api_docs/vis_type_table.mdx
+++ b/api_docs/vis_type_table.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeTable
 title: "visTypeTable"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeTable plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeTable']
 ---
 import visTypeTableObj from './vis_type_table.devdocs.json';
diff --git a/api_docs/vis_type_timelion.mdx b/api_docs/vis_type_timelion.mdx
index 502100b2541ef..d5e05b8e749d2 100644
--- a/api_docs/vis_type_timelion.mdx
+++ b/api_docs/vis_type_timelion.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeTimelion
 title: "visTypeTimelion"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeTimelion plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeTimelion']
 ---
 import visTypeTimelionObj from './vis_type_timelion.devdocs.json';
diff --git a/api_docs/vis_type_timeseries.mdx b/api_docs/vis_type_timeseries.mdx
index 01ec3973ced2f..f3c8850a690ee 100644
--- a/api_docs/vis_type_timeseries.mdx
+++ b/api_docs/vis_type_timeseries.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeTimeseries
 title: "visTypeTimeseries"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeTimeseries plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeTimeseries']
 ---
 import visTypeTimeseriesObj from './vis_type_timeseries.devdocs.json';
diff --git a/api_docs/vis_type_vega.mdx b/api_docs/vis_type_vega.mdx
index 2a75cae2ee36d..5f9482a8d8748 100644
--- a/api_docs/vis_type_vega.mdx
+++ b/api_docs/vis_type_vega.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeVega
 title: "visTypeVega"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeVega plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeVega']
 ---
 import visTypeVegaObj from './vis_type_vega.devdocs.json';
diff --git a/api_docs/vis_type_vislib.mdx b/api_docs/vis_type_vislib.mdx
index 88c97e8638f13..b4ffd1665696c 100644
--- a/api_docs/vis_type_vislib.mdx
+++ b/api_docs/vis_type_vislib.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeVislib
 title: "visTypeVislib"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeVislib plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeVislib']
 ---
 import visTypeVislibObj from './vis_type_vislib.devdocs.json';
diff --git a/api_docs/vis_type_xy.mdx b/api_docs/vis_type_xy.mdx
index b3f1e332f5e8a..67cd8879d9daa 100644
--- a/api_docs/vis_type_xy.mdx
+++ b/api_docs/vis_type_xy.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeXy
 title: "visTypeXy"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeXy plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeXy']
 ---
 import visTypeXyObj from './vis_type_xy.devdocs.json';
diff --git a/api_docs/visualizations.devdocs.json b/api_docs/visualizations.devdocs.json
index e29566167cad6..b267870a5d419 100644
--- a/api_docs/visualizations.devdocs.json
+++ b/api_docs/visualizations.devdocs.json
@@ -4166,15 +4166,7 @@
             "label": "timefilter",
             "description": [],
             "signature": [
-              "{ setRefreshInterval: (refreshInterval: Partial<",
-              {
-                "pluginId": "data",
-                "scope": "common",
-                "docId": "kibDataQueryPluginApi",
-                "section": "def-common.RefreshInterval",
-                "text": "RefreshInterval"
-              },
-              ">) => void; isTimeRangeSelectorEnabled: () => boolean; isAutoRefreshSelectorEnabled: () => boolean; isTimeTouched: () => boolean; isRefreshIntervalTouched: () => boolean; getEnabledUpdated$: () => ",
+              "{ isTimeRangeSelectorEnabled: () => boolean; isAutoRefreshSelectorEnabled: () => boolean; isTimeTouched: () => boolean; isRefreshIntervalTouched: () => boolean; getEnabledUpdated$: () => ",
               "Observable",
               "<boolean>; getTimeUpdate$: () => ",
               "Observable",
@@ -4218,7 +4210,15 @@
                 "section": "def-common.RefreshInterval",
                 "text": "RefreshInterval"
               },
-              "; createFilter: (indexPattern: ",
+              "; setRefreshInterval: (refreshInterval: Partial<",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataQueryPluginApi",
+                "section": "def-common.RefreshInterval",
+                "text": "RefreshInterval"
+              },
+              ">) => void; createFilter: (indexPattern: ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
@@ -6328,7 +6328,7 @@
             "section": "def-public.VisualizeInput",
             "text": "VisualizeInput"
           },
-          "; getDescription: () => string; reload: () => Promise<void>; destroy: () => void; getQuery: () => Promise<",
+          "; getDescription: () => string; destroy: () => void; getQuery: () => Promise<",
           {
             "pluginId": "@kbn/es-query",
             "scope": "common",
@@ -6400,7 +6400,7 @@
             "section": "def-public.ExpressionRenderError",
             "text": "ExpressionRenderError"
           },
-          ") => void; supportedTriggers: () => string[]; getExpressionVariables$: () => ",
+          ") => void; reload: () => Promise<void>; supportedTriggers: () => string[]; getExpressionVariables$: () => ",
           "Observable",
           "<Record<string, unknown> | undefined>; getExpressionVariables: () => Record<string, unknown> | undefined; inputIsRefType: (input: ",
           {
diff --git a/api_docs/visualizations.mdx b/api_docs/visualizations.mdx
index 1d18208d4c2fd..4ff9c14f3f6a0 100644
--- a/api_docs/visualizations.mdx
+++ b/api_docs/visualizations.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visualizations
 title: "visualizations"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visualizations plugin
-date: 2023-04-19
+date: 2023-04-20
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visualizations']
 ---
 import visualizationsObj from './visualizations.devdocs.json';